Merge pull request #1574 from TestBoost/master

[UNDERTOW-2371] initialize the DefaultServer once to speed up test HttpContinueSslServletTestCase

Author: baranowb

servlet/src/test/java/io/undertow/servlet/test/handlers/AbstractHttpContinueServletTestCase.java

@@ -32,7 +32,6 @@
 import org.apache.http.params.HttpParams;
 import org.junit.Assert;
 import org.junit.Assume;
-import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -56,10 +55,10 @@ public abstract class AbstractHttpContinueServletTestCase {
     public static void setup() {
         DeploymentUtils.setupServlet(Servlets.servlet(ContinueConsumeServlet.class).addMappings("/path"),
                 Servlets.servlet(ContinueIgnoreServlet.class).addMappings("/ignore"));
+        Assume.assumeFalse(DefaultServer.isAjp());
     }
 
-    @Before
-    public void before() throws Exception {
+    public static void before() throws Exception {
         Assume.assumeFalse(DefaultServer.isAjp());
     }
 

servlet/src/test/java/io/undertow/servlet/test/handlers/HttpContinueSslServletTestCase.java

@@ -20,8 +20,8 @@
 
 import io.undertow.testutils.DefaultServer;
 import io.undertow.testutils.TestHttpClient;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
 
 import java.io.IOException;
@@ -42,14 +42,14 @@ protected TestHttpClient getClient() {
         return client;
     }
 
-    @Before
-    public void before() throws Exception {
-        super.before();
+    @BeforeClass
+    public static void before() throws Exception {
+        AbstractHttpContinueServletTestCase.before();
         DefaultServer.startSSLServer();
     }
 
-    @After
-    public void after() throws IOException {
+    @AfterClass
+    public static void after() throws IOException {
         DefaultServer.stopSSLServer();
     }
 }