[java] Improving default matcher to enable Appium

diemol · diemol · commit 797a859d985f · 2022-08-15T10:32:42.000+02:00
In many cases, session requests for Appium servers
won't include a browserName or a browserVersion. If
many common W3C caps are missing, the matcher was
returning false.

This change passes the matching logic to the extension
matching. Now Appium session requests are better matched.
diff --git a/java/src/org/openqa/selenium/grid/data/DefaultSlotMatcher.java b/java/src/org/openqa/selenium/grid/data/DefaultSlotMatcher.java
@@ -103,7 +103,7 @@ private Boolean initialMatch(Capabilities stereotype, Capabilities capabilities)
         }
       })
       .reduce(Boolean::logicalAnd)
-      .orElse(false);
+      .orElse(true);
   }
 
   private Boolean platformVersionMatch(Capabilities stereotype, Capabilities capabilities) {
diff --git a/java/test/org/openqa/selenium/grid/data/DefaultSlotMatcherTest.java b/java/test/org/openqa/selenium/grid/data/DefaultSlotMatcherTest.java
@@ -17,14 +17,14 @@
 
 package org.openqa.selenium.grid.data;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 import org.junit.jupiter.api.Test;
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.ImmutableCapabilities;
 import org.openqa.selenium.Platform;
 import org.openqa.selenium.remote.CapabilityType;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class DefaultSlotMatcherTest {
 
   private final DefaultSlotMatcher slotMatcher = new DefaultSlotMatcher();
@@ -381,4 +381,23 @@ public void emptyCapabilitiesDoNotMatch() {
     assertThat(slotMatcher.matches(stereotype, capabilities)).isFalse();
   }
 
+  @Test
+  public void extensionCapsAlsoMatch() {
+    Capabilities stereotype = new ImmutableCapabilities(
+      CapabilityType.PLATFORM_NAME, Platform.IOS,
+      "appium:platformVersion", "15.5",
+      "appium:automationName", "XCUITest",
+      "appium:deviceName", "iPhone 13"
+    );
+
+    Capabilities capabilities = new ImmutableCapabilities(
+      CapabilityType.PLATFORM_NAME, Platform.IOS,
+      "appium:platformVersion", "15.5",
+      "appium:automationName", "XCUITest",
+      "appium:noReset", true,
+      "appium:deviceName", "iPhone 13"
+    );
+
+    assertThat(slotMatcher.matches(stereotype, capabilities)).isTrue();
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ private Boolean initialMatch(Capabilities stereotype, Capabilities capabilities)`
`103`	`103`	`}`
`104`	`104`	`})`
`105`	`105`	`.reduce(Boolean::logicalAnd)`
`106`		`- .orElse(false);`
	`106`	`+ .orElse(true);`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`private Boolean platformVersionMatch(Capabilities stereotype, Capabilities capabilities) {`