Use browser name to determine if using Safari Tech Preview

The browser names are different when using the Tech Preview.
Might as well take advantage of that.

Author: shs96c

java/client/src/org/openqa/selenium/safari/SafariOptions.java

@@ -49,6 +49,8 @@
  */
 public class SafariOptions extends MutableCapabilities {
 
+  private static final String SAFARI_TECH_PREVIEW = "Safari Technology Preview";
+
   /**
    * Key used to store SafariOptions in a {@link Capabilities} object.
    * @deprecated No replacement. Use the methods on this class
@@ -63,9 +65,6 @@ private interface Option {
     // Defined by Apple
     String AUTOMATIC_INSPECTION  = "safari:automaticInspection";
     String AUTOMATIC_PROFILING = "safari:automaticProfiling";
-
-    // Defined by us
-    String TECH_PREVIEW = "se:safari:techPreview";
   }
 
   private Map<String, Object> options = new TreeMap<>();
@@ -155,14 +154,13 @@ public SafariOptions setAutomaticProfiling(boolean automaticProfiling) {
   public SafariOptions setUseTechnologyPreview(boolean useTechnologyPreview) {
     options.put(Option.TECHNOLOGY_PREVIEW, useTechnologyPreview);
     // Use an object here, rather than a boolean to avoid a stack overflow
-    super.setCapability(Option.TECH_PREVIEW, Boolean.valueOf(useTechnologyPreview));
-    super.setCapability(BROWSER_NAME, useTechnologyPreview ? "Safari Technology Preview" : "safari");
+    super.setCapability(BROWSER_NAME, useTechnologyPreview ? SAFARI_TECH_PREVIEW : "safari");
     return this;
   }
 
   @Override
   public void setCapability(String key, Object value) {
-    if (Option.TECHNOLOGY_PREVIEW.equals(key) || Option.TECH_PREVIEW.equals(key)) {
+    if (Option.TECHNOLOGY_PREVIEW.equals(key)) {
       setUseTechnologyPreview(Boolean.valueOf(value.toString()));
     } else {
       super.setCapability(key, value);
@@ -171,7 +169,7 @@ public void setCapability(String key, Object value) {
 
   @Override
   public void setCapability(String key, boolean value) {
-    if (Option.TECHNOLOGY_PREVIEW.equals(key) || Option.TECH_PREVIEW.equals(key)) {
+    if (Option.TECHNOLOGY_PREVIEW.equals(key)) {
       setUseTechnologyPreview(value);
     } else {
       super.setCapability(key, value);
@@ -194,7 +192,8 @@ public boolean getAutomaticProfiling() {
   }
 
   public boolean getUseTechnologyPreview() {
-    return is(Option.TECH_PREVIEW)|| options.get(Option.TECHNOLOGY_PREVIEW) == Boolean.TRUE;
+    return SAFARI_TECH_PREVIEW.equals(getBrowserName()) ||
+           options.get(Option.TECHNOLOGY_PREVIEW) == Boolean.TRUE;
   }
 
   // (De)serialization of the options

java/client/test/org/openqa/selenium/safari/SafariOptionsTest.java

@@ -25,6 +25,7 @@
 
 import org.junit.Test;
 import org.openqa.selenium.ImmutableCapabilities;
+import org.openqa.selenium.remote.CapabilityType;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -57,18 +58,18 @@ public void canConstructFromCapabilities() {
     options = new SafariOptions(new ImmutableCapabilities(SafariOptions.CAPABILITY, embeddedOptions));
     assertFalse(options.getUseTechnologyPreview());
 
-    options = new SafariOptions(new ImmutableCapabilities("se:safari:techPreview", true));
+    options = new SafariOptions(new ImmutableCapabilities(CapabilityType.BROWSER_NAME, "Safari Technology Preview"));
     assertTrue(options.getUseTechnologyPreview());
 
-    options = new SafariOptions(new ImmutableCapabilities("se:safari:techPreview", false));
+    options = new SafariOptions(new ImmutableCapabilities(CapabilityType.BROWSER_NAME, "safari"));
     assertFalse(options.getUseTechnologyPreview());
   }
 
   @Test
   public void newerStyleCapabilityWinsOverOlderStyle() {
     SafariOptions options = new SafariOptions(new ImmutableCapabilities(
-        SafariOptions.CAPABILITY, ImmutableMap.of("technologyPreview", false),
-        "se:safari:techPreview", true));
+        CapabilityType.BROWSER_NAME, "Safari Technology Preview",
+        SafariOptions.CAPABILITY, ImmutableMap.of("technologyPreview", false)));
 
     assertTrue(options.getUseTechnologyPreview());
   }