diff --git beeline/pom.xml beeline/pom.xml index 4e5ad0795c..a5a1e42896 100644 --- beeline/pom.xml +++ beeline/pom.xml @@ -29,7 +29,7 @@ .. - 1.6.6 + 2.0.2 @@ -127,7 +127,7 @@ org.powermock - powermock-api-mockito + powermock-api-mockito2 ${powermock.version} test diff --git beeline/src/test/org/apache/hive/beeline/TestBufferedRows.java beeline/src/test/org/apache/hive/beeline/TestBufferedRows.java index 9478ec5880..1add3c01b3 100644 --- beeline/src/test/org/apache/hive/beeline/TestBufferedRows.java +++ beeline/src/test/org/apache/hive/beeline/TestBufferedRows.java @@ -17,6 +17,7 @@ */ package org.apache.hive.beeline; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -26,7 +27,6 @@ import org.junit.Assert; import org.junit.Test; -import org.mockito.Matchers; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; @@ -99,7 +99,7 @@ public Boolean answer(InvocationOnMock invocation) { } }); - when(mockResultSet.getObject(Matchers.anyInt())).thenAnswer(new Answer() { + when(mockResultSet.getObject(anyInt())).thenAnswer(new Answer() { @Override public String answer(InvocationOnMock invocation) { Object[] args = invocation.getArguments(); diff --git beeline/src/test/org/apache/hive/beeline/TestTableOutputFormat.java beeline/src/test/org/apache/hive/beeline/TestTableOutputFormat.java index 0f557e8bc4..5b8407088f 100644 --- beeline/src/test/org/apache/hive/beeline/TestTableOutputFormat.java +++ beeline/src/test/org/apache/hive/beeline/TestTableOutputFormat.java @@ -15,13 +15,14 @@ */ package org.apache.hive.beeline; +import static org.mockito.ArgumentMatchers.anyInt; + import java.io.PrintStream; import java.sql.ResultSet; import java.sql.ResultSetMetaData; import java.sql.SQLException; import static org.junit.Assert.assertEquals; import org.junit.Test; -import org.mockito.Matchers; import static org.mockito.Mockito.when; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; @@ -96,7 +97,7 @@ public Boolean answer(final InvocationOnMock invocation) { } }); - when(mockResultSet.getObject(Matchers.anyInt())).thenAnswer(new Answer() { + when(mockResultSet.getObject(anyInt())).thenAnswer(new Answer() { @Override public String answer(final InvocationOnMock invocation) { Object[] args = invocation.getArguments(); diff --git beeline/src/test/org/apache/hive/beeline/schematool/TestHiveSchemaTool.java beeline/src/test/org/apache/hive/beeline/schematool/TestHiveSchemaTool.java index 2311b0409f..52b2aca520 100644 --- beeline/src/test/org/apache/hive/beeline/schematool/TestHiveSchemaTool.java +++ beeline/src/test/org/apache/hive/beeline/schematool/TestHiveSchemaTool.java @@ -35,11 +35,10 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.eq; -import static org.mockito.Matchers.same; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.ArgumentMatchers.same; import static org.mockito.Mockito.when; import static org.powermock.api.mockito.PowerMockito.mockStatic; -import static org.powermock.api.mockito.PowerMockito.verifyStatic; @RunWith(PowerMockRunner.class) @PowerMockIgnore("javax.management.*") @@ -71,7 +70,6 @@ public void setup() throws IOException { @After public void globalAssert() throws IOException { - verifyStatic(); HiveSchemaHelper.getValidConfVar(eq(MetastoreConf.ConfVars.CONNECT_URL_KEY), same(hiveConf)); HiveSchemaHelper .getValidConfVar(eq(MetastoreConf.ConfVars.CONNECTION_DRIVER), same(hiveConf)); diff --git cli/src/test/org/apache/hadoop/hive/cli/TestCliDriverMethods.java cli/src/test/org/apache/hadoop/hive/cli/TestCliDriverMethods.java index 42e3bc564a..5f219005c9 100644 --- cli/src/test/org/apache/hadoop/hive/cli/TestCliDriverMethods.java +++ cli/src/test/org/apache/hadoop/hive/cli/TestCliDriverMethods.java @@ -18,9 +18,9 @@ package org.apache.hadoop.hive.cli; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; diff --git common/src/test/org/apache/hadoop/hive/common/TestFileUtils.java common/src/test/org/apache/hadoop/hive/common/TestFileUtils.java index 9b5748e724..15e74db366 100644 --- common/src/test/org/apache/hadoop/hive/common/TestFileUtils.java +++ common/src/test/org/apache/hadoop/hive/common/TestFileUtils.java @@ -22,7 +22,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.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; diff --git druid-handler/src/test/org/apache/hadoop/hive/druid/serde/TestDruidSerDe.java druid-handler/src/test/org/apache/hadoop/hive/druid/serde/TestDruidSerDe.java index 74576975a4..edfcc65460 100644 --- druid-handler/src/test/org/apache/hadoop/hive/druid/serde/TestDruidSerDe.java +++ druid-handler/src/test/org/apache/hadoop/hive/druid/serde/TestDruidSerDe.java @@ -18,8 +18,8 @@ package org.apache.hadoop.hive.druid.serde; import static org.junit.Assert.assertEquals; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyObject; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyObject; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/mutate/client/TestMutatorClient.java hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/mutate/client/TestMutatorClient.java index 91b90ed818..4222786d80 100644 --- hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/mutate/client/TestMutatorClient.java +++ hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/mutate/client/TestMutatorClient.java @@ -20,7 +20,7 @@ import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -42,7 +42,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) public class TestMutatorClient { diff --git hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/mutate/client/lock/TestLock.java hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/mutate/client/lock/TestLock.java index 0a46faf90d..99f9afdaa9 100644 --- hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/mutate/client/lock/TestLock.java +++ hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/mutate/client/lock/TestLock.java @@ -24,10 +24,10 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyLong; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; @@ -60,7 +60,7 @@ import org.mockito.ArgumentCaptor; import org.mockito.Captor; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import com.google.common.collect.ImmutableSet; diff --git hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/mutate/worker/TestMutatorCoordinator.java hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/mutate/worker/TestMutatorCoordinator.java index fab56b35b9..297e67c40d 100644 --- hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/mutate/worker/TestMutatorCoordinator.java +++ hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/mutate/worker/TestMutatorCoordinator.java @@ -17,15 +17,16 @@ */ package org.apache.hive.hcatalog.streaming.mutate.worker; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyList; -import static org.mockito.Matchers.anyLong; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyList; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.lenient; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; import java.util.Arrays; @@ -41,7 +42,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) public class TestMutatorCoordinator { @@ -92,7 +93,7 @@ public void createCoordinator() throws Exception { mockMutator); when(mockPartitionHelper.getPathForPartition(any(List.class))).thenReturn(PATH_A); when(mockRecordInspector.extractRecordIdentifier(RECORD)).thenReturn(ROW__ID_INSERT); - when(mockSequenceValidator.isInSequence(any(RecordIdentifier.class))).thenReturn(true); + lenient().when(mockSequenceValidator.isInSequence(any(RecordIdentifier.class))).thenReturn(true); when(mockGroupingValidator.isInSequence(any(List.class), anyInt())).thenReturn(true); coordinator = new MutatorCoordinator(configuration, mockMutatorFactory, mockPartitionHelper, mockGroupingValidator, @@ -247,7 +248,7 @@ public void closeNoRecords() throws Exception { coordinator.close(); // No mutator created - verifyZeroInteractions(mockMutator); + verifyNoMoreInteractions(mockMutator); } @Test diff --git hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/mutate/worker/TestMutatorImpl.java hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/mutate/worker/TestMutatorImpl.java index d2c89e53ad..5219532d3e 100644 --- hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/mutate/worker/TestMutatorImpl.java +++ hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/mutate/worker/TestMutatorImpl.java @@ -19,8 +19,8 @@ import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; -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.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -40,7 +40,7 @@ import org.mockito.ArgumentCaptor; import org.mockito.Captor; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) public class TestMutatorImpl { diff --git itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/authorization/plugin/TestHiveAuthorizerCheckInvocation.java itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/authorization/plugin/TestHiveAuthorizerCheckInvocation.java index 37bb6aded3..0db6eb74e8 100644 --- itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/authorization/plugin/TestHiveAuthorizerCheckInvocation.java +++ itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/authorization/plugin/TestHiveAuthorizerCheckInvocation.java @@ -23,7 +23,7 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/authorization/plugin/TestHiveAuthorizerShowFilters.java itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/authorization/plugin/TestHiveAuthorizerShowFilters.java index cf120ea1f2..89ea6697a7 100644 --- itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/authorization/plugin/TestHiveAuthorizerShowFilters.java +++ itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/authorization/plugin/TestHiveAuthorizerShowFilters.java @@ -19,7 +19,7 @@ package org.apache.hadoop.hive.ql.security.authorization.plugin; import static org.junit.Assert.assertEquals; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import java.util.ArrayList; import java.util.Arrays; diff --git itests/hive-unit/src/test/java/org/apache/hive/jdbc/authorization/TestHS2AuthzContext.java itests/hive-unit/src/test/java/org/apache/hive/jdbc/authorization/TestHS2AuthzContext.java index 4b1a101124..01379fc0d8 100644 --- itests/hive-unit/src/test/java/org/apache/hive/jdbc/authorization/TestHS2AuthzContext.java +++ itests/hive-unit/src/test/java/org/apache/hive/jdbc/authorization/TestHS2AuthzContext.java @@ -20,7 +20,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.verify; import java.sql.Connection; diff --git itests/hive-unit/src/test/java/org/apache/hive/service/cli/session/TestHiveSessionImpl.java itests/hive-unit/src/test/java/org/apache/hive/service/cli/session/TestHiveSessionImpl.java index 1ee3a501eb..85bbe9e74d 100644 --- itests/hive-unit/src/test/java/org/apache/hive/service/cli/session/TestHiveSessionImpl.java +++ itests/hive-unit/src/test/java/org/apache/hive/service/cli/session/TestHiveSessionImpl.java @@ -18,6 +18,8 @@ package org.apache.hive.service.cli.session; +import static org.mockito.ArgumentMatchers.*; + import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hive.service.cli.HiveSQLException; import org.apache.hive.service.cli.OperationHandle; @@ -27,7 +29,6 @@ import org.junit.Assert; import org.junit.Test; import org.mockito.Mockito; -import static org.mockito.Matchers.*; import java.util.Arrays; import java.util.HashMap; diff --git itests/hive-unit/src/test/java/org/apache/hive/service/cli/thrift/TestThriftHttpCLIServiceFeatures.java itests/hive-unit/src/test/java/org/apache/hive/service/cli/thrift/TestThriftHttpCLIServiceFeatures.java index 901286775d..c073ace081 100644 --- itests/hive-unit/src/test/java/org/apache/hive/service/cli/thrift/TestThriftHttpCLIServiceFeatures.java +++ itests/hive-unit/src/test/java/org/apache/hive/service/cli/thrift/TestThriftHttpCLIServiceFeatures.java @@ -20,7 +20,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.verify; import java.io.IOException; @@ -45,7 +45,6 @@ import org.apache.hadoop.hive.ql.security.authorization.plugin.HiveAuthzContext; import org.apache.hive.jdbc.HttpBasicAuthInterceptor; import org.apache.hive.service.auth.HiveAuthConstants; -import org.apache.hive.service.auth.HiveAuthConstants.AuthTypes; import org.apache.hive.service.rpc.thrift.TCLIService; import org.apache.hive.service.rpc.thrift.TExecuteStatementReq; import org.apache.hive.service.rpc.thrift.TOpenSessionReq; diff --git jdbc-handler/pom.xml jdbc-handler/pom.xml index 268f38ef11..b2d9ec8eb9 100644 --- jdbc-handler/pom.xml +++ jdbc-handler/pom.xml @@ -115,7 +115,7 @@ org.powermock - powermock-api-mockito + powermock-api-mockito2 ${powermock.version} test diff --git jdbc-handler/src/test/java/org/apache/hive/storage/jdbc/TestJdbcInputFormat.java jdbc-handler/src/test/java/org/apache/hive/storage/jdbc/TestJdbcInputFormat.java index cde97d6473..07102170e2 100644 --- jdbc-handler/src/test/java/org/apache/hive/storage/jdbc/TestJdbcInputFormat.java +++ jdbc-handler/src/test/java/org/apache/hive/storage/jdbc/TestJdbcInputFormat.java @@ -39,8 +39,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -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; @RunWith(PowerMockRunner.class) diff --git jdbc/src/test/org/apache/hive/jdbc/TestHivePreparedStatement.java jdbc/src/test/org/apache/hive/jdbc/TestHivePreparedStatement.java index b641395980..394c89cd06 100644 --- jdbc/src/test/org/apache/hive/jdbc/TestHivePreparedStatement.java +++ jdbc/src/test/org/apache/hive/jdbc/TestHivePreparedStatement.java @@ -18,7 +18,7 @@ package org.apache.hive.jdbc; import static org.junit.Assert.assertEquals; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.mockito.Mockito.times; diff --git llap-client/pom.xml llap-client/pom.xml index 84e87ec36d..df25bf6709 100644 --- llap-client/pom.xml +++ llap-client/pom.xml @@ -164,7 +164,7 @@ org.powermock - powermock-api-mockito + powermock-api-mockito2 ${powermock.version} test diff --git llap-server/src/test/org/apache/hadoop/hive/llap/TestReflectionUtils.java llap-server/src/test/org/apache/hadoop/hive/llap/TestReflectionUtils.java new file mode 100644 index 0000000000..c53fe7aef6 --- /dev/null +++ llap-server/src/test/org/apache/hadoop/hive/llap/TestReflectionUtils.java @@ -0,0 +1,54 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.hadoop.hive.llap; + +import static org.junit.Assert.fail; + +import java.lang.reflect.Field; + +public class TestReflectionUtils { + + public static Field reflectField(Class classToReflect, String fieldNameValueToFetch) { + try { + Field reflectField = null; + Class classForReflect = classToReflect; + do { + try { + reflectField = classForReflect.getDeclaredField(fieldNameValueToFetch); + } catch (NoSuchFieldException e) { + classForReflect = classForReflect.getSuperclass(); + } + } while (reflectField==null || classForReflect==null); + reflectField.setAccessible(true); + return reflectField; + } catch (Exception e) { + fail("Failed to reflect " + fieldNameValueToFetch + " from " + classToReflect); + } + return null; + } + + public static void reflectSetValue(Object objToReflect, String fieldNameToSet, Object valueToSet) { + try { + Field reflectField = reflectField(objToReflect.getClass(), fieldNameToSet); + reflectField.set(objToReflect, valueToSet); + } catch (Exception e) { + fail("Failed to reflectively set " + fieldNameToSet + "=" + valueToSet); + } + } + +} diff --git llap-server/src/test/org/apache/hadoop/hive/llap/cache/TestLowLevelLrfuCachePolicy.java llap-server/src/test/org/apache/hadoop/hive/llap/cache/TestLowLevelLrfuCachePolicy.java index fbe58ff919..d290c483aa 100644 --- llap-server/src/test/org/apache/hadoop/hive/llap/cache/TestLowLevelLrfuCachePolicy.java +++ llap-server/src/test/org/apache/hadoop/hive/llap/cache/TestLowLevelLrfuCachePolicy.java @@ -24,7 +24,7 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.anyLong; +import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; diff --git llap-server/src/test/org/apache/hadoop/hive/llap/daemon/impl/comparator/TestAMReporter.java llap-server/src/test/org/apache/hadoop/hive/llap/daemon/impl/comparator/TestAMReporter.java index 068aad4f19..33c5439985 100644 --- llap-server/src/test/org/apache/hadoop/hive/llap/daemon/impl/comparator/TestAMReporter.java +++ llap-server/src/test/org/apache/hadoop/hive/llap/daemon/impl/comparator/TestAMReporter.java @@ -40,8 +40,8 @@ import java.util.concurrent.atomic.AtomicReference; import static org.junit.Assert.assertEquals; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git llap-server/src/test/org/apache/hadoop/hive/llap/io/encoded/TestVectorDeserializeOrcWriter.java llap-server/src/test/org/apache/hadoop/hive/llap/io/encoded/TestVectorDeserializeOrcWriter.java index 647538eb84..abb3e191e1 100644 --- llap-server/src/test/org/apache/hadoop/hive/llap/io/encoded/TestVectorDeserializeOrcWriter.java +++ llap-server/src/test/org/apache/hadoop/hive/llap/io/encoded/TestVectorDeserializeOrcWriter.java @@ -17,11 +17,13 @@ */ package org.apache.hadoop.hive.llap.io.encoded; +import java.lang.reflect.Field; import java.util.ArrayList; import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; import org.apache.hadoop.hive.common.io.encoded.EncodedColumnBatch; +import org.apache.hadoop.hive.llap.TestReflectionUtils; import org.apache.hadoop.hive.llap.io.api.impl.ColumnVectorBatch; import org.apache.hadoop.hive.llap.io.decode.EncodedDataConsumer; import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; @@ -38,8 +40,6 @@ import static org.mockito.Mockito.CALLS_REAL_METHODS; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.withSettings; -import static org.mockito.internal.util.reflection.Whitebox.getInternalState; -import static org.mockito.internal.util.reflection.Whitebox.setInternalState; /** * Unit tests for VectorDeserializeOrcWriter. @@ -53,8 +53,10 @@ public void testConcurrencyIssueWhileWriting() throws Exception { //Setup//////////////////////////////////////////////////////////////////////////////////////// EncodedDataConsumer consumer = createBlankEncodedDataConsumer(); + Field cvbPoolField = EncodedDataConsumer.class.getDeclaredField("cvbPool"); + cvbPoolField.setAccessible(true); FixedSizedObjectPool cvbPool = (FixedSizedObjectPool) - getInternalState(consumer, "cvbPool"); + cvbPoolField.get(consumer); ColumnVectorBatch cvb = new ColumnVectorBatch(TEST_NUM_COLS); VectorizedRowBatch vrb = new VectorizedRowBatch(TEST_NUM_COLS); @@ -104,12 +106,13 @@ private static void createTestVectors(ColumnVectorBatch cvb, VectorizedRowBatch private static VectorDeserializeOrcWriter createOrcWriter( Queue writeOpQueue, VectorizedRowBatch vrb) { VectorDeserializeOrcWriter orcWriter = mock(VectorDeserializeOrcWriter.class, - withSettings().defaultAnswer(CALLS_REAL_METHODS)); - setInternalState(orcWriter, "sourceBatch", vrb); - setInternalState(orcWriter, "destinationBatch", vrb); - setInternalState(orcWriter, "currentBatches", new ArrayList()); - setInternalState(orcWriter, "queue", writeOpQueue); - setInternalState(orcWriter, "isAsync", true); + withSettings().defaultAnswer(CALLS_REAL_METHODS)); + + TestReflectionUtils.reflectSetValue(orcWriter,"sourceBatch", vrb); + TestReflectionUtils.reflectSetValue(orcWriter,"destinationBatch", vrb); + TestReflectionUtils.reflectSetValue(orcWriter,"currentBatches", new ArrayList()); + TestReflectionUtils.reflectSetValue(orcWriter,"queue", writeOpQueue); + TestReflectionUtils.reflectSetValue(orcWriter,"isAsync", true); return orcWriter; } diff --git llap-tez/src/test/org/apache/hadoop/hive/llap/tezplugins/TestLlapTaskCommunicator.java llap-tez/src/test/org/apache/hadoop/hive/llap/tezplugins/TestLlapTaskCommunicator.java index 5efe7c677c..9b4ac271f0 100644 --- llap-tez/src/test/org/apache/hadoop/hive/llap/tezplugins/TestLlapTaskCommunicator.java +++ llap-tez/src/test/org/apache/hadoop/hive/llap/tezplugins/TestLlapTaskCommunicator.java @@ -17,9 +17,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; -import static org.mockito.Mockito.RETURNS_DEEP_STUBS; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; diff --git llap-tez/src/test/org/apache/hadoop/hive/llap/tezplugins/TestLlapTaskSchedulerService.java llap-tez/src/test/org/apache/hadoop/hive/llap/tezplugins/TestLlapTaskSchedulerService.java index 46007559cd..707012399b 100644 --- llap-tez/src/test/org/apache/hadoop/hive/llap/tezplugins/TestLlapTaskSchedulerService.java +++ llap-tez/src/test/org/apache/hadoop/hive/llap/tezplugins/TestLlapTaskSchedulerService.java @@ -18,8 +18,8 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -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.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; diff --git llap-tez/src/test/org/apache/hadoop/hive/llap/tezplugins/metrics/TestBlacklistingLlapMetricsListener.java llap-tez/src/test/org/apache/hadoop/hive/llap/tezplugins/metrics/TestBlacklistingLlapMetricsListener.java index dec75865c9..f7409bdc55 100644 --- llap-tez/src/test/org/apache/hadoop/hive/llap/tezplugins/metrics/TestBlacklistingLlapMetricsListener.java +++ llap-tez/src/test/org/apache/hadoop/hive/llap/tezplugins/metrics/TestBlacklistingLlapMetricsListener.java @@ -40,8 +40,8 @@ import java.util.Map; import static org.junit.Assert.assertEquals; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyLong; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.Mockito.never; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.times; diff --git llap-tez/src/test/org/apache/hadoop/hive/llap/tezplugins/metrics/TestLlapMetricsCollector.java llap-tez/src/test/org/apache/hadoop/hive/llap/tezplugins/metrics/TestLlapMetricsCollector.java index f212ac6638..8f13690bbb 100644 --- llap-tez/src/test/org/apache/hadoop/hive/llap/tezplugins/metrics/TestLlapMetricsCollector.java +++ llap-tez/src/test/org/apache/hadoop/hive/llap/tezplugins/metrics/TestLlapMetricsCollector.java @@ -38,7 +38,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.anyLong; +import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.Mockito.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; diff --git pom.xml pom.xml index 579e74568f..228c30e0f0 100644 --- pom.xml +++ pom.xml @@ -193,8 +193,8 @@ 2.5.0 2.3 1.5.9 - 1.10.19 - 1.7.4 + 3.3.3 + 2.0.2 2.0.0-M5 4.1.17.Final 3.10.5.Final diff --git ql/pom.xml ql/pom.xml index 9b45d31385..99429711ee 100644 --- ql/pom.xml +++ ql/pom.xml @@ -29,7 +29,7 @@ .. - 1.6.6 + 2.0.2 0.9.10 @@ -757,7 +757,7 @@ org.powermock - powermock-api-mockito + powermock-api-mockito2 ${powermock.version} test diff --git ql/src/test/org/apache/hadoop/hive/ql/TestCompileLock.java ql/src/test/org/apache/hadoop/hive/ql/TestCompileLock.java index 5921044fea..7566f8ea59 100644 --- ql/src/test/org/apache/hadoop/hive/ql/TestCompileLock.java +++ ql/src/test/org/apache/hadoop/hive/ql/TestCompileLock.java @@ -57,7 +57,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertThat; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; /** * Class for testing HS2 compile lock behavior (serializable, parallel unbounded, parallel bounded). diff --git ql/src/test/org/apache/hadoop/hive/ql/exec/TestGetInputSummary.java ql/src/test/org/apache/hadoop/hive/ql/exec/TestGetInputSummary.java index 5f55cebb98..160892c7dc 100644 --- ql/src/test/org/apache/hadoop/hive/ql/exec/TestGetInputSummary.java +++ ql/src/test/org/apache/hadoop/hive/ql/exec/TestGetInputSummary.java @@ -19,7 +19,7 @@ package org.apache.hadoop.hive.ql.exec; 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.times; import static org.mockito.Mockito.verify; diff --git ql/src/test/org/apache/hadoop/hive/ql/exec/TestUtilities.java ql/src/test/org/apache/hadoop/hive/ql/exec/TestUtilities.java index 18b5f270d8..b6a6bab6cb 100644 --- ql/src/test/org/apache/hadoop/hive/ql/exec/TestUtilities.java +++ ql/src/test/org/apache/hadoop/hive/ql/exec/TestUtilities.java @@ -26,7 +26,7 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import static org.apache.hadoop.hive.ql.exec.Utilities.getFileExtension; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; @@ -35,7 +35,6 @@ import java.io.File; import java.io.IOException; -import java.io.Serializable; import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; diff --git ql/src/test/org/apache/hadoop/hive/ql/exec/repl/TestReplDumpTask.java ql/src/test/org/apache/hadoop/hive/ql/exec/repl/TestReplDumpTask.java index 9973e9a733..ebdaa3da83 100644 --- ql/src/test/org/apache/hadoop/hive/ql/exec/repl/TestReplDumpTask.java +++ ql/src/test/org/apache/hadoop/hive/ql/exec/repl/TestReplDumpTask.java @@ -41,11 +41,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.mockito.Matchers.eq; -import static org.mockito.Matchers.same; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.ArgumentMatchers.same; import static org.mockito.Mockito.mock; import static org.powermock.api.mockito.PowerMockito.mockStatic; -import static org.powermock.api.mockito.PowerMockito.verifyStatic; import static org.powermock.api.mockito.PowerMockito.when; import static org.powermock.api.mockito.PowerMockito.whenNew; import static org.apache.hadoop.hive.ql.exec.repl.ReplExternalTables.Writer; @@ -149,7 +148,6 @@ public void removeDBPropertyToPreventRenameWhenBootstrapDumpOfTableFails() throw try { task.bootStrapDump(new Path("mock"), null, mock(Path.class), hive); } finally { - verifyStatic(); Utils.resetDbBootstrapDumpState(same(hive), eq("default"), eq(dbRandomKey)); } } diff --git ql/src/test/org/apache/hadoop/hive/ql/exec/spark/TestSparkTask.java ql/src/test/org/apache/hadoop/hive/ql/exec/spark/TestSparkTask.java index bde6f6d5cf..98c08e4ea3 100644 --- ql/src/test/org/apache/hadoop/hive/ql/exec/spark/TestSparkTask.java +++ ql/src/test/org/apache/hadoop/hive/ql/exec/spark/TestSparkTask.java @@ -17,7 +17,7 @@ */ package org.apache.hadoop.hive.ql.exec.spark; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; diff --git ql/src/test/org/apache/hadoop/hive/ql/exec/spark/TestSparkUtilities.java ql/src/test/org/apache/hadoop/hive/ql/exec/spark/TestSparkUtilities.java index 3af0006474..78ff6ecc2e 100644 --- ql/src/test/org/apache/hadoop/hive/ql/exec/spark/TestSparkUtilities.java +++ ql/src/test/org/apache/hadoop/hive/ql/exec/spark/TestSparkUtilities.java @@ -42,7 +42,7 @@ import java.util.concurrent.atomic.AtomicReference; import static org.junit.Assert.assertEquals; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.eq; import static org.mockito.Mockito.mock; @@ -65,7 +65,7 @@ public void testGetSparkSessionUsingMultipleThreadsWithTheSameSession() throws H SparkSessionManager mockSessionManager = mock(SparkSessionManager.class); doAnswer(invocationOnMock -> { - SparkSession sparkSession = invocationOnMock.getArgumentAt(0, SparkSession.class); + SparkSession sparkSession = invocationOnMock.getArgument(0, SparkSession.class); if (sparkSession == null) { return mock(SparkSession.class); } else { @@ -76,7 +76,7 @@ public void testGetSparkSessionUsingMultipleThreadsWithTheSameSession() throws H SessionState mockSessionState = mock(SessionState.class); when(mockSessionState.getConf()).thenReturn(mockConf); doAnswer(invocationOnMock -> { - activeSparkSession.set(invocationOnMock.getArgumentAt(0, SparkSession.class)); + activeSparkSession.set(invocationOnMock.getArgument(0, SparkSession.class)); return null; }).when(mockSessionState).setSparkSession(any(SparkSession.class)); doAnswer(invocationOnMock -> @@ -137,7 +137,7 @@ public void testCreateMoveTaskDoesntCreateCascadeTempDirs() throws Exception { }).when(fsOp).getConf(); doAnswer(invocationOnMock -> { - assertEquals(expectedPathRef.value, invocationOnMock.getArgumentAt(0, Path.class)); + assertEquals(expectedPathRef.value, invocationOnMock.getArgument(0, Path.class)); return null; }).when(fileSinkDesc).setDirName(any(Path.class)); diff --git ql/src/test/org/apache/hadoop/hive/ql/exec/tez/TestTezTask.java ql/src/test/org/apache/hadoop/hive/ql/exec/tez/TestTezTask.java index c14dc62b21..bd70f691a1 100644 --- ql/src/test/org/apache/hadoop/hive/ql/exec/tez/TestTezTask.java +++ ql/src/test/org/apache/hadoop/hive/ql/exec/tez/TestTezTask.java @@ -20,7 +20,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.*; import static org.mockito.Mockito.*; import org.apache.hadoop.yarn.api.records.URL; diff --git ql/src/test/org/apache/hadoop/hive/ql/exec/tez/TestUtils.java ql/src/test/org/apache/hadoop/hive/ql/exec/tez/TestUtils.java index d0425e5572..d9aa03244c 100644 --- ql/src/test/org/apache/hadoop/hive/ql/exec/tez/TestUtils.java +++ ql/src/test/org/apache/hadoop/hive/ql/exec/tez/TestUtils.java @@ -50,7 +50,7 @@ import java.util.Set; import static org.junit.Assert.assertFalse; -import static org.mockito.Matchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.Mockito.when; import static org.mockito.MockitoAnnotations.initMocks; diff --git ql/src/test/org/apache/hadoop/hive/ql/exec/tez/TestWorkloadManager.java ql/src/test/org/apache/hadoop/hive/ql/exec/tez/TestWorkloadManager.java index 4659ecb97b..3e7256ec7b 100644 --- ql/src/test/org/apache/hadoop/hive/ql/exec/tez/TestWorkloadManager.java +++ ql/src/test/org/apache/hadoop/hive/ql/exec/tez/TestWorkloadManager.java @@ -27,7 +27,7 @@ import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import static org.mockito.Matchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git ql/src/test/org/apache/hadoop/hive/ql/exec/tez/monitoring/TestTezProgressMonitor.java ql/src/test/org/apache/hadoop/hive/ql/exec/tez/monitoring/TestTezProgressMonitor.java index 3338ca4e4b..91efafd10d 100644 --- ql/src/test/org/apache/hadoop/hive/ql/exec/tez/monitoring/TestTezProgressMonitor.java +++ ql/src/test/org/apache/hadoop/hive/ql/exec/tez/monitoring/TestTezProgressMonitor.java @@ -23,13 +23,11 @@ import org.apache.tez.dag.api.client.DAGClient; import org.apache.tez.dag.api.client.DAGStatus; import org.apache.tez.dag.api.client.Progress; -import org.apache.tez.dag.api.client.StatusGetOpts; import org.apache.tez.dag.api.client.VertexStatus; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.Matchers; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import java.io.IOException; import java.util.ArrayList; @@ -42,9 +40,9 @@ import static org.hamcrest.CoreMatchers.sameInstance; import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertThat; -import static org.mockito.Matchers.anySet; -import static org.mockito.Matchers.eq; -import static org.mockito.Matchers.isNull; +import static org.mockito.ArgumentMatchers.anySet; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.ArgumentMatchers.isNull; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; diff --git ql/src/test/org/apache/hadoop/hive/ql/hooks/TestQueryHooks.java ql/src/test/org/apache/hadoop/hive/ql/hooks/TestQueryHooks.java index 51e7215183..263c68acb8 100644 --- ql/src/test/org/apache/hadoop/hive/ql/hooks/TestQueryHooks.java +++ ql/src/test/org/apache/hadoop/hive/ql/hooks/TestQueryHooks.java @@ -27,10 +27,10 @@ import org.junit.Test; import org.mockito.ArgumentMatcher; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.argThat; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.argThat; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; @@ -151,7 +151,7 @@ private Driver createDriver() throws IllegalAccessException, ClassNotFoundExcept return driver; } - private static final class QueryLifeTimeHookContextMatcher extends ArgumentMatcher { + private static final class QueryLifeTimeHookContextMatcher implements ArgumentMatcher { private final String command; @@ -160,8 +160,8 @@ private QueryLifeTimeHookContextMatcher(String command) { } @Override - public boolean matches(Object o) { - return ((QueryLifeTimeHookContext) o).getCommand().equals(this.command); + public boolean matches(QueryLifeTimeHookContext queryLifeTimeHookContext) { + return queryLifeTimeHookContext.getCommand().equals(this.command); } } } diff --git ql/src/test/org/apache/hadoop/hive/ql/io/TestHiveBinarySearchRecordReader.java ql/src/test/org/apache/hadoop/hive/ql/io/TestHiveBinarySearchRecordReader.java index 89fff4719b..2658bb675d 100644 --- ql/src/test/org/apache/hadoop/hive/ql/io/TestHiveBinarySearchRecordReader.java +++ ql/src/test/org/apache/hadoop/hive/ql/io/TestHiveBinarySearchRecordReader.java @@ -18,13 +18,12 @@ package org.apache.hadoop.hive.ql.io; -import static org.mockito.Matchers.anyObject; +import static org.mockito.ArgumentMatchers.anyObject; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.LinkedHashMap; diff --git ql/src/test/org/apache/hadoop/hive/ql/parse/repl/TestCopyUtils.java ql/src/test/org/apache/hadoop/hive/ql/parse/repl/TestCopyUtils.java index 610af09515..535bc6dc32 100644 --- ql/src/test/org/apache/hadoop/hive/ql/parse/repl/TestCopyUtils.java +++ ql/src/test/org/apache/hadoop/hive/ql/parse/repl/TestCopyUtils.java @@ -38,10 +38,10 @@ import java.util.List; import static org.junit.Assert.assertFalse; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.anyListOf; -import static org.mockito.Matchers.eq; -import static org.mockito.Matchers.same; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyListOf; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.ArgumentMatchers.same; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.powermock.api.mockito.PowerMockito.mockStatic; diff --git ql/src/test/org/apache/hadoop/hive/ql/parse/repl/load/message/TestPrimaryToReplicaResourceFunction.java ql/src/test/org/apache/hadoop/hive/ql/parse/repl/load/message/TestPrimaryToReplicaResourceFunction.java index 3c7ef1dee8..dfb64cef97 100644 --- ql/src/test/org/apache/hadoop/hive/ql/parse/repl/load/message/TestPrimaryToReplicaResourceFunction.java +++ ql/src/test/org/apache/hadoop/hive/ql/parse/repl/load/message/TestPrimaryToReplicaResourceFunction.java @@ -48,7 +48,7 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.powermock.api.mockito.PowerMockito.mockStatic; import static org.powermock.api.mockito.PowerMockito.when; diff --git ql/src/test/org/apache/hadoop/hive/ql/security/authorization/plugin/TestHivePrivilegeObjectOwnerNameAndType.java ql/src/test/org/apache/hadoop/hive/ql/security/authorization/plugin/TestHivePrivilegeObjectOwnerNameAndType.java index e6576d18cf..2bd5c8aa3d 100644 --- ql/src/test/org/apache/hadoop/hive/ql/security/authorization/plugin/TestHivePrivilegeObjectOwnerNameAndType.java +++ ql/src/test/org/apache/hadoop/hive/ql/security/authorization/plugin/TestHivePrivilegeObjectOwnerNameAndType.java @@ -36,7 +36,7 @@ import java.util.List; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.verify; diff --git ql/src/test/org/apache/hadoop/hive/ql/udf/ptf/TestBoundaryCache.java ql/src/test/org/apache/hadoop/hive/ql/udf/ptf/TestBoundaryCache.java index 714c51badc..5bd1ca4f68 100644 --- ql/src/test/org/apache/hadoop/hive/ql/udf/ptf/TestBoundaryCache.java +++ ql/src/test/org/apache/hadoop/hive/ql/udf/ptf/TestBoundaryCache.java @@ -51,7 +51,7 @@ import static org.apache.hadoop.hive.ql.parse.WindowingSpec.Direction.PRECEDING; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -227,7 +227,7 @@ private void runTest(WindowingSpec.Direction startDirection, int startAmount, AtomicInteger readCounter) throws Exception { PTFPartition partitionMock = mock(PTFPartition.class); doAnswer(invocationOnMock -> { - int idx = invocationOnMock.getArgumentAt(0, Integer.class); + int idx = invocationOnMock.getArgument(0, Integer.class); return partition.get(idx); }).when(partitionMock).getAt(any(Integer.class)); doAnswer(invocationOnMock -> { @@ -242,18 +242,18 @@ private void runTest(WindowingSpec.Direction startDirection, int startAmount, ValueBoundaryScanner scannerSpy = spy(scan); doAnswer(invocationOnMock -> { readCounter.incrementAndGet(); - List row = invocationOnMock.getArgumentAt(0, List.class); + List row = invocationOnMock.getArgument(0, List.class); return row.get(orderByCol); }).when(scannerSpy).computeValue(any(Object.class)); doAnswer(invocationOnMock -> { - IntWritable v1 = invocationOnMock.getArgumentAt(0, IntWritable.class); - IntWritable v2 = invocationOnMock.getArgumentAt(1, IntWritable.class); + IntWritable v1 = invocationOnMock.getArgument(0, IntWritable.class); + IntWritable v2 = invocationOnMock.getArgument(1, IntWritable.class); return (v1 != null && v2 != null) ? v1.get() == v2.get() : v1 == null && v2 == null; }).when(scannerSpy).isEqual(any(Object.class), any(Object.class)); doAnswer(invocationOnMock -> { - IntWritable v1 = invocationOnMock.getArgumentAt(0, IntWritable.class); - IntWritable v2 = invocationOnMock.getArgumentAt(1, IntWritable.class); - Integer amt = invocationOnMock.getArgumentAt(2, Integer.class); + IntWritable v1 = invocationOnMock.getArgument(0, IntWritable.class); + IntWritable v2 = invocationOnMock.getArgument(1, IntWritable.class); + Integer amt = invocationOnMock.getArgument(2, Integer.class); return (v1 != null && v2 != null) ? (v1.get() - v2.get()) > amt : v1 != null || v2 != null; }).when(scannerSpy).isDistanceGreater(any(Object.class), any(Object.class), any(Integer.class)); diff --git service/pom.xml service/pom.xml index 911e93a624..04c9a299c7 100644 --- service/pom.xml +++ service/pom.xml @@ -307,7 +307,7 @@ org.powermock - powermock-api-mockito + powermock-api-mockito2 ${powermock.version} test diff --git shims/common/src/main/test/org/apache/hadoop/fs/TestProxyFileSystem.java shims/common/src/main/test/org/apache/hadoop/fs/TestProxyFileSystem.java index 37667bba48..068cef7359 100644 --- shims/common/src/main/test/org/apache/hadoop/fs/TestProxyFileSystem.java +++ shims/common/src/main/test/org/apache/hadoop/fs/TestProxyFileSystem.java @@ -27,7 +27,7 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git shims/common/src/main/test/org/apache/hadoop/hive/io/TestHdfsUtils.java shims/common/src/main/test/org/apache/hadoop/hive/io/TestHdfsUtils.java index 541b205632..117399acbd 100644 --- shims/common/src/main/test/org/apache/hadoop/hive/io/TestHdfsUtils.java +++ shims/common/src/main/test/org/apache/hadoop/hive/io/TestHdfsUtils.java @@ -33,7 +33,7 @@ import org.junit.Test; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestMsckCheckPartitions.java standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestMsckCheckPartitions.java index 980423eccd..fdfc582603 100644 --- standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestMsckCheckPartitions.java +++ standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestMsckCheckPartitions.java @@ -39,7 +39,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestTableIterable.java standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestTableIterable.java index f0d442755c..71c4759f4e 100644 --- standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestTableIterable.java +++ standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestTableIterable.java @@ -33,8 +33,8 @@ import org.apache.thrift.TException; import static org.junit.Assert.assertEquals; -import static org.mockito.Matchers.anyListOf; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyListOf; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/tools/metatool/TestMetaToolTaskUpdateLocation.java standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/tools/metatool/TestMetaToolTaskUpdateLocation.java index 63868b58da..6b5d96f2b4 100644 --- standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/tools/metatool/TestMetaToolTaskUpdateLocation.java +++ standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/tools/metatool/TestMetaToolTaskUpdateLocation.java @@ -18,7 +18,7 @@ package org.apache.hadoop.hive.metastore.tools.metatool; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.when; import java.io.ByteArrayOutputStream; diff --git standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/tools/schematool/TestSchemaToolTaskDrop.java standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/tools/schematool/TestSchemaToolTaskDrop.java index 271f83a6b7..6a3b896a37 100644 --- standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/tools/schematool/TestSchemaToolTaskDrop.java +++ standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/tools/schematool/TestSchemaToolTaskDrop.java @@ -30,9 +30,9 @@ import java.sql.ResultSet; import java.sql.Statement; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.when; diff --git standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/utils/TestHdfsUtils.java standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/utils/TestHdfsUtils.java index de21fc5017..3542168e8c 100644 --- standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/utils/TestHdfsUtils.java +++ standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/utils/TestHdfsUtils.java @@ -39,7 +39,7 @@ import java.util.List; import java.util.Random; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git standalone-metastore/pom.xml standalone-metastore/pom.xml index 0fa63898ed..b26e3b3c99 100644 --- standalone-metastore/pom.xml +++ standalone-metastore/pom.xml @@ -90,7 +90,7 @@ 0.9.3 0.9.3-1 2.12.1 - 1.10.19 + 3.3.3 1.5.1 com.google.protobuf diff --git testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/context/TestCloudExecutionContextProvider.java testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/context/TestCloudExecutionContextProvider.java index 4985b7d4e6..3fe89b04df 100644 --- testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/context/TestCloudExecutionContextProvider.java +++ testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/context/TestCloudExecutionContextProvider.java @@ -18,7 +18,7 @@ */ package org.apache.hive.ptest.execution.context; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when;