emmanuel/gclc-core
emmanuel/gclc-core
1
0
Fork 0
Code Issues 2 Pull Requests Projects 1 Releases Wiki Activity

Removed unreachable code, set test output in fine grain logging

Browse Source 
Signed-off-by: Emmanuel Bigeon <emmanuel@bigeon.fr>
This commit is contained in:
Emmanuel Bigeon 2016-12-03 11:12:02 -05:00
parent f3c3580855
commit d07795cb6a
2 changed files with 17 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gclc-socket/src/main/java/fr/bigeon/gclc/socket/SocketConsoleApplicationShell.java
View File

@ -203,12 +203,6 @@ public class SocketConsoleApplicationShell implements Runnable {
BufferedReader inBuf = new BufferedReader(isr)) { BufferedReader inBuf = new BufferedReader(isr)) {
consoleInput.connect(outStream); consoleInput.connect(outStream);
runSokectServer(); runSokectServer();
// Close the application
// Pass command to application
if (app.isRunning()) {
writer.write(applicationShutdown + EOL);
writer.flush();
}
} }
} catch ( } catch (
@ -278,7 +272,8 @@ public class SocketConsoleApplicationShell implements Runnable {
* @throws IOException if the communication failed */ * @throws IOException if the communication failed */
private void communicate(final Socket socket, final PrintWriter writer, private void communicate(final Socket socket, final PrintWriter writer,
BufferedReader in) throws IOException { BufferedReader in) throws IOException {
Thread th = new Thread(new OutputForwardRunnable(writer, socket), "ClientComm"); //$NON-NLS-1$ Thread th = new Thread(new OutputForwardRunnable(writer, socket),
"ClientComm"); //$NON-NLS-1$
th.start(); th.start();
if (autoClose) { if (autoClose) {
communicateOnce(socket, in); communicateOnce(socket, in);
@ -295,9 +290,7 @@ public class SocketConsoleApplicationShell implements Runnable {
ReadingRunnable reading = new ReadingRunnable(in); ReadingRunnable reading = new ReadingRunnable(in);
Thread th = new Thread(reading, "gclcToApp"); //$NON-NLS-1$ Thread th = new Thread(reading, "gclcToApp"); //$NON-NLS-1$
th.start(); th.start();
if (app.isRunning()) {
communicationContent(reading); communicationContent(reading);
}
reading.setRunning(false); reading.setRunning(false);
socket.shutdownOutput(); socket.shutdownOutput();
} }

30
gclc-socket/src/test/java/fr/bigeon/gclc/socket/SocketConsoleApplicationTest.java
View File

@ -48,20 +48,18 @@ import java.io.IOException;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.net.Socket; import java.net.Socket;
import java.util.Arrays; import java.util.logging.Logger;
import org.junit.Test; import org.junit.Test;
import fr.bigeon.smu.StringEncoder;
/** Test class for {@link SocketConsoleApplicationShell} /** Test class for {@link SocketConsoleApplicationShell}
* *
* @author Emmanuel Bigeon */ * @author Emmanuel Bigeon */
@SuppressWarnings({"static-method", "unused", "javadoc", "nls"}) @SuppressWarnings({"static-method", "unused", "javadoc", "nls"})
public class SocketConsoleApplicationTest { public class SocketConsoleApplicationTest {
private static final StringEncoder ENCODER = new StringEncoder("%", private static final Logger LOGGER = Logger
Arrays.asList("\n")); //$NON-NLS-1$ .getLogger(SocketConsoleApplicationTest.class.getName());
@Test @Test
public void integrationTest() { public void integrationTest() {
@ -90,14 +88,14 @@ public class SocketConsoleApplicationTest {
int i = 0; int i = 0;
String[] cmds = {"help", "toto", "test", "bye"}; String[] cmds = {"help", "toto", "test", "bye"};
while ((fromServer = in.readLine()) != null) { while ((fromServer = in.readLine()) != null) {
System.out.println("Server: \n" + ENCODER.decode(fromServer)); LOGGER.fine("Server: \n" + fromServer);
if (fromServer.equals("Bye.")) { if (fromServer.equals("Bye.")) {
break; break;
} }
while (fromServer != null && !fromServer.equals("> ")) { while (fromServer != null && !fromServer.equals("> ")) {
fromServer = in.readLine(); fromServer = in.readLine();
System.out System.out
.println("Server: \n" + ENCODER.decode(fromServer)); .println("Server: \n" + fromServer);
} }
if (fromServer == null) { if (fromServer == null) {
fail("Null pointer"); fail("Null pointer");
@ -105,7 +103,7 @@ public class SocketConsoleApplicationTest {
final String fromUser = cmds[i]; final String fromUser = cmds[i];
if (fromUser != null) { if (fromUser != null) {
System.out.println("Client: " + fromUser); LOGGER.fine("Client: " + fromUser);
out.println(fromUser); out.println(fromUser);
} }
i++; i++;
@ -126,20 +124,20 @@ public class SocketConsoleApplicationTest {
String[] cmds = {"help", "toto", "test", String[] cmds = {"help", "toto", "test",
ConsoleTestApplication.EXIT}; ConsoleTestApplication.EXIT};
while ((fromServer = in.readLine()) != null) { while ((fromServer = in.readLine()) != null) {
System.out.println("Server: \n" + ENCODER.decode(fromServer)); LOGGER.fine("Server: \n" + fromServer);
while (fromServer != null && !fromServer.equals("> ")) { while (fromServer != null && !fromServer.equals("> ")) {
System.out System.out
.println("Server: \n" + ENCODER.decode(fromServer)); .println("Server: \n" + fromServer);
fromServer = in.readLine(); fromServer = in.readLine();
} }
if (fromServer == null) { if (fromServer == null) {
break; break;
} }
System.out.println("Server: \n" + ENCODER.decode(fromServer)); LOGGER.fine("Server: \n" + fromServer);
final String fromUser = cmds[i]; final String fromUser = cmds[i];
if (fromUser != null) { if (fromUser != null) {
System.out.println("Client: " + fromUser); LOGGER.fine("Client: " + fromUser);
out.println(fromUser); out.println(fromUser);
} }
i++; i++;
@ -168,7 +166,7 @@ public class SocketConsoleApplicationTest {
while (fromServer != null && !fromServer.equals("> ")) { while (fromServer != null && !fromServer.equals("> ")) {
fromServer = in.readLine(); fromServer = in.readLine();
System.out System.out
.println("Server: \n" + ENCODER.decode(fromServer)); .println("Server: \n" + fromServer);
} }
if (fromServer == null) { if (fromServer == null) {
break; break;
@ -176,7 +174,7 @@ public class SocketConsoleApplicationTest {
final String fromUser = cmds[i]; final String fromUser = cmds[i];
if (fromUser != null) { if (fromUser != null) {
System.out.println("Client: " + fromUser); LOGGER.fine("Client: " + fromUser);
out.println(fromUser); out.println(fromUser);
} }
i++; i++;
@ -217,7 +215,7 @@ public class SocketConsoleApplicationTest {
!fromServer.equals("See you")) { !fromServer.equals("See you")) {
fromServer = in.readLine(); fromServer = in.readLine();
System.out System.out
.println("Server: \n" + ENCODER.decode(fromServer)); .println("Server: \n" + fromServer);
} }
if (fromServer == null || fromServer.equals("Bye.") || if (fromServer == null || fromServer.equals("Bye.") ||
fromServer.equals("See you")) { fromServer.equals("See you")) {
@ -226,7 +224,7 @@ public class SocketConsoleApplicationTest {
final String fromUser = cmds[i]; final String fromUser = cmds[i];
if (fromUser != null) { if (fromUser != null) {
System.out.println("Client: " + fromUser); LOGGER.fine("Client: " + fromUser);
out.println(fromUser); out.println(fromUser);
} }
i++; i++;