[java] Removing usage of deprecated caps in DesiredCapabilities

Author: diemol

java/src/org/openqa/selenium/remote/DesiredCapabilities.java

@@ -25,16 +25,16 @@
 
 import static org.openqa.selenium.remote.CapabilityType.ACCEPT_INSECURE_CERTS;
 import static org.openqa.selenium.remote.CapabilityType.BROWSER_NAME;
-import static org.openqa.selenium.remote.CapabilityType.PLATFORM;
+import static org.openqa.selenium.remote.CapabilityType.BROWSER_VERSION;
+import static org.openqa.selenium.remote.CapabilityType.PLATFORM_NAME;
 import static org.openqa.selenium.remote.CapabilityType.SUPPORTS_JAVASCRIPT;
-import static org.openqa.selenium.remote.CapabilityType.VERSION;
 
 public class DesiredCapabilities extends MutableCapabilities {
 
   public DesiredCapabilities(String browser, String version, Platform platform) {
     setCapability(BROWSER_NAME, browser);
-    setCapability(VERSION, version);
-    setCapability(PLATFORM, platform);
+    setCapability(BROWSER_VERSION, version);
+    setCapability(PLATFORM_NAME, platform);
   }
 
   public DesiredCapabilities() {
@@ -64,11 +64,11 @@ public void setBrowserName(String browserName) {
   }
 
   public void setVersion(String version) {
-    setCapability(VERSION, version);
+    setCapability(BROWSER_VERSION, version);
   }
 
   public void setPlatform(Platform platform) {
-    setCapability(PLATFORM, platform);
+    setCapability(PLATFORM_NAME, platform);
   }
 
   /**

java/test/org/openqa/selenium/json/JsonTest.java

@@ -19,6 +19,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.reflect.TypeToken;
+
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.openqa.selenium.Capabilities;
@@ -129,14 +130,6 @@ public void shouldUseBeanSettersToPopulateFields() {
     assertThat(seen.theName).isEqualTo("fishy");
   }
 
-  public static class BeanWithSetter {
-    String theName;
-
-    public void setName(String name) {
-      theName = name;
-    }
-  }
-
   @Test
   public void shouldAllowUserToPopulateFieldsDirectly() {
     Map<String, String> map = ImmutableMap.of("theName", "fishy");
@@ -159,14 +152,6 @@ public void settingFinalFieldsShouldWork() {
     assertThat(seen.theName).isEqualTo("fishy");
   }
 
-  public static class BeanWithFinalField {
-    private final String theName;
-
-    public BeanWithFinalField() {
-      this.theName = "magic";
-    }
-  }
-
   @Test
   public void canConstructASimpleString() {
     String text = new Json().toType("\"cheese\"", String.class);
@@ -257,14 +242,16 @@ public void shouldPopulateFieldsOnNestedBeans() {
 
   @Test
   public void shouldProperlyFillInACapabilitiesObject() {
-    DesiredCapabilities capabilities =
-        new DesiredCapabilities("browser", CapabilityType.VERSION, Platform.ANY);
-    capabilities.setJavascriptEnabled(true);
+    DesiredCapabilities capabilities = new DesiredCapabilities(CapabilityType.BROWSER_NAME,
+                                                               CapabilityType.BROWSER_VERSION,
+                                                               Platform.ANY);
     String text = new Json().toJson(capabilities);
 
     Capabilities readCapabilities = new Json().toType(text, DesiredCapabilities.class);
 
-    assertThat(readCapabilities).isEqualTo(capabilities);
+    assertThat(readCapabilities.getBrowserName()).isEqualTo(capabilities.getBrowserName());
+    assertThat(readCapabilities.getBrowserVersion()).isEqualTo(capabilities.getBrowserVersion());
+    assertThat(readCapabilities.getPlatformName()).isEqualTo(capabilities.getPlatformName());
   }
 
   @Test
@@ -536,14 +523,33 @@ public void canCoerceSimpleValuesToStrings() {
     Json json = new Json();
     String raw = json.toJson(value);
     Map<String, String> roundTripped = json.toType(
-        raw,
-        new TypeToken<Map<String, String>>(){}.getType());
+      raw,
+      new TypeToken<Map<String, String>>() {
+      }.getType());
 
     assertThat(roundTripped.get("boolean")).isEqualTo("true");
     assertThat(roundTripped.get("integer")).isEqualTo("42");
     assertThat(roundTripped.get("float")).isEqualTo("3.14");
   }
 
+  public static class BeanWithSetter {
+
+    String theName;
+
+    public void setName(String name) {
+      theName = name;
+    }
+  }
+
+  public static class BeanWithFinalField {
+
+    private final String theName;
+
+    public BeanWithFinalField() {
+      this.theName = "magic";
+    }
+  }
+
   public static class SimpleBean {
 
     private String value;