[grid] Changing session factory method to use caps instead of WebDriverInfo

Author: diemol

java/server/src/org/openqa/selenium/grid/node/config/NodeOptions.java

@@ -79,7 +79,7 @@ public Node getNode() {
 
   public Map<Capabilities, Collection<SessionFactory>> getSessionFactories(
     /* Danger! Java stereotype ahead! */
-    Function<WebDriverInfo, Collection<SessionFactory>> factoryFactory) {
+    Function<Capabilities, Collection<SessionFactory>> factoryFactory) {
 
     int maxSessions = getMaxSessions();
 
@@ -195,8 +195,7 @@ private void addSpecificDrivers(
   }
 
   private Map<WebDriverInfo, Collection<SessionFactory>> discoverDrivers(
-    int maxSessions,
-    Function<WebDriverInfo, Collection<SessionFactory>> factoryFactory) {
+    int maxSessions, Function<Capabilities, Collection<SessionFactory>> factoryFactory) {
 
     if (!config.getBool(NODE_SECTION, "detect-drivers").orElse(true)) {
       return ImmutableMap.of();
@@ -220,7 +219,7 @@ private Map<WebDriverInfo, Collection<SessionFactory>> discoverDrivers(
         .filter(builder -> builder.score(caps) > 0)
         .forEach(builder -> {
           for (int i = 0; i < Math.min(info.getMaximumSimultaneousSessions(), maxSessions); i++) {
-            toReturn.putAll(info, factoryFactory.apply(info));
+            toReturn.putAll(info, factoryFactory.apply(caps));
           }
         });
     });

java/server/src/org/openqa/selenium/grid/node/local/LocalNodeFactory.java

@@ -19,7 +19,6 @@
 
 import com.google.common.collect.ImmutableList;
 import org.openqa.selenium.Capabilities;
-import org.openqa.selenium.WebDriverInfo;
 import org.openqa.selenium.grid.config.Config;
 import org.openqa.selenium.grid.docker.DockerOptions;
 import org.openqa.selenium.grid.log.LoggingOptions;
@@ -63,7 +62,8 @@ public static Node create(Config config) {
     List<DriverService.Builder<?, ?>> builders = new ArrayList<>();
     ServiceLoader.load(DriverService.Builder.class).forEach(builders::add);
 
-    nodeOptions.getSessionFactories(info -> createSessionFactory(tracer, clientFactory, builders, info))
+    nodeOptions
+      .getSessionFactories(caps -> createSessionFactory(tracer, clientFactory, builders, caps))
       .forEach((caps, factories) -> factories.forEach(factory -> builder.add(caps, factory)));
 
     if (config.getAll("docker", "configs").isPresent()) {
@@ -78,21 +78,19 @@ private static Collection<SessionFactory> createSessionFactory(
     Tracer tracer,
     HttpClient.Factory clientFactory,
     List<DriverService.Builder<?, ?>> builders,
-    WebDriverInfo info) {
+    Capabilities capabilities) {
     ImmutableList.Builder<SessionFactory> toReturn = ImmutableList.builder();
 
-    Capabilities caps = info.getCanonicalCapabilities();
-
     builders.stream()
-      .filter(builder -> builder.score(caps) > 0)
+      .filter(builder -> builder.score(capabilities) > 0)
       .forEach(builder -> {
-        DriverService.Builder<?, ?> freePortBuilder = builder.usingAnyFreePort();
+        DriverService.Builder<?, ?> driverServiceBuilder = builder.usingAnyFreePort();
         toReturn.add(new DriverServiceSessionFactory(
           tracer,
           clientFactory,
-          info.getCanonicalCapabilities(),
-          c -> freePortBuilder.score(c) > 0,
-          freePortBuilder));
+          capabilities,
+          c -> driverServiceBuilder.score(c) > 0,
+          driverServiceBuilder));
       });
 
     return toReturn.build();

java/server/test/org/openqa/selenium/grid/node/config/NodeOptionsTest.java

@@ -22,7 +22,6 @@
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.ImmutableCapabilities;
 import org.openqa.selenium.Platform;
-import org.openqa.selenium.WebDriverInfo;
 import org.openqa.selenium.chrome.ChromeDriverInfo;
 import org.openqa.selenium.grid.config.Config;
 import org.openqa.selenium.grid.config.ConfigException;
@@ -62,16 +61,18 @@ public void canConfigureNodeWithDriverDetection() {
 
     Config config = new MapConfig(singletonMap("node", singletonMap("detect-drivers", "true")));
 
-    List<WebDriverInfo> reported = new ArrayList<>();
-    new NodeOptions(config).getSessionFactories(info -> {
-      reported.add(info);
+    List<Capabilities> reported = new ArrayList<>();
+    new NodeOptions(config).getSessionFactories(caps -> {
+      reported.add(caps);
       return Collections.emptySet();
     });
 
-    String expected = new ChromeDriverInfo().getDisplayName();
+    ChromeDriverInfo chromeDriverInfo = new ChromeDriverInfo();
+    String expected = chromeDriverInfo.getDisplayName();
 
     reported.stream()
-      .filter(info -> expected.equals(info.getDisplayName()))
+      .filter(chromeDriverInfo::isSupporting)
+      .filter(caps -> expected.equalsIgnoreCase(caps.getBrowserName()))
       .findFirst()
       .orElseThrow(() -> new AssertionError("Unable to find Chrome info"));
   }
@@ -84,9 +85,9 @@ public void shouldDetectCorrectDriversOnWindows() {
 
     Config config = new MapConfig(singletonMap("node", singletonMap("detect-drivers", "true")));
 
-    List<WebDriverInfo> reported = new ArrayList<>();
-    new NodeOptions(config).getSessionFactories(info -> {
-      reported.add(info);
+    List<Capabilities> reported = new ArrayList<>();
+    new NodeOptions(config).getSessionFactories(caps -> {
+      reported.add(caps);
       return Collections.emptySet();
     });
 
@@ -106,9 +107,9 @@ public void shouldDetectCorrectDriversOnMac() {
 
     Config config = new MapConfig(singletonMap("node", singletonMap("detect-drivers", "true")));
 
-    List<WebDriverInfo> reported = new ArrayList<>();
-    new NodeOptions(config).getSessionFactories(info -> {
-      reported.add(info);
+    List<Capabilities> reported = new ArrayList<>();
+    new NodeOptions(config).getSessionFactories(caps -> {
+      reported.add(caps);
       return Collections.emptySet();
     });
 
@@ -122,9 +123,9 @@ public void shouldDetectCorrectDriversOnMac() {
   @Test
   public void canConfigureNodeWithoutDriverDetection() {
     Config config = new MapConfig(singletonMap("node", singletonMap("detect-drivers", "false")));
-    List<WebDriverInfo> reported = new ArrayList<>();
-    new NodeOptions(config).getSessionFactories(info -> {
-      reported.add(info);
+    List<Capabilities> reported = new ArrayList<>();
+    new NodeOptions(config).getSessionFactories(caps -> {
+      reported.add(caps);
       return Collections.emptySet();
     });
 
@@ -139,10 +140,10 @@ public void shouldThrowConfigExceptionIfDetectDriversIsFalseAndSpecificDriverIsA
                      "detect-drivers", "false",
                      "drivers", "[chrome]"
                    )));
-    List<WebDriverInfo> reported = new ArrayList<>();
+    List<Capabilities> reported = new ArrayList<>();
     try {
-      new NodeOptions(config).getSessionFactories(info -> {
-        reported.add(info);
+      new NodeOptions(config).getSessionFactories(caps -> {
+        reported.add(caps);
         return Collections.emptySet();
       });
       fail("Should have not executed 'getSessionFactories' successfully");
@@ -157,9 +158,9 @@ public void shouldThrowConfigExceptionIfDetectDriversIsFalseAndSpecificDriverIsA
   public void detectDriversByDefault() {
     Config config = new MapConfig(emptyMap());
 
-    List<WebDriverInfo> reported = new ArrayList<>();
-    new NodeOptions(config).getSessionFactories(info -> {
-      reported.add(info);
+    List<Capabilities> reported = new ArrayList<>();
+    new NodeOptions(config).getSessionFactories(caps -> {
+      reported.add(caps);
       return Collections.emptySet();
     });
 
@@ -191,9 +192,9 @@ public void canBeConfiguredToUseHelperClassesToCreateSessionFactories() {
     assertThat(sessionFactories.iterator().next()).isInstanceOf(SessionFactory.class);
   }
 
-  private Condition<? super List<? extends WebDriverInfo>> supporting(String name) {
+  private Condition<? super List<? extends Capabilities>> supporting(String name) {
     return new Condition<>(
-      infos -> infos.stream().anyMatch(info -> name.equals(info.getCanonicalCapabilities().getBrowserName())),
+      caps -> caps.stream().anyMatch(cap -> name.equals(cap.getBrowserName())),
       "supporting %s",
       name);
   }