Skip to content

Commit 65f7425

Browse files
barancevbarancev
committed
Test refactoring, less code duplication
1 parent 54ed175 commit 65f7425

File tree

3 files changed

+42
-57
lines changed

3 files changed

+42
-57
lines changed

‎java/server/test/org/openqa/grid/common/RegistrationRequestTest.java

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,7 @@ public void testToJson() {
8686

8787
@Test
8888
public void basicCommandLineParam() {
89-
GridNodeConfiguration config = new GridNodeConfiguration();
90-
JCommander.newBuilder().addObject(config).build().parse(
89+
GridNodeConfiguration config = parseCliOptions(
9190
"-role", "wd", "-hubHost", "ABC", "-hubPort", "1234", "-host","localhost");
9291
RegistrationRequest req = RegistrationRequest.build(config);
9392

@@ -98,8 +97,7 @@ public void basicCommandLineParam() {
9897

9998
@Test
10099
public void commandLineParamDefault() {
101-
GridNodeConfiguration config = new GridNodeConfiguration();
102-
JCommander.newBuilder().addObject(config).build().parse("-role", "wd");
100+
GridNodeConfiguration config = parseCliOptions("-role", "wd");
103101
RegistrationRequest req = RegistrationRequest.build(config);
104102
// the hub defaults to current IP.
105103
assertNotNull(req.getConfiguration().getHubHost());
@@ -111,8 +109,7 @@ public void commandLineParamDefault() {
111109

112110
@Test
113111
public void commandLineParamDefaultCapabilities() {
114-
GridNodeConfiguration config = new GridNodeConfiguration();
115-
JCommander.newBuilder().addObject(config).build().parse(
112+
GridNodeConfiguration config = parseCliOptions(
116113
"-role", "wd", "-hubHost", "ABC", "-hubPort", "1234", "-host","localhost");
117114
RegistrationRequest req = RegistrationRequest.build(config);
118115
assertEquals("ABC", req.getConfiguration().getHubHost());
@@ -121,23 +118,20 @@ public void commandLineParamDefaultCapabilities() {
121118

122119
@Test
123120
public void registerParam() {
124-
GridNodeConfiguration config = new GridNodeConfiguration();
125-
JCommander.newBuilder().addObject(config).build().parse(
121+
GridNodeConfiguration config = parseCliOptions(
126122
"-role", "wd", "-hubHost", "ABC", "-host","localhost");
127123
RegistrationRequest req = RegistrationRequest.build(config);
128124
assertEquals(true, req.getConfiguration().register);
129125

130-
config = new GridNodeConfiguration();
131-
JCommander.newBuilder().addObject(config).build().parse(
126+
config = parseCliOptions(
132127
"-role", "wd", "-hubHost", "ABC", "-hubPort", "1234","-host","localhost", "-register","false");
133128
RegistrationRequest req2 = RegistrationRequest.build(config);
134129
assertEquals(false, req2.getConfiguration().register);
135130
}
136131

137132
@Test
138133
public void ensurePre2_9HubCompatibility() {
139-
GridNodeConfiguration config = new GridNodeConfiguration();
140-
JCommander.newBuilder().addObject(config).build().parse(
134+
GridNodeConfiguration config = parseCliOptions(
141135
"-role", "wd", "-host","example.com", "-port", "5555");
142136
RegistrationRequest req = RegistrationRequest.build(config);
143137

@@ -146,8 +140,7 @@ public void ensurePre2_9HubCompatibility() {
146140

147141
@Test(expected = GridConfigurationException.class)
148142
public void validateWithException() {
149-
GridNodeConfiguration config = new GridNodeConfiguration();
150-
JCommander.newBuilder().addObject(config).build().parse(
143+
GridNodeConfiguration config = parseCliOptions(
151144
"-role", "node", "-hubHost", "localhost", "-hub", "localhost:4444");
152145
RegistrationRequest req = new RegistrationRequest(config);
153146

@@ -382,4 +375,10 @@ private void assertConstruction(RegistrationRequest req) {
382375
assertNotNull(capabilities.getCapability("seleniumProtocol"));
383376
}
384377
}
378+
379+
private GridNodeConfiguration parseCliOptions(String... args) {
380+
GridNodeConfiguration config = new GridNodeConfiguration();
381+
JCommander.newBuilder().addObject(config).build().parse(args);
382+
return config;
383+
}
385384
}

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,7 @@ public void proxyConfigIsInheritedFromRegistry() {
8989
GridRegistry registry = DefaultGridRegistry.newInstance(new Hub(new GridHubConfiguration()));
9090
registry.getHub().getConfiguration().cleanUpCycle = 42;
9191

92-
GridNodeConfiguration nodeConfiguration = new GridNodeConfiguration();
93-
JCommander.newBuilder().addObject(nodeConfiguration).build().parse("-role", "webdriver");
92+
GridNodeConfiguration nodeConfiguration = parseCliOptions("-role", "webdriver");
9493
RegistrationRequest req = RegistrationRequest.build(nodeConfiguration);
9594
req.getConfiguration().proxy = null;
9695

@@ -108,8 +107,7 @@ public void proxyConfigOverwritesRegistryConfig() {
108107
registry.getConfiguration().cleanUpCycle = 42;
109108
registry.getConfiguration().maxSession = 1;
110109

111-
GridNodeConfiguration nodeConfiguration = new GridNodeConfiguration();
112-
JCommander.newBuilder().addObject(nodeConfiguration).build().parse(
110+
GridNodeConfiguration nodeConfiguration = parseCliOptions(
113111
"-role", "webdriver", "-cleanUpCycle", "100", "-maxSession", "50");
114112
RegistrationRequest req = RegistrationRequest.build(nodeConfiguration);
115113
req.getConfiguration().proxy = null;
@@ -127,8 +125,7 @@ public void proxyTakesRemoteAsIdIfIdNotSpecified() {
127125
String remoteHost ="http://machine1:5555";
128126
GridRegistry registry = DefaultGridRegistry.newInstance();
129127

130-
GridNodeConfiguration nodeConfiguration = new GridNodeConfiguration();
131-
JCommander.newBuilder().addObject(nodeConfiguration).build().parse(
128+
GridNodeConfiguration nodeConfiguration = parseCliOptions(
132129
"-role", "webdriver","-host", "machine1", "-port", "5555");
133130
RegistrationRequest req = RegistrationRequest.build(nodeConfiguration);
134131
req.getConfiguration().proxy = null;
@@ -141,8 +138,7 @@ public void proxyTakesRemoteAsIdIfIdNotSpecified() {
141138
@Test
142139
public void proxyWithIdSpecified() {
143140
GridRegistry registry = DefaultGridRegistry.newInstance();
144-
GridNodeConfiguration nodeConfiguration = new GridNodeConfiguration();
145-
JCommander.newBuilder().addObject(nodeConfiguration).build().parse(
141+
GridNodeConfiguration nodeConfiguration = parseCliOptions(
146142
"-role", "webdriver","-host", "machine1", "-port", "5555","-id", "abc");
147143
RegistrationRequest req = RegistrationRequest.build(nodeConfiguration);
148144
req.getConfiguration().proxy = null;
@@ -155,8 +151,7 @@ public void proxyWithIdSpecified() {
155151
@Test
156152
public void timeouts() {
157153
GridRegistry registry = DefaultGridRegistry.newInstance();
158-
GridNodeConfiguration nodeConfiguration = new GridNodeConfiguration();
159-
JCommander.newBuilder().addObject(nodeConfiguration).build().parse(
154+
GridNodeConfiguration nodeConfiguration = parseCliOptions(
160155
"-role", "webdriver","-host", "machine1", "-port", "5555","-id", "abc","-timeout", "23", "-browserTimeout", "12");
161156
RegistrationRequest req = RegistrationRequest.build(nodeConfiguration);
162157
req.getConfiguration().proxy = null;
@@ -194,4 +189,9 @@ public void teardown() {
194189
registry.stop();
195190
}
196191

192+
private GridNodeConfiguration parseCliOptions(String... args) {
193+
GridNodeConfiguration config = new GridNodeConfiguration();
194+
JCommander.newBuilder().addObject(config).build().parse(args);
195+
return config;
196+
}
197197
}

‎java/server/test/org/openqa/grid/internal/utils/configuration/GridNodeConfigurationTest.java

Lines changed: 19 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -165,9 +165,8 @@ public void testConstructorEqualsDefaultConfig() {
165165

166166
@Test
167167
public void testAsJson() {
168-
final String[] args = new String[] { "-capabilities", "browserName=chrome,platform=linux" };
169-
GridNodeConfiguration gnc = new GridNodeConfiguration();
170-
JCommander.newBuilder().addObject(gnc).build().parse(args);
168+
GridNodeConfiguration gnc = parseCliOptions(
169+
"-capabilities", "browserName=chrome,platform=linux");
171170

172171
assertEquals("{\"capabilities\":"
173172
+ "[{\"browserName\":\"chrome\",\"platform\":\"LINUX\"}],"
@@ -207,10 +206,8 @@ public void testWithCapabilitiesArgs() {
207206

208207
@Test
209208
public void testWithCapabilitiesArgsWithExtraSpacing() {
210-
final String[] args = new String[] { "-capabilities",
211-
"browserName= chrome, platform =linux, maxInstances=10, boolean = false " };
212-
GridNodeConfiguration gnc = new GridNodeConfiguration();
213-
JCommander.newBuilder().addObject(gnc).build().parse(args);
209+
GridNodeConfiguration gnc = parseCliOptions(
210+
"-capabilities", "browserName= chrome, platform =linux, maxInstances=10, boolean = false ");
214211
assertTrue(gnc.capabilities.size() == 1);
215212
assertEquals("chrome", gnc.capabilities.get(0).getBrowserName());
216213
assertEquals(10L, gnc.capabilities.get(0).getCapability("maxInstances"));
@@ -220,25 +217,19 @@ public void testWithCapabilitiesArgsWithExtraSpacing() {
220217

221218
@Test
222219
public void testGetHubHost() {
223-
final String[] args = new String[]{"-hubHost", "dummyhost", "-hubPort", "1234"};
224-
GridNodeConfiguration gnc = new GridNodeConfiguration();
225-
JCommander.newBuilder().addObject(gnc).build().parse(args);
220+
GridNodeConfiguration gnc = parseCliOptions("-hubHost", "dummyhost", "-hubPort", "1234");
226221
assertEquals("dummyhost", gnc.getHubHost());
227222
}
228223

229224
@Test
230225
public void testGetHubHostFromHubOption() {
231-
final String[] args = new String[]{"-hub", "http://dummyhost:1234/wd/hub"};
232-
GridNodeConfiguration gnc = new GridNodeConfiguration();
233-
JCommander.newBuilder().addObject(gnc).build().parse(args);
226+
GridNodeConfiguration gnc = parseCliOptions("-hub", "http://dummyhost:1234/wd/hub");
234227
assertEquals("dummyhost", gnc.getHubHost());
235228
}
236229

237230
@Test
238231
public void testOneOfHubOrHubHostShouldBePresent() {
239-
final String[] args = new String[]{"-hubPort", "1234"};
240-
GridNodeConfiguration gnc = new GridNodeConfiguration();
241-
JCommander.newBuilder().addObject(gnc).build().parse(args);
232+
GridNodeConfiguration gnc = parseCliOptions("-hubPort", "1234");
242233
Throwable t = catchThrowable(gnc::getHubHost);
243234
assertThat(t, CoreMatchers.instanceOf(RuntimeException.class));
244235
t = catchThrowable(gnc::getHubPort);
@@ -247,34 +238,26 @@ public void testOneOfHubOrHubHostShouldBePresent() {
247238

248239
@Test
249240
public void testHubOptionHasPrecedenceOverHubHost() {
250-
final String[] args = new String[]{"-hub", "http://smarthost:4321/wd/hub",
251-
"-hubHost", "dummyhost", "-hubPort", "1234"};
252-
GridNodeConfiguration gnc = new GridNodeConfiguration();
253-
JCommander.newBuilder().addObject(gnc).build().parse(args);
241+
GridNodeConfiguration gnc = parseCliOptions(
242+
"-hub", "http://smarthost:4321/wd/hub", "-hubHost", "dummyhost", "-hubPort", "1234");
254243
assertEquals("smarthost", gnc.getHubHost());
255244
}
256245

257246
@Test
258247
public void testGetHubPort() {
259-
final String[] args = new String[]{"-hubHost", "dummyhost", "-hubPort", "1234"};
260-
GridNodeConfiguration gnc = new GridNodeConfiguration();
261-
JCommander.newBuilder().addObject(gnc).build().parse(args);
248+
GridNodeConfiguration gnc = parseCliOptions("-hubHost", "dummyhost", "-hubPort", "1234");
262249
assertEquals(1234, gnc.getHubPort().intValue());
263250
}
264251

265252
@Test
266253
public void testGetHubPortFromHubOption() {
267-
final String[] args = new String[]{"-hub", "http://dummyhost:1234/wd/hub"};
268-
GridNodeConfiguration gnc = new GridNodeConfiguration();
269-
JCommander.newBuilder().addObject(gnc).build().parse(args);
254+
GridNodeConfiguration gnc = parseCliOptions("-hub", "http://dummyhost:1234/wd/hub");
270255
assertEquals(1234, gnc.getHubPort().intValue());
271256
}
272257

273258
@Test
274259
public void testOneOfHubOrHubPortShouldBePresent() {
275-
final String[] args = new String[]{"-hubHost", "dummyhost"};
276-
GridNodeConfiguration gnc = new GridNodeConfiguration();
277-
JCommander.newBuilder().addObject(gnc).build().parse(args);
260+
GridNodeConfiguration gnc = parseCliOptions("-hubHost", "dummyhost");
278261
Throwable t = catchThrowable(gnc::getHubHost);
279262
assertThat(t, CoreMatchers.instanceOf(RuntimeException.class));
280263
t = catchThrowable(gnc::getHubPort);
@@ -283,10 +266,8 @@ public void testOneOfHubOrHubPortShouldBePresent() {
283266

284267
@Test
285268
public void testHubOptionHasPrecedenceOverHubPort() {
286-
final String[] args = new String[]{"-hub", "http://smarthost:4321/wd/hub",
287-
"-hubHost", "dummyhost", "-hubPort", "1234"};
288-
GridNodeConfiguration gnc = new GridNodeConfiguration();
289-
JCommander.newBuilder().addObject(gnc).build().parse(args);
269+
GridNodeConfiguration gnc = parseCliOptions(
270+
"-hub", "http://smarthost:4321/wd/hub", "-hubHost", "dummyhost", "-hubPort", "1234");
290271
assertEquals(4321, gnc.getHubPort().intValue());
291272
}
292273

@@ -375,4 +356,9 @@ public void testFixupCapabilitiesAddsUUID() {
375356
.allMatch(cap -> cap.getCapability(GridNodeConfiguration.CONFIG_UUID_CAPABILITY) != null));
376357
}
377358

359+
private GridNodeConfiguration parseCliOptions(String... args) {
360+
GridNodeConfiguration config = new GridNodeConfiguration();
361+
JCommander.newBuilder().addObject(config).build().parse(args);
362+
return config;
363+
}
378364
}

0 commit comments

Comments
 (0)