fixing grid test compilation error, one test failure

SeleniumHQ · Mar 15, 2016 · b619cda · b619cda
1 parent 49dd3b2
commit b619cda
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/java/server/src/org/openqa/selenium/remote/server/SeleniumServer.java b/java/server/src/org/openqa/selenium/remote/server/SeleniumServer.java
@@ -83,7 +83,7 @@ public void setConfiguration(StandaloneConfiguration configuration) {
   }
 
   public void boot() {
-    if (configuration.jettyThreads > 0) {
+    if (configuration.jettyThreads != null && configuration.jettyThreads > 0) {
       server = new Server(new QueuedThreadPool(configuration.jettyThreads));
     } else {
       server = new Server();

diff --git a/java/server/test/org/openqa/grid/internal/utils/SelfRegisteringRemoteTest.java b/java/server/test/org/openqa/grid/internal/utils/SelfRegisteringRemoteTest.java
@@ -27,14 +27,12 @@ public int getRealPort() {
     };
     RegistrationRequest config = new RegistrationRequest();
     config.setRole(GridRole.NODE);
-    config.getConfiguration().put(RegistrationRequest.HUB_HOST, "localhost");
-    config.getConfiguration().put(RegistrationRequest.HUB_PORT, 4444);
-    config.getConfiguration().put(RegistrationRequest.PORT, 0);
-    config.getConfiguration().put(RegistrationRequest.REMOTE_HOST, "http://localhost:0/");
+    config.getConfiguration().port = 0;
+    config.getConfiguration().hub = "http://locahost:4444";
     SelfRegisteringRemote remote = new SelfRegisteringRemote(config);
     remote.setRemoteServer(server);
     remote.updateConfigWithRealPort();
-    String host = (String) remote.getConfiguration().get(RegistrationRequest.REMOTE_HOST);
+    String host = (String) remote.getConfiguration().getRemoteHost();
     assertEquals("Ensure that the remote host is updated properly",
                  "http://localhost:" + server.getRealPort(), host);