This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch 5.1
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/5.1 by this push:
new 965f2e147e PHOENIX-6769 Align mockito version with Hadoop and HBase
(#2266)
965f2e147e is described below
commit 965f2e147e683504713482e92bb0259229896063
Author: Istvan Toth <[email protected]>
AuthorDate: Thu Aug 7 06:40:32 2025 +0200
PHOENIX-6769 Align mockito version with Hadoop and HBase (#2266)
* Update mockito to 4.11.0, same as HBase branch-3
* Remove org.hamcrest usage and direct dependency
---
phoenix-core/pom.xml | 5 ---
.../apache/phoenix/end2end/AppendOnlySchemaIT.java | 23 +++++++-------
.../end2end/OrderByWithServerMemoryLimitIT.java | 7 ++---
.../end2end/ParameterizedIndexUpgradeToolIT.java | 2 +-
.../end2end/RebuildIndexConnectionPropsIT.java | 19 +++++++++---
.../org/apache/phoenix/end2end/SumFunctionIT.java | 13 ++++----
.../apache/phoenix/end2end/UpsertWithSCNIT.java | 25 ++++++++-------
.../end2end/join/SortMergeJoinNoSpoolingIT.java | 8 ++---
.../monitoring/PhoenixMetricsDisabledIT.java | 5 ++-
.../phoenix/monitoring/PhoenixMetricsIT.java | 23 +++++++++-----
.../rpc/UpdateCacheConnectionLevelPropIT.java | 4 +--
.../java/org/apache/phoenix/rpc/UpdateCacheIT.java | 6 ++--
.../coprocessor/TaskMetaDataEndpointTest.java | 16 +++++-----
.../phoenix/hbase/index/write/TestIndexWriter.java | 3 +-
.../hbase/index/write/TestParalleIndexWriter.java | 2 +-
.../write/TestParalleWriterIndexCommitter.java | 2 +-
.../org/apache/phoenix/index/ShouldVerifyTest.java | 8 ++---
.../phoenix/index/VerifySingleIndexRowTest.java | 36 ++++++++++++----------
.../apache/phoenix/jdbc/PhoenixStatementTest.java | 24 ++++++++++++---
.../apache/phoenix/monitoring/MetricUtilTest.java | 2 +-
.../query/ConnectionQueryServicesImplTest.java | 6 ++--
.../schema/stats/StatisticsScannerTest.java | 12 +++-----
.../phoenix/util/AbstractUpsertExecutorTest.java | 4 +--
.../java/org/apache/phoenix/util/LogUtilTest.java | 2 +-
phoenix-pherf/pom.xml | 5 ---
.../org/apache/phoenix/pherf/ResourceTest.java | 4 +--
pom.xml | 14 +++------
27 files changed, 142 insertions(+), 138 deletions(-)
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index 2899a7c98f..209b0bf43c 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -322,11 +322,6 @@
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-core</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AppendOnlySchemaIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AppendOnlySchemaIT.java
index 6659338b44..2c09cfeb7f 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AppendOnlySchemaIT.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AppendOnlySchemaIT.java
@@ -22,14 +22,13 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyList;
-import static org.mockito.Matchers.anyListOf;
-import static org.mockito.Matchers.anyLong;
-import static org.mockito.Matchers.anyMap;
-import static org.mockito.Matchers.anySetOf;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Matchers.isNull;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyList;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.anyMap;
+import static org.mockito.ArgumentMatchers.anySet;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.times;
@@ -116,9 +115,9 @@ public class AppendOnlySchemaIT extends
ParallelStatsDisabledIT {
anyLong(), anyLong());
// verify no create table rpcs
- verify(connectionQueryServices,
never()).createTable(anyListOf(Mutation.class),
- any(byte[].class), any(PTableType.class), anyMap(), anyList(),
any(byte[][].class),
- eq(false), eq(false), eq(false), any(PTable.class));
+ verify(connectionQueryServices, never()).createTable(anyList(),
any(byte[].class),
+ any(PTableType.class), anyMap(), anyList(), any(byte[][].class),
eq(false), eq(false),
+ eq(false), any(PTable.class));
reset(connectionQueryServices);
// execute alter table ddl that adds the same column
@@ -140,7 +139,7 @@ public class AppendOnlySchemaIT extends
ParallelStatsDisabledIT {
// else verify no add column calls
verify(connectionQueryServices, notExists ? times(1) :
never()).addColumn(
eq(Collections.<Mutation> emptyList()), any(PTable.class),
any(PTable.class), anyMap(),
- anySetOf(String.class), anyListOf(PColumn.class));
+ anySet(), anyList());
// upsert one row
conn2.createStatement()
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrderByWithServerMemoryLimitIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrderByWithServerMemoryLimitIT.java
index e8519af7fa..cb745a8b52 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrderByWithServerMemoryLimitIT.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/OrderByWithServerMemoryLimitIT.java
@@ -18,8 +18,7 @@
package org.apache.phoenix.end2end;
import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.sql.Connection;
@@ -80,8 +79,8 @@ public class OrderByWithServerMemoryLimitIT extends BaseTest {
rs.next();
fail("Expected PhoenixIOException due to IllegalStateException");
} catch (SQLException e) {
- assertThat(e.getMessage(),
- containsString("ERROR 101 (08000): Unexpected IO exception. ERROR
101 (08000): "
+ assertTrue(
+ e.getMessage().contains("ERROR 101 (08000): Unexpected IO exception.
ERROR 101 (08000): "
+ "Queue full. Consider increasing memory threshold or " +
"spooling to disk"));
}
}
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParameterizedIndexUpgradeToolIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParameterizedIndexUpgradeToolIT.java
index 5c4e1fced8..570985ffa9 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParameterizedIndexUpgradeToolIT.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParameterizedIndexUpgradeToolIT.java
@@ -493,7 +493,7 @@ public class ParameterizedIndexUpgradeToolIT extends
BaseTest {
// transaction table
.run(argCapture.capture());
} else {
- Mockito.verifyZeroInteractions(indexToolMock);
+ Mockito.verifyNoMoreInteractions(indexToolMock);
}
}
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RebuildIndexConnectionPropsIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RebuildIndexConnectionPropsIT.java
index 920a178db7..82b03e7049 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RebuildIndexConnectionPropsIT.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RebuildIndexConnectionPropsIT.java
@@ -22,6 +22,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+import java.lang.reflect.Field;
import java.sql.DriverManager;
import java.util.HashMap;
import java.util.Map;
@@ -37,6 +38,8 @@ import org.apache.phoenix.jdbc.PhoenixDriver;
import org.apache.phoenix.jdbc.PhoenixEmbeddedDriver;
import org.apache.phoenix.query.BaseTest;
import org.apache.phoenix.query.ConnectionQueryServices;
+import org.apache.phoenix.query.ConnectionQueryServicesImpl;
+import org.apache.phoenix.query.DelegateQueryServices;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.query.QueryServicesOptions;
import org.apache.phoenix.util.PhoenixRuntime;
@@ -45,7 +48,6 @@ import org.apache.phoenix.util.ReadOnlyProps;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.mockito.internal.util.reflection.Whitebox;
@Category(NeedsOwnMiniClusterTest.class)
public class RebuildIndexConnectionPropsIT extends BaseTest {
@@ -103,10 +105,17 @@ public class RebuildIndexConnectionPropsIT extends
BaseTest {
assertEquals(Long.toString(NUM_RPC_RETRIES),
rebuildQueryServicesConfig.get(HConstants.HBASE_CLIENT_RETRIES_NUMBER));
ConnectionQueryServices rebuildQueryServices =
rebuildIndexConnection.getQueryServices();
- Connection rebuildIndexHConnection =
- (Connection) Whitebox.getInternalState(rebuildQueryServices,
"connection");
- Connection regularHConnection = (Connection) Whitebox
- .getInternalState(regularConnection.getQueryServices(),
"connection");
+
+ Field parentField =
DelegateQueryServices.class.getDeclaredField("parent");
+ parentField.setAccessible(true);
+ QueryServices parent = (QueryServices)
parentField.get(rebuildQueryServices);
+
+ Field connectionField =
ConnectionQueryServicesImpl.class.getDeclaredField("connection");
+ connectionField.setAccessible(true);
+ Connection rebuildIndexHConnection = (Connection)
connectionField.get(parent);
+ Connection regularHConnection =
+ (Connection)
connectionField.get(regularConnection.getQueryServices());
+
// assert that a new HConnection was created
assertFalse(regularHConnection.toString().equals(rebuildIndexHConnection.toString()));
Configuration rebuildHConnectionConfig =
rebuildIndexHConnection.getConfiguration();
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SumFunctionIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SumFunctionIT.java
index fe58b9ac66..3312d97b7e 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SumFunctionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SumFunctionIT.java
@@ -17,8 +17,9 @@
*/
package org.apache.phoenix.end2end;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import java.sql.Connection;
import java.sql.DriverManager;
@@ -43,10 +44,10 @@ public class SumFunctionIT extends ParallelStatsDisabledIT {
try (ResultSet rs = s.executeQuery("select sum(case when col1 is null
then col2 else 0 end), "
+ "sum(case when col1 is not null then col2 else 0 end) from " +
tableName)) {
- assertThat(rs.next(), is(true));
- assertThat(rs.getInt(1), is(1));
- assertThat(rs.getInt(2), is(2));
- assertThat(rs.next(), is(false));
+ assertTrue(rs.next());
+ assertEquals(rs.getInt(1), 1);
+ assertEquals(rs.getInt(2), 2);
+ assertFalse(rs.next());
}
}
}
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertWithSCNIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertWithSCNIT.java
index 8c8a1e859c..b7cfc5a0d3 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertWithSCNIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertWithSCNIT.java
@@ -17,7 +17,6 @@
*/
package org.apache.phoenix.end2end;
-import static org.hamcrest.CoreMatchers.containsString;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -78,8 +77,8 @@ public class UpsertWithSCNIT extends ParallelStatsDisabledIT {
helpTestUpsertWithSCNIT(false, true, false, false, false);
exception.expect(SQLException.class);
- exception.expectMessage(containsString(
-
String.valueOf(SQLExceptionCode.CANNOT_SPECIFY_SCN_FOR_TXN_TABLE.getErrorCode())));
+ exception.expectMessage(
+
String.valueOf(SQLExceptionCode.CANNOT_SPECIFY_SCN_FOR_TXN_TABLE.getErrorCode()));
prep.executeUpdate();
}
@@ -116,8 +115,8 @@ public class UpsertWithSCNIT extends
ParallelStatsDisabledIT {
helpTestUpsertWithSCNIT(false, false, true, true, false);
exception.expect(SQLException.class);
- exception.expectMessage(containsString(String
-
.valueOf(SQLExceptionCode.CANNOT_UPSERT_WITH_SCN_FOR_TABLE_WITH_INDEXES.getErrorCode())));
+ exception.expectMessage(String
+
.valueOf(SQLExceptionCode.CANNOT_UPSERT_WITH_SCN_FOR_TABLE_WITH_INDEXES.getErrorCode()));
prep.executeUpdate();
}
@@ -126,8 +125,8 @@ public class UpsertWithSCNIT extends
ParallelStatsDisabledIT {
helpTestUpsertWithSCNIT(false, false, false, true, false);
exception.expect(SQLException.class);
- exception.expectMessage(containsString(String
-
.valueOf(SQLExceptionCode.CANNOT_UPSERT_WITH_SCN_FOR_TABLE_WITH_INDEXES.getErrorCode())));
+ exception.expectMessage(String
+
.valueOf(SQLExceptionCode.CANNOT_UPSERT_WITH_SCN_FOR_TABLE_WITH_INDEXES.getErrorCode()));
prep.executeUpdate();
}
@@ -136,8 +135,8 @@ public class UpsertWithSCNIT extends
ParallelStatsDisabledIT {
helpTestUpsertWithSCNIT(false, false, true, false, true);
exception.expect(SQLException.class);
- exception.expectMessage(containsString(String
-
.valueOf(SQLExceptionCode.CANNOT_UPSERT_WITH_SCN_FOR_TABLE_WITH_INDEXES.getErrorCode())));
+ exception.expectMessage(String
+
.valueOf(SQLExceptionCode.CANNOT_UPSERT_WITH_SCN_FOR_TABLE_WITH_INDEXES.getErrorCode()));
prep.executeUpdate();
}
@@ -146,8 +145,8 @@ public class UpsertWithSCNIT extends
ParallelStatsDisabledIT {
helpTestUpsertWithSCNIT(false, false, false, false, true);
exception.expect(SQLException.class);
- exception.expectMessage(containsString(String
-
.valueOf(SQLExceptionCode.CANNOT_UPSERT_WITH_SCN_FOR_TABLE_WITH_INDEXES.getErrorCode())));
+ exception.expectMessage(String
+
.valueOf(SQLExceptionCode.CANNOT_UPSERT_WITH_SCN_FOR_TABLE_WITH_INDEXES.getErrorCode()));
prep.executeUpdate();
}
@@ -156,8 +155,8 @@ public class UpsertWithSCNIT extends
ParallelStatsDisabledIT {
helpTestUpsertWithSCNIT(true, false, false, false, false);
exception.expect(SQLException.class);
- exception.expectMessage(containsString(String
-
.valueOf(SQLExceptionCode.CANNOT_UPSERT_WITH_SCN_FOR_ROW_TIMESTAMP_COLUMN.getErrorCode())));
+ exception.expectMessage(String
+
.valueOf(SQLExceptionCode.CANNOT_UPSERT_WITH_SCN_FOR_ROW_TIMESTAMP_COLUMN.getErrorCode()));
prep.executeUpdate();
}
}
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/SortMergeJoinNoSpoolingIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/SortMergeJoinNoSpoolingIT.java
index 63b3d48c31..baea893994 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/SortMergeJoinNoSpoolingIT.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/SortMergeJoinNoSpoolingIT.java
@@ -18,8 +18,7 @@
package org.apache.phoenix.end2end.join;
import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.sql.Connection;
@@ -81,11 +80,10 @@ public class SortMergeJoinNoSpoolingIT extends
SortMergeJoinNoIndexIT {
rs.next();
fail("Expected PhoenixIOException due to IllegalStateException");
} catch (PhoenixIOException e) {
- assertThat(e.getMessage(),
- containsString("Queue full. Consider increasing memory threshold or
spooling to disk"));
+ assertTrue(e.getMessage()
+ .contains("Queue full. Consider increasing memory threshold or
spooling to disk"));
}
}
}
-
}
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/monitoring/PhoenixMetricsDisabledIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/monitoring/PhoenixMetricsDisabledIT.java
index adfef7cf83..c5dcfaf4cb 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/monitoring/PhoenixMetricsDisabledIT.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/monitoring/PhoenixMetricsDisabledIT.java
@@ -20,7 +20,7 @@ package org.apache.phoenix.monitoring;
import static org.apache.phoenix.monitoring.NoOpGlobalMetricImpl.NO_SAMPLES;
import static org.apache.phoenix.monitoring.NoOpGlobalMetricImpl.NO_VALUE;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
import java.sql.DriverManager;
import java.util.Map;
@@ -34,7 +34,6 @@ import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.util.InstanceResolver;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.ReadOnlyProps;
-import org.hamcrest.CoreMatchers;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -75,7 +74,7 @@ public class PhoenixMetricsDisabledIT extends BaseTest {
@Test
public void testResetGlobalPhoenixMetrics() {
for (GlobalMetric m : PhoenixRuntime.getGlobalPhoenixClientMetrics()) {
- assertThat(m, CoreMatchers.<GlobalMetric>
instanceOf(NoOpGlobalMetricImpl.class));
+ assertTrue(m instanceof NoOpGlobalMetricImpl);
assertEquals(NO_VALUE, m.getValue());
assertEquals(NO_SAMPLES, m.getNumberOfSamples());
}
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/monitoring/PhoenixMetricsIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/monitoring/PhoenixMetricsIT.java
index f2c4fbe3ad..0a8921a51f 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/monitoring/PhoenixMetricsIT.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/monitoring/PhoenixMetricsIT.java
@@ -50,10 +50,10 @@ import static
org.apache.phoenix.monitoring.MetricType.TASK_EXECUTION_TIME;
import static org.apache.phoenix.util.PhoenixRuntime.TENANT_ID_ATTRIB;
import static org.apache.phoenix.util.PhoenixRuntime.UPSERT_BATCH_SIZE_ATTRIB;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import java.lang.reflect.Field;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.PreparedStatement;
@@ -83,10 +83,8 @@ import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.util.EnvironmentEdge;
import org.apache.phoenix.util.EnvironmentEdgeManager;
import org.apache.phoenix.util.PhoenixRuntime;
-import org.hamcrest.CoreMatchers;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.mockito.internal.util.reflection.Whitebox;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -124,7 +122,7 @@ public class PhoenixMetricsIT extends BasePhoenixMetricsIT {
public void testResetGlobalPhoenixMetrics() throws Exception {
resetGlobalMetrics();
for (GlobalMetric m : PhoenixRuntime.getGlobalPhoenixClientMetrics()) {
- assertThat(m, CoreMatchers.<GlobalMetric>
instanceOf(GlobalMetricImpl.class));
+ assertTrue(m instanceof GlobalMetricImpl);
assertEquals(0, m.getValue());
assertEquals(0, m.getNumberOfSamples());
}
@@ -867,12 +865,21 @@ public class PhoenixMetricsIT extends
BasePhoenixMetricsIT {
}
}
- private void changeInternalStateForTesting(PhoenixResultSet rs) {
+ private void changeInternalStateForTesting(PhoenixResultSet rs) throws
NoSuchFieldException,
+ SecurityException, IllegalArgumentException, IllegalAccessException {
// get and set the internal state for testing purposes.
+ // TODO use a spy ?
ReadMetricQueue testMetricsQueue = new TestReadMetricsQueue(LogLevel.OFF,
true);
- StatementContext ctx = (StatementContext) Whitebox.getInternalState(rs,
"context");
- Whitebox.setInternalState(ctx, "readMetricsQueue", testMetricsQueue);
- Whitebox.setInternalState(rs, "readMetricsQueue", testMetricsQueue);
+
+ Field rsQueueField =
PhoenixResultSet.class.getDeclaredField("readMetricsQueue");
+ rsQueueField.setAccessible(true);
+ rsQueueField.set(rs, testMetricsQueue);
+
+ StatementContext ctx = rs.getContext();
+ Field ctxQueueField =
StatementContext.class.getDeclaredField("readMetricsQueue");
+ ctxQueueField.setAccessible(true);
+ // Default realm for MiniKDC
+ ctxQueueField.set(ctx, testMetricsQueue);
}
private void assertReadMetricValuesForSelectSql(ArrayList<Long> numRows,
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/rpc/UpdateCacheConnectionLevelPropIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/rpc/UpdateCacheConnectionLevelPropIT.java
index 400d470b9e..c3e07c432c 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/rpc/UpdateCacheConnectionLevelPropIT.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/rpc/UpdateCacheConnectionLevelPropIT.java
@@ -19,8 +19,8 @@ package org.apache.phoenix.rpc;
import static org.apache.phoenix.util.TestUtil.DEFAULT_SCHEMA_NAME;
import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.anyLong;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.isNull;
import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.times;
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/rpc/UpdateCacheIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/rpc/UpdateCacheIT.java
index 79492fa66c..c0df784c47 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/rpc/UpdateCacheIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/rpc/UpdateCacheIT.java
@@ -22,9 +22,9 @@ import static
org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import static org.mockito.Matchers.anyLong;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Matchers.isNull;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
diff --git
a/phoenix-core/src/test/java/org/apache/phoenix/coprocessor/TaskMetaDataEndpointTest.java
b/phoenix-core/src/test/java/org/apache/phoenix/coprocessor/TaskMetaDataEndpointTest.java
index b25e93756d..ed1934c991 100644
---
a/phoenix-core/src/test/java/org/apache/phoenix/coprocessor/TaskMetaDataEndpointTest.java
+++
b/phoenix-core/src/test/java/org/apache/phoenix/coprocessor/TaskMetaDataEndpointTest.java
@@ -166,11 +166,11 @@ public class TaskMetaDataEndpointTest {
TaskMetaDataProtos.TaskMutateRequest request = builder.build();
CoprocessorRpcUtils.BlockingRpcCallback<MetaDataProtos.MetaDataResponse>
rpcCallback =
new CoprocessorRpcUtils.BlockingRpcCallback<>();
-
Mockito.doNothing().when(region).mutateRowsWithLocks(Mockito.anyCollectionOf(Mutation.class),
- Mockito.any(), Mockito.anyLong(), Mockito.anyLong());
+
Mockito.doNothing().when(region).mutateRowsWithLocks(Mockito.anyCollection(),
Mockito.any(),
+ Mockito.anyLong(), Mockito.anyLong());
taskMetaDataEndpoint.upsertTaskDetails(controller, request, rpcCallback);
- Mockito.verify(region, Mockito.times(1)).mutateRowsWithLocks(
- Mockito.anyCollectionOf(Mutation.class), Mockito.any(),
Mockito.anyLong(), Mockito.anyLong());
+ Mockito.verify(region,
Mockito.times(1)).mutateRowsWithLocks(Mockito.anyCollection(),
+ Mockito.any(), Mockito.anyLong(), Mockito.anyLong());
}
@Test
@@ -183,11 +183,11 @@ public class TaskMetaDataEndpointTest {
TaskMetaDataProtos.TaskMutateRequest request = builder.build();
CoprocessorRpcUtils.BlockingRpcCallback<MetaDataProtos.MetaDataResponse>
rpcCallback =
new CoprocessorRpcUtils.BlockingRpcCallback<>();
- Mockito.doThrow(IOException.class).when(region).mutateRowsWithLocks(
- Mockito.anyCollectionOf(Mutation.class), Mockito.any(),
Mockito.anyLong(), Mockito.anyLong());
+
Mockito.doThrow(IOException.class).when(region).mutateRowsWithLocks(Mockito.anyCollection(),
+ Mockito.any(), Mockito.anyLong(), Mockito.anyLong());
taskMetaDataEndpoint.upsertTaskDetails(controller, request, rpcCallback);
- Mockito.verify(region, Mockito.times(1)).mutateRowsWithLocks(
- Mockito.anyCollectionOf(Mutation.class), Mockito.any(),
Mockito.anyLong(), Mockito.anyLong());
+ Mockito.verify(region,
Mockito.times(1)).mutateRowsWithLocks(Mockito.anyCollection(),
+ Mockito.any(), Mockito.anyLong(), Mockito.anyLong());
assertEquals(MetaDataProtos.MutationCode.UNABLE_TO_UPSERT_TASK,
rpcCallback.get().getReturnCode());
}
diff --git
a/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestIndexWriter.java
b/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestIndexWriter.java
index 959974bd7a..ebc8f28498 100644
---
a/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestIndexWriter.java
+++
b/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestIndexWriter.java
@@ -38,7 +38,6 @@ import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Connection;
import org.apache.hadoop.hbase.client.Mutation;
import org.apache.hadoop.hbase.client.Put;
-import org.apache.hadoop.hbase.client.Row;
import org.apache.hadoop.hbase.client.Table;
import org.apache.hadoop.hbase.client.TableDescriptor;
import org.apache.hadoop.hbase.client.TableDescriptorBuilder;
@@ -193,7 +192,7 @@ public class TestIndexWriter {
}
return null;
}
- }).when(table).batch(Mockito.anyListOf(Row.class), Mockito.any());
+ }).when(table).batch(Mockito.anyList(), Mockito.any());
// add the tables to the set of tables, so its returned to the writer
tables.put(new ImmutableBytesPtr(tableName), table);
diff --git
a/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestParalleIndexWriter.java
b/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestParalleIndexWriter.java
index bb564c4375..6c0c934167 100644
---
a/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestParalleIndexWriter.java
+++
b/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestParalleIndexWriter.java
@@ -79,7 +79,7 @@ public class TestParalleIndexWriter {
writer.stop(this.test.getTableNameString() + " finished");
assertTrue("Factory didn't get shutdown after writer#stop!",
factory.shutdown);
assertTrue("ExectorService isn't terminated after writer#stop!",
exec.isShutdown());
- Mockito.verifyZeroInteractions(mockStop);
+ Mockito.verifyNoMoreInteractions(mockStop);
}
@SuppressWarnings({ "unchecked", "deprecation" })
diff --git
a/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestParalleWriterIndexCommitter.java
b/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestParalleWriterIndexCommitter.java
index e7d8eaba38..c1593e8b32 100644
---
a/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestParalleWriterIndexCommitter.java
+++
b/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestParalleWriterIndexCommitter.java
@@ -78,7 +78,7 @@ public class TestParalleWriterIndexCommitter {
writer.stop(this.test.getTableNameString() + " finished");
assertTrue("Factory didn't get shutdown after writer#stop!",
factory.shutdown);
assertTrue("ExectorService isn't terminated after writer#stop!",
exec.isShutdown());
- Mockito.verifyZeroInteractions(mockStop);
+ Mockito.verifyNoMoreInteractions(mockStop);
}
@SuppressWarnings({ "unchecked" })
diff --git
a/phoenix-core/src/test/java/org/apache/phoenix/index/ShouldVerifyTest.java
b/phoenix-core/src/test/java/org/apache/phoenix/index/ShouldVerifyTest.java
index e9ce96aaa9..c3bae523d9 100644
--- a/phoenix-core/src/test/java/org/apache/phoenix/index/ShouldVerifyTest.java
+++ b/phoenix-core/src/test/java/org/apache/phoenix/index/ShouldVerifyTest.java
@@ -17,8 +17,8 @@
*/
package org.apache.phoenix.index;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.Mockito.when;
import java.io.IOException;
@@ -33,7 +33,7 @@ import
org.apache.phoenix.mapreduce.index.IndexVerificationResultRepository;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import org.mockito.Matchers;
+import org.mockito.ArgumentMatchers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
@@ -58,7 +58,7 @@ public class ShouldVerifyTest {
MockitoAnnotations.initMocks(this);
indexRowKey = null;
when(im.getIndexTableName()).thenReturn(Bytes.toBytes("indexName"));
- when(scanner.shouldVerify(any(IndexTool.IndexVerifyType.class),
Matchers.<byte[]> any(),
+ when(scanner.shouldVerify(any(IndexTool.IndexVerifyType.class),
ArgumentMatchers.<byte[]> any(),
any(Scan.class), any(Region.class), any(IndexMaintainer.class),
any(IndexVerificationResultRepository.class),
anyBoolean())).thenCallRealMethod();
when(scanner.shouldVerify()).thenCallRealMethod();
diff --git
a/phoenix-core/src/test/java/org/apache/phoenix/index/VerifySingleIndexRowTest.java
b/phoenix-core/src/test/java/org/apache/phoenix/index/VerifySingleIndexRowTest.java
index d494d8bf97..66cfa27ef8 100644
---
a/phoenix-core/src/test/java/org/apache/phoenix/index/VerifySingleIndexRowTest.java
+++
b/phoenix-core/src/test/java/org/apache/phoenix/index/VerifySingleIndexRowTest.java
@@ -22,7 +22,7 @@ import static
org.apache.phoenix.query.QueryConstants.EMPTY_COLUMN_BYTES;
import static org.apache.phoenix.query.QueryConstants.UNVERIFIED_BYTES;
import static org.apache.phoenix.query.QueryConstants.VERIFIED_BYTES;
import static org.junit.Assert.*;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.when;
@@ -61,7 +61,7 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
-import org.mockito.Matchers;
+import org.mockito.ArgumentMatchers;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
@@ -260,10 +260,11 @@ public class VerifySingleIndexRowTest extends
BaseConnectionlessQueryTest {
}
}
- private void initializeRebuildScannerAttributes() {
-
when(rebuildScanner.setIndexTableTTL(Matchers.anyInt())).thenCallRealMethod();
- when(rebuildScanner.setIndexMaintainer(Matchers.<IndexMaintainer>
any())).thenCallRealMethod();
-
when(rebuildScanner.setMaxLookBackInMills(Matchers.anyLong())).thenCallRealMethod();
+ private void initializeRebuildScannerAttributes() throws SQLException {
+
when(rebuildScanner.setIndexTableTTL(ArgumentMatchers.anyInt())).thenCallRealMethod();
+ when(rebuildScanner.setIndexMaintainer(ArgumentMatchers.<IndexMaintainer>
any()))
+ .thenCallRealMethod();
+
when(rebuildScanner.setMaxLookBackInMills(ArgumentMatchers.anyLong())).thenCallRealMethod();
rebuildScanner.setIndexTableTTL(HConstants.FOREVER);
indexMaintainer = pIndexTable.getIndexMaintainer(pDataTable, pconn);
rebuildScanner.setIndexMaintainer(indexMaintainer);
@@ -276,17 +277,19 @@ public class VerifySingleIndexRowTest extends
BaseConnectionlessQueryTest {
when(GlobalIndexRegionScanner.getIndexRowKey(indexMaintainer,
put)).thenCallRealMethod();
when(rebuildScanner.prepareIndexMutations(put, delete,
indexKeyToMutationMap,
mostRecentIndexRowKeys)).thenCallRealMethod();
- when(rebuildScanner.verifySingleIndexRow(Matchers.<byte[]> any(),
Matchers.<List> any(),
- Matchers.<List> any(), Matchers.<Set> any(), Matchers.<List> any(),
- Matchers.<IndexToolVerificationResult.PhaseResult> any(),
Matchers.anyBoolean()))
- .thenCallRealMethod();
-
doNothing().when(rebuildScanner).logToIndexToolOutputTable(Matchers.<byte[]>
any(),
- Matchers.<byte[]> any(), Mockito.anyLong(), Mockito.anyLong(),
Mockito.anyString(),
- Matchers.<byte[]> any(), Matchers.<byte[]> any(), Matchers.anyBoolean(),
+ when(rebuildScanner.verifySingleIndexRow(ArgumentMatchers.<byte[]> any(),
+ ArgumentMatchers.<List> any(), ArgumentMatchers.<List> any(),
ArgumentMatchers.<Set> any(),
+ ArgumentMatchers.<List> any(),
+ ArgumentMatchers.<IndexToolVerificationResult.PhaseResult> any(),
+ ArgumentMatchers.anyBoolean())).thenCallRealMethod();
+
doNothing().when(rebuildScanner).logToIndexToolOutputTable(ArgumentMatchers.<byte[]>
any(),
+ ArgumentMatchers.<byte[]> any(), Mockito.anyLong(), Mockito.anyLong(),
Mockito.anyString(),
+ ArgumentMatchers.<byte[]> any(), ArgumentMatchers.<byte[]> any(),
+ ArgumentMatchers.anyBoolean(),
Mockito.<IndexVerificationOutputRepository.IndexVerificationErrorType>
any());
-
doNothing().when(rebuildScanner).logToIndexToolOutputTable(Matchers.<byte[]>
any(),
- Matchers.<byte[]> any(), Mockito.anyLong(), Mockito.anyLong(),
Mockito.anyString(),
- Matchers.anyBoolean(),
+
doNothing().when(rebuildScanner).logToIndexToolOutputTable(ArgumentMatchers.<byte[]>
any(),
+ ArgumentMatchers.<byte[]> any(), Mockito.anyLong(), Mockito.anyLong(),
Mockito.anyString(),
+ ArgumentMatchers.anyBoolean(),
Mockito.<IndexVerificationOutputRepository.IndexVerificationErrorType>
any());
// populate the local map to use to create actual mutations
@@ -531,7 +534,6 @@ public class VerifySingleIndexRowTest extends
BaseConnectionlessQueryTest {
@Test
public void
testVerifySingleIndexRow_compactionOnIndexTable_noExpectedMutationWithinMaxLookBack()
throws Exception {
- Assume.assumeTrue(HbaseCompatCapabilities.isMaxLookbackTimeSupported());
String dataRowKey = "k1";
byte[] indexRowKey1Bytes = generateIndexRowKey(dataRowKey, "val1");
List<Mutation> expectedMutations = new ArrayList<>();
diff --git
a/phoenix-core/src/test/java/org/apache/phoenix/jdbc/PhoenixStatementTest.java
b/phoenix-core/src/test/java/org/apache/phoenix/jdbc/PhoenixStatementTest.java
index 5e248d1a6f..70daf0e2b7 100644
---
a/phoenix-core/src/test/java/org/apache/phoenix/jdbc/PhoenixStatementTest.java
+++
b/phoenix-core/src/test/java/org/apache/phoenix/jdbc/PhoenixStatementTest.java
@@ -28,6 +28,7 @@ import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import java.lang.reflect.Field;
import java.sql.*;
import java.util.List;
import java.util.Properties;
@@ -36,12 +37,25 @@ import org.apache.phoenix.query.BaseConnectionlessQueryTest;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.query.QueryServicesOptions;
import org.junit.Test;
-import org.mockito.internal.util.reflection.Whitebox;
import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;
public class PhoenixStatementTest extends BaseConnectionlessQueryTest {
+ private static Field connectionField;
+ private static Field batchField;
+
+ static {
+ try {
+ connectionField = PhoenixStatement.class.getDeclaredField("connection");
+ connectionField.setAccessible(true);
+ batchField = PhoenixStatement.class.getDeclaredField("batch");
+ batchField.setAccessible(true);
+ } catch (NoSuchFieldException | SecurityException e) {
+ // Test would fail
+ }
+ }
+
@Test
public void testMutationUsingExecuteQueryShouldFail() throws Exception {
Properties connectionProperties = new Properties();
@@ -167,10 +181,10 @@ public class PhoenixStatementTest extends
BaseConnectionlessQueryTest {
Connection connection = DriverManager.getConnection(getUrl(),
connectionProperties);
Statement stmt = connection.createStatement();
PhoenixConnection connSpy =
spy(connection.unwrap(PhoenixConnection.class));
- Whitebox.setInternalState(stmt, "connection", connSpy);
+ connectionField.set(stmt, connSpy);
List<PhoenixPreparedStatement> batch =
Lists.newArrayList(mock(PhoenixPreparedStatement.class),
mock(PhoenixPreparedStatement.class),
mock(PhoenixPreparedStatement.class));
- Whitebox.setInternalState(stmt, "batch", batch);
+ batchField.set(stmt, batch);
final String exMsg = "TEST";
when(batch.get(0).getUpdateCount()).thenReturn(1);
doThrow(new SQLException(exMsg)).when(batch.get(1)).executeForBatch();
@@ -196,9 +210,9 @@ public class PhoenixStatementTest extends
BaseConnectionlessQueryTest {
Connection connection = DriverManager.getConnection(getUrl(),
connectionProperties);
Statement stmt = connection.createStatement();
PhoenixConnection connSpy =
spy(connection.unwrap(PhoenixConnection.class));
- Whitebox.setInternalState(stmt, "connection", connSpy);
+ connectionField.set(stmt, connSpy);
List<PhoenixPreparedStatement> batch =
Lists.newArrayList(mock(PhoenixPreparedStatement.class));
- Whitebox.setInternalState(stmt, "batch", batch);
+ batchField.set(stmt, batch);
final String exMsg = "TEST";
doThrow(new SQLException(exMsg)).when(connSpy).commit();
when(connSpy.getAutoCommit()).thenReturn(true);
diff --git
a/phoenix-core/src/test/java/org/apache/phoenix/monitoring/MetricUtilTest.java
b/phoenix-core/src/test/java/org/apache/phoenix/monitoring/MetricUtilTest.java
index 5a1470dc29..c611a993de 100644
---
a/phoenix-core/src/test/java/org/apache/phoenix/monitoring/MetricUtilTest.java
+++
b/phoenix-core/src/test/java/org/apache/phoenix/monitoring/MetricUtilTest.java
@@ -28,7 +28,7 @@ import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
import org.apache.phoenix.log.LogLevel;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
@RunWith(MockitoJUnitRunner.class)
public class MetricUtilTest {
diff --git
a/phoenix-core/src/test/java/org/apache/phoenix/query/ConnectionQueryServicesImplTest.java
b/phoenix-core/src/test/java/org/apache/phoenix/query/ConnectionQueryServicesImplTest.java
index a9808a0081..4b9ae98332 100644
---
a/phoenix-core/src/test/java/org/apache/phoenix/query/ConnectionQueryServicesImplTest.java
+++
b/phoenix-core/src/test/java/org/apache/phoenix/query/ConnectionQueryServicesImplTest.java
@@ -27,8 +27,8 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-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.Mockito.doCallRealMethod;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doThrow;
@@ -141,7 +141,7 @@ public class ConnectionQueryServicesImplTest {
// Should be called after upgradeSystemTables()
// Proves that execution proceeded
- verify(mockCqs).getSystemTableNamesInDefaultNamespace(any(Admin.class));
+ verify(mockCqs).getSystemTableNamesInDefaultNamespace(any());
try {
// Verifies that the exception is propagated back to the caller
diff --git
a/phoenix-core/src/test/java/org/apache/phoenix/schema/stats/StatisticsScannerTest.java
b/phoenix-core/src/test/java/org/apache/phoenix/schema/stats/StatisticsScannerTest.java
index 4b768edcaa..dd9c57b9fc 100644
---
a/phoenix-core/src/test/java/org/apache/phoenix/schema/stats/StatisticsScannerTest.java
+++
b/phoenix-core/src/test/java/org/apache/phoenix/schema/stats/StatisticsScannerTest.java
@@ -17,7 +17,7 @@
*/
package org.apache.phoenix.schema.stats;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doCallRealMethod;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
@@ -26,7 +26,6 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import java.io.IOException;
-import java.util.List;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.client.Connection;
import org.apache.hadoop.hbase.client.RegionInfo;
@@ -34,7 +33,6 @@ import
org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment;
import org.apache.hadoop.hbase.regionserver.InternalScanner;
import org.apache.hadoop.hbase.regionserver.Region;
import org.apache.hadoop.hbase.regionserver.RegionServerServices;
-import org.apache.phoenix.hbase.index.util.ImmutableBytesPtr;
import
org.apache.phoenix.schema.stats.StatisticsScanner.StatisticsScannerCallable;
import org.junit.Before;
import org.junit.Test;
@@ -78,7 +76,7 @@ public class StatisticsScannerTest {
// Wire up the mocks to the mock StatisticsScanner
when(mockScanner.getStatisticsWriter()).thenReturn(statsWriter);
when(mockScanner.createCallable()).thenReturn(callable);
-
when(mockScanner.getStatsCollectionRunTracker(any(Configuration.class))).thenReturn(runTracker);
+
when(mockScanner.getStatsCollectionRunTracker(any())).thenReturn(runTracker);
when(mockScanner.getRegion()).thenReturn(region);
when(mockScanner.getConfig()).thenReturn(config);
when(mockScanner.getTracker()).thenReturn(tracker);
@@ -122,8 +120,7 @@ public class StatisticsScannerTest {
@Test
public void testCheckRegionServerStoppingOnException() throws Exception {
StatisticsScannerCallable realCallable = mockScanner.new
StatisticsScannerCallable();
- doThrow(new
IOException()).when(statsWriter).deleteStatsForRegion(any(Region.class),
- any(StatisticsCollector.class), any(ImmutableBytesPtr.class),
any(List.class));
+ doThrow(new IOException()).when(statsWriter).deleteStatsForRegion(any(),
any(), any(), any());
when(conn.isClosed()).thenReturn(true);
when(conn.isAborted()).thenReturn(false);
@@ -137,8 +134,7 @@ public class StatisticsScannerTest {
@Test
public void testCheckRegionServerStoppedOnException() throws Exception {
StatisticsScannerCallable realCallable = mockScanner.new
StatisticsScannerCallable();
- doThrow(new
IOException()).when(statsWriter).deleteStatsForRegion(any(Region.class),
- any(StatisticsCollector.class), any(ImmutableBytesPtr.class),
any(List.class));
+ doThrow(new IOException()).when(statsWriter).deleteStatsForRegion(any(),
any(), any(), any());
when(conn.isClosed()).thenReturn(false);
when(conn.isAborted()).thenReturn(true);
diff --git
a/phoenix-core/src/test/java/org/apache/phoenix/util/AbstractUpsertExecutorTest.java
b/phoenix-core/src/test/java/org/apache/phoenix/util/AbstractUpsertExecutorTest.java
index 6851c11704..424dc5429a 100644
---
a/phoenix-core/src/test/java/org/apache/phoenix/util/AbstractUpsertExecutorTest.java
+++
b/phoenix-core/src/test/java/org/apache/phoenix/util/AbstractUpsertExecutorTest.java
@@ -17,8 +17,8 @@
*/
package org.apache.phoenix.util;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
diff --git
a/phoenix-core/src/test/java/org/apache/phoenix/util/LogUtilTest.java
b/phoenix-core/src/test/java/org/apache/phoenix/util/LogUtilTest.java
index 1fc13b6b10..79fab393e8 100644
--- a/phoenix-core/src/test/java/org/apache/phoenix/util/LogUtilTest.java
+++ b/phoenix-core/src/test/java/org/apache/phoenix/util/LogUtilTest.java
@@ -25,7 +25,7 @@ import org.apache.phoenix.jdbc.PhoenixConnection;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
import org.apache.phoenix.thirdparty.com.google.common.collect.ImmutableMap;
diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml
index fc8f2a5328..e356cce706 100644
--- a/phoenix-pherf/pom.xml
+++ b/phoenix-pherf/pom.xml
@@ -196,11 +196,6 @@
<artifactId>system-rules</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-core</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
diff --git
a/phoenix-pherf/src/test/java/org/apache/phoenix/pherf/ResourceTest.java
b/phoenix-pherf/src/test/java/org/apache/phoenix/pherf/ResourceTest.java
index 168c62caa2..b8ce5be583 100644
--- a/phoenix-pherf/src/test/java/org/apache/phoenix/pherf/ResourceTest.java
+++ b/phoenix-pherf/src/test/java/org/apache/phoenix/pherf/ResourceTest.java
@@ -17,9 +17,7 @@
*/
package org.apache.phoenix.pherf;
-import static org.hamcrest.CoreMatchers.containsString;
import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import java.nio.file.Path;
@@ -56,7 +54,7 @@ public class ResourceTest {
Collection<Path> paths = list.getResourceList(pattern);
assertTrue("Resource file list was empty", paths.size() > 0);
for (Path path : paths) {
- assertThat(path.toString(), containsString(assertStr));
+ assertTrue(path.toString().contains(assertStr));
}
return paths;
}
diff --git a/pom.xml b/pom.xml
index f900c52ddc..f6d1b254f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -134,9 +134,8 @@
<jetty.version>9.4.57.v20241219</jetty.version>
<javax.servlet-api.version>3.1.0</javax.servlet-api.version>
<!-- Test Dependencies -->
- <mockito.version>1.10.19</mockito.version>
+ <mockito.version>4.11.0</mockito.version>
<junit.version>4.13.1</junit.version>
- <hamcrest.version>1.3</hamcrest.version>
<!-- Plugin versions -->
<maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
@@ -1095,15 +1094,10 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <artifactId>mockito-bom</artifactId>
<version>${mockito.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-core</artifactId>
- <version>${hamcrest.version}</version>
- <scope>test</scope>
+ <type>pom</type>
+ <scope>import</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
