Skip to content

Commit 87c8732

Browse files
shs96cshs96c
committed
[grid] Remove "DefaultGridRegistry.newInstance()" method which is only used in tests
1 parent 12655f7 commit 87c8732

25 files changed

+119
-71
lines changed

‎java/server/src/org/openqa/grid/internal/DefaultGridRegistry.java

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
import org.openqa.grid.internal.listeners.RegistrationListener;
2323
import org.openqa.grid.internal.listeners.SelfHealingProxy;
24+
import org.openqa.grid.internal.utils.configuration.GridHubConfiguration;
2425
import org.openqa.grid.web.Hub;
2526
import org.openqa.grid.web.servlet.handler.RequestHandler;
2627
import org.openqa.selenium.remote.DesiredCapabilities;
@@ -86,16 +87,6 @@ public void start() {
8687
}
8788
}
8889

89-
/**
90-
* Creates a new {@link GridRegistry} that is not associated with a Hub and starts it.
91-
*
92-
* @return the registry
93-
*/
94-
@SuppressWarnings({"NullableProblems"})
95-
public static GridRegistry newInstance() {
96-
return newInstance(null);
97-
}
98-
9990
/**
10091
* Creates a new {@link GridRegistry} and starts it.
10192
*

‎java/server/test/org/openqa/grid/internal/AddingProxyAgainFreesResources.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
import org.junit.Test;
2626
import org.openqa.grid.common.exception.GridException;
2727
import org.openqa.grid.internal.mock.GridHelper;
28+
import org.openqa.grid.internal.utils.configuration.GridHubConfiguration;
29+
import org.openqa.grid.web.Hub;
2830
import org.openqa.grid.web.servlet.handler.RequestHandler;
2931
import org.openqa.selenium.remote.CapabilityType;
3032
import org.openqa.selenium.support.ui.FluentWait;
@@ -52,7 +54,7 @@ public class AddingProxyAgainFreesResources {
5254
*/
5355
@Before
5456
public void setup() throws Exception {
55-
registry = DefaultGridRegistry.newInstance();
57+
registry = DefaultGridRegistry.newInstance(new Hub(new GridHubConfiguration()));
5658
ff.put(CapabilityType.APPLICATION_NAME, "FF");
5759
p1 = RemoteProxyFactory.getNewBasicRemoteProxy(ff, "http://machine1:4444", registry);
5860
registry.add(p1);

‎java/server/test/org/openqa/grid/internal/BaseRemoteProxyTest.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public class BaseRemoteProxyTest {
4747

4848
@Before
4949
public void before() {
50-
registry = DefaultGridRegistry.newInstance();
50+
registry = DefaultGridRegistry.newInstance(new Hub(new GridHubConfiguration()));
5151
}
5252

5353
@Test
@@ -102,9 +102,9 @@ public void proxyConfigIsInheritedFromRegistry() {
102102

103103
@Test
104104
public void proxyConfigOverwritesRegistryConfig() {
105-
GridRegistry registry = DefaultGridRegistry.newInstance();
106-
registry.getConfiguration().cleanUpCycle = 42;
107-
registry.getConfiguration().maxSession = 1;
105+
GridRegistry registry = DefaultGridRegistry.newInstance(new Hub(new GridHubConfiguration()));
106+
registry.getHub().getConfiguration().cleanUpCycle = 42;
107+
registry.getHub().getConfiguration().maxSession = 1;
108108

109109
GridNodeConfiguration nodeConfiguration = parseCliOptions(
110110
"-role", "webdriver", "-cleanUpCycle", "100", "-maxSession", "50");
@@ -122,7 +122,7 @@ public void proxyConfigOverwritesRegistryConfig() {
122122
@Test
123123
public void proxyTakesRemoteAsIdIfIdNotSpecified() {
124124
String remoteHost ="http://machine1:5555";
125-
GridRegistry registry = DefaultGridRegistry.newInstance();
125+
GridRegistry registry = DefaultGridRegistry.newInstance(new Hub(new GridHubConfiguration()));
126126

127127
GridNodeConfiguration nodeConfiguration = parseCliOptions(
128128
"-role", "webdriver","-host", "machine1", "-port", "5555");
@@ -136,7 +136,7 @@ public void proxyTakesRemoteAsIdIfIdNotSpecified() {
136136

137137
@Test
138138
public void proxyWithIdSpecified() {
139-
GridRegistry registry = DefaultGridRegistry.newInstance();
139+
GridRegistry registry = DefaultGridRegistry.newInstance(new Hub(new GridHubConfiguration()));
140140
GridNodeConfiguration nodeConfiguration = parseCliOptions(
141141
"-role", "webdriver","-host", "machine1", "-port", "5555","-id", "abc");
142142
RegistrationRequest req = RegistrationRequest.build(nodeConfiguration);
@@ -149,7 +149,7 @@ public void proxyWithIdSpecified() {
149149

150150
@Test
151151
public void timeouts() {
152-
GridRegistry registry = DefaultGridRegistry.newInstance();
152+
GridRegistry registry = DefaultGridRegistry.newInstance(new Hub(new GridHubConfiguration()));
153153
GridNodeConfiguration nodeConfiguration = parseCliOptions(
154154
"-role", "webdriver","-host", "machine1", "-port", "5555","-id", "abc","-timeout", "23", "-browserTimeout", "12");
155155
RegistrationRequest req = RegistrationRequest.build(nodeConfiguration);

‎java/server/test/org/openqa/grid/internal/ConcurrencyLockTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
import org.junit.Test;
2525
import org.openqa.grid.internal.mock.GridHelper;
2626
import org.openqa.grid.internal.mock.MockedRequestHandler;
27+
import org.openqa.grid.internal.utils.configuration.GridHubConfiguration;
28+
import org.openqa.grid.web.Hub;
2729
import org.openqa.selenium.remote.CapabilityType;
2830

2931
import java.util.ArrayList;
@@ -52,7 +54,7 @@ public class ConcurrencyLockTest {
5254
*/
5355
@Before
5456
public void setup() throws Exception {
55-
registry = DefaultGridRegistry.newInstance();
57+
registry = DefaultGridRegistry.newInstance(new Hub(new GridHubConfiguration()));
5658
ie.put(CapabilityType.APPLICATION_NAME, "IE");
5759
ff.put(CapabilityType.APPLICATION_NAME, "FF");
5860

‎java/server/test/org/openqa/grid/internal/GridShutdownTest.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
import org.junit.Test;
2626
import org.openqa.grid.internal.mock.GridHelper;
2727
import org.openqa.grid.internal.mock.MockedRequestHandler;
28+
import org.openqa.grid.internal.utils.configuration.GridHubConfiguration;
29+
import org.openqa.grid.web.Hub;
2830
import org.openqa.grid.web.servlet.handler.RequestHandler;
2931
import org.openqa.selenium.remote.CapabilityType;
3032

@@ -43,7 +45,8 @@ public void shutdown() throws Exception {
4345
ff.put(CapabilityType.APPLICATION_NAME, "FF");
4446
ff.put(MAX_INSTANCES, 1);
4547

46-
final GridRegistry registry = DefaultGridRegistry.newInstance();
48+
final GridRegistry registry =
49+
DefaultGridRegistry.newInstance(new Hub(new GridHubConfiguration()));
4750

4851
RemoteProxy p1 =
4952
RemoteProxyFactory.getNewBasicRemoteProxy(ff, "http://machine1:4444", registry);

‎java/server/test/org/openqa/grid/internal/LoadBalancedTests.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@
2727
import org.openqa.grid.common.RegistrationRequest;
2828
import org.openqa.grid.internal.mock.GridHelper;
2929
import org.openqa.grid.internal.mock.MockedRequestHandler;
30+
import org.openqa.grid.internal.utils.configuration.GridHubConfiguration;
3031
import org.openqa.grid.internal.utils.configuration.GridNodeConfiguration;
32+
import org.openqa.grid.web.Hub;
3133
import org.openqa.selenium.remote.CapabilityType;
3234
import org.openqa.selenium.remote.DesiredCapabilities;
3335

@@ -50,8 +52,8 @@ public class LoadBalancedTests {
5052

5153
@Before
5254
public void setup() {
53-
registry = DefaultGridRegistry.newInstance();
54-
registry2 = DefaultGridRegistry.newInstance();
55+
registry = DefaultGridRegistry.newInstance(new Hub(new GridHubConfiguration()));
56+
registry2 = DefaultGridRegistry.newInstance(new Hub(new GridHubConfiguration()));
5557

5658
register5ProxiesOf5Slots();
5759
register3ProxiesVariableSlotSize();

‎java/server/test/org/openqa/grid/internal/NewRequestCrashesDuringNewSessionTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
import org.openqa.grid.common.SeleniumProtocol;
2727
import org.openqa.grid.internal.mock.GridHelper;
2828
import org.openqa.grid.internal.mock.MockedRequestHandler;
29+
import org.openqa.grid.internal.utils.configuration.GridHubConfiguration;
30+
import org.openqa.grid.web.Hub;
2931
import org.openqa.grid.web.servlet.handler.SeleniumBasedRequest;
3032
import org.openqa.selenium.remote.CapabilityType;
3133

@@ -45,7 +47,7 @@ public class NewRequestCrashesDuringNewSessionTest {
4547
*/
4648
@Before
4749
public void setup() throws Exception {
48-
registry = DefaultGridRegistry.newInstance();
50+
registry = DefaultGridRegistry.newInstance(new Hub(new GridHubConfiguration()));
4951
ff.put(CapabilityType.APPLICATION_NAME, "FF");
5052

5153
p1 = RemoteProxyFactory.getNewBasicRemoteProxy(ff, "http://machine1:4444", registry);

‎java/server/test/org/openqa/grid/internal/NewSessionRequestTimeout.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
import org.junit.Test;
2323
import org.openqa.grid.internal.mock.GridHelper;
2424
import org.openqa.grid.internal.mock.MockedRequestHandler;
25+
import org.openqa.grid.internal.utils.configuration.GridHubConfiguration;
26+
import org.openqa.grid.web.Hub;
2527
import org.openqa.selenium.remote.CapabilityType;
2628

2729
import java.util.HashMap;
@@ -38,7 +40,7 @@ public class NewSessionRequestTimeout {
3840
*/
3941
@Before
4042
public void setup() throws Exception {
41-
registry = DefaultGridRegistry.newInstance();
43+
registry = DefaultGridRegistry.newInstance(new Hub(new GridHubConfiguration()));
4244
ff.put(CapabilityType.APPLICATION_NAME, "FF");
4345

4446
p1 = RemoteProxyFactory.getNewBasicRemoteProxy(ff, "http://machine1:4444", registry);

‎java/server/test/org/openqa/grid/internal/ParallelTest.java

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
import org.openqa.grid.common.RegistrationRequest;
2727
import org.openqa.grid.internal.mock.GridHelper;
2828
import org.openqa.grid.internal.mock.MockedRequestHandler;
29+
import org.openqa.grid.internal.utils.configuration.GridHubConfiguration;
30+
import org.openqa.grid.web.Hub;
2931
import org.openqa.grid.web.servlet.handler.RequestHandler;
3032
import org.openqa.selenium.remote.CapabilityType;
3133
import org.openqa.selenium.remote.DesiredCapabilities;
@@ -65,7 +67,7 @@ public void prepareReqRequest() {
6567

6668
@Test
6769
public void canGetApp2() {
68-
GridRegistry registry = DefaultGridRegistry.newInstance();
70+
GridRegistry registry = DefaultGridRegistry.newInstance(new Hub(new GridHubConfiguration()));
6971
RemoteProxy p1 = new BaseRemoteProxy(req, registry);
7072
try {
7173
registry.add(p1);
@@ -84,7 +86,8 @@ public void canGetApp2() {
8486
*/
8587
@Test
8688
public void cannotGet2App2() {
87-
final GridRegistry registry = DefaultGridRegistry.newInstance();
89+
final GridRegistry registry =
90+
DefaultGridRegistry.newInstance(new Hub(new GridHubConfiguration()));
8891
RemoteProxy p1 = new BaseRemoteProxy(req, registry);
8992
try {
9093
registry.add(p1);
@@ -110,7 +113,8 @@ public void cannotGet2App2() {
110113
*/
111114
@Test(timeout = 2000)
112115
public void canGet5App1() {
113-
final GridRegistry registry = DefaultGridRegistry.newInstance();
116+
final GridRegistry registry =
117+
DefaultGridRegistry.newInstance(new Hub(new GridHubConfiguration()));
114118
RemoteProxy p1 = new BaseRemoteProxy(req, registry);
115119
try {
116120
registry.add(p1);
@@ -129,7 +133,8 @@ public void canGet5App1() {
129133
*/
130134
@Test(timeout = 1000)
131135
public void cannotGet6App1() {
132-
final GridRegistry registry = DefaultGridRegistry.newInstance();
136+
final GridRegistry registry =
137+
DefaultGridRegistry.newInstance(new Hub(new GridHubConfiguration()));
133138
RemoteProxy p1 = new BaseRemoteProxy(req, registry);
134139
try {
135140
registry.add(p1);
@@ -163,7 +168,8 @@ public void cannotGet6App1() {
163168
*/
164169
@Test(timeout = 1000)
165170
public void cannotGetApp2() {
166-
final GridRegistry registry = DefaultGridRegistry.newInstance();
171+
final GridRegistry registry =
172+
DefaultGridRegistry.newInstance(new Hub(new GridHubConfiguration()));
167173
RemoteProxy p1 = new BaseRemoteProxy(req, registry);
168174
try {
169175
registry.add(p1);
@@ -192,7 +198,7 @@ public void cannotGetApp2() {
192198

193199
@Test(timeout = 10000)
194200
public void releaseAndReserve() {
195-
GridRegistry registry = DefaultGridRegistry.newInstance();
201+
GridRegistry registry = DefaultGridRegistry.newInstance(new Hub(new GridHubConfiguration()));
196202
RemoteProxy p1;
197203
RegistrationRequest req;
198204
Map<String, Object> app1 = new HashMap<>();

‎java/server/test/org/openqa/grid/internal/PriorityTest.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
import org.junit.Test;
2525
import org.openqa.grid.internal.listeners.Prioritizer;
2626
import org.openqa.grid.internal.mock.GridHelper;
27+
import org.openqa.grid.internal.utils.configuration.GridHubConfiguration;
28+
import org.openqa.grid.web.Hub;
2729
import org.openqa.grid.web.servlet.handler.RequestHandler;
2830
import org.openqa.selenium.remote.CapabilityType;
2931

@@ -64,8 +66,8 @@ public int compareTo(Map<String, Object> a, Map<String, Object> b) {
6466
*/
6567
@Before
6668
public void setup() throws Exception {
67-
registry = DefaultGridRegistry.newInstance();
68-
registry.getConfiguration().prioritizer = highestNumberHasPriority;
69+
registry = DefaultGridRegistry.newInstance(new Hub(new GridHubConfiguration()));
70+
registry.getHub().getConfiguration().prioritizer = highestNumberHasPriority;
6971
ff.put(CapabilityType.APPLICATION_NAME, "FF");
7072
p1 = RemoteProxyFactory.getNewBasicRemoteProxy(ff, "http://machine1:4444", registry);
7173
registry.add(p1);

‎java/server/test/org/openqa/grid/internal/PriorityTestLoad.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
import org.junit.Test;
2626
import org.openqa.grid.internal.listeners.Prioritizer;
2727
import org.openqa.grid.internal.mock.GridHelper;
28+
import org.openqa.grid.internal.utils.configuration.GridHubConfiguration;
29+
import org.openqa.grid.web.Hub;
2830
import org.openqa.grid.web.servlet.handler.RequestHandler;
2931
import org.openqa.selenium.remote.CapabilityType;
3032

@@ -64,8 +66,8 @@ public int compareTo(Map<String, Object> a, Map<String, Object> b) {
6466
*/
6567
@Before
6668
public void setup() throws Exception {
67-
registry = DefaultGridRegistry.newInstance();
68-
registry.getConfiguration().prioritizer = highestNumberHasPriority;
69+
registry = DefaultGridRegistry.newInstance(new Hub(new GridHubConfiguration()));
70+
registry.getHub().getConfiguration().prioritizer = highestNumberHasPriority;
6971
ff.put(CapabilityType.APPLICATION_NAME, "FF");
7072
RemoteProxy
7173
p1 =

‎java/server/test/org/openqa/grid/internal/ProxySetTest.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@
2323

2424
import org.junit.Test;
2525
import org.openqa.grid.common.RegistrationRequest;
26+
import org.openqa.grid.internal.utils.configuration.GridHubConfiguration;
2627
import org.openqa.grid.internal.utils.configuration.GridNodeConfiguration;
28+
import org.openqa.grid.web.Hub;
2729
import org.openqa.selenium.remote.BrowserType;
2830
import org.openqa.selenium.remote.DesiredCapabilities;
2931

@@ -34,7 +36,7 @@ public class ProxySetTest {
3436

3537
@Test
3638
public void removeIfPresent() throws Exception {
37-
GridRegistry registry = DefaultGridRegistry.newInstance();
39+
GridRegistry registry = DefaultGridRegistry.newInstance(new Hub(new GridHubConfiguration()));
3840
try {
3941
ProxySet set = registry.getAllProxies();
4042
RemoteProxy
@@ -61,7 +63,7 @@ public void removeIfPresent() throws Exception {
6163

6264
@Test
6365
public void testProxySortingByIdle() throws Exception {
64-
GridRegistry registry = DefaultGridRegistry.newInstance();
66+
GridRegistry registry = DefaultGridRegistry.newInstance(new Hub(new GridHubConfiguration()));
6567
try {
6668
ProxySet set = registry.getAllProxies();
6769

‎java/server/test/org/openqa/grid/internal/RegistryStateTest.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
import org.openqa.grid.common.RegistrationRequest;
2828
import org.openqa.grid.internal.mock.GridHelper;
2929
import org.openqa.grid.internal.mock.MockedRequestHandler;
30+
import org.openqa.grid.internal.utils.configuration.GridHubConfiguration;
31+
import org.openqa.grid.web.Hub;
3032
import org.openqa.grid.web.servlet.handler.RequestHandler;
3133
import org.openqa.selenium.remote.CapabilityType;
3234
import org.openqa.selenium.remote.DesiredCapabilities;
@@ -65,7 +67,7 @@ public void prepareReqRequest() {
6567

6668
@Test
6769
public void sessionIsRemoved() {
68-
GridRegistry registry = DefaultGridRegistry.newInstance();
70+
GridRegistry registry = DefaultGridRegistry.newInstance(new Hub(new GridHubConfiguration()));
6971

7072
RemoteProxy p1 = new BaseRemoteProxy(req, registry);
7173

@@ -85,7 +87,7 @@ public void sessionIsRemoved() {
8587

8688
@Test(timeout = 5000)
8789
public void basicChecks() {
88-
GridRegistry registry = DefaultGridRegistry.newInstance();
90+
GridRegistry registry = DefaultGridRegistry.newInstance(new Hub(new GridHubConfiguration()));
8991
RemoteProxy p1 = new BaseRemoteProxy(req, registry);
9092

9193
try {
@@ -114,7 +116,7 @@ public void basicChecks() {
114116

115117
@Test(timeout = 4000)
116118
public void sessionIsRemoved2() {
117-
GridRegistry registry = DefaultGridRegistry.newInstance();
119+
GridRegistry registry = DefaultGridRegistry.newInstance(new Hub(new GridHubConfiguration()));
118120
RemoteProxy p1 = new BaseRemoteProxy(req, registry);
119121

120122
try {
@@ -133,7 +135,7 @@ public void sessionIsRemoved2() {
133135

134136
@Test(timeout = 4000)
135137
public void sessionByExtKey() {
136-
GridRegistry registry = DefaultGridRegistry.newInstance();
138+
GridRegistry registry = DefaultGridRegistry.newInstance(new Hub(new GridHubConfiguration()));
137139
RemoteProxy p1 = new BaseRemoteProxy(req, registry);
138140

139141
try {
@@ -162,7 +164,7 @@ public void sessionByExtKey() {
162164

163165
@Test
164166
public void sessionByExtKeyNull() {
165-
GridRegistry registry = DefaultGridRegistry.newInstance();
167+
GridRegistry registry = DefaultGridRegistry.newInstance(new Hub(new GridHubConfiguration()));
166168
RemoteProxy p1 = new BaseRemoteProxy(req, registry);
167169

168170
try {

0 commit comments

Comments
 (0)