Add PlatformName to CanonicalCapabilities

shucon · Jun 23, 2020 · b0494d2 · b0494d2
1 parent 2fac300
commit b0494d2
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 9 deletions.
diff --git a/java/client/src/org/openqa/selenium/chrome/ChromeDriverInfo.java b/java/client/src/org/openqa/selenium/chrome/ChromeDriverInfo.java
@@ -17,6 +17,8 @@
 
 package org.openqa.selenium.chrome;
 
+import static org.openqa.selenium.remote.CapabilityType.PLATFORM_NAME;
+
 import com.google.auto.service.AutoService;
 
 import org.openqa.selenium.Capabilities;
@@ -41,7 +43,7 @@ public String getDisplayName() {
 
   @Override
   public Capabilities getCanonicalCapabilities() {
-    return new ImmutableCapabilities(CapabilityType.BROWSER_NAME, BrowserType.CHROME);
+    return new ImmutableCapabilities(CapabilityType.BROWSER_NAME, BrowserType.CHROME, PLATFORM_NAME, System.getProperty("os.name"));
   }
 
   @Override

diff --git a/java/client/src/org/openqa/selenium/edge/EdgeDriverInfo.java b/java/client/src/org/openqa/selenium/edge/EdgeDriverInfo.java
@@ -17,6 +17,7 @@
 package org.openqa.selenium.edge;
 
 import static org.openqa.selenium.remote.CapabilityType.BROWSER_NAME;
+import static org.openqa.selenium.remote.CapabilityType.PLATFORM_NAME;
 
 import com.google.auto.service.AutoService;
 
@@ -42,7 +43,7 @@ public String getDisplayName() {
 
   @Override
   public Capabilities getCanonicalCapabilities() {
-    return new ImmutableCapabilities(BROWSER_NAME, BrowserType.EDGE);
+    return new ImmutableCapabilities(BROWSER_NAME, BrowserType.EDGE, PLATFORM_NAME, System.getProperty("os.name"));
   }
 
   @Override

diff --git a/java/client/src/org/openqa/selenium/edgehtml/EdgeHtmlDriverInfo.java b/java/client/src/org/openqa/selenium/edgehtml/EdgeHtmlDriverInfo.java
@@ -17,6 +17,7 @@
 package org.openqa.selenium.edgehtml;
 
 import static org.openqa.selenium.remote.CapabilityType.BROWSER_NAME;
+import static org.openqa.selenium.remote.CapabilityType.PLATFORM_NAME;
 
 import com.google.auto.service.AutoService;
 
@@ -41,7 +42,7 @@ public String getDisplayName() {
 
   @Override
   public Capabilities getCanonicalCapabilities() {
-    return new ImmutableCapabilities(BROWSER_NAME, BrowserType.EDGE, EdgeHtmlOptions.USE_CHROMIUM, false);
+    return new ImmutableCapabilities(BROWSER_NAME, BrowserType.EDGE, EdgeHtmlOptions.USE_CHROMIUM, false, PLATFORM_NAME, System.getProperty("os.name"));
   }
 
   @Override

diff --git a/java/client/src/org/openqa/selenium/firefox/GeckoDriverInfo.java b/java/client/src/org/openqa/selenium/firefox/GeckoDriverInfo.java
@@ -19,6 +19,7 @@
 
 import static org.openqa.selenium.firefox.FirefoxDriver.Capability.MARIONETTE;
 import static org.openqa.selenium.remote.CapabilityType.BROWSER_NAME;
+import static org.openqa.selenium.remote.CapabilityType.PLATFORM_NAME;
 
 import com.google.auto.service.AutoService;
 
@@ -42,7 +43,7 @@ public String getDisplayName() {
 
   @Override
   public Capabilities getCanonicalCapabilities() {
-    return new ImmutableCapabilities(BROWSER_NAME, BrowserType.FIREFOX);
+    return new ImmutableCapabilities(BROWSER_NAME, BrowserType.FIREFOX, PLATFORM_NAME, System.getProperty("os.name"));
   }
 
   @Override

diff --git a/java/client/src/org/openqa/selenium/firefox/xpi/XpiDriverInfo.java b/java/client/src/org/openqa/selenium/firefox/xpi/XpiDriverInfo.java
@@ -19,6 +19,7 @@
 
 import static org.openqa.selenium.firefox.FirefoxDriver.Capability.MARIONETTE;
 import static org.openqa.selenium.remote.CapabilityType.BROWSER_NAME;
+import static org.openqa.selenium.remote.CapabilityType.PLATFORM_NAME;
 
 import com.google.auto.service.AutoService;
 
@@ -45,7 +46,7 @@ public String getDisplayName() {
 
   @Override
   public Capabilities getCanonicalCapabilities() {
-    return new ImmutableCapabilities(BROWSER_NAME, BrowserType.FIREFOX, MARIONETTE, true);
+    return new ImmutableCapabilities(BROWSER_NAME, BrowserType.FIREFOX, MARIONETTE, true, PLATFORM_NAME, System.getProperty("os.name"));
   }
 
   @Override

diff --git a/java/client/src/org/openqa/selenium/ie/InternetExplorerDriverInfo.java b/java/client/src/org/openqa/selenium/ie/InternetExplorerDriverInfo.java
@@ -18,6 +18,7 @@
 package org.openqa.selenium.ie;
 
 import static org.openqa.selenium.remote.CapabilityType.BROWSER_NAME;
+import static org.openqa.selenium.remote.CapabilityType.PLATFORM_NAME;
 
 import com.google.auto.service.AutoService;
 
@@ -41,7 +42,7 @@ public String getDisplayName() {
 
   @Override
   public Capabilities getCanonicalCapabilities() {
-    return new ImmutableCapabilities(BROWSER_NAME, BrowserType.IE);
+    return new ImmutableCapabilities(BROWSER_NAME, BrowserType.IE, PLATFORM_NAME, System.getProperty("os.name"));
   }
 
   @Override

diff --git a/java/client/src/org/openqa/selenium/opera/OperaDriverInfo.java b/java/client/src/org/openqa/selenium/opera/OperaDriverInfo.java
@@ -18,6 +18,7 @@
 package org.openqa.selenium.opera;
 
 import static org.openqa.selenium.remote.CapabilityType.BROWSER_NAME;
+import static org.openqa.selenium.remote.CapabilityType.PLATFORM_NAME;
 
 import com.google.auto.service.AutoService;
 
@@ -41,7 +42,7 @@ public String getDisplayName() {
 
   @Override
   public Capabilities getCanonicalCapabilities() {
-    return new ImmutableCapabilities(BROWSER_NAME, BrowserType.OPERA_BLINK);
+    return new ImmutableCapabilities(BROWSER_NAME, BrowserType.OPERA_BLINK, PLATFORM_NAME, System.getProperty("os.name"));
   }
 
   @Override

diff --git a/java/client/src/org/openqa/selenium/safari/SafariDriverInfo.java b/java/client/src/org/openqa/selenium/safari/SafariDriverInfo.java
@@ -18,6 +18,7 @@
 package org.openqa.selenium.safari;
 
 import static org.openqa.selenium.remote.CapabilityType.BROWSER_NAME;
+import static org.openqa.selenium.remote.CapabilityType.PLATFORM_NAME;
 
 import com.google.auto.service.AutoService;
 
@@ -41,7 +42,7 @@ public String getDisplayName() {
 
   @Override
   public Capabilities getCanonicalCapabilities() {
-    return new ImmutableCapabilities(BROWSER_NAME, BrowserType.SAFARI);
+    return new ImmutableCapabilities(BROWSER_NAME, BrowserType.SAFARI, PLATFORM_NAME, System.getProperty("os.name"));
   }
 
   @Override

diff --git a/java/client/src/org/openqa/selenium/safari/SafariTechPreviewDriverInfo.java b/java/client/src/org/openqa/selenium/safari/SafariTechPreviewDriverInfo.java
@@ -18,6 +18,7 @@
 package org.openqa.selenium.safari;
 
 import static org.openqa.selenium.remote.CapabilityType.BROWSER_NAME;
+import static org.openqa.selenium.remote.CapabilityType.PLATFORM_NAME;
 
 import com.google.auto.service.AutoService;
 
@@ -40,7 +41,7 @@ public String getDisplayName() {
 
   @Override
   public Capabilities getCanonicalCapabilities() {
-    return new ImmutableCapabilities(BROWSER_NAME, SafariOptions.SAFARI_TECH_PREVIEW);
+    return new ImmutableCapabilities(BROWSER_NAME, SafariOptions.SAFARI_TECH_PREVIEW, PLATFORM_NAME, System.getProperty("os.name"));
   }
 
   @Override

diff --git a/java/server/src/org/openqa/selenium/grid/graphql/Node.java b/java/server/src/org/openqa/selenium/grid/graphql/Node.java
@@ -53,6 +53,10 @@ public int getMaxSession() {
     return maxSession;
   }
 
+  public String getCapabilities() {
+    return capabilities;
+  }
+
   public String getStatus() {
     return isUp ? "UP" : "UNAVAILABLE";
   }