From e71fcf4ef7f30a096e67495d5d45a4366289dee2 Mon Sep 17 00:00:00 2001
From: egimaben <egimaben@gmail.com>
Date: Wed, 24 Aug 2016 18:11:18 +0300
Subject: [PATCH] fixed failing tests

---
 .../com/baeldung/socket/EchoMultiTest.java    | 32 +++++++++----------
 .../java/com/baeldung/socket/EchoTest.java    | 12 ++++---
 .../com/baeldung/socket/GreetServerTest.java  |  3 +-
 3 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/sockets/src/test/java/com/baeldung/socket/EchoMultiTest.java b/sockets/src/test/java/com/baeldung/socket/EchoMultiTest.java
index 21b9bb9c19..19a59c211c 100644
--- a/sockets/src/test/java/com/baeldung/socket/EchoMultiTest.java
+++ b/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
-	public void init() {
+	@Test
+	public void givenClient1_whenServerResponds_thenCorrect() {
+		EchoClient client = new EchoClient();
 		client.startConnection("127.0.0.1", 5555);
-	}
-
-	@After
-	public void finish(){
+		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 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();
 	}
 
 }
diff --git a/sockets/src/test/java/com/baeldung/socket/EchoTest.java b/sockets/src/test/java/com/baeldung/socket/EchoTest.java
index e1786b2649..6fefb907e2 100644
--- a/sockets/src/test/java/com/baeldung/socket/EchoTest.java
+++ b/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() {
-		client = new EchoClient();
+	public void init() {
 		client.startConnection("127.0.0.1", 4444);
 	}
 
-	@Test @Ignore
+	@Test
 	public void givenClient_whenServerEchosMessage_thenCorrect() {
 
 		String resp1 = client.sendMessage("hello");
diff --git a/sockets/src/test/java/com/baeldung/socket/GreetServerTest.java b/sockets/src/test/java/com/baeldung/socket/GreetServerTest.java
index d5060b4fa4..fedc32fb39 100644
--- a/sockets/src/test/java/com/baeldung/socket/GreetServerTest.java
+++ b/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);
     }