Avoid using singletons in tests.

I've seen test failures because of the use of statics in the grid tests, and this contains a test that's flaky on travis.
SeleniumHQ · Oct 4, 2016 · 49cc3ae · 49cc3ae
1 parent 5cf66fe
commit 49cc3ae
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 18 deletions.
diff --git a/java/server/test/org/openqa/grid/internal/listener/CommandListenerTest.java b/java/server/test/org/openqa/grid/internal/listener/CommandListenerTest.java
@@ -30,7 +30,7 @@
 import org.apache.http.HttpResponse;
 import org.apache.http.StatusLine;
 import org.apache.http.client.HttpClient;
-import org.junit.BeforeClass;
+import org.junit.Before;
 import org.junit.Test;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
@@ -134,11 +134,11 @@ public Integer answer(InvocationOnMock invocation) {
     }
   }
 
-  static RegistrationRequest req = null;
-  static Map<String, Object> app1 = new HashMap<>();
+  private RegistrationRequest req = null;
+  private Map<String, Object> app1 = new HashMap<>();
 
-  @BeforeClass
-  public static void prepare() {
+  @Before
+  public void prepare() {
     app1.put(CapabilityType.APPLICATION_NAME, "app1");
     GridNodeConfiguration config = new GridNodeConfiguration();
     config.capabilities.add(new DesiredCapabilities(app1));

diff --git a/java/server/test/org/openqa/grid/internal/listener/SessionListenerTest.java b/java/server/test/org/openqa/grid/internal/listener/SessionListenerTest.java
@@ -22,7 +22,7 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 
-import org.junit.BeforeClass;
+import org.junit.Before;
 import org.junit.Test;
 import org.openqa.grid.common.RegistrationRequest;
 import org.openqa.grid.internal.DetachedRemoteProxy;
@@ -43,7 +43,17 @@
 
 public class SessionListenerTest {
 
-  static class MyRemoteProxy extends DetachedRemoteProxy implements TestSessionListener {
+  private RegistrationRequest req = null;
+  private Map<String, Object> app1 = new HashMap<>();
+
+  @Before
+  public void prepare() {
+    app1.put(CapabilityType.APPLICATION_NAME, "app1");
+    req = new RegistrationRequest();
+    req.getConfiguration().capabilities.add(new DesiredCapabilities(app1));
+  }
+
+  private static class MyRemoteProxy extends DetachedRemoteProxy implements TestSessionListener {
 
     public MyRemoteProxy(RegistrationRequest request, Registry registry) {
       super(request, registry);
@@ -59,16 +69,6 @@ public void beforeSession(TestSession session) {
     }
   }
 
-  static RegistrationRequest req = null;
-  static Map<String, Object> app1 = new HashMap<>();
-
-  @BeforeClass
-  public static void prepare() {
-    app1.put(CapabilityType.APPLICATION_NAME, "app1");
-    req = new RegistrationRequest();
-    req.getConfiguration().capabilities.add(new DesiredCapabilities(app1));
-  }
-
   @Test
   public void beforeAfterRan() {
     Registry registry = Registry.newInstance();
@@ -278,5 +278,4 @@ public void doubleRelease() throws InterruptedException {
     }
 
   }
-
 }