fixed failing tests

sockets/src/test/java/com/baeldung/socket/EchoMultiTest.java

@@ -14,46 +14,44 @@ public class EchoMultiTest {
 		Executors.newSingleThreadExecutor().submit(() -> new EchoMultiServer().start(5555));
 	}
 
-	EchoClient client = new EchoClient();
 
-	@Before
+	@Test
-	public void init() {
+	public void givenClient1_whenServerResponds_thenCorrect() {
+		EchoClient client = new EchoClient();
 		client.startConnection("127.0.0.1", 5555);
-	}
+		String msg1 = client.sendMessage("hello");
-
+		String msg2 = client.sendMessage("world");
-	@After
+		String terminate = client.sendMessage(".");
-	public void finish(){
+		assertEquals(msg1, "hello");
+		assertEquals(msg2, "world");
+		assertEquals(terminate, "bye");
 		client.stopConnection();
 	}
 
-	@Test
-	public void givenClient1_whenServerResponds_thenCorrect() {
-		String msg1 = client.sendMessage("hello");
-		String msg2 = client.sendMessage("world");
-		String terminate = client.sendMessage(".");
-		assertEquals(msg1, "hello");
-		assertEquals(msg2, "world");
-		assertEquals(terminate, "bye");
-	}
-
 	@Test
 	public void givenClient2_whenServerResponds_thenCorrect() {
+		EchoClient client = new EchoClient();
+		client.startConnection("127.0.0.1", 5555);
 		String msg1 = client.sendMessage("hello");
 		String msg2 = client.sendMessage("world");
 		String terminate = client.sendMessage(".");
 		assertEquals(msg1, "hello");
 		assertEquals(msg2, "world");
 		assertEquals(terminate, "bye");
+		client.stopConnection();
 	}
 
 	@Test
 	public void givenClient3_whenServerResponds_thenCorrect() {
+		EchoClient client = new EchoClient();
+		client.startConnection("127.0.0.1", 5555);
 		String msg1 = client.sendMessage("hello");
 		String msg2 = client.sendMessage("world");
 		String terminate = client.sendMessage(".");
 		assertEquals(msg1, "hello");
 		assertEquals(msg2, "world");
 		assertEquals(terminate, "bye");
+		client.stopConnection();
 	}
 
 }

sockets/src/test/java/com/baeldung/socket/EchoTest.java

@@ -4,19 +4,23 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
+import java.util.concurrent.Executors;
 
 import static org.junit.Assert.assertEquals;
 
 public class EchoTest {
-	EchoClient client = null;
+	{
+		Executors.newSingleThreadExecutor().submit(() -> new EchoServer().start(4444));
+	}
+
+	EchoClient client = new EchoClient();
 
 	@Before
-	public void setup() {
+	public void init() {
-		client = new EchoClient();
 		client.startConnection("127.0.0.1", 4444);
 	}
 
-	@Test @Ignore
+	@Test
 	public void givenClient_whenServerEchosMessage_thenCorrect() {
 
 		String resp1 = client.sendMessage("hello");

sockets/src/test/java/com/baeldung/socket/GreetServerTest.java

@@ -19,11 +19,12 @@ public class GreetServerTest {
     @Before
     public void init() {
         client = new GreetClient();
+		client.startConnection("127.0.0.1", 6666);
+
     }
 
     @Test
     public void givenGreetingClient_whenServerRespondsWhenStarted_thenCorrect() {
-        client.startConnection("127.0.0.1", 6666);
         String response = client.sendMessage("hello server");
         assertEquals("hello client", response);
     }