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/TestTransaction.java hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/mutate/client/TestTransaction.java index c47cf4d7cf..4d30c253c6 100644 --- hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/mutate/client/TestTransaction.java +++ hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/mutate/client/TestTransaction.java @@ -31,7 +31,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 TestTransaction { diff --git hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/mutate/client/lock/TestHeartbeatTimerTask.java hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/mutate/client/lock/TestHeartbeatTimerTask.java index 1edec690b0..33e29cf924 100644 --- hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/mutate/client/lock/TestHeartbeatTimerTask.java +++ hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/mutate/client/lock/TestHeartbeatTimerTask.java @@ -33,7 +33,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 TestHeartbeatTimerTask { 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..156a37ebc7 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,18 +24,18 @@ 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.anyCollection; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doThrow; +import static org.mockito.Mockito.lenient; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.when; import java.net.InetAddress; -import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.Set; @@ -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; @@ -99,9 +99,10 @@ public void injectMocks() throws Exception { when(mockMetaStoreClient.lock(any(LockRequest.class))).thenReturn(mockLockResponse); when(mockLockResponse.getLockid()).thenReturn(LOCK_ID); when(mockLockResponse.getState()).thenReturn(ACQUIRED); - when( - mockHeartbeatFactory.newInstance(any(IMetaStoreClient.class), any(LockFailureListener.class), any(Long.class), - any(Collection.class), anyLong(), anyInt())).thenReturn(mockHeartbeat); + // Transaction IDs can also be null + when(mockHeartbeatFactory.newInstance( + any(IMetaStoreClient.class), any(LockFailureListener.class), any(), anyCollection(), any(Long.class), anyInt()) + ).thenReturn(mockHeartbeat); readLock = new Lock(mockMetaStoreClient, mockHeartbeatFactory, configuration, mockListener, USER, SOURCES, Collections. emptySet(), 3, 0); @@ -138,7 +139,7 @@ public void testAcquireReadLockCheckHeartbeatCreated() throws Exception { configuration.set("hive.txn.timeout", "100s"); readLock.acquire(); - verify(mockHeartbeatFactory).newInstance(eq(mockMetaStoreClient), eq(mockListener), any(Long.class), eq(SOURCES), + verify(mockHeartbeatFactory).newInstance(eq(mockMetaStoreClient), eq(mockListener), any(), eq(SOURCES), eq(LOCK_ID), eq(75)); } @@ -321,11 +322,11 @@ public void testHeartbeatFailsTxnAbortedException() throws Exception { @Test public void testHeartbeatContinuesTException() throws Exception { Throwable t = new TException(); - doThrow(t).when(mockMetaStoreClient).heartbeat(0, LOCK_ID); + lenient().doThrow(t).when(mockMetaStoreClient).heartbeat(0, LOCK_ID); HeartbeatTimerTask task = new HeartbeatTimerTask(mockMetaStoreClient, mockListener, TRANSACTION_ID, SOURCES, LOCK_ID); task.run(); - verifyZeroInteractions(mockListener); + verifyNoInteractions(mockListener); } private static Table createTable(String databaseName, String tableName) { diff --git hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/mutate/worker/TestMetaStorePartitionHelper.java hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/mutate/worker/TestMetaStorePartitionHelper.java index 335ecd2af8..4a7d358698 100644 --- hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/mutate/worker/TestMetaStorePartitionHelper.java +++ hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/mutate/worker/TestMetaStorePartitionHelper.java @@ -20,7 +20,7 @@ import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.when; import java.io.IOException; @@ -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 TestMetaStorePartitionHelper { @@ -95,7 +95,7 @@ public void injectMocks() throws Exception { public void getPathForUnpartitionedTable() throws Exception { Path path = helper.getPathForPartition(UNPARTITIONED_VALUES); assertThat(path, is(TABLE_PATH)); - verifyZeroInteractions(mockClient); + verifyNoInteractions(mockClient); } @Test @@ -107,7 +107,7 @@ public void getPathForPartitionedTable() throws Exception { @Test public void createOnUnpartitionTableDoesNothing() throws Exception { helper.createPartitionIfNotExists(UNPARTITIONED_VALUES); - verifyZeroInteractions(mockClient); + verifyNoInteractions(mockClient); } @Test 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 hcatalog/webhcat/svr/src/test/java/org/apache/hive/hcatalog/templeton/ConcurrentJobRequestsTestBase.java hcatalog/webhcat/svr/src/test/java/org/apache/hive/hcatalog/templeton/ConcurrentJobRequestsTestBase.java index 05beccbcce..45ad767cf4 100644 --- hcatalog/webhcat/svr/src/test/java/org/apache/hive/hcatalog/templeton/ConcurrentJobRequestsTestBase.java +++ hcatalog/webhcat/svr/src/test/java/org/apache/hive/hcatalog/templeton/ConcurrentJobRequestsTestBase.java @@ -21,7 +21,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; @@ -37,6 +36,11 @@ import org.mockito.Mockito; import org.mockito.stubbing.Answer; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.doReturn; + /* * Base class for mocking job operations with concurrent requests. */ @@ -88,8 +92,8 @@ public JobRunnable ConcurrentJobsStatus(final int threadCount, AppConfig appConf StatusDelegator delegator = new StatusDelegator(appConfig); final StatusDelegator mockDelegator = Mockito.spy(delegator); - Mockito.doAnswer(answer).when(mockDelegator).getJobStatus(Mockito.any(String.class), - Mockito.any(String.class)); + doAnswer(answer).when(mockDelegator).getJobStatus(any(String.class), + any(String.class)); JobRunnable statusJobRunnable = new JobRunnable() { @Override @@ -116,9 +120,9 @@ public JobRunnable ConcurrentListJobs(final int threadCount, AppConfig config, ListDelegator delegator = new ListDelegator(config); final ListDelegator mockDelegator = Mockito.spy(delegator); - Mockito.doAnswer(answer).when(mockDelegator).listJobs(Mockito.any(String.class), - Mockito.any(boolean.class), Mockito.any(String.class), - Mockito.any(int.class), Mockito.any(boolean.class)); + doAnswer(answer).when(mockDelegator).listJobs(any(String.class), + any(boolean.class), any(String.class), + any(int.class), any(boolean.class)); JobRunnable listJobRunnable = new JobRunnable() { @Override @@ -149,18 +153,19 @@ public JobRunnable SubmitConcurrentJobs(final int threadCount, AppConfig config, TempletonControllerJob mockCtrl = Mockito.mock(TempletonControllerJob.class); - Mockito.doReturn(jobIdResponse).when(mockCtrl).getSubmittedId(); + doReturn(jobIdResponse).when(mockCtrl).getSubmittedId(); - Mockito.doReturn(mockCtrl).when(mockDelegator).getTempletonController(); + doReturn(mockCtrl).when(mockDelegator).getTempletonController(); - Mockito.doAnswer(responseAnswer).when(mockDelegator).runTempletonControllerJob( - Mockito.any(TempletonControllerJob.class), Mockito.any(List.class)); + doAnswer(responseAnswer).when(mockDelegator).runTempletonControllerJob( + any(TempletonControllerJob.class), any(List.class)); - Mockito.doAnswer(timeoutResponseAnswer).when(mockDelegator).killJob( - Mockito.any(String.class), Mockito.any(String.class)); + doAnswer(timeoutResponseAnswer).when(mockDelegator).killJob( + any(String.class), any(String.class)); - Mockito.doNothing().when(mockDelegator).registerJob(Mockito.any(String.class), - Mockito.any(String.class), Mockito.any(String.class), Mockito.any(Map.class)); + // UserArgs Map can be null - thus use any() + doNothing().when(mockDelegator).registerJob(any(String.class), + any(String.class), any(String.class), any()); JobRunnable submitJobRunnable = new JobRunnable() { @Override diff --git hcatalog/webhcat/svr/src/test/java/org/apache/hive/hcatalog/templeton/TestConcurrentJobRequestsThreads.java hcatalog/webhcat/svr/src/test/java/org/apache/hive/hcatalog/templeton/TestConcurrentJobRequestsThreads.java index 12a211af3f..4865d1f0d0 100644 --- hcatalog/webhcat/svr/src/test/java/org/apache/hive/hcatalog/templeton/TestConcurrentJobRequestsThreads.java +++ hcatalog/webhcat/svr/src/test/java/org/apache/hive/hcatalog/templeton/TestConcurrentJobRequestsThreads.java @@ -18,10 +18,7 @@ */ package org.apache.hive.hcatalog.templeton; -import java.io.IOException; import java.util.ArrayList; -import java.util.concurrent.TimeoutException; -import org.eclipse.jetty.http.HttpStatus; import org.junit.BeforeClass; import org.junit.Rule; diff --git hcatalog/webhcat/svr/src/test/java/org/apache/hive/hcatalog/templeton/TestConcurrentJobRequestsThreadsAndTimeout.java hcatalog/webhcat/svr/src/test/java/org/apache/hive/hcatalog/templeton/TestConcurrentJobRequestsThreadsAndTimeout.java index 19d87b6126..d351a98a4c 100644 --- hcatalog/webhcat/svr/src/test/java/org/apache/hive/hcatalog/templeton/TestConcurrentJobRequestsThreadsAndTimeout.java +++ hcatalog/webhcat/svr/src/test/java/org/apache/hive/hcatalog/templeton/TestConcurrentJobRequestsThreadsAndTimeout.java @@ -21,7 +21,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.concurrent.TimeoutException; -import org.eclipse.jetty.http.HttpStatus; import org.junit.BeforeClass; import org.junit.Rule; 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..8b9ecd921f 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; @@ -71,8 +71,8 @@ * HiveAuthorizer.filterListCmdObjects, and stores the list argument in * filterArguments */ - protected static class MockedHiveAuthorizerFactory implements HiveAuthorizerFactory { - protected abstract class AuthorizerWithFilterCmdImpl implements HiveAuthorizer { + public static class MockedHiveAuthorizerFactory implements HiveAuthorizerFactory { + public abstract class AuthorizerWithFilterCmdImpl implements HiveAuthorizer { @Override public List filterListCmdObjects(List listObjs, HiveAuthzContext context) throws HiveAuthzPluginException, HiveAccessControlException { 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..977fe43320 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 @@ -18,37 +18,33 @@ package org.apache.hive.jdbc.authorization; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; -import static org.mockito.Mockito.verify; - -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.SQLException; -import java.sql.Statement; -import java.util.HashMap; - import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.conf.HiveConf.ConfVars; import org.apache.hadoop.hive.ql.security.HiveAuthenticationProvider; import org.apache.hadoop.hive.ql.security.SessionStateUserAuthenticator; -import org.apache.hadoop.hive.ql.security.authorization.plugin.HiveAccessControlException; import org.apache.hadoop.hive.ql.security.authorization.plugin.HiveAuthorizer; import org.apache.hadoop.hive.ql.security.authorization.plugin.HiveAuthorizerFactory; -import org.apache.hadoop.hive.ql.security.authorization.plugin.HiveAuthzPluginException; +import org.apache.hadoop.hive.ql.security.authorization.plugin.HiveAuthzContext; import org.apache.hadoop.hive.ql.security.authorization.plugin.HiveAuthzSessionContext; import org.apache.hadoop.hive.ql.security.authorization.plugin.HiveMetastoreClientFactory; import org.apache.hadoop.hive.ql.security.authorization.plugin.HiveOperationType; -import org.apache.hadoop.hive.ql.security.authorization.plugin.HivePrivilegeObject; -import org.apache.hadoop.hive.ql.security.authorization.plugin.HiveAuthzContext; import org.apache.hive.jdbc.miniHS2.MiniHS2; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.mockito.ArgumentCaptor; -import org.mockito.Matchers; import org.mockito.Mockito; + +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.Statement; +import java.util.HashMap; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyList; +import static org.mockito.Mockito.verify; /** * Test context information that gets passed to authorization api */ @@ -103,8 +99,7 @@ public void testAuthzContextContentsCmdProcessorCmd() throws Exception { verifyContextContents("dfs -ls /", "-ls /"); } - private void verifyContextContents(final String cmd, String ctxCmd) throws Exception, - HiveAuthzPluginException, HiveAccessControlException { + private void verifyContextContents(final String cmd, String ctxCmd) throws Exception { Connection hs2Conn = getConnection("user1"); Statement stmt = hs2Conn.createStatement(); @@ -116,8 +111,7 @@ private void verifyContextContents(final String cmd, String ctxCmd) throws Excep .forClass(HiveAuthzContext.class); verify(mockedAuthorizer).checkPrivileges(any(HiveOperationType.class), - Matchers.anyListOf(HivePrivilegeObject.class), - Matchers.anyListOf(HivePrivilegeObject.class), contextCapturer.capture()); + anyList(), any(), contextCapturer.capture()); HiveAuthzContext context = contextCapturer.getValue(); 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..9216c6ea43 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,9 @@ 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.ArgumentMatchers.anyString; import static org.mockito.Mockito.never; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.times; @@ -72,6 +73,9 @@ @Mock private LlapServiceInstanceSet mockInstanceSet; + @Mock + private LlapServiceInstance mockLlapServiceInstance; + @Before public void setUp() throws Exception { initMocks(this); @@ -80,9 +84,10 @@ public void setUp() throws Exception { when(mockRegistry.getInstances()).thenReturn(mockInstanceSet); when(mockRegistry.lockForConfigChange(anyLong(), anyLong())).thenReturn( new ConfigChangeLockResult(true, Long.MIN_VALUE)); + when(mockRegistry.getInstances().getInstance(anyString())).thenReturn(mockLlapServiceInstance); when(mockClientFactory.create(any(LlapServiceInstance.class))).thenReturn(mockClient); when(mockClient.setCapacity( - any(RpcController.class), + any(), any(SetCapacityRequestProto.class))).thenReturn(TEST_RESPONSE); listener = new BlacklistingLlapMetricsListener(); @@ -97,7 +102,7 @@ public void testBlacklist() throws ServiceException { // Then ArgumentCaptor argumentCaptor = ArgumentCaptor.forClass(String.class); - verify(mockClient, times(1)).setCapacity(any(RpcController.class), any(SetCapacityRequestProto.class)); + verify(mockClient, times(1)).setCapacity(any(), any(SetCapacityRequestProto.class)); verify(mockInstanceSet, times(1)).getInstance(argumentCaptor.capture()); assertEquals("3", argumentCaptor.getValue()); } @@ -158,7 +163,7 @@ public void testCheckTime() throws Exception { listener.newClusterMetrics(data); ArgumentCaptor argumentCaptor = ArgumentCaptor.forClass(String.class); - verify(mockClient, times(1)).setCapacity(any(RpcController.class), any(SetCapacityRequestProto.class)); + verify(mockClient, times(1)).setCapacity(any(), any(SetCapacityRequestProto.class)); verify(mockInstanceSet, times(1)).getInstance(argumentCaptor.capture()); assertEquals("3", argumentCaptor.getValue()); } 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..3023132d9f 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; @@ -82,7 +82,7 @@ public void setUp() throws ServiceException { .thenReturn(MockListener.class.getName()); when(mockClientFactory.create(any(LlapServiceInstance.class))).thenReturn(mockClient); when(mockClient.getDaemonMetrics( - any(RpcController.class), + any(), // can be NULL any(LlapDaemonProtocolProtos.GetDaemonMetricsRequestProto.class))).thenReturn(TEST_RESPONSE); collector = new LlapMetricsCollector(mockConf, mockExecutor, mockClientFactory); } @@ -93,6 +93,8 @@ public void testAddService() { LlapServiceInstance mockService = mock(LlapServiceInstance.class); when(mockService.getWorkerIdentity()).thenReturn(TEST_IDENTITY_1); + assertTrue(collector != null); + // When collector.onCreate(mockService, TEST_SEQ_VERSION); collector.collectMetrics(); 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/TestMsckCreatePartitionsInBatches.java ql/src/test/org/apache/hadoop/hive/ql/exec/TestMsckCreatePartitionsInBatches.java index 3e45016450..0a145b3144 100644 --- ql/src/test/org/apache/hadoop/hive/ql/exec/TestMsckCreatePartitionsInBatches.java +++ ql/src/test/org/apache/hadoop/hive/ql/exec/TestMsckCreatePartitionsInBatches.java @@ -17,16 +17,6 @@ */ package org.apache.hadoop.hive.ql.exec; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.conf.HiveConf.ConfVars; import org.apache.hadoop.hive.metastore.CheckResult.PartitionResult; @@ -54,6 +44,22 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mockito; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.Mockito.doThrow; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; + public class TestMsckCreatePartitionsInBatches { private static HiveConf hiveConf; private static Msck msck; @@ -146,14 +152,14 @@ private void cleanUpTableQuietly(String catName, String dbName, String tableName public void testNumberOfCreatePartitionCalls() throws Exception { // create 10 dummy partitions Set partsNotInMs = createPartsNotInMs(10); - IMetaStoreClient spyDb = Mockito.spy(db); + IMetaStoreClient spyDb = spy(db); // batch size of 5 and decaying factor of 2 msck.createPartitionsInBatches(spyDb, repairOutput, partsNotInMs, table, 5, 2, 0); // there should be 2 calls to create partitions with each batch size of 5 ArgumentCaptor ifNotExistsArg = ArgumentCaptor.forClass(Boolean.class); ArgumentCaptor needResultsArg = ArgumentCaptor.forClass(Boolean.class); - ArgumentCaptor> argParts = ArgumentCaptor.forClass((Class) List.class); - Mockito.verify(spyDb, Mockito.times(2)).add_partitions(argParts.capture(), ifNotExistsArg.capture(), needResultsArg.capture()); + ArgumentCaptor> argParts = ArgumentCaptor.forClass(List.class); + verify(spyDb, times(2)).add_partitions(argParts.capture(), ifNotExistsArg.capture(), needResultsArg.capture()); // confirm the batch sizes were 5, 5 in the two calls to create partitions List> apds = argParts.getAllValues(); int retryAttempt = 1; @@ -175,14 +181,14 @@ public void testNumberOfCreatePartitionCalls() throws Exception { public void testUnevenNumberOfCreatePartitionCalls() throws Exception { // create 9 dummy partitions Set partsNotInMs = createPartsNotInMs(9); - IMetaStoreClient spyDb = Mockito.spy(db); + IMetaStoreClient spyDb = spy(db); // batch size of 5 and decaying factor of 2 msck.createPartitionsInBatches(spyDb, repairOutput, partsNotInMs, table, 5, 2, 0); // there should be 2 calls to create partitions with batch sizes of 5, 4 ArgumentCaptor ifNotExistsArg = ArgumentCaptor.forClass(Boolean.class); ArgumentCaptor needResultsArg = ArgumentCaptor.forClass(Boolean.class); - ArgumentCaptor> argParts = ArgumentCaptor.forClass((Class) List.class); - Mockito.verify(spyDb, Mockito.times(2)).add_partitions(argParts.capture(), ifNotExistsArg.capture(), needResultsArg.capture()); + ArgumentCaptor> argParts = ArgumentCaptor.forClass(List.class); + verify(spyDb, times(2)).add_partitions(argParts.capture(), ifNotExistsArg.capture(), needResultsArg.capture()); // confirm the batch sizes were 5, 4 in the two calls to create partitions List> apds = argParts.getAllValues(); int retryAttempt = 1; @@ -204,7 +210,7 @@ public void testUnevenNumberOfCreatePartitionCalls() throws Exception { public void testEqualNumberOfPartitions() throws Exception { // create 13 dummy partitions Set partsNotInMs = createPartsNotInMs(13); - IMetaStoreClient spyDb = Mockito.spy(db); + IMetaStoreClient spyDb = spy(db); // batch size of 13 and decaying factor of 2 msck.createPartitionsInBatches(spyDb, repairOutput, partsNotInMs, table, 13, 2, 0); // there should be 1 call to create partitions with batch sizes of 13 @@ -212,7 +218,7 @@ public void testEqualNumberOfPartitions() throws Exception { ArgumentCaptor needResultsArg = ArgumentCaptor.forClass(Boolean.class); ArgumentCaptor> argParts = ArgumentCaptor.forClass((Class) List.class); // there should be 1 call to create partitions with batch sizes of 13 - Mockito.verify(spyDb, Mockito.times(1)).add_partitions(argParts.capture(), ifNotExistsArg.capture(), + verify(spyDb, times(1)).add_partitions(argParts.capture(), ifNotExistsArg.capture(), needResultsArg.capture()); Assert.assertEquals("Unexpected number of batch size", 13, argParts.getValue().size()); @@ -230,17 +236,17 @@ public void testEqualNumberOfPartitions() throws Exception { public void testSmallNumberOfPartitions() throws Exception { // create 10 dummy partitions Set partsNotInMs = createPartsNotInMs(10); - IMetaStoreClient spyDb = Mockito.spy(db); + IMetaStoreClient spyDb = spy(db); // batch size of 20 and decaying factor of 2 msck.createPartitionsInBatches(spyDb, repairOutput, partsNotInMs, table, 20, 2, 0); // there should be 1 call to create partitions with batch sizes of 10 - Mockito.verify(spyDb, Mockito.times(1)).add_partitions(Mockito.anyObject(), Mockito.anyBoolean(), - Mockito.anyBoolean()); + verify(spyDb, times(1)).add_partitions(Mockito.anyObject(), anyBoolean(), + anyBoolean()); ArgumentCaptor ifNotExistsArg = ArgumentCaptor.forClass(Boolean.class); ArgumentCaptor needResultsArg = ArgumentCaptor.forClass(Boolean.class); - ArgumentCaptor> argParts = ArgumentCaptor.forClass((Class) List.class); + ArgumentCaptor> argParts = ArgumentCaptor.forClass(List.class); // there should be 1 call to create partitions with batch sizes of 10 - Mockito.verify(spyDb, Mockito.times(1)).add_partitions(argParts.capture(), ifNotExistsArg.capture(), + verify(spyDb, times(1)).add_partitions(argParts.capture(), ifNotExistsArg.capture(), needResultsArg.capture()); Assert.assertEquals("Unexpected number of batch size", 10, argParts.getValue().size()); @@ -258,20 +264,20 @@ public void testSmallNumberOfPartitions() throws Exception { public void testBatchingWhenException() throws Exception { // create 13 dummy partitions Set partsNotInMs = createPartsNotInMs(23); - IMetaStoreClient spyDb = Mockito.spy(db); + IMetaStoreClient spyDb = spy(db); // first call to createPartitions should throw exception - Mockito.doThrow(HiveException.class).doCallRealMethod().doCallRealMethod().when(spyDb) - .add_partitions(Mockito.anyObject(), Mockito.anyBoolean(), - Mockito.anyBoolean()); + doThrow(MetaException.class).doCallRealMethod().doCallRealMethod().when(spyDb) + .add_partitions(any(), anyBoolean(), + anyBoolean()); // test with a batch size of 30 and decaying factor of 2 msck.createPartitionsInBatches(spyDb, repairOutput, partsNotInMs, table, 30, 2, 0); // confirm the batch sizes were 23, 15, 8 in the three calls to create partitions ArgumentCaptor ifNotExistsArg = ArgumentCaptor.forClass(Boolean.class); ArgumentCaptor needResultsArg = ArgumentCaptor.forClass(Boolean.class); - ArgumentCaptor> argParts = ArgumentCaptor.forClass((Class) List.class); + ArgumentCaptor> argParts = ArgumentCaptor.forClass(List.class); // there should be 3 calls to create partitions with batch sizes of 23, 15, 8 - Mockito.verify(spyDb, Mockito.times(3)).add_partitions(argParts.capture(), ifNotExistsArg.capture(), + verify(spyDb, times(3)).add_partitions(argParts.capture(), ifNotExistsArg.capture(), needResultsArg.capture()); List> apds = argParts.getAllValues(); int retryAttempt = 1; @@ -298,9 +304,9 @@ public void testBatchingWhenException() throws Exception { @Test public void testRetriesExhaustedBatchSize() throws Exception { Set partsNotInMs = createPartsNotInMs(17); - IMetaStoreClient spyDb = Mockito.spy(db); - Mockito.doThrow(HiveException.class).when(spyDb) - .add_partitions(Mockito.anyObject(), Mockito.anyBoolean(), Mockito.anyBoolean()); + IMetaStoreClient spyDb = spy(db); + doThrow(MetaException.class).when(spyDb) + .add_partitions(any(), anyBoolean(), anyBoolean()); // batch size of 5 and decaying factor of 2 Exception ex = null; try { @@ -313,9 +319,9 @@ public void testRetriesExhaustedBatchSize() throws Exception { // there should be 5 calls to create partitions with batch sizes of 17, 15, 7, 3, 1 ArgumentCaptor ifNotExistsArg = ArgumentCaptor.forClass(Boolean.class); ArgumentCaptor needResultsArg = ArgumentCaptor.forClass(Boolean.class); - ArgumentCaptor> argParts = ArgumentCaptor.forClass((Class) List.class); + ArgumentCaptor> argParts = ArgumentCaptor.forClass(List.class); // there should be 5 calls to create partitions with batch sizes of 17, 15, 7, 3, 1 - Mockito.verify(spyDb, Mockito.times(5)).add_partitions(argParts.capture(), ifNotExistsArg.capture(), + verify(spyDb, times(5)).add_partitions(argParts.capture(), ifNotExistsArg.capture(), needResultsArg.capture()); List> apds = argParts.getAllValues(); int retryAttempt = 1; @@ -345,9 +351,9 @@ public void testRetriesExhaustedBatchSize() throws Exception { @Test public void testMaxRetriesReached() throws Exception { Set partsNotInMs = createPartsNotInMs(17); - IMetaStoreClient spyDb = Mockito.spy(db); - Mockito.doThrow(HiveException.class).when(spyDb) - .add_partitions(Mockito.anyObject(), Mockito.anyBoolean(), Mockito.anyBoolean()); + IMetaStoreClient spyDb = spy(db); + doThrow(MetaException.class).when(spyDb) + .add_partitions(any(), anyBoolean(), anyBoolean()); // batch size of 5 and decaying factor of 2 Exception ex = null; try { @@ -359,8 +365,8 @@ public void testMaxRetriesReached() throws Exception { Assert.assertTrue("Unexpected class of exception thrown", ex instanceof RetryUtilities.RetryException); ArgumentCaptor ifNotExistsArg = ArgumentCaptor.forClass(Boolean.class); ArgumentCaptor needResultsArg = ArgumentCaptor.forClass(Boolean.class); - ArgumentCaptor> argParts = ArgumentCaptor.forClass((Class) List.class); - Mockito.verify(spyDb, Mockito.times(2)).add_partitions(argParts.capture(), ifNotExistsArg.capture(), needResultsArg.capture()); + ArgumentCaptor> argParts = ArgumentCaptor.forClass(List.class); + verify(spyDb, times(2)).add_partitions(argParts.capture(), ifNotExistsArg.capture(), needResultsArg.capture()); List> apds = argParts.getAllValues(); int retryAttempt = 1; Assert.assertEquals( @@ -381,9 +387,9 @@ public void testMaxRetriesReached() throws Exception { @Test public void testOneMaxRetries() throws Exception { Set partsNotInMs = createPartsNotInMs(17); - IMetaStoreClient spyDb = Mockito.spy(db); - Mockito.doThrow(HiveException.class).when(spyDb) - .add_partitions(Mockito.anyObject(), Mockito.anyBoolean(), Mockito.anyBoolean()); + IMetaStoreClient spyDb = spy(db); + doThrow(MetaException.class).when(spyDb) + .add_partitions(any(), anyBoolean(), anyBoolean()); // batch size of 5 and decaying factor of 2 Exception ex = null; try { @@ -396,9 +402,9 @@ public void testOneMaxRetries() throws Exception { // there should be 5 calls to create partitions with batch sizes of 17, 15, 7, 3, 1 ArgumentCaptor ifNotExistsArg = ArgumentCaptor.forClass(Boolean.class); ArgumentCaptor needResultsArg = ArgumentCaptor.forClass(Boolean.class); - ArgumentCaptor> argParts = ArgumentCaptor.forClass((Class) List.class); + ArgumentCaptor> argParts = ArgumentCaptor.forClass(List.class); // there should be 5 calls to create partitions with batch sizes of 17, 15, 7, 3, 1 - Mockito.verify(spyDb, Mockito.times(1)).add_partitions(argParts.capture(), ifNotExistsArg.capture(), + verify(spyDb, times(1)).add_partitions(argParts.capture(), ifNotExistsArg.capture(), needResultsArg.capture()); List> apds = argParts.getAllValues(); int retryAttempt = 1; diff --git ql/src/test/org/apache/hadoop/hive/ql/exec/TestMsckDropPartitionsInBatches.java ql/src/test/org/apache/hadoop/hive/ql/exec/TestMsckDropPartitionsInBatches.java index 1ec46364f1..acf81f8aa6 100644 --- ql/src/test/org/apache/hadoop/hive/ql/exec/TestMsckDropPartitionsInBatches.java +++ ql/src/test/org/apache/hadoop/hive/ql/exec/TestMsckDropPartitionsInBatches.java @@ -17,15 +17,6 @@ */ package org.apache.hadoop.hive.ql.exec; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.conf.HiveConf.ConfVars; import org.apache.hadoop.hive.metastore.CheckResult.PartitionResult; @@ -34,7 +25,7 @@ import org.apache.hadoop.hive.metastore.Msck; import org.apache.hadoop.hive.metastore.PartitionDropOptions; import org.apache.hadoop.hive.metastore.api.FieldSchema; -import org.apache.hadoop.hive.metastore.api.MetastoreException; +import org.apache.hadoop.hive.metastore.api.MetaException; import org.apache.hadoop.hive.metastore.api.SerDeInfo; import org.apache.hadoop.hive.metastore.api.StorageDescriptor; import org.apache.hadoop.hive.metastore.api.Table; @@ -50,7 +41,22 @@ import org.junit.BeforeClass; import org.junit.Test; import org.mockito.ArgumentCaptor; -import org.mockito.Mockito; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyList; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.doThrow; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; /** * Unit test for function dropPartitionsInBatches in DDLTask. @@ -166,7 +172,7 @@ private int findMSB(int n) { private void runDropPartitions(int partCount, int batchSize, int maxRetries, int exceptionStatus) throws Exception { - IMetaStoreClient spyDb = Mockito.spy(db); + IMetaStoreClient spyDb = spy(db); // create partCount dummy partitions Set partsNotInFs = dropPartsNotInFs(partCount); @@ -204,10 +210,9 @@ private void runDropPartitions(int partCount, int batchSize, int maxRetries, int expectedCallCount++; // only first call throws exception - Mockito.doThrow(MetastoreException.class).doCallRealMethod().doCallRealMethod().when(spyDb) - .dropPartitions(Mockito.eq(table.getCatName()), Mockito.eq(table.getDbName()), - Mockito.eq(table.getTableName()), - Mockito.any(List.class), Mockito.any(PartitionDropOptions.class)); + doThrow(MetaException.class).doCallRealMethod().doCallRealMethod().when(spyDb) + .dropPartitions(eq(table.getCatName()), eq(table.getDbName()), + eq(table.getTableName()), anyList(), any(PartitionDropOptions.class)); } expectedBatchSizes = new int[expectedCallCount]; @@ -242,9 +247,9 @@ private void runDropPartitions(int partCount, int batchSize, int maxRetries, int expectedBatchSizes[i] = Integer.min(partCount, actualBatchSize); } // all calls fail - Mockito.doThrow(MetastoreException.class).when(spyDb) - .dropPartitions(Mockito.eq(table.getCatName()), Mockito.eq(table.getDbName()), Mockito.eq(table.getTableName()), - Mockito.any(List.class), Mockito.any(PartitionDropOptions.class)); + doThrow(MetaException.class).when(spyDb) + .dropPartitions(eq(table.getCatName()), eq(table.getDbName()), eq(table.getTableName()), + anyList(), any(PartitionDropOptions.class)); Exception ex = null; try { @@ -260,9 +265,9 @@ private void runDropPartitions(int partCount, int batchSize, int maxRetries, int // there should be expectedCallCount calls to drop partitions with each batch size of // actualBatchSize ArgumentCaptor argument = ArgumentCaptor.forClass(List.class); - Mockito.verify(spyDb, Mockito.times(expectedCallCount)) - .dropPartitions(Mockito.eq(table.getCatName()), Mockito.eq(table.getDbName()), Mockito.eq(table.getTableName()), - argument.capture(), Mockito.any(PartitionDropOptions.class)); + verify(spyDb, times(expectedCallCount)) + .dropPartitions(eq(table.getCatName()), eq(table.getDbName()), eq(table.getTableName()), + argument.capture(), any(PartitionDropOptions.class)); // confirm the batch sizes were as expected List droppedParts = argument.getAllValues(); @@ -326,7 +331,7 @@ public void testSmallNumberOfPartitions() throws Exception { /** * Tests the number of calls to dropPartitions and the respective batch sizes when first call to - * dropPartitions throws MetastoreException. The batch size should be reduced once by the + * dropPartitions throws MetaException. The batch size should be reduced once by the * decayingFactor 2, iow after batch size is halved. * * @throws Exception @@ -338,7 +343,7 @@ public void testBatchingWhenException() throws Exception { /** * Tests the retries exhausted case when Hive.DropPartitions method call always keep throwing - * MetastoreException. The batch sizes should exponentially decreased based on the decaying factor and + * MetaException. The batch sizes should exponentially decreased based on the decaying factor and * ultimately give up when it reaches 0. * * @throws Exception 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/repl/bootstrap/AddDependencyToLeavesTest.java ql/src/test/org/apache/hadoop/hive/ql/exec/repl/bootstrap/AddDependencyToLeavesTest.java index bf11362e92..881c9f49c0 100644 --- ql/src/test/org/apache/hadoop/hive/ql/exec/repl/bootstrap/AddDependencyToLeavesTest.java +++ ql/src/test/org/apache/hadoop/hive/ql/exec/repl/bootstrap/AddDependencyToLeavesTest.java @@ -27,7 +27,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import java.io.Serializable; import java.util.Arrays; 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..f1eca4b55a 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 @@ -17,22 +17,6 @@ */ package org.apache.hadoop.hive.ql.exec.tez; -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; -import org.apache.hive.common.util.Ref; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.UUID; -import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hive.common.metrics.common.Metrics; @@ -49,12 +33,13 @@ import org.apache.hadoop.hive.ql.plan.TezEdgeProperty; import org.apache.hadoop.hive.ql.plan.TezEdgeProperty.EdgeType; import org.apache.hadoop.hive.ql.plan.TezWork; -import org.apache.hadoop.hive.ql.plan.TezWork.VertexType; import org.apache.hadoop.hive.ql.session.SessionState; import org.apache.hadoop.hive.ql.session.SessionState.LogHelper; import org.apache.hadoop.mapred.JobConf; import org.apache.hadoop.yarn.api.records.LocalResource; import org.apache.hadoop.yarn.api.records.Resource; +import org.apache.hadoop.yarn.api.records.URL; +import org.apache.hive.common.util.Ref; import org.apache.tez.client.TezClient; import org.apache.tez.dag.api.DAG; import org.apache.tez.dag.api.Edge; @@ -70,6 +55,29 @@ import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyBoolean; +import static org.mockito.Mockito.anyMap; +import static org.mockito.Mockito.anyString; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.eq; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + public class TestTezTask { DagUtils utils; @@ -91,12 +99,12 @@ public void setUp() throws Exception { utils = mock(DagUtils.class); fs = mock(FileSystem.class); path = mock(Path.class); - when(path.getFileSystem(any(Configuration.class))).thenReturn(fs); - when(utils.getTezDir(any(Path.class))).thenReturn(path); + when(path.getFileSystem(any())).thenReturn(fs); + when(utils.getTezDir(any())).thenReturn(path); when( - utils.createVertex(any(JobConf.class), any(BaseWork.class), any(Path.class), + utils.createVertex(any(), any(BaseWork.class), any(Path.class), any(FileSystem.class), any(Context.class), - anyBoolean(), any(TezWork.class), any(VertexType.class), any(Map.class))).thenAnswer( + anyBoolean(), any(TezWork.class), any(), anyMap())).thenAnswer( new Answer() { @Override @@ -107,7 +115,7 @@ public Vertex answer(InvocationOnMock invocation) throws Throwable { } }); - when(utils.createEdge(any(JobConf.class), any(Vertex.class), any(Vertex.class), + when(utils.createEdge(any(), any(Vertex.class), any(Vertex.class), any(TezEdgeProperty.class), any(BaseWork.class), any(TezWork.class))) .thenAnswer(new Answer() { @Override @@ -228,7 +236,7 @@ public void testSubmit() throws Exception { @Test public void testClose() throws HiveException { task.close(work, 0, null); - verify(op, times(4)).jobClose(any(Configuration.class), eq(true)); + verify(op, times(4)).jobClose(any(), eq(true)); } @Test @@ -238,13 +246,13 @@ public void testExistingSessionGetsStorageHandlerResources() throws Exception { LocalResource res = createResource(inputOutputJars[0]); final Map resources = Collections.singletonMap(jarFilePath, res); - when(utils.localizeTempFiles(anyString(), any(Configuration.class), eq(inputOutputJars), + when(utils.localizeTempFiles(anyString(), any(), eq(inputOutputJars), any(String[].class))).thenReturn(resources); when(sessionState.isOpen()).thenReturn(true); when(sessionState.isOpening()).thenReturn(false); task.ensureSessionHasResources(sessionState, inputOutputJars); // TODO: ideally we should have a test for session itself. - verify(sessionState).ensureLocalResources(any(Configuration.class), eq(inputOutputJars)); + verify(sessionState).ensureLocalResources(any(), eq(inputOutputJars)); } private static LocalResource createResource(String 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..ec52f3856d 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,28 +23,25 @@ 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; import java.util.HashMap; import java.util.Map; -import java.util.Set; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.hasItems; 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.any; +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; @@ -89,15 +86,15 @@ private Progress setup(Progress progressMock, int total, int succeeded, int fail @Test public void setupInternalStateOnObjectCreation() throws IOException, TezException { when(dagStatus.getState()).thenReturn(DAGStatus.State.RUNNING); - when(dagClient.getVertexStatus(eq(MAPPER), anySet())).thenReturn(succeeded); - when(dagClient.getVertexStatus(eq(REDUCER), anySet())).thenReturn(running); + when(dagClient.getVertexStatus(eq(MAPPER), any())).thenReturn(succeeded); + when(dagClient.getVertexStatus(eq(REDUCER), any())).thenReturn(running); TezProgressMonitor monitor = new TezProgressMonitor(dagClient, dagStatus, new ArrayList(), progressMap(), console, Long.MAX_VALUE); - verify(dagClient).getVertexStatus(eq(MAPPER), isNull(Set.class)); - verify(dagClient).getVertexStatus(eq(REDUCER), isNull(Set.class)); + verify(dagClient).getVertexStatus(eq(MAPPER), isNull()); + verify(dagClient).getVertexStatus(eq(REDUCER), isNull()); verifyNoMoreInteractions(dagClient); assertThat(monitor.vertexStatusMap.keySet(), hasItems(MAPPER, REDUCER)); diff --git ql/src/test/org/apache/hadoop/hive/ql/exec/util/DAGTraversalTest.java ql/src/test/org/apache/hadoop/hive/ql/exec/util/DAGTraversalTest.java index f482e3be6e..b8d4256c36 100644 --- ql/src/test/org/apache/hadoop/hive/ql/exec/util/DAGTraversalTest.java +++ ql/src/test/org/apache/hadoop/hive/ql/exec/util/DAGTraversalTest.java @@ -20,7 +20,7 @@ import org.apache.hadoop.hive.ql.exec.Task; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import java.io.Serializable; import java.util.Arrays; 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/TestAcidInputFormat.java ql/src/test/org/apache/hadoop/hive/ql/io/TestAcidInputFormat.java index 49ae637765..dc281d2c59 100644 --- ql/src/test/org/apache/hadoop/hive/ql/io/TestAcidInputFormat.java +++ ql/src/test/org/apache/hadoop/hive/ql/io/TestAcidInputFormat.java @@ -32,7 +32,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 TestAcidInputFormat { 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/io/orc/TestOrcRawRecordMerger.java ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestOrcRawRecordMerger.java index 17ceedefd9..f63c40a7b5 100644 --- ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestOrcRawRecordMerger.java +++ ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestOrcRawRecordMerger.java @@ -75,6 +75,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertNull; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.when; public class TestOrcRawRecordMerger { @@ -169,19 +171,19 @@ private Reader createMockReader() throws IOException { setRow(row4, OrcRecordUpdater.INSERT_OPERATION, 40, 50, 60, 130, "fourth"); OrcStruct row5 = new OrcStruct(OrcRecordUpdater.FIELDS); setRow(row5, OrcRecordUpdater.INSERT_OPERATION, 40, 50, 61, 140, "fifth"); - Mockito.when(reader.rowsOptions(Mockito.any(Reader.Options.class), Mockito.any(HiveConf.class))) + when(reader.rowsOptions(any(Reader.Options.class), any(HiveConf.class))) .thenReturn(recordReader); - Mockito.when(recordReader.hasNext()). + when(recordReader.hasNext()). thenReturn(true, true, true, true, true, false); - Mockito.when(recordReader.getProgress()).thenReturn(1.0f); + when(recordReader.getProgress()).thenReturn(1.0f); - Mockito.when(recordReader.next(null)).thenReturn(row1); - Mockito.when(recordReader.next(row1)).thenReturn(row2); - Mockito.when(recordReader.next(row2)).thenReturn(row3); - Mockito.when(recordReader.next(row3)).thenReturn(row4); - Mockito.when(recordReader.next(row4)).thenReturn(row5); + when(recordReader.next(null)).thenReturn(row1); + when(recordReader.next(row1)).thenReturn(row2); + when(recordReader.next(row2)).thenReturn(row3); + when(recordReader.next(row3)).thenReturn(row4); + when(recordReader.next(row4)).thenReturn(row5); return reader; } @@ -275,16 +277,17 @@ private Reader createMockOriginalReader() throws IOException { OrcStruct row4 = createOriginalRow("fourth"); OrcStruct row5 = createOriginalRow("fifth"); - Mockito.when(reader.rowsOptions(Mockito.any(Reader.Options.class), Mockito.any(HiveConf.class))) + // HiveConf argument of rowsOptions can be null + when(reader.rowsOptions(any(Reader.Options.class), any())) .thenReturn(recordReader); - Mockito.when(recordReader.hasNext()). + when(recordReader.hasNext()). thenReturn(true, true, true, true, true, false); - Mockito.when(recordReader.getRowNumber()).thenReturn(0L, 1L, 2L, 3L, 4L); - Mockito.when(recordReader.next(null)).thenReturn(row1); - Mockito.when(recordReader.next(row1)).thenReturn(row2); - Mockito.when(recordReader.next(row2)).thenReturn(row3); - Mockito.when(recordReader.next(row3)).thenReturn(row4); - Mockito.when(recordReader.next(row4)).thenReturn(row5); + when(recordReader.getRowNumber()).thenReturn(0L, 1L, 2L, 3L, 4L); + when(recordReader.next(null)).thenReturn(row1); + when(recordReader.next(row1)).thenReturn(row2); + when(recordReader.next(row2)).thenReturn(row3); + when(recordReader.next(row3)).thenReturn(row4); + when(recordReader.next(row4)).thenReturn(row5); return reader; } @@ -415,8 +418,8 @@ public void testNewBase() throws Exception { typeBuilder.setKind(OrcProto.Type.Kind.STRING); types.add(typeBuilder.build()); - Mockito.when(reader.getTypes()).thenReturn(types); - Mockito.when(reader.rowsOptions(Mockito.any(Reader.Options.class), Mockito.any(HiveConf.class))) + when(reader.getTypes()).thenReturn(types); + when(reader.rowsOptions(any(Reader.Options.class), any())) .thenReturn(recordReader); OrcStruct row1 = new OrcStruct(OrcRecordUpdater.FIELDS); @@ -430,22 +433,22 @@ public void testNewBase() throws Exception { OrcStruct row5 = new OrcStruct(OrcRecordUpdater.FIELDS); setRow(row5, OrcRecordUpdater.INSERT_OPERATION, 40, 50, 61, 140, "fifth"); - Mockito.when(recordReader.hasNext()). + when(recordReader.hasNext()). thenReturn(true, true, true, true, true, false); - Mockito.when(recordReader.getProgress()).thenReturn(1.0f); + when(recordReader.getProgress()).thenReturn(1.0f); - Mockito.when(recordReader.next(null)).thenReturn(row1, row4); - Mockito.when(recordReader.next(row1)).thenReturn(row2); - Mockito.when(recordReader.next(row2)).thenReturn(row3); - Mockito.when(recordReader.next(row3)).thenReturn(row5); + when(recordReader.next(null)).thenReturn(row1, row4); + when(recordReader.next(row1)).thenReturn(row2); + when(recordReader.next(row2)).thenReturn(row3); + when(recordReader.next(row3)).thenReturn(row5); - Mockito.when(reader.hasMetadataValue(OrcRecordUpdater.ACID_KEY_INDEX_NAME)) + when(reader.hasMetadataValue(OrcRecordUpdater.ACID_KEY_INDEX_NAME)) .thenReturn(true); - Mockito.when(reader.getMetadataValue(OrcRecordUpdater.ACID_KEY_INDEX_NAME)) + when(reader.getMetadataValue(OrcRecordUpdater.ACID_KEY_INDEX_NAME)) .thenReturn(ByteBuffer.wrap("10,20,30;40,50,60;40,50,61" .getBytes("UTF-8"))); - Mockito.when(reader.getStripes()) + when(reader.getStripes()) .thenReturn(createStripes(2, 2, 1)); OrcRawRecordMerger merger = new OrcRawRecordMerger(conf, false, reader, diff --git ql/src/test/org/apache/hadoop/hive/ql/lockmgr/TestDummyTxnManager.java ql/src/test/org/apache/hadoop/hive/ql/lockmgr/TestDummyTxnManager.java index 7a3ba3e5ca..62e9bc4f44 100644 --- ql/src/test/org/apache/hadoop/hive/ql/lockmgr/TestDummyTxnManager.java +++ ql/src/test/org/apache/hadoop/hive/ql/lockmgr/TestDummyTxnManager.java @@ -39,7 +39,7 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import java.lang.reflect.Field; import java.util.ArrayList; @@ -114,7 +114,7 @@ public void testSingleReadTable() throws Exception { LockException lEx = new LockException(ErrorMsg.LOCK_ACQUIRE_CANCELLED.getMsg()); when(mockLockManager.lock(anyListOf(HiveLockObj.class), eq(false), eq(driverState))).thenReturn(expectedLocks); when(mockLockManager.lock(anyListOf(HiveLockObj.class), eq(false), eq(driverInterrupted))).thenThrow(lEx); - doNothing().when(mockLockManager).setContext(any(HiveLockManagerCtx.class)); + lenient().doNothing().when(mockLockManager).setContext(any(HiveLockManagerCtx.class)); doNothing().when(mockLockManager).close(); ArgumentCaptor lockObjsCaptor = ArgumentCaptor.forClass(List.class); diff --git ql/src/test/org/apache/hadoop/hive/ql/optimizer/calcite/rules/TestHivePointLookupOptimizerRule.java ql/src/test/org/apache/hadoop/hive/ql/optimizer/calcite/rules/TestHivePointLookupOptimizerRule.java index 2b37c5436f..ef878f0239 100644 --- ql/src/test/org/apache/hadoop/hive/ql/optimizer/calcite/rules/TestHivePointLookupOptimizerRule.java +++ ql/src/test/org/apache/hadoop/hive/ql/optimizer/calcite/rules/TestHivePointLookupOptimizerRule.java @@ -18,8 +18,6 @@ package org.apache.hadoop.hive.ql.optimizer.calcite.rules; -import static org.junit.Assert.assertEquals; - import org.apache.calcite.jdbc.JavaTypeFactoryImpl; import org.apache.calcite.plan.RelOptCluster; import org.apache.calcite.plan.RelOptSchema; @@ -38,10 +36,13 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.Matchers; import org.mockito.Mock; -import org.mockito.Mockito; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; + +import static org.junit.Assert.assertEquals; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.lenient; @RunWith(MockitoJUnitRunner.class) public class TestHivePointLookupOptimizerRule { @@ -74,9 +75,9 @@ public void before() { RexBuilder rexBuilder = new RexBuilder(typeFactory); final RelOptCluster optCluster = RelOptCluster.create(planner, rexBuilder); RelDataType rowTypeMock = typeFactory.createStructType(MyRecord.class); - Mockito.doReturn(rowTypeMock).when(tableMock).getRowType(); - Mockito.doReturn(tableMock).when(schemaMock).getTableForMember(Matchers.any()); - Mockito.doReturn(hiveTableMDMock).when(tableMock).getHiveTableMD(); + doReturn(rowTypeMock).when(tableMock).getRowType(); + doReturn(tableMock).when(schemaMock).getTableForMember(any()); + lenient().doReturn(hiveTableMDMock).when(tableMock).getHiveTableMD(); builder = HiveRelFactories.HIVE_BUILDER.create(optCluster, schemaMock); diff --git ql/src/test/org/apache/hadoop/hive/ql/optimizer/calcite/rules/TestHiveReduceExpressionsWithStatsRule.java ql/src/test/org/apache/hadoop/hive/ql/optimizer/calcite/rules/TestHiveReduceExpressionsWithStatsRule.java index 183f1279ad..7dc1277fa4 100644 --- ql/src/test/org/apache/hadoop/hive/ql/optimizer/calcite/rules/TestHiveReduceExpressionsWithStatsRule.java +++ ql/src/test/org/apache/hadoop/hive/ql/optimizer/calcite/rules/TestHiveReduceExpressionsWithStatsRule.java @@ -47,7 +47,7 @@ import org.mockito.Matchers; import org.mockito.Mock; import org.mockito.Mockito; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import com.google.common.collect.Lists; diff --git ql/src/test/org/apache/hadoop/hive/ql/optimizer/signature/TestRelSignature.java ql/src/test/org/apache/hadoop/hive/ql/optimizer/signature/TestRelSignature.java index f8a54ca702..7532bfdb06 100644 --- ql/src/test/org/apache/hadoop/hive/ql/optimizer/signature/TestRelSignature.java +++ ql/src/test/org/apache/hadoop/hive/ql/optimizer/signature/TestRelSignature.java @@ -20,6 +20,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.lenient; import org.apache.calcite.jdbc.JavaTypeFactoryImpl; import org.apache.calcite.plan.RelOptCluster; @@ -50,8 +52,7 @@ import org.junit.runner.RunWith; import org.mockito.Matchers; import org.mockito.Mock; -import org.mockito.Mockito; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) public class TestRelSignature { @@ -84,9 +85,9 @@ public void before() { RexBuilder rexBuilder = new RexBuilder(typeFactory); final RelOptCluster optCluster = RelOptCluster.create(planner, rexBuilder); RelDataType rowTypeMock = typeFactory.createStructType(MyRecord.class); - Mockito.doReturn(rowTypeMock).when(tableMock).getRowType(); - Mockito.doReturn(tableMock).when(schemaMock).getTableForMember(Matchers.any()); - Mockito.doReturn(hiveTableMDMock).when(tableMock).getHiveTableMD(); + doReturn(rowTypeMock).when(tableMock).getRowType(); + doReturn(tableMock).when(schemaMock).getTableForMember(Matchers.any()); + lenient().doReturn(hiveTableMDMock).when(tableMock).getHiveTableMD(); builder = HiveRelFactories.HIVE_BUILDER.create(optCluster, schemaMock); } 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/dump/TestHiveWrapper.java ql/src/test/org/apache/hadoop/hive/ql/parse/repl/dump/TestHiveWrapper.java index cb3b5cc98a..f0ead1d521 100644 --- ql/src/test/org/apache/hadoop/hive/ql/parse/repl/dump/TestHiveWrapper.java +++ ql/src/test/org/apache/hadoop/hive/ql/parse/repl/dump/TestHiveWrapper.java @@ -26,7 +26,7 @@ import org.mockito.InOrder; import org.mockito.Mock; import org.mockito.Mockito; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) public class TestHiveWrapper { 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..faba6e4caa 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; @@ -87,7 +87,7 @@ public void createDestinationPath() throws IOException, SemanticException, URISy when(mockFs.getScheme()).thenReturn("hdfs"); when(mockFs.getUri()).thenReturn(new URI("hdfs", "somehost:9000", null, null, null)); mockStatic(System.class); - when(System.nanoTime()).thenReturn(Long.MAX_VALUE); +// when(System.nanoTime()).thenReturn(Long.MAX_VALUE); when(functionObj.getFunctionName()).thenReturn("someFunctionName"); mockStatic(ReplCopyTask.class); Task mock = mock(Task.class); @@ -100,6 +100,6 @@ public void createDestinationPath() throws IOException, SemanticException, URISy assertThat(resourceUri.getUri(), is(equalTo( "hdfs://somehost:9000/someBasePath/withADir/replicadbname/somefunctionname/" + String - .valueOf(Long.MAX_VALUE) + "/ab.jar"))); + .valueOf(0L) + "/ab.jar"))); } } \ No newline at end of file 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/generic/TestGenericUDAFEvaluator.java ql/src/test/org/apache/hadoop/hive/ql/udf/generic/TestGenericUDAFEvaluator.java index d3df170395..0bc1975fd0 100644 --- ql/src/test/org/apache/hadoop/hive/ql/udf/generic/TestGenericUDAFEvaluator.java +++ ql/src/test/org/apache/hadoop/hive/ql/udf/generic/TestGenericUDAFEvaluator.java @@ -31,7 +31,7 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import java.util.Collections; import java.util.List; diff --git ql/src/test/org/apache/hadoop/hive/ql/udf/generic/TestGenericUDFExtractUnion.java ql/src/test/org/apache/hadoop/hive/ql/udf/generic/TestGenericUDFExtractUnion.java index 3adc5ca349..0fcb341a3f 100644 --- ql/src/test/org/apache/hadoop/hive/ql/udf/generic/TestGenericUDFExtractUnion.java +++ ql/src/test/org/apache/hadoop/hive/ql/udf/generic/TestGenericUDFExtractUnion.java @@ -37,7 +37,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import com.google.common.collect.ImmutableList; 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 service/src/test/org/apache/hive/service/auth/TestLdapAuthenticationProviderImpl.java service/src/test/org/apache/hive/service/auth/TestLdapAuthenticationProviderImpl.java index 0396b74912..e42be95287 100644 --- service/src/test/org/apache/hive/service/auth/TestLdapAuthenticationProviderImpl.java +++ service/src/test/org/apache/hive/service/auth/TestLdapAuthenticationProviderImpl.java @@ -32,7 +32,7 @@ import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import static org.junit.Assert.*; import static org.mockito.Mockito.*; diff --git service/src/test/org/apache/hive/service/auth/ldap/TestChainFilter.java service/src/test/org/apache/hive/service/auth/ldap/TestChainFilter.java index b8385ebdda..8043d9c9f4 100644 --- service/src/test/org/apache/hive/service/auth/ldap/TestChainFilter.java +++ service/src/test/org/apache/hive/service/auth/ldap/TestChainFilter.java @@ -23,7 +23,7 @@ import org.apache.hadoop.hive.conf.HiveConf; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import org.junit.Before; import org.mockito.Mock; diff --git service/src/test/org/apache/hive/service/auth/ldap/TestCustomQueryFilter.java service/src/test/org/apache/hive/service/auth/ldap/TestCustomQueryFilter.java index 48972e7715..d8725ae9df 100644 --- service/src/test/org/apache/hive/service/auth/ldap/TestCustomQueryFilter.java +++ service/src/test/org/apache/hive/service/auth/ldap/TestCustomQueryFilter.java @@ -24,7 +24,7 @@ import org.apache.hadoop.hive.conf.HiveConf; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import org.junit.Before; import org.mockito.Mock; diff --git service/src/test/org/apache/hive/service/auth/ldap/TestGroupFilter.java service/src/test/org/apache/hive/service/auth/ldap/TestGroupFilter.java index 9ea5361836..35dae4c40c 100644 --- service/src/test/org/apache/hive/service/auth/ldap/TestGroupFilter.java +++ service/src/test/org/apache/hive/service/auth/ldap/TestGroupFilter.java @@ -24,7 +24,7 @@ import org.apache.hadoop.hive.conf.HiveConf; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import org.junit.Before; import org.mockito.Mock; diff --git service/src/test/org/apache/hive/service/auth/ldap/TestLdapSearch.java service/src/test/org/apache/hive/service/auth/ldap/TestLdapSearch.java index c5e995e2a2..78cba2ac55 100644 --- service/src/test/org/apache/hive/service/auth/ldap/TestLdapSearch.java +++ service/src/test/org/apache/hive/service/auth/ldap/TestLdapSearch.java @@ -32,7 +32,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import static org.junit.Assert.*; import static org.mockito.Mockito.*; diff --git service/src/test/org/apache/hive/service/auth/ldap/TestSearchResultHandler.java service/src/test/org/apache/hive/service/auth/ldap/TestSearchResultHandler.java index db01d107ee..7136b5f864 100644 --- service/src/test/org/apache/hive/service/auth/ldap/TestSearchResultHandler.java +++ service/src/test/org/apache/hive/service/auth/ldap/TestSearchResultHandler.java @@ -28,7 +28,7 @@ import javax.naming.directory.SearchResult; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import static org.junit.Assert.*; import static org.mockito.Mockito.*; diff --git service/src/test/org/apache/hive/service/auth/ldap/TestUserFilter.java service/src/test/org/apache/hive/service/auth/ldap/TestUserFilter.java index 4c86de2a4c..3edac26e45 100644 --- service/src/test/org/apache/hive/service/auth/ldap/TestUserFilter.java +++ service/src/test/org/apache/hive/service/auth/ldap/TestUserFilter.java @@ -23,7 +23,7 @@ import org.apache.hadoop.hive.conf.HiveConf; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import org.junit.Before; import org.mockito.Mock; diff --git service/src/test/org/apache/hive/service/auth/ldap/TestUserSearchFilter.java service/src/test/org/apache/hive/service/auth/ldap/TestUserSearchFilter.java index d42e5f12ce..d066fd01bb 100644 --- service/src/test/org/apache/hive/service/auth/ldap/TestUserSearchFilter.java +++ service/src/test/org/apache/hive/service/auth/ldap/TestUserSearchFilter.java @@ -25,7 +25,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import static org.junit.Assert.*; import static org.mockito.Mockito.*; diff --git service/src/test/org/apache/hive/service/cli/thrift/ThriftHttpServletTest.java service/src/test/org/apache/hive/service/cli/thrift/ThriftHttpServletTest.java index 948e97f5ce..04c11b077c 100644 --- service/src/test/org/apache/hive/service/cli/thrift/ThriftHttpServletTest.java +++ service/src/test/org/apache/hive/service/cli/thrift/ThriftHttpServletTest.java @@ -27,7 +27,7 @@ import org.junit.runner.RunWith; import org.mockito.Mockito; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import javax.servlet.http.HttpServletRequest; 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..55f90949a1 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; @@ -59,7 +59,7 @@ public void testSetFullFileStatusFailInheritGroup() throws IOException { doThrow(RuntimeException.class).when(fs).setOwner(any(Path.class), any(String.class), any(String.class)); HdfsUtils.setFullFileStatus(conf, mockHadoopFileStatus, "fakeGroup2", fs, new Path("fakePath"), false); - verify(fs).setOwner(any(Path.class), any(String.class), any(String.class)); + verify(fs).setOwner(any(Path.class), any(), any(String.class)); } /** @@ -156,7 +156,7 @@ public void testSetFullFileStatusFailInheritAclsRecursive() throws Exception { doThrow(RuntimeException.class).when(mockFsShell).run(any(String[].class)); HdfsUtils.setFullFileStatus(conf, mockHadoopFileStatus, "", mock(FileSystem.class), fakeTarget, true, mockFsShell); - verify(mockFsShell).run(new String[]{"-setfacl", "-R", "--set", any(String.class), fakeTarget.toString()}); + verify(mockFsShell).run(new String[]{"-setfacl", "-R", "--set", any(), fakeTarget.toString()}); } /** @@ -179,6 +179,6 @@ public void testSetFullFileStatusFailInheritPermsRecursive() throws Exception { HdfsUtils.setFullFileStatus(conf, mockHadoopFileStatus, "", mock(FileSystem.class), fakeTarget, true, mockFsShell); - verify(mockFsShell).run(new String[]{"-chmod", "-R", any(String.class), fakeTarget.toString()}); + verify(mockFsShell).run(new String[]{"-chmod", "-R", any(), fakeTarget.toString()}); } } diff --git spark-client/src/test/java/org/apache/hive/spark/client/TestJobHandle.java spark-client/src/test/java/org/apache/hive/spark/client/TestJobHandle.java index b81a34ba71..d6ecd86f80 100644 --- spark-client/src/test/java/org/apache/hive/spark/client/TestJobHandle.java +++ spark-client/src/test/java/org/apache/hive/spark/client/TestJobHandle.java @@ -25,7 +25,7 @@ import org.junit.runner.RunWith; import org.mockito.InOrder; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import static org.junit.Assert.*; import static org.mockito.Mockito.*; diff --git standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreLdapAuthenticationProviderImpl.java standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreLdapAuthenticationProviderImpl.java index bad5da5dd1..002fd07cc6 100644 --- standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreLdapAuthenticationProviderImpl.java +++ standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestMetaStoreLdapAuthenticationProviderImpl.java @@ -34,10 +34,18 @@ import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; - -import static org.junit.Assert.*; -import static org.mockito.Mockito.*; +import org.mockito.junit.MockitoJUnitRunner; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.ArgumentMatchers.isA; +import static org.mockito.Mockito.atLeastOnce; +import static org.mockito.Mockito.lenient; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; @RunWith(MockitoJUnitRunner.class) public class TestMetaStoreLdapAuthenticationProviderImpl { @@ -90,7 +98,7 @@ public void testAuthenticateNoUserOrGroupFilter() throws NamingException, Authen DirSearchFactory factory = mock(DirSearchFactory.class); - when(search.findUserDn("user1")).thenReturn("cn=user1,ou=PowerUsers,dc=mycorp,dc=com"); + lenient().when(search.findUserDn("user1")).thenReturn("cn=user1,ou=PowerUsers,dc=mycorp,dc=com"); when(factory.getInstance(conf, "cn=user1,ou=PowerUsers,dc=mycorp,dc=com", "Blah")).thenReturn(search); when(factory.getInstance(conf, "cn=user1,ou=Users,dc=mycorp,dc=com", "Blah")).thenThrow(AuthenticationException.class); @@ -223,7 +231,7 @@ public void testAuthenticateWhenUserFilterFailsAndGroupMembershipKeyFilterPasses when(search.findUserDn("user3")).thenReturn("cn=user3,ou=PowerUsers,dc=mycorp,dc=com"); - when(search.findGroupsForUser("cn=user3,ou=PowerUsers,dc=mycorp,dc=com")) + lenient().when(search.findGroupsForUser("cn=user3,ou=PowerUsers,dc=mycorp,dc=com")) .thenReturn(Arrays.asList( "cn=testGroup,ou=Groups,dc=mycorp,dc=com", "cn=group3,ou=Groups,dc=mycorp,dc=com")); @@ -253,7 +261,7 @@ public void testAuthenticateWhenCustomQueryFilterFailsAndUserFilterPasses() thro "(&(objectClass=person)(|(memberOf=CN=Domain Admins,CN=Users,DC=apache,DC=org)(memberOf=CN=Administrators,CN=Builtin,DC=apache,DC=org)))"); MetastoreConf.setVar(conf, MetastoreConf.ConfVars.METASTORE_PLAIN_LDAP_USERFILTER, "user3"); - when(search.findUserDn("user3")).thenReturn("cn=user3,ou=PowerUsers,dc=mycorp,dc=com"); + lenient().when(search.findUserDn("user3")).thenReturn("cn=user3,ou=PowerUsers,dc=mycorp,dc=com"); when(search.executeCustomQuery(anyString())).thenReturn(Arrays.asList( "cn=user1,ou=PowerUsers,dc=mycorp,dc=com", "cn=user2,ou=PowerUsers,dc=mycorp,dc=com")); 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/ldap/TestChainFilter.java standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/ldap/TestChainFilter.java index 5835007d86..257187c735 100644 --- standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/ldap/TestChainFilter.java +++ standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/ldap/TestChainFilter.java @@ -25,7 +25,7 @@ import org.apache.hadoop.hive.metastore.conf.MetastoreConf; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import org.junit.Before; import org.mockito.Mock; diff --git standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/ldap/TestCustomQueryFilter.java standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/ldap/TestCustomQueryFilter.java index ce8b1b7d14..76a125529c 100644 --- standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/ldap/TestCustomQueryFilter.java +++ standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/ldap/TestCustomQueryFilter.java @@ -26,7 +26,7 @@ import org.apache.hadoop.hive.metastore.conf.MetastoreConf; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import org.junit.Before; import org.mockito.Mock; diff --git standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/ldap/TestGroupFilter.java standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/ldap/TestGroupFilter.java index eef1f064a7..bf1b76b461 100644 --- standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/ldap/TestGroupFilter.java +++ standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/ldap/TestGroupFilter.java @@ -26,7 +26,7 @@ import org.apache.hadoop.hive.metastore.conf.MetastoreConf; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import org.junit.Before; import org.mockito.Mock; @@ -144,7 +144,7 @@ public void testGroupMembershipKeyCaseInsensitiveFilterApplyNegative() throws AuthenticationException, NamingException, IOException { MetastoreConf.setVar(conf, MetastoreConf.ConfVars.METASTORE_PLAIN_LDAP_GROUPFILTER, "hiveusers,containsg1"); - when(search.findGroupsForUser(eq("user1"))).thenReturn(Arrays.asList("SuperUsers", "Office1", "G1", "G2")); + lenient().when(search.findGroupsForUser(eq("user1"))).thenReturn(Arrays.asList("SuperUsers", "Office1", "G1", "G2")); Filter filter = factory.getInstance(conf); filter.apply(search, "user1"); @@ -155,7 +155,7 @@ public void testGroupMembershipKeyFilterApplyNegative() throws AuthenticationException, NamingException, IOException { MetastoreConf.setVar(conf, MetastoreConf.ConfVars.METASTORE_PLAIN_LDAP_GROUPFILTER, "HiveUsers"); - when(search.findGroupsForUser(eq("user1"))).thenReturn(Arrays.asList("SuperUsers", "Office1", "G1", "G2")); + lenient().when(search.findGroupsForUser(eq("user1"))).thenReturn(Arrays.asList("SuperUsers", "Office1", "G1", "G2")); Filter filter = factory.getInstance(conf); filter.apply(search, "user1"); diff --git standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/ldap/TestLdapSearch.java standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/ldap/TestLdapSearch.java index df913db13f..92aef8c25e 100644 --- standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/ldap/TestLdapSearch.java +++ standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/ldap/TestLdapSearch.java @@ -34,7 +34,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import static org.junit.Assert.*; import static org.mockito.Mockito.*; diff --git standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/ldap/TestSearchResultHandler.java standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/ldap/TestSearchResultHandler.java index 74022e93b0..041e2a1c1e 100644 --- standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/ldap/TestSearchResultHandler.java +++ standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/ldap/TestSearchResultHandler.java @@ -28,7 +28,7 @@ import javax.naming.directory.SearchResult; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import static org.junit.Assert.*; import static org.mockito.Mockito.*; diff --git standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/ldap/TestUserFilter.java standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/ldap/TestUserFilter.java index a79f0de0c2..1ee46f457b 100644 --- standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/ldap/TestUserFilter.java +++ standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/ldap/TestUserFilter.java @@ -25,7 +25,7 @@ import org.apache.hadoop.hive.metastore.conf.MetastoreConf; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import org.junit.Before; import org.mockito.Mock; diff --git standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/ldap/TestUserSearchFilter.java standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/ldap/TestUserSearchFilter.java index bf182ec07d..ebeeb0837d 100644 --- standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/ldap/TestUserSearchFilter.java +++ standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/ldap/TestUserSearchFilter.java @@ -27,7 +27,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import static org.junit.Assert.*; import static org.mockito.Mockito.*; 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;