[java] Fixing use of deprecated methods after updating mockito

SeleniumHQ · Oct 1, 2019 · e22c13b · e22c13b
1 parent 26a6315
commit e22c13b
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/java/client/test/org/openqa/selenium/ProxyTest.java b/java/client/test/org/openqa/selenium/ProxyTest.java
@@ -207,7 +207,7 @@ public void longSocksVersionFromMap() {
     proxyData.put("sslProxy", "ssl.proxy");
     proxyData.put("noProxy", "localhost,127.0.0.*");
     proxyData.put("socksProxy", "socks.proxy:65555");
-    proxyData.put("socksVersion", new Long(l));
+    proxyData.put("socksVersion", l);
     proxyData.put("socksUsername", "test1");
     proxyData.put("socksPassword", "test2");
 

diff --git a/java/client/test/org/openqa/selenium/environment/GlobalTestEnvironment.java b/java/client/test/org/openqa/selenium/environment/GlobalTestEnvironment.java
@@ -41,7 +41,7 @@ public static synchronized <T extends TestEnvironment> T get(
       Class<T> startThisIfNothingIsAlreadyRunning) {
     if (environment == null) {
       try {
-        environment = startThisIfNothingIsAlreadyRunning.newInstance();
+        environment = startThisIfNothingIsAlreadyRunning.getConstructor().newInstance();
       } catch (Exception e) {
         throw new RuntimeException(e);
       }

diff --git a/java/client/test/org/openqa/selenium/interactions/touch/TouchLongPressTest.java b/java/client/test/org/openqa/selenium/interactions/touch/TouchLongPressTest.java
@@ -19,7 +19,7 @@
 
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 
 import org.junit.Before;
@@ -52,6 +52,6 @@ public void testCanLongPress() {
 
     verify(mockTouch).longPress(mockCoordinates);
     verifyNoMoreInteractions(mockTouch);
-    verifyZeroInteractions(mockCoordinates);
+    verifyNoInteractions(mockCoordinates);
   }
 }
diff --git a/...test/org/openqa/selenium/support/pagefactory/internal/LocatingElementListHandlerTest.java b/...test/org/openqa/selenium/support/pagefactory/internal/LocatingElementListHandlerTest.java
@@ -22,7 +22,7 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 
 import org.junit.Test;
@@ -62,7 +62,7 @@ public void shouldAlwaysLocateTheElementPerCall() {
     verify(locator, times(2)).findElements();
     verify(element2, times(1)).sendKeys("Fishy");
     verifyNoMoreInteractions(locator, element2);
-    verifyZeroInteractions(element1);
+    verifyNoInteractions(element1);
   }
 
   @Test

diff --git a/java/client/test/org/openqa/selenium/support/ui/ExpectedConditionsTest.java b/java/client/test/org/openqa/selenium/support/ui/ExpectedConditionsTest.java
@@ -24,7 +24,7 @@
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 import static org.openqa.selenium.support.ui.ExpectedConditions.and;
 import static org.openqa.selenium.support.ui.ExpectedConditions.attributeContains;
@@ -166,7 +166,7 @@ public void waitingForVisibilityOfElement_elementAlreadyVisible() {
     when(mockElement.isDisplayed()).thenReturn(true);
 
     assertThat(wait.until(visibilityOf(mockElement))).isSameAs(mockElement);
-    verifyZeroInteractions(mockSleeper);
+    verifyNoInteractions(mockSleeper);
   }
 
   @Test
@@ -194,7 +194,7 @@ public void waitingForVisibilityOfElementInverse_elementNotVisible() {
     when(mockElement.isDisplayed()).thenReturn(false);
 
     assertThat(wait.until(not(visibilityOf(mockElement)))).isTrue();
-    verifyZeroInteractions(mockSleeper);
+    verifyNoInteractions(mockSleeper);
   }
 
   @Test
@@ -228,7 +228,7 @@ public void invertingAConditionThatReturnsNull() {
     when(mockCondition.apply(mockDriver)).thenReturn(null);
 
     assertThat(wait.until(not(mockCondition))).isTrue();
-    verifyZeroInteractions(mockSleeper);
+    verifyNoInteractions(mockSleeper);
   }
 
   @Test

diff --git a/java/server/test/org/openqa/selenium/remote/server/NewSessionPipelineTest.java b/java/server/test/org/openqa/selenium/remote/server/NewSessionPipelineTest.java
@@ -23,7 +23,7 @@
 import static org.mockito.Mockito.atLeast;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 
 import com.google.common.collect.ImmutableMap;
@@ -57,7 +57,7 @@ public void shouldCallSessionFactory() {
 
     pipeline.createNewSession(NewSessionPayload.create(caps));
     verify(factory).apply(argThat(req -> req.getCapabilities().getCapability("browserName").equals("firefox")));
-    verifyZeroInteractions(fallback);
+    verifyNoInteractions(fallback);
   }
 
   @Test