From c910f2533418fe50d02af484bdcb13f663e0aaff Mon Sep 17 00:00:00 2001
From: baljeet20 <baljeet20@gmail.com>
Date: Thu, 20 Jul 2017 22:47:55 +0530
Subject: [PATCH] review changes (#2299)

---
 mockserver/pom.xml                             | 13 +++++++++++++
 ...MockServer.java => MockServerLiveTest.java} | 18 ++++++++----------
 2 files changed, 21 insertions(+), 10 deletions(-)
 rename mockserver/src/test/java/com/baeldung/mock/server/{TestMockServer.java => MockServerLiveTest.java} (95%)

diff --git a/mockserver/pom.xml b/mockserver/pom.xml
index a3ca5459c9..8d3e97f129 100644
--- a/mockserver/pom.xml
+++ b/mockserver/pom.xml
@@ -37,5 +37,18 @@
         </dependency>
 
     </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.20</version>
+                <configuration>
+                    <excludes>
+                        <exclude>**/**LiveTest.java</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+        </plugins>
 
+    </build>
 </project>
\ No newline at end of file
diff --git a/mockserver/src/test/java/com/baeldung/mock/server/TestMockServer.java b/mockserver/src/test/java/com/baeldung/mock/server/MockServerLiveTest.java
similarity index 95%
rename from mockserver/src/test/java/com/baeldung/mock/server/TestMockServer.java
rename to mockserver/src/test/java/com/baeldung/mock/server/MockServerLiveTest.java
index aea1b8b278..56d354be7f 100644
--- a/mockserver/src/test/java/com/baeldung/mock/server/TestMockServer.java
+++ b/mockserver/src/test/java/com/baeldung/mock/server/MockServerLiveTest.java
@@ -5,9 +5,7 @@ import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.HttpClientBuilder;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 import org.mockserver.client.server.MockServerClient;
 import org.mockserver.integration.ClientAndProxy;
 import org.mockserver.integration.ClientAndServer;
@@ -28,13 +26,13 @@ import static org.mockserver.model.HttpRequest.request;
 import static org.mockserver.model.HttpResponse.response;
 import static org.mockserver.model.StringBody.exact;
 
-public class TestMockServer {
+public class MockServerLiveTest {
 
-    private ClientAndProxy proxy;
-    private ClientAndServer mockServer;
+    private static ClientAndProxy proxy;
+    private static ClientAndServer mockServer;
 
-    @Before
-    public void startProxy() {
+    @BeforeClass
+    public static void startProxy() {
         mockServer = startClientAndServer(1080);
         proxy = startClientAndProxy(1090);
     }
@@ -170,8 +168,8 @@ public class TestMockServer {
                 );
     }
 
-    @After
-    public void stopProxy() {
+    @AfterClass
+    public static void stopProxy() {
         proxy.stop();
         mockServer.stop();
     }