[grid] Remove "DefaultGridRegistry.newInstance()" method which is onl…

…y used in tests
LiangY · Mar 6, 2018 · 87c8732 · 87c8732
1 parent 12655f7
commit 87c8732
Show file tree

Hide file tree

Showing 25 changed files with 119 additions and 71 deletions.
diff --git a/java/server/src/org/openqa/grid/internal/DefaultGridRegistry.java b/java/server/src/org/openqa/grid/internal/DefaultGridRegistry.java
@@ -21,6 +21,7 @@
 
 import org.openqa.grid.internal.listeners.RegistrationListener;
 import org.openqa.grid.internal.listeners.SelfHealingProxy;
+import org.openqa.grid.internal.utils.configuration.GridHubConfiguration;
 import org.openqa.grid.web.Hub;
 import org.openqa.grid.web.servlet.handler.RequestHandler;
 import org.openqa.selenium.remote.DesiredCapabilities;
@@ -86,16 +87,6 @@ public void start() {
     }
   }
 
-  /**
-   * Creates a new {@link GridRegistry} that is not associated with a Hub and starts it.
-   *
-   * @return the registry
-   */
-  @SuppressWarnings({"NullableProblems"})
-  public static GridRegistry newInstance() {
-    return newInstance(null);
-  }
-
   /**
    * Creates a new {@link GridRegistry} and starts it.
    *

diff --git a/java/server/test/org/openqa/grid/internal/AddingProxyAgainFreesResources.java b/java/server/test/org/openqa/grid/internal/AddingProxyAgainFreesResources.java
@@ -25,6 +25,8 @@
 import org.junit.Test;
 import org.openqa.grid.common.exception.GridException;
 import org.openqa.grid.internal.mock.GridHelper;
+import org.openqa.grid.internal.utils.configuration.GridHubConfiguration;
+import org.openqa.grid.web.Hub;
 import org.openqa.grid.web.servlet.handler.RequestHandler;
 import org.openqa.selenium.remote.CapabilityType;
 import org.openqa.selenium.support.ui.FluentWait;
@@ -52,7 +54,7 @@ public class AddingProxyAgainFreesResources {
    */
   @Before
   public void setup() throws Exception {
-    registry = DefaultGridRegistry.newInstance();
+    registry = DefaultGridRegistry.newInstance(new Hub(new GridHubConfiguration()));
     ff.put(CapabilityType.APPLICATION_NAME, "FF");
     p1 = RemoteProxyFactory.getNewBasicRemoteProxy(ff, "http://machine1:4444", registry);
     registry.add(p1);

diff --git a/java/server/test/org/openqa/grid/internal/BaseRemoteProxyTest.java b/java/server/test/org/openqa/grid/internal/BaseRemoteProxyTest.java
@@ -47,7 +47,7 @@ public class BaseRemoteProxyTest {
 
   @Before
   public void before() {
-    registry = DefaultGridRegistry.newInstance();
+    registry = DefaultGridRegistry.newInstance(new Hub(new GridHubConfiguration()));
   }
 
   @Test
@@ -102,9 +102,9 @@ public void proxyConfigIsInheritedFromRegistry() {
 
   @Test
   public void proxyConfigOverwritesRegistryConfig() {
-    GridRegistry registry = DefaultGridRegistry.newInstance();
-    registry.getConfiguration().cleanUpCycle = 42;
-    registry.getConfiguration().maxSession = 1;
+    GridRegistry registry = DefaultGridRegistry.newInstance(new Hub(new GridHubConfiguration()));
+    registry.getHub().getConfiguration().cleanUpCycle = 42;
+    registry.getHub().getConfiguration().maxSession = 1;
 
     GridNodeConfiguration nodeConfiguration = parseCliOptions(
         "-role", "webdriver", "-cleanUpCycle", "100", "-maxSession", "50");
@@ -122,7 +122,7 @@ public void proxyConfigOverwritesRegistryConfig() {
   @Test
   public void proxyTakesRemoteAsIdIfIdNotSpecified() {
     String remoteHost ="http://machine1:5555";
-    GridRegistry registry = DefaultGridRegistry.newInstance();
+    GridRegistry registry = DefaultGridRegistry.newInstance(new Hub(new GridHubConfiguration()));
 
     GridNodeConfiguration nodeConfiguration = parseCliOptions(
         "-role", "webdriver","-host", "machine1", "-port", "5555");
@@ -136,7 +136,7 @@ public void proxyTakesRemoteAsIdIfIdNotSpecified() {
 
   @Test
   public void proxyWithIdSpecified() {
-    GridRegistry registry = DefaultGridRegistry.newInstance();
+    GridRegistry registry = DefaultGridRegistry.newInstance(new Hub(new GridHubConfiguration()));
     GridNodeConfiguration nodeConfiguration = parseCliOptions(
         "-role", "webdriver","-host", "machine1", "-port", "5555","-id", "abc");
     RegistrationRequest req = RegistrationRequest.build(nodeConfiguration);
@@ -149,7 +149,7 @@ public void proxyWithIdSpecified() {
 
   @Test
   public void timeouts() {
-    GridRegistry registry = DefaultGridRegistry.newInstance();
+    GridRegistry registry = DefaultGridRegistry.newInstance(new Hub(new GridHubConfiguration()));
     GridNodeConfiguration nodeConfiguration = parseCliOptions(
         "-role", "webdriver","-host", "machine1", "-port", "5555","-id", "abc","-timeout", "23", "-browserTimeout", "12");
     RegistrationRequest req = RegistrationRequest.build(nodeConfiguration);

diff --git a/java/server/test/org/openqa/grid/internal/ConcurrencyLockTest.java b/java/server/test/org/openqa/grid/internal/ConcurrencyLockTest.java
@@ -24,6 +24,8 @@
 import org.junit.Test;
 import org.openqa.grid.internal.mock.GridHelper;
 import org.openqa.grid.internal.mock.MockedRequestHandler;
+import org.openqa.grid.internal.utils.configuration.GridHubConfiguration;
+import org.openqa.grid.web.Hub;
 import org.openqa.selenium.remote.CapabilityType;
 
 import java.util.ArrayList;
@@ -52,7 +54,7 @@ public class ConcurrencyLockTest {
    */
   @Before
   public void setup() throws Exception {
-    registry = DefaultGridRegistry.newInstance();
+    registry = DefaultGridRegistry.newInstance(new Hub(new GridHubConfiguration()));
     ie.put(CapabilityType.APPLICATION_NAME, "IE");
     ff.put(CapabilityType.APPLICATION_NAME, "FF");
 

diff --git a/java/server/test/org/openqa/grid/internal/GridShutdownTest.java b/java/server/test/org/openqa/grid/internal/GridShutdownTest.java
@@ -25,6 +25,8 @@
 import org.junit.Test;
 import org.openqa.grid.internal.mock.GridHelper;
 import org.openqa.grid.internal.mock.MockedRequestHandler;
+import org.openqa.grid.internal.utils.configuration.GridHubConfiguration;
+import org.openqa.grid.web.Hub;
 import org.openqa.grid.web.servlet.handler.RequestHandler;
 import org.openqa.selenium.remote.CapabilityType;
 
@@ -43,7 +45,8 @@ public void shutdown() throws Exception {
     ff.put(CapabilityType.APPLICATION_NAME, "FF");
     ff.put(MAX_INSTANCES, 1);
 
-    final GridRegistry registry = DefaultGridRegistry.newInstance();
+    final GridRegistry registry =
+        DefaultGridRegistry.newInstance(new Hub(new GridHubConfiguration()));
 
     RemoteProxy p1 =
         RemoteProxyFactory.getNewBasicRemoteProxy(ff, "http://machine1:4444", registry);

diff --git a/java/server/test/org/openqa/grid/internal/LoadBalancedTests.java b/java/server/test/org/openqa/grid/internal/LoadBalancedTests.java
@@ -27,7 +27,9 @@
 import org.openqa.grid.common.RegistrationRequest;
 import org.openqa.grid.internal.mock.GridHelper;
 import org.openqa.grid.internal.mock.MockedRequestHandler;
+import org.openqa.grid.internal.utils.configuration.GridHubConfiguration;
 import org.openqa.grid.internal.utils.configuration.GridNodeConfiguration;
+import org.openqa.grid.web.Hub;
 import org.openqa.selenium.remote.CapabilityType;
 import org.openqa.selenium.remote.DesiredCapabilities;
 
@@ -50,8 +52,8 @@ public class LoadBalancedTests {
 
   @Before
   public void setup() {
-    registry = DefaultGridRegistry.newInstance();
-    registry2 = DefaultGridRegistry.newInstance();
+    registry = DefaultGridRegistry.newInstance(new Hub(new GridHubConfiguration()));
+    registry2 = DefaultGridRegistry.newInstance(new Hub(new GridHubConfiguration()));
 
     register5ProxiesOf5Slots();
     register3ProxiesVariableSlotSize();

diff --git a/java/server/test/org/openqa/grid/internal/NewRequestCrashesDuringNewSessionTest.java b/java/server/test/org/openqa/grid/internal/NewRequestCrashesDuringNewSessionTest.java
@@ -26,6 +26,8 @@
 import org.openqa.grid.common.SeleniumProtocol;
 import org.openqa.grid.internal.mock.GridHelper;
 import org.openqa.grid.internal.mock.MockedRequestHandler;
+import org.openqa.grid.internal.utils.configuration.GridHubConfiguration;
+import org.openqa.grid.web.Hub;
 import org.openqa.grid.web.servlet.handler.SeleniumBasedRequest;
 import org.openqa.selenium.remote.CapabilityType;
 
@@ -45,7 +47,7 @@ public class NewRequestCrashesDuringNewSessionTest {
    */
   @Before
   public void setup() throws Exception {
-    registry = DefaultGridRegistry.newInstance();
+    registry = DefaultGridRegistry.newInstance(new Hub(new GridHubConfiguration()));
     ff.put(CapabilityType.APPLICATION_NAME, "FF");
 
     p1 = RemoteProxyFactory.getNewBasicRemoteProxy(ff, "http://machine1:4444", registry);

diff --git a/java/server/test/org/openqa/grid/internal/NewSessionRequestTimeout.java b/java/server/test/org/openqa/grid/internal/NewSessionRequestTimeout.java
@@ -22,6 +22,8 @@
 import org.junit.Test;
 import org.openqa.grid.internal.mock.GridHelper;
 import org.openqa.grid.internal.mock.MockedRequestHandler;
+import org.openqa.grid.internal.utils.configuration.GridHubConfiguration;
+import org.openqa.grid.web.Hub;
 import org.openqa.selenium.remote.CapabilityType;
 
 import java.util.HashMap;
@@ -38,7 +40,7 @@ public class NewSessionRequestTimeout {
    */
   @Before
   public void setup() throws Exception {
-    registry = DefaultGridRegistry.newInstance();
+    registry = DefaultGridRegistry.newInstance(new Hub(new GridHubConfiguration()));
     ff.put(CapabilityType.APPLICATION_NAME, "FF");
 
     p1 = RemoteProxyFactory.getNewBasicRemoteProxy(ff, "http://machine1:4444", registry);

diff --git a/java/server/test/org/openqa/grid/internal/ParallelTest.java b/java/server/test/org/openqa/grid/internal/ParallelTest.java
@@ -26,6 +26,8 @@
 import org.openqa.grid.common.RegistrationRequest;
 import org.openqa.grid.internal.mock.GridHelper;
 import org.openqa.grid.internal.mock.MockedRequestHandler;
+import org.openqa.grid.internal.utils.configuration.GridHubConfiguration;
+import org.openqa.grid.web.Hub;
 import org.openqa.grid.web.servlet.handler.RequestHandler;
 import org.openqa.selenium.remote.CapabilityType;
 import org.openqa.selenium.remote.DesiredCapabilities;
@@ -65,7 +67,7 @@ public void prepareReqRequest() {
 
   @Test
   public void canGetApp2() {
-    GridRegistry registry = DefaultGridRegistry.newInstance();
+    GridRegistry registry = DefaultGridRegistry.newInstance(new Hub(new GridHubConfiguration()));
     RemoteProxy p1 = new BaseRemoteProxy(req, registry);
     try {
       registry.add(p1);
@@ -84,7 +86,8 @@ public void canGetApp2() {
    */
   @Test
   public void cannotGet2App2() {
-    final GridRegistry registry = DefaultGridRegistry.newInstance();
+    final GridRegistry registry =
+        DefaultGridRegistry.newInstance(new Hub(new GridHubConfiguration()));
     RemoteProxy p1 = new BaseRemoteProxy(req, registry);
     try {
       registry.add(p1);
@@ -110,7 +113,8 @@ public void cannotGet2App2() {
    */
   @Test(timeout = 2000)
   public void canGet5App1() {
-    final GridRegistry registry = DefaultGridRegistry.newInstance();
+    final GridRegistry registry =
+        DefaultGridRegistry.newInstance(new Hub(new GridHubConfiguration()));
     RemoteProxy p1 = new BaseRemoteProxy(req, registry);
     try {
       registry.add(p1);
@@ -129,7 +133,8 @@ public void canGet5App1() {
    */
   @Test(timeout = 1000)
   public void cannotGet6App1() {
-    final GridRegistry registry = DefaultGridRegistry.newInstance();
+    final GridRegistry registry =
+        DefaultGridRegistry.newInstance(new Hub(new GridHubConfiguration()));
     RemoteProxy p1 = new BaseRemoteProxy(req, registry);
     try {
       registry.add(p1);
@@ -163,7 +168,8 @@ public void cannotGet6App1() {
    */
   @Test(timeout = 1000)
   public void cannotGetApp2() {
-    final GridRegistry registry = DefaultGridRegistry.newInstance();
+    final GridRegistry registry =
+        DefaultGridRegistry.newInstance(new Hub(new GridHubConfiguration()));
     RemoteProxy p1 = new BaseRemoteProxy(req, registry);
     try {
       registry.add(p1);
@@ -192,7 +198,7 @@ public void cannotGetApp2() {
 
   @Test(timeout = 10000)
   public void releaseAndReserve() {
-    GridRegistry registry = DefaultGridRegistry.newInstance();
+    GridRegistry registry = DefaultGridRegistry.newInstance(new Hub(new GridHubConfiguration()));
     RemoteProxy p1;
     RegistrationRequest req;
     Map<String, Object> app1 = new HashMap<>();

diff --git a/java/server/test/org/openqa/grid/internal/PriorityTest.java b/java/server/test/org/openqa/grid/internal/PriorityTest.java
@@ -24,6 +24,8 @@
 import org.junit.Test;
 import org.openqa.grid.internal.listeners.Prioritizer;
 import org.openqa.grid.internal.mock.GridHelper;
+import org.openqa.grid.internal.utils.configuration.GridHubConfiguration;
+import org.openqa.grid.web.Hub;
 import org.openqa.grid.web.servlet.handler.RequestHandler;
 import org.openqa.selenium.remote.CapabilityType;
 
@@ -64,8 +66,8 @@ public int compareTo(Map<String, Object> a, Map<String, Object> b) {
    */
   @Before
   public void setup() throws Exception {
-    registry = DefaultGridRegistry.newInstance();
-    registry.getConfiguration().prioritizer = highestNumberHasPriority;
+    registry = DefaultGridRegistry.newInstance(new Hub(new GridHubConfiguration()));
+    registry.getHub().getConfiguration().prioritizer = highestNumberHasPriority;
     ff.put(CapabilityType.APPLICATION_NAME, "FF");
     p1 = RemoteProxyFactory.getNewBasicRemoteProxy(ff, "http://machine1:4444", registry);
     registry.add(p1);

diff --git a/java/server/test/org/openqa/grid/internal/PriorityTestLoad.java b/java/server/test/org/openqa/grid/internal/PriorityTestLoad.java
@@ -25,6 +25,8 @@
 import org.junit.Test;
 import org.openqa.grid.internal.listeners.Prioritizer;
 import org.openqa.grid.internal.mock.GridHelper;
+import org.openqa.grid.internal.utils.configuration.GridHubConfiguration;
+import org.openqa.grid.web.Hub;
 import org.openqa.grid.web.servlet.handler.RequestHandler;
 import org.openqa.selenium.remote.CapabilityType;
 
@@ -64,8 +66,8 @@ public int compareTo(Map<String, Object> a, Map<String, Object> b) {
    */
   @Before
   public void setup() throws Exception {
-    registry = DefaultGridRegistry.newInstance();
-    registry.getConfiguration().prioritizer = highestNumberHasPriority;
+    registry = DefaultGridRegistry.newInstance(new Hub(new GridHubConfiguration()));
+    registry.getHub().getConfiguration().prioritizer = highestNumberHasPriority;
     ff.put(CapabilityType.APPLICATION_NAME, "FF");
     RemoteProxy
       p1 =

diff --git a/java/server/test/org/openqa/grid/internal/ProxySetTest.java b/java/server/test/org/openqa/grid/internal/ProxySetTest.java
@@ -23,7 +23,9 @@
 
 import org.junit.Test;
 import org.openqa.grid.common.RegistrationRequest;
+import org.openqa.grid.internal.utils.configuration.GridHubConfiguration;
 import org.openqa.grid.internal.utils.configuration.GridNodeConfiguration;
+import org.openqa.grid.web.Hub;
 import org.openqa.selenium.remote.BrowserType;
 import org.openqa.selenium.remote.DesiredCapabilities;
 
@@ -34,7 +36,7 @@ public class ProxySetTest {
 
   @Test
   public void removeIfPresent() throws Exception {
-    GridRegistry registry = DefaultGridRegistry.newInstance();
+    GridRegistry registry = DefaultGridRegistry.newInstance(new Hub(new GridHubConfiguration()));
     try {
       ProxySet set = registry.getAllProxies();
       RemoteProxy
@@ -61,7 +63,7 @@ public void removeIfPresent() throws Exception {
 
   @Test
   public void testProxySortingByIdle() throws Exception {
-    GridRegistry registry = DefaultGridRegistry.newInstance();
+    GridRegistry registry = DefaultGridRegistry.newInstance(new Hub(new GridHubConfiguration()));
     try {
       ProxySet set = registry.getAllProxies();
 

diff --git a/java/server/test/org/openqa/grid/internal/RegistryStateTest.java b/java/server/test/org/openqa/grid/internal/RegistryStateTest.java
@@ -27,6 +27,8 @@
 import org.openqa.grid.common.RegistrationRequest;
 import org.openqa.grid.internal.mock.GridHelper;
 import org.openqa.grid.internal.mock.MockedRequestHandler;
+import org.openqa.grid.internal.utils.configuration.GridHubConfiguration;
+import org.openqa.grid.web.Hub;
 import org.openqa.grid.web.servlet.handler.RequestHandler;
 import org.openqa.selenium.remote.CapabilityType;
 import org.openqa.selenium.remote.DesiredCapabilities;
@@ -65,7 +67,7 @@ public void prepareReqRequest() {
 
   @Test
   public void sessionIsRemoved() {
-    GridRegistry registry = DefaultGridRegistry.newInstance();
+    GridRegistry registry = DefaultGridRegistry.newInstance(new Hub(new GridHubConfiguration()));
 
     RemoteProxy p1 = new BaseRemoteProxy(req, registry);
 
@@ -85,7 +87,7 @@ public void sessionIsRemoved() {
 
   @Test(timeout = 5000)
   public void basicChecks() {
-    GridRegistry registry = DefaultGridRegistry.newInstance();
+    GridRegistry registry = DefaultGridRegistry.newInstance(new Hub(new GridHubConfiguration()));
     RemoteProxy p1 = new BaseRemoteProxy(req, registry);
 
     try {
@@ -114,7 +116,7 @@ public void basicChecks() {
 
   @Test(timeout = 4000)
   public void sessionIsRemoved2() {
-    GridRegistry registry = DefaultGridRegistry.newInstance();
+    GridRegistry registry = DefaultGridRegistry.newInstance(new Hub(new GridHubConfiguration()));
     RemoteProxy p1 = new BaseRemoteProxy(req, registry);
 
     try {
@@ -133,7 +135,7 @@ public void sessionIsRemoved2() {
 
   @Test(timeout = 4000)
   public void sessionByExtKey() {
-    GridRegistry registry = DefaultGridRegistry.newInstance();
+    GridRegistry registry = DefaultGridRegistry.newInstance(new Hub(new GridHubConfiguration()));
     RemoteProxy p1 = new BaseRemoteProxy(req, registry);
 
     try {
@@ -162,7 +164,7 @@ public void sessionByExtKey() {
 
   @Test
   public void sessionByExtKeyNull() {
-    GridRegistry registry = DefaultGridRegistry.newInstance();
+    GridRegistry registry = DefaultGridRegistry.newInstance(new Hub(new GridHubConfiguration()));
     RemoteProxy p1 = new BaseRemoteProxy(req, registry);
 
     try {