Allowinf to set an arbitrary platform capability even if it can't be …

…converted to Platform enum. Non-standard platform values can cause matching issues on Grid, but they can be usable for third-party Grid implementations
zhoubaozhou · Nov 5, 2014 · b0e0e34 · b0e0e34
1 parent 5d5df6e
commit b0e0e34
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
diff --git a/java/client/src/org/openqa/selenium/remote/DesiredCapabilities.java b/java/client/src/org/openqa/selenium/remote/DesiredCapabilities.java
@@ -26,6 +26,7 @@
 
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.Platform;
+import org.openqa.selenium.WebDriverException;
 import org.openqa.selenium.logging.LogLevelMapping;
 import org.openqa.selenium.logging.LoggingPreferences;
 
@@ -165,7 +166,11 @@ public void setCapability(String capabilityName, boolean value) {
 
   public void setCapability(String capabilityName, String value) {
     if (PLATFORM.equals(capabilityName)) {
-      capabilities.put(capabilityName, Platform.fromString(value));
+      try {
+        capabilities.put(capabilityName, Platform.fromString(value));
+      } catch (WebDriverException ex) {
+        capabilities.put(capabilityName, value);
+      }
     } else {
       capabilities.put(capabilityName, value);
     }

diff --git a/java/client/test/org/openqa/selenium/remote/DesiredCapabilitiesTest.java b/java/client/test/org/openqa/selenium/remote/DesiredCapabilitiesTest.java
@@ -104,4 +104,11 @@ public void shouldAutomaticallyConvertPlatformFromStringToEnum() {
     assertEquals(caps.getCapability(CapabilityType.PLATFORM), Platform.WIN8_1);
   }
 
+  @Test
+  public void shouldNotAutomaticallyConvertPlatformIfItNotConvertible() {
+    DesiredCapabilities caps = new DesiredCapabilities();
+    caps.setCapability(CapabilityType.PLATFORM, "FreeBSD");
+    assertEquals(caps.getCapability(CapabilityType.PLATFORM), "FreeBSD");
+  }
+
 }