trim key/value strings for grid node -capabilities / -browser command…

… line switch Fixes SeleniumHQ#3069
anilkumarn02 · Nov 7, 2016 · 4deddd2 · 4deddd2
1 parent 8859d2c
commit 4deddd2
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 5 deletions.
diff --git a/...penqa/grid/internal/utils/configuration/converters/BrowserDesiredCapabilityConverter.java b/...penqa/grid/internal/utils/configuration/converters/BrowserDesiredCapabilityConverter.java
@@ -28,15 +28,17 @@ public DesiredCapabilities convert(String value) {
     DesiredCapabilities capabilities = new DesiredCapabilities();
     for (String cap : value.split(",")) {
       String[] pieces = cap.split("=");
+      String capabilityName = pieces[0].trim();
+      String capabilityValue = pieces[1].trim();
       try {
-        final Long x = Long.parseLong(pieces[1]);
-        capabilities.setCapability(pieces[0], x);
+        final Long x = Long.parseLong(capabilityValue);
+        capabilities.setCapability(capabilityName, x);
       } catch (NumberFormatException e) {
         // ignore the exception. process as boolean or string.
-        if (pieces[1].equals("true") || pieces[1].equals("false")) {
-          capabilities.setCapability(pieces[0], Boolean.parseBoolean(pieces[1]));
+        if (capabilityValue.equals("true") || capabilityValue.equals("false")) {
+          capabilities.setCapability(capabilityName, Boolean.parseBoolean(capabilityValue));
         } else {
-          capabilities.setCapability(pieces[0], pieces[1]);
+          capabilities.setCapability(capabilityName, capabilityValue);
         }
       }
     }

diff --git a/java/server/test/org/openqa/grid/internal/utils/configuration/GridNodeConfigurationTest.java b/java/server/test/org/openqa/grid/internal/utils/configuration/GridNodeConfigurationTest.java
@@ -30,6 +30,7 @@
 
 import org.junit.Test;
 import org.openqa.grid.common.exception.GridConfigurationException;
+import org.openqa.selenium.Platform;
 import org.openqa.selenium.remote.DesiredCapabilities;
 
 import java.util.Arrays;
@@ -126,6 +127,20 @@ public void testWithCapabilitiesArgs() {
     assertEquals("chrome", gnc.capabilities.get(0).getBrowserName());
     assertEquals(10L, gnc.capabilities.get(0).getCapability("maxInstances"));
     assertEquals(false, gnc.capabilities.get(0).getCapability("boolean"));
+    assertEquals(Platform.LINUX, gnc.capabilities.get(0).getPlatform());
+  }
+
+  @Test
+  public void testWithCapabilitiesArgsWithExtraSpacing() {
+    final String[] args = new String[] { "-capabilities",
+                                         "browserName= chrome, platform =linux, maxInstances=10, boolean = false " };
+    GridNodeConfiguration gnc = new GridNodeConfiguration();
+    new JCommander(gnc, args);
+    assertTrue(gnc.capabilities.size() == 1);
+    assertEquals("chrome", gnc.capabilities.get(0).getBrowserName());
+    assertEquals(10L, gnc.capabilities.get(0).getCapability("maxInstances"));
+    assertEquals(false, gnc.capabilities.get(0).getCapability("boolean"));
+    assertEquals(Platform.LINUX, gnc.capabilities.get(0).getPlatform());
   }
 
   @Test