Upgrade Mockito from 1.10.19 to 2.13.0

diff --git a/pom.xml b/pom.xml
index 2bd72de3ae46c1b40afd78eca6b3a1eef2beef8c..b9b7d4fda995b5b42a46648ad009a1f264085c5d 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -975,7 +975,7 @@
       <dependency>
         <groupId>org.mockito</groupId>
         <artifactId>mockito-core</artifactId>
-        <version>1.10.19</version>
+        <version>2.13.0</version>
         <exclusions>
           <exclusion>
             <groupId>org.hamcrest</groupId>

diff --git a/sonar-core/src/test/java/org/sonar/core/util/DefaultHttpDownloaderTest.java b/sonar-core/src/test/java/org/sonar/core/util/DefaultHttpDownloaderTest.java
index edf673b6e2430a35d2c054910c50bf56b34d639f..ecb23275f2e82d4279768e0cc947b66ba8da2589 100644 (file)
--- a/sonar-core/src/test/java/org/sonar/core/util/DefaultHttpDownloaderTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/util/DefaultHttpDownloaderTest.java
@@ -22,7 +22,6 @@ package org.sonar.core.util;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.Authenticator;
 import java.net.InetSocketAddress;
 import java.net.NoRouteToHostException;
 import java.net.PasswordAuthentication;
@@ -39,7 +38,6 @@ import java.util.Properties;
 import java.util.zip.GZIPOutputStream;
 import org.hamcrest.BaseMatcher;
 import org.hamcrest.Description;
-import org.hamcrest.TypeSafeMatcher;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Rule;
@@ -295,18 +293,11 @@ public class DefaultHttpDownloaderTest {
 
     new DefaultHttpDownloader.BaseHttpDownloader(system, settings.asConfig(), null);
 
-    verify(system).setDefaultAuthenticator(argThat(new TypeSafeMatcher<Authenticator>() {
-      @Override
-      protected boolean matchesSafely(Authenticator authenticator) {
-        DefaultHttpDownloader.ProxyAuthenticator a = (DefaultHttpDownloader.ProxyAuthenticator) authenticator;
-        PasswordAuthentication authentication = a.getPasswordAuthentication();
-        return authentication.getUserName().equals("the_login") &&
-          new String(authentication.getPassword()).equals("the_passwd");
-      }
-
-      @Override
-      public void describeTo(Description description) {
-      }
+    verify(system).setDefaultAuthenticator(argThat(authenticator -> {
+      DefaultHttpDownloader.ProxyAuthenticator a = (DefaultHttpDownloader.ProxyAuthenticator) authenticator;
+      PasswordAuthentication authentication = a.getPasswordAuthentication();
+      return authentication.getUserName().equals("the_login") &&
+        new String(authentication.getPassword()).equals("the_passwd");
     }));
   }
 

diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scanner/WsTestUtil.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/WsTestUtil.java
index 161d44b6fe58da2b5cc4dc4324b8895ab59b3eef..1cda6fd4e15df9d6dd5334b6a15348b22822c452 100644 (file)
--- a/sonar-scanner-engine/src/test/java/org/sonar/scanner/WsTestUtil.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/WsTestUtil.java
@@ -21,9 +21,9 @@ package org.sonar.scanner;
 
 import java.io.InputStream;
 import java.io.Reader;
+import javax.annotation.Nullable;
 import org.apache.commons.lang.StringUtils;
-import org.hamcrest.BaseMatcher;
-import org.hamcrest.Description;
+import org.mockito.ArgumentMatcher;
 import org.sonar.scanner.bootstrap.ScannerWsClient;
 import org.sonarqube.ws.client.WsRequest;
 import org.sonarqube.ws.client.WsResponse;
@@ -71,7 +71,7 @@ public class WsTestUtil {
     verify(mock).call(argThat(new RequestMatcher(path)));
   }
 
-  private static class RequestMatcher extends BaseMatcher<WsRequest> {
+  private static class RequestMatcher implements ArgumentMatcher<WsRequest> {
     private String path;
 
     public RequestMatcher(String path) {
@@ -79,17 +79,11 @@ public class WsTestUtil {
     }
 
     @Override
-    public boolean matches(Object item) {
+    public boolean matches(@Nullable WsRequest item) {
       if (item == null) {
         return false;
       }
-      WsRequest request = (WsRequest) item;
-      return StringUtils.equals(request.getPath(), path);
-    }
-
-    @Override
-    public void describeTo(Description description) {
-      description.appendText("request path (\"" + path + "\")");
+      return StringUtils.equals(item.getPath(), path);
     }
   }
 }

diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scanner/report/ContextPropertiesPublisherTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/report/ContextPropertiesPublisherTest.java
index 190db162aa00a733ce6e54ba195ccbe2609c4b23..04bdf6cf150676773b5599be2d99e1826d2bccbf 100644 (file)
--- a/sonar-scanner-engine/src/test/java/org/sonar/scanner/report/ContextPropertiesPublisherTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/report/ContextPropertiesPublisherTest.java
@@ -24,8 +24,6 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.hamcrest.Description;
-import org.hamcrest.TypeSafeMatcher;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -91,17 +89,10 @@ public class ContextPropertiesPublisherTest {
   }
 
   private void expectWritten(List<ScannerReport.ContextProperty> expected) {
-    verify(writer).writeContextProperties(argThat(new TypeSafeMatcher<Iterable<ScannerReport.ContextProperty>>() {
-      @Override
-      protected boolean matchesSafely(Iterable<ScannerReport.ContextProperty> props) {
-        List<ScannerReport.ContextProperty> copy = Lists.newArrayList(props);
-        copy.removeAll(expected);
-        return copy.isEmpty();
-      }
-
-      @Override
-      public void describeTo(Description description) {
-      }
+    verify(writer).writeContextProperties(argThat(props -> {
+      List<ScannerReport.ContextProperty> copy = Lists.newArrayList(props);
+      copy.removeAll(expected);
+      return copy.isEmpty();
     }));
   }
 

diff --git a/sonar-ws/src/test/java/org/sonarqube/ws/client/LocalWsConnectorTest.java b/sonar-ws/src/test/java/org/sonarqube/ws/client/LocalWsConnectorTest.java
index c4983eaf09f66c39b4e5303126f843e5cdb9733c..79b6c6e4583f9842508a7ca84b835906eb91c63a 100644 (file)
--- a/sonar-ws/src/test/java/org/sonarqube/ws/client/LocalWsConnectorTest.java
+++ b/sonar-ws/src/test/java/org/sonarqube/ws/client/LocalWsConnectorTest.java
@@ -25,9 +25,8 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import org.apache.commons.io.IOUtils;
-import org.hamcrest.Description;
-import org.hamcrest.TypeSafeMatcher;
 import org.junit.Test;
+import org.mockito.ArgumentMatcher;
 import org.sonar.api.server.ws.LocalConnector;
 import org.sonarqube.ws.MediaTypes;
 
@@ -87,12 +86,11 @@ public class LocalWsConnectorTest {
     when(connector.call(any(LocalConnector.LocalRequest.class))).thenReturn(response);
   }
 
-  private void verifyRequested(final String expectedMethod, final String expectedPath,
-    final String expectedMediaType,
-    final Map<String, String> expectedParams) {
-    verify(connector).call(argThat(new TypeSafeMatcher<LocalConnector.LocalRequest>() {
+  private void verifyRequested(String expectedMethod, String expectedPath,
+    String expectedMediaType, Map<String, String> expectedParams) {
+    verify(connector).call(argThat(new ArgumentMatcher<LocalConnector.LocalRequest>() {
       @Override
-      protected boolean matchesSafely(LocalConnector.LocalRequest localRequest) {
+      public boolean matches(LocalConnector.LocalRequest localRequest) {
         boolean ok = localRequest.getMethod().equals(expectedMethod) && localRequest.getPath().equals(expectedPath);
         ok &= localRequest.getMediaType().equals(expectedMediaType);
         for (Map.Entry<String, String> expectedParam : expectedParams.entrySet()) {
@@ -102,10 +100,6 @@ public class LocalWsConnectorTest {
         }
         return ok;
       }
-
-      @Override
-      public void describeTo(Description description) {
-      }
     }));
   }