Fix the build

java/client/test/org/openqa/selenium/remote/AugmenterTest.java

@@ -17,24 +17,26 @@
 
 package org.openqa.selenium.remote;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.mockito.Mockito.mock;
-import static org.openqa.selenium.remote.CapabilityType.SUPPORTS_JAVASCRIPT;
-import static org.openqa.selenium.remote.DriverCommand.FIND_ELEMENT;
-
 import com.google.common.collect.ImmutableMap;
-
 import org.junit.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.ImmutableCapabilities;
+import org.openqa.selenium.SearchContext;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.mockito.Mockito.mock;
+import static org.openqa.selenium.remote.CapabilityType.SUPPORTS_JAVASCRIPT;
+import static org.openqa.selenium.remote.DriverCommand.FIND_ELEMENT;
 
 public class AugmenterTest extends BaseAugmenterTest {
 
@@ -43,21 +45,6 @@ public BaseAugmenter getAugmenter() {
     return new Augmenter();
   }
 
-  @Test
-  public void shouldAllowReflexiveCalls() {
-    Capabilities caps = new ImmutableCapabilities(CapabilityType.SUPPORTS_FINDING_BY_CSS, true);
-    StubExecutor executor = new StubExecutor(caps);
-    final WebElement element = mock(WebElement.class);
-    executor.expect(FIND_ELEMENT, ImmutableMap.of("using", "css selector", "value", "cheese"),
-        element);
-
-    WebDriver driver = new RemoteWebDriver(executor, caps);
-    WebDriver returned = getAugmenter().augment(driver);
-
-    returned.findElement(By.cssSelector("cheese"));
-    // No exception is a Good Thing
-  }
-
   @Test
   public void canUseTheAugmenterToInterceptConcreteMethodCalls() throws Exception {
     Capabilities caps = new ImmutableCapabilities(SUPPORTS_JAVASCRIPT, true);

java/client/test/org/openqa/selenium/remote/BUILD.bazel

@@ -15,7 +15,7 @@ java_library(
 )
 
 java_test_suite(
-    name = "SmallTests",
+    name = "small-tests",
     size = "small",
     srcs = glob(
         ["*Test.java"],

java/client/test/org/openqa/selenium/remote/BaseAugmenterTest.java

@@ -21,7 +21,10 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.mockito.Mockito.mock;
+import static org.openqa.selenium.remote.DriverCommand.FIND_ELEMENT;
 
+import com.google.common.collect.ImmutableMap;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.Capabilities;
@@ -30,6 +33,7 @@
 import org.openqa.selenium.NoSuchElementException;
 import org.openqa.selenium.Rotatable;
 import org.openqa.selenium.ScreenOrientation;
+import org.openqa.selenium.SearchContext;
 import org.openqa.selenium.TakesScreenshot;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
@@ -195,6 +199,53 @@ public void shouldNotChokeOnFinalFields() {
     getAugmenter().augment(withFinals);
   }
 
+  @Test
+  @Ignore("Reflexive calls are currently broken in every implementation")
+  public void shouldAllowReflexiveCalls() {
+    Capabilities caps = new ImmutableCapabilities("find by magic", true);
+    StubExecutor executor = new StubExecutor(caps);
+    final WebElement element = mock(WebElement.class);
+    executor.expect(
+      FIND_ELEMENT,
+      ImmutableMap.of("using", "magic", "value", "cheese"),
+      element);
+
+    WebDriver driver = new RemoteWebDriver(executor, caps);
+    BaseAugmenter augmenter = getAugmenter();
+
+    augmenter.addDriverAugmentation("find by magic", new AugmenterProvider() {
+      @Override
+      public Class<?> getDescribedInterface() {
+        return FindByMagic.class;
+      }
+
+      @Override
+      public InterfaceImplementation getImplementation(Object value) {
+        return (executeMethod, self, method, args) -> element;
+      }
+    });
+    WebDriver returned = augmenter.augment(driver);
+
+    returned.findElement(new ByMagic("cheese"));
+    // No exception is a Good Thing
+  }
+
+  private static class ByMagic extends By {
+    private final String magicWord;
+
+    public ByMagic(String magicWord) {
+      this.magicWord = magicWord;
+    }
+
+    @Override
+    public List<WebElement> findElements(SearchContext context) {
+      return List.of(((FindByMagic) context).findByMagic(magicWord));
+    }
+  }
+
+  public interface FindByMagic {
+    WebElement findByMagic(String magicWord);
+  }
 
   @Test
   public void shouldBeAbleToAugmentMultipleTimes() {
@@ -290,8 +341,16 @@ public Capabilities getCapabilities() {
     }
 
     @Override
-    public WebElement findElementById(String id) {
-      throw new NoSuchElementException("Boom");
+    public WebElement findElement(By locator) {
+      return super.findElement(locator);
+    }
+
+    @Override
+    protected WebElement findElement(String by, String using) {
+      if ("id".equals(by)) {
+        throw new NoSuchElementException("Boom");
+      }
+      return null;
     }
   }
 

java/client/test/org/openqa/selenium/testing/TestUtilities.java

@@ -38,9 +38,6 @@ public static boolean isNativeEventsEnabled(WebDriver driver) {
   }
 
   public static String getUserAgent(WebDriver driver) {
-    if (driver instanceof HtmlUnitDriver) {
-      return ((HtmlUnitDriver) driver).getBrowserVersion().getUserAgent();
-    }
     try {
       return (String) ((JavascriptExecutor) driver).executeScript(
         "return navigator.userAgent;");