Clean unit tests

Author: Thierry Boileau

org.restlet/src/test/java/org/restlet/engine/connector/AsyncTestCase.java

@@ -101,6 +101,7 @@ private void testCall(Context context, int count, Method method) throws Exceptio
 
     @BeforeEach
     protected void setUpEach() throws Exception {
+        Engine.clearThreadLocalVariables();
         Engine.register(true);
         // Create components
         clientComponent = new Component();
@@ -188,5 +189,6 @@ protected void tearDownEach() throws Exception {
         // Stop the components
         clientComponent.stop();
         originComponent.stop();
+        Engine.clearThreadLocalVariables();
     }
 }

org.restlet/src/test/java/org/restlet/engine/connector/BaseConnectorsTestCase.java

@@ -113,7 +113,7 @@ private void initEngine(HttpServer server, HttpClient client) {
         if (shouldDebug()) {
             Engine.setLogLevel(Level.FINE);
         }
-
+        Engine.clearThreadLocalVariables();
         Engine nre = Engine.register(false);
         nre.getRegisteredServers().add(server.serverHelper);
         nre.getRegisteredClients().add(client.clientHelper);
@@ -123,7 +123,8 @@ private void initEngine(HttpServer server, HttpClient client) {
 
     private void resetEngine() {
         // Restore a clean engine
-        org.restlet.engine.Engine.register();
+        Engine.register();
+        Engine.clearThreadLocalVariables();
     }
 
     public enum HttpServer {

org.restlet/src/test/java/org/restlet/engine/connector/HttpTransportProtocolsTestCase.java

@@ -81,6 +81,11 @@ public static void setup() {
             nre.getRegisteredClients().add(0, new HttpClientHelper(null));
         }
 
+        @BeforeAll
+        public static void tearDown() {
+            Engine.clearThreadLocalVariables();
+        }
+
         @Override
         Server newServer(String httpTransportProtocolOption) {
             final Context context = new Context();

org.restlet/src/test/java/org/restlet/engine/connector/ShutdownHookTestCase.java

@@ -33,7 +33,9 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.restlet.Context;
 import org.restlet.Request;
@@ -50,9 +52,16 @@ public class ShutdownHookTestCase {
     private static final Logger LOGGER = Logger.getLogger("ShutdownHookTest");
     private static boolean shouldDebug = false;
 
-    @BeforeAll
-    public static void setUp() {
-        LOGGER.setLevel(Level.INFO);
+    @BeforeEach
+    public void setUp() {
+        LOGGER.setLevel(Level.FINE);
+        Engine.clearThreadLocalVariables();
+        Engine.register(true);
+    }
+
+    @AfterEach
+    public void tearDown() {
+        Engine.clearThreadLocalVariables();
         Engine.register(true);
     }
 
@@ -78,7 +87,7 @@ public void whenServerIsNotHandlingRequestThenItStopsImmediately() throws Except
      *
      * This is done by making a request froze, then stopping the server, and checking that it didn't wait.
      */
-    // FIXME @Test
+    @Test
     public void whenServerIsHandlingBlockingRequestThenItStopsImmediately() throws Exception {
         // Given a server resource that takes 1 min to send a response
         final Lock lock = new Lock("Server");
@@ -113,7 +122,7 @@ public void whenServerIsHandlingBlockingRequestThenItStopsImmediately() throws E
      *
      * This is done by making a request froze, then stopping the server, and checking that it waited the expected amount of time before shutting down.
      */
-    // FIXME @Test
+    @Test
     public void whenServerIsHandlingBlockingRequestThenItGracefullyWaitsFor1SecondBeforeStopping() throws Exception {
         // Given a server resource that takes 1 min to send a response
         final Lock serverLock = new Lock("Server");
@@ -148,7 +157,7 @@ public void whenServerIsHandlingBlockingRequestThenItGracefullyWaitsFor1SecondBe
      *
      * This is done by making a request froze, then stopping the server, and checking that a new request is not taken into account.
      */
-    // FIXME @Test
+    @Test
     public void whenServerIsHandlingBlockingRequestThenItRefusesNewRequest() throws Exception {
         // Given a server resource that takes 1 min to send a response
         final Lock lock = new Lock("Server");
@@ -185,7 +194,7 @@ public void whenServerIsHandlingBlockingRequestThenItRefusesNewRequest() throws
      *
      * This is done by making a request froze for a short amount of time, then stopping the server, and checking that the request has been handled.
      */
-    // FIXME @Test
+    @Test
     public void whenServerIsHandlingLongRequestThenRequestIsHandledCorrectlyBeforeStopping() throws Exception {
         // Given a server resource that takes 1 sec to send a response
         final Lock lock = new Lock("Server");

org.restlet/src/test/java/org/restlet/engine/connector/SslBaseConnectorsTestCase.java

@@ -24,6 +24,7 @@
 import org.restlet.Server;
 import org.restlet.data.Parameter;
 import org.restlet.data.Protocol;
+import org.restlet.engine.Engine;
 import org.restlet.engine.io.IoUtils;
 import org.restlet.util.Series;
 
@@ -45,6 +46,8 @@ public abstract class SslBaseConnectorsTestCase extends BaseConnectorsTestCase {
 
     @BeforeAll
     public static void globalSetUp() throws IOException {
+        Engine.clearThreadLocalVariables();
+        Engine.register();
         testKeystoreFile = Files
                 .createTempFile("sslBaseConnectorsTest", KEYSTORE_FILE_NAME)
                 .toFile();
@@ -114,6 +117,7 @@ protected static void tearDown() {
         testKeystoreFile.delete();
 
         // Restore a clean engine
+        Engine.clearThreadLocalVariables();
         org.restlet.engine.Engine.register();
     }
 

org.restlet/src/test/java/org/restlet/representation/DigesterRepresentationTestCase.java

@@ -37,6 +37,7 @@ public class DigesterRepresentationTestCase {
 
     @BeforeEach
     protected void setUpEach() throws Exception {
+        Engine.clearThreadLocalVariables();
         Engine.register();
         component = new Component();
         final Server server = component.getServers().add(Protocol.HTTP, 0);
@@ -47,6 +48,8 @@ protected void setUpEach() throws Exception {
 
     @AfterEach
     protected void tearDownEach() throws Exception {
+        Engine.clearThreadLocalVariables();
+        Engine.register();
         component.stop();
         component = null;
     }

org.restlet/src/test/java/org/restlet/representation/FileRepresentationTestCase.java

@@ -49,6 +49,7 @@ public class FileRepresentationTestCase {
 
     @BeforeEach
     protected void setUpEach() throws Exception {
+        Engine.clearThreadLocalVariables();
         Engine.register(true);
         component = new Component();
         Server server = component.getServers().add(Protocol.HTTP, 0);
@@ -62,6 +63,7 @@ protected void setUpEach() throws Exception {
 
     @AfterEach
     protected void tearDownEach() throws Exception {
+        Engine.clearThreadLocalVariables();
         component.stop();
         component = null;
     }

org.restlet/src/test/java/org/restlet/routing/RedirectTestCase.java

@@ -9,11 +9,14 @@
 
 package org.restlet.routing;
 
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.restlet.*;
 import org.restlet.data.MediaType;
 import org.restlet.data.Method;
 import org.restlet.data.Protocol;
+import org.restlet.engine.Engine;
 import org.restlet.representation.StringRepresentation;
 
 import static java.lang.String.format;
@@ -36,6 +39,18 @@ private void testCall(Context context, Method method, String uri)
         response.getEntity().write(System.out);
     }
 
+    @BeforeEach
+    public void setUp() {
+        Engine.clearThreadLocalVariables();
+        Engine.register();
+    }
+
+    @AfterEach
+    public void tearDown() {
+        Engine.clearThreadLocalVariables();
+        Engine.register();
+    }
+
     /**
      * Tests the cookies parsing.
      */