E11 T1

Author: slagyr

test/cleancoderscom/socketserver/SocketServerTest.java

@@ -11,22 +11,30 @@
 
 import static org.junit.Assert.*;
 
-@RunWith(HierarchicalContextRunner.class)
 public class SocketServerTest {
-  private ClosingSocketService service;
   private SocketServer server;
+  private EchoSocketService echoService;
   private int port;
 
   @Before
-  public void setup() {
+  public void setup() throws Exception {
     port = 8042;
+    echoService = new EchoSocketService();
+    server = new SocketServer(port, echoService);
+  }
+
+  @After
+  public void tearDown() throws Exception {
+    server.stop();
   }
 
   public static abstract class TestSocketService implements SocketService {
     public void serve(Socket s) {
       try {
         doService(s);
-        synchronized(this) { notify(); }
+        synchronized(this) {
+          notify();
+        }
         s.close();
       } catch(IOException e) {
         e.printStackTrace();
@@ -36,112 +44,6 @@ public void serve(Socket s) {
     protected abstract void doService(Socket s) throws IOException;
   }
 
-  public static class ClosingSocketService extends TestSocketService {
-    public int connections;
-
-    protected void doService(Socket s) throws IOException {
-      connections++;
-    }
-  }
-
-  public class WithClosingSocketService {
-    @Before
-    public void setUp() throws Exception {
-      service = new ClosingSocketService();
-      server = new SocketServer(port, service);
-    }
-
-    @After
-    public void tearDown() throws Exception {
-      server.stop();
-    }
-
-    @Test
-    public void instantiate() throws Exception {
-      assertEquals(port, server.getPort());
-      assertEquals(service, server.getService());
-    }
-
-    @Test
-    public void canStartAndStopServer() throws Exception {
-      server.start();
-      assertTrue(server.isRunning());
-      server.stop();
-      assertFalse(server.isRunning());
-    }
-
-    @Test
-    public void acceptsAnIncomingConnection() throws Exception {
-      // TODO - MDM - Possible Race Condition?  Have seen hanging test.
-      server.start();
-      new Socket("localhost", port);
-      synchronized(service) {
-        service.wait();
-      }
-      server.stop();
-
-      assertEquals(1, service.connections);
-    }
-
-    @Test
-    public void acceptsMultipleIncomingConnections() throws Exception {
-      // TODO - MDM - Possible Race Condition?  Have seen hanging test.
-      server.start();
-      new Socket("localhost", port);
-      synchronized(service) {
-        service.wait();
-      }
-      new Socket("localhost", port);
-      synchronized(service) {
-        service.wait();
-      }
-      server.stop();
-
-      assertEquals(2, service.connections);
-    }
-  }
-
-  public static class ReadingSocketService extends TestSocketService {
-    public String message;
-
-    protected void doService(Socket s) throws IOException {
-      InputStream is = s.getInputStream();
-      InputStreamReader isr = new InputStreamReader(is);
-      BufferedReader br = new BufferedReader(isr);
-      message = br.readLine();
-    }
-  }
-
-  public class WithReadingSocketService {
-    private ReadingSocketService readingService;
-
-    @Before
-    public void setup() throws Exception {
-      readingService = new ReadingSocketService();
-      server = new SocketServer(port, readingService);
-    }
-
-    @After
-    public void tearDown() throws Exception {
-      server.stop();
-    }
-
-    @Test
-    public void canSendAndReceiveData() throws Exception {
-      // TODO - MDM - Possible Race Condition?  Have seen hanging test.
-      server.start();
-      Socket s = new Socket("localhost", port);
-      OutputStream os = s.getOutputStream();
-      os.write("hello\n".getBytes());
-      synchronized(readingService) {
-        readingService.wait();
-      }
-      server.stop();
-
-      assertEquals("hello", readingService.message);
-    }
-  }
-
   public static class EchoSocketService extends TestSocketService {
 
     protected void doService(Socket s) throws IOException {
@@ -155,37 +57,25 @@ protected void doService(Socket s) throws IOException {
     }
   }
 
-  public class WithEchoSocketService {
-    private EchoSocketService echoService;
-
-    @Before
-    public void setup() throws Exception {
-      echoService = new EchoSocketService();
-      server = new SocketServer(port, echoService);
-    }
-
-    @After
-    public void tearDown() throws Exception {
-      server.stop();
-    }
+  @Test
+  public void canEcho() throws Exception {
+    server.start();
+    Thread.yield();
+    Socket s = new Socket("localhost", port);
+    OutputStream os = s.getOutputStream();
+    os.write("echo\n".getBytes());
+    InputStream is = s.getInputStream();
+    InputStreamReader isr = new InputStreamReader(is);
+    BufferedReader br = new BufferedReader(isr);
+    String response = br.readLine();
+    assertEquals("echo", response);
+  }
 
-    @Test
-    public void canEcho() throws Exception {
-      // TODO - MDM - Possible Race Condition?  Have seen hanging test.
-      server.start();
-      Socket s = new Socket("localhost", port);
-      OutputStream os = s.getOutputStream();
-      os.write("echo\n".getBytes());
-      synchronized(echoService) {
-        echoService.wait();
-      }
-      InputStream is = s.getInputStream();
-      InputStreamReader isr = new InputStreamReader(is);
-      BufferedReader br = new BufferedReader(isr);
-      String response = br.readLine();
-      assertEquals("echo", response);
-    }
+  @Test
+  public void multipleEchos() throws Exception
+  {
+    
   }
+}
 
 
-}