Use org.mockito.ArgumentMatchers instead of Mockito

org.mockito.Mockito#any is inherited from org.mockito.ArgumentMatchers.
Use ArgumentMatchers directly to no longer rely on the inheritance
chain. A future version of Mockito will remove this inheritance chain.

Signed-off-by: Alexei Barantsev <[email protected]>

Author: TimvdLippe

java/client/test/org/openqa/selenium/firefox/FirefoxDriverTest.java

@@ -35,7 +35,7 @@
 
 import org.junit.After;
 import org.junit.Test;
-import org.mockito.Mockito;
+import org.mockito.ArgumentMatchers;
 import org.openqa.selenium.By;
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.Dimension;
@@ -200,7 +200,7 @@ public void shouldGetMeaningfulExceptionOnBrowserDeath() throws Exception {
       field.setAccessible(true);
       CommandExecutor spoof = mock(CommandExecutor.class);
       doThrow(new IOException("The remote server died"))
-          .when(spoof).execute(Mockito.any());
+          .when(spoof).execute(ArgumentMatchers.any());
 
       field.set(driver2, spoof);
 

java/client/test/org/openqa/selenium/lift/TestContextTest.java

@@ -20,7 +20,7 @@
 import static org.hamcrest.Matchers.containsString;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.fail;
-import static org.mockito.Mockito.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;

java/client/test/org/openqa/selenium/lift/WebDriverTestContextTest.java

@@ -20,7 +20,7 @@
 import static org.hamcrest.Matchers.containsString;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.fail;
-import static org.mockito.Mockito.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;

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

@@ -19,7 +19,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.mockito.Mockito.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 

java/client/test/org/openqa/selenium/support/PageFactoryTest.java

@@ -23,7 +23,7 @@
 import static org.mockito.Mockito.when;
 
 import org.junit.Test;
-import org.mockito.Mockito;
+import org.mockito.ArgumentMatchers;
 import org.openqa.selenium.NoSuchElementException;
 import org.openqa.selenium.TimeoutException;
 import org.openqa.selenium.WebDriver;
@@ -165,7 +165,7 @@ public void shouldComplainWhenMoreThanOneFindByShortFormAttributeIsSet() {
   @Test
   public void shouldNotThrowANoSuchElementExceptionWhenUsedWithAFluentWait() {
     driver = mock(WebDriver.class);
-    when(driver.findElement(Mockito.any())).thenThrow(new NoSuchElementException("because"));
+    when(driver.findElement(ArgumentMatchers.any())).thenThrow(new NoSuchElementException("because"));
 
     TickingClock clock = new TickingClock();
     Wait<WebDriver> wait = new WebDriverWait(driver, clock, clock, 1, 1001);

java/client/test/org/openqa/selenium/support/events/EventFiringWebDriverTest.java

@@ -19,7 +19,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.mockito.Mockito.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.mock;

java/client/test/org/openqa/selenium/support/pagefactory/ByAllTest.java

@@ -19,7 +19,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.mockito.Mockito.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;

java/client/test/org/openqa/selenium/support/pagefactory/DefaultFieldDecoratorTest.java

@@ -18,7 +18,7 @@
 package org.openqa.selenium.support.pagefactory;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;

java/client/test/org/openqa/selenium/support/ui/SelectTest.java

@@ -25,7 +25,7 @@
 import static org.mockito.Mockito.when;
 
 import org.junit.Test;
-import org.mockito.Mockito;
+import org.mockito.ArgumentMatchers;
 import org.openqa.selenium.By;
 import org.openqa.selenium.NoSuchElementException;
 import org.openqa.selenium.WebElement;
@@ -267,7 +267,7 @@ public void shouldIndicateWhetherASelectIsMultipleCorrectly() {
   @Test
   public void shouldThrowAnExceptionIfThereAreNoElementsToSelect() {
     final WebElement element = mockSelectWebElement("false");
-    when(element.findElements(Mockito.any())).thenReturn(Collections.emptyList());
+    when(element.findElements(ArgumentMatchers.any())).thenReturn(Collections.emptyList());
 
     Select select = new Select(element);
 

java/client/test/org/openqa/selenium/support/ui/WebDriverWaitTest.java

@@ -19,7 +19,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.mockito.Mockito.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 import static org.mockito.Mockito.withSettings;