PHOENIX-7261 Align mockito version with Hadoop and HBase in QueryServer

apache · Oct 15, 2024 · e1db709 · e1db709
1 parent a77dd19
commit e1db709
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/...r/src/test/java/org/apache/phoenix/queryserver/server/PhoenixRemoteUserExtractorTest.java b/...r/src/test/java/org/apache/phoenix/queryserver/server/PhoenixRemoteUserExtractorTest.java
@@ -17,7 +17,7 @@
 package org.apache.phoenix.queryserver.server;
 
 import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;

diff --git a/...ver/src/test/java/org/apache/phoenix/queryserver/server/QueryServerConfigurationTest.java b/...ver/src/test/java/org/apache/phoenix/queryserver/server/QueryServerConfigurationTest.java
@@ -17,8 +17,9 @@
  */
 package org.apache.phoenix.queryserver.server;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.nullable;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
@@ -59,7 +60,7 @@ public void setup() throws IOException {
   public void testSpnegoEnabled() throws IOException {
     setupKeytabForSpnego();
     // SPENEGO settings will be provided to the builder when enabled
-    doReturn(builder).when(builder).withSpnego(anyString(), any(String[].class));
+    doReturn(builder).when(builder).withSpnego(anyString(), nullable(String[].class));
     configureAndVerifyImpersonation(builder, false);
     // A keytab file will also be provided for automatic login
     verify(builder).withAutomaticLogin(any(File.class));
@@ -78,8 +79,8 @@ public void testSpnegoDisabled() throws IOException {
   @Test
   public void testCustomServerConfiguration() {
     queryServer.enableCustomAuth(builder, CONF, ugi);
-    verify(builder).withCustomAuthentication(any(AvaticaServerConfiguration.class));
-    verify(builder, never()).withSpnego(anyString(), any(String[].class));
+    verify(builder).withCustomAuthentication(nullable(AvaticaServerConfiguration.class));
+    verify(builder, never()).withSpnego(anyString(), nullable(String[].class));
     verify(builder, never()).withAutomaticLogin(any(File.class));
     verify(builder, never()).withImpersonation(any(DoAsRemoteUserCallback.class));
   }

diff --git a/...ueryserver/src/test/java/org/apache/phoenix/queryserver/server/ServerCustomizersTest.java b/...ueryserver/src/test/java/org/apache/phoenix/queryserver/server/ServerCustomizersTest.java
@@ -33,7 +33,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.mockito.Matchers.*;
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 

diff --git a/pom.xml b/pom.xml
@@ -95,7 +95,7 @@
 
         <!-- Test Dependency versions -->
         <testng.version>6.10</testng.version>
-        <mockito-all.version>1.8.5</mockito-all.version>
+        <mockito-all.version>4.11.0</mockito-all.version>
         <junit.version>4.13.2</junit.version>
 
         <!-- Plugin versions -->
@@ -1206,9 +1206,10 @@
             </dependency>
             <dependency>
                 <groupId>org.mockito</groupId>
-                <artifactId>mockito-core</artifactId>
+                <artifactId>mockito-bom</artifactId>
                 <version>${mockito-all.version}</version>
-                <scope>test</scope>
+                <type>pom</type>
+                <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>org.apache.hadoop</groupId>