Normalise handling of Platform in ImmutableCapabilities

Author: shs96c

java/client/src/org/openqa/selenium/Capabilities.java

@@ -43,7 +43,7 @@ default Platform getPlatform() {
     }
 
     if (rawPlatform instanceof String) {
-      return Platform.valueOf((String) rawPlatform);
+      return Platform.fromString((String) rawPlatform);
     } else if (rawPlatform instanceof Platform) {
       return (Platform) rawPlatform;
     }

java/client/src/org/openqa/selenium/ImmutableCapabilities.java

@@ -42,6 +42,27 @@ public ImmutableCapabilities(Map<String, ?> capabilities) {
         caps.put(key, value);
       }
     });
+
+    // Normalise the "platform" value for both OSS and W3C.
+    Object value = caps.getOrDefault("platform", caps.get("platformName"));
+    if (value != null) {
+      Object platform;
+      if (value instanceof Platform) {
+        platform = (Platform) value;
+      } else if (value instanceof String) {
+        try {
+          platform = Platform.fromString((String) value);
+        } catch (WebDriverException ignored) {
+          // Just use the string we were given.
+          platform = value;
+        }
+      } else {
+        throw new IllegalStateException("Platform was neither a string or a Platform: " + value);
+      }
+
+      caps.put("platform", platform);
+      caps.put("platformName", platform);
+    }
   }
 
   @Override

java/client/src/org/openqa/selenium/Platform.java

@@ -124,7 +124,7 @@ public String toString() {
       return "OS X 10.10";
     }
   },
-  
+
   EL_CAPITAN("el capitan", "os x 10.11") {
     @Override
     public Platform family() {
@@ -284,18 +284,20 @@ public static Platform extractFromSysProperty(String osName, String osVersion) {
    * @return the Platform enum value matching the parameter
    */
   public static Platform fromString(String name) {
-    try {
-      return Platform.valueOf(name);
-    } catch (IllegalArgumentException ex) {
-      for (Platform os : Platform.values()) {
-        for (String matcher : os.partOfOsName) {
-          if (name.toLowerCase().equals(matcher.toLowerCase())) {
-            return os;
-          }
+    for (Platform platform : values()) {
+      if (platform.toString().equalsIgnoreCase(name)) {
+        return platform;
+      }
+    }
+
+    for (Platform os : Platform.values()) {
+      for (String matcher : os.partOfOsName) {
+        if (name.toLowerCase().equals(matcher.toLowerCase())) {
+          return os;
         }
       }
-      throw new WebDriverException("Unrecognized platform: " + name);
     }
+    throw new WebDriverException("Unrecognized platform: " + name);
   }
 
   /**