From f7651e2f63ddba9ed1ae4052e38464f85dd445f0 Mon Sep 17 00:00:00 2001 From: muskan1012 <55579937+muskan1012@users.noreply.github.com> Date: Tue, 5 Nov 2024 23:05:53 +0530 Subject: [PATCH] HADOOP-19243. Upgrade Mockito version to 4.11.0 (#6968) Mockito is now at a JDK-17 compatible version. Contributed by Muskan Mishra --- .../hadoop-client-minicluster/pom.xml | 13 +++++++-- .../hadoop-huaweicloud/pom.xml | 18 ++++++++++-- hadoop-common-project/hadoop-auth/pom.xml | 1 + hadoop-common-project/hadoop-common/pom.xml | 2 +- .../org/apache/hadoop/ipc/TestServer.java | 2 ++ .../security/http/TestCrossOriginFilter.java | 10 ++++--- .../http/TestRestCsrfPreventionFilter.java | 12 ++++---- .../org/apache/hadoop/test/MockitoUtil.java | 9 ++++++ hadoop-common-project/hadoop-kms/pom.xml | 2 +- hadoop-common-project/hadoop-nfs/pom.xml | 2 +- .../hadoop-hdfs-client/pom.xml | 2 +- .../hadoop-hdfs-httpfs/pom.xml | 2 +- .../hadoop-hdfs-native-client/pom.xml | 2 +- hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml | 2 +- hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml | 2 +- .../federation/router/TestRouterAdmin.java | 21 +++++++++----- .../router/TestRouterRpcMultiDestination.java | 2 +- hadoop-hdfs-project/hadoop-hdfs/pom.xml | 2 +- .../hdfs/server/namenode/INodeFile.java | 5 ++-- .../TestBlockManagerSafeMode.java | 1 + .../server/namenode/TestCacheDirectives.java | 3 +- .../TestCommitBlockSynchronization.java | 7 +++-- .../hdfs/server/namenode/TestFSDirAttrOp.java | 6 +++- .../namenode/TestSnapshotPathINodes.java | 4 ++- .../snapshot/TestFileWithSnapshotFeature.java | 19 +++++++++++-- .../v2/app/rm/TestRMCommunicator.java | 2 +- .../v2/hs/webapp/TestHsWebServicesAcls.java | 8 +++--- .../TestYarnClientProtocolProvider.java | 5 ++-- .../hadoop-mapreduce-client/pom.xml | 2 ++ hadoop-project/pom.xml | 6 ++-- hadoop-tools/hadoop-archive-logs/pom.xml | 2 +- hadoop-tools/hadoop-archives/pom.xml | 2 +- hadoop-tools/hadoop-aws/pom.xml | 2 +- hadoop-tools/hadoop-azure/pom.xml | 1 + hadoop-tools/hadoop-compat-bench/pom.xml | 2 +- hadoop-tools/hadoop-datajoin/pom.xml | 2 +- hadoop-tools/hadoop-distcp/pom.xml | 2 +- .../hadoop-dynamometer-blockgen/pom.xml | 2 +- .../hadoop-dynamometer-infra/pom.xml | 2 +- .../hadoop-dynamometer-workload/pom.xml | 2 +- hadoop-tools/hadoop-extras/pom.xml | 2 +- .../hadoop-federation-balance/pom.xml | 2 +- hadoop-tools/hadoop-fs2img/pom.xml | 2 +- hadoop-tools/hadoop-gridmix/pom.xml | 2 +- .../mapred/gridmix/TestGridMixClasses.java | 2 +- hadoop-tools/hadoop-kafka/pom.xml | 2 +- hadoop-tools/hadoop-sls/pom.xml | 2 +- hadoop-tools/hadoop-streaming/pom.xml | 2 +- .../hadoop-yarn/hadoop-yarn-api/pom.xml | 2 +- .../pom.xml | 6 ++-- .../application/TestAppCatalogSolrClient.java | 11 +++++--- .../pom.xml | 2 +- .../hadoop-yarn-services-api/pom.xml | 2 +- .../hadoop-yarn-services-core/pom.xml | 2 +- .../containerlaunch/TestAbstractLauncher.java | 2 +- .../hadoop-yarn/hadoop-yarn-client/pom.xml | 2 +- .../hadoop-yarn/hadoop-yarn-common/pom.xml | 2 +- .../pom.xml | 2 +- .../hadoop-yarn-server-common/pom.xml | 2 +- .../hadoop-yarn-server-nodemanager/pom.xml | 2 +- .../resources/TestCGroupsHandlerImpl.java | 2 +- .../resources/TestCGroupsV2HandlerImpl.java | 2 +- .../gpu/TestGpuResourceAllocator.java | 2 +- .../runtime/TestDockerContainerRuntime.java | 10 +++++-- .../com/nec/TestNECVEPlugin.java | 2 +- .../pom.xml | 7 +---- ...TestFSConfigToCSConfigArgumentHandler.java | 2 +- .../TestFSConfigToCSConfigConverter.java | 2 +- .../TestQueuePlacementConverter.java | 2 +- .../hadoop-yarn-server-router/pom.xml | 2 +- .../pom.xml | 2 +- .../hadoop-yarn-server-tests/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 28 ++++++++++++++++--- .../TestDocumentStoreCollectionCreator.java | 11 ++++---- .../TestDocumentStoreTimelineReaderImpl.java | 19 +++++++++++-- .../TestDocumentStoreTimelineWriterImpl.java | 22 ++++++++++++--- .../TestCosmosDBDocumentStoreReader.java | 14 +++++----- .../TestCosmosDBDocumentStoreWriter.java | 18 ++++++------ .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../hadoop-yarn-server-web-proxy/pom.xml | 2 +- .../hadoop-yarn/hadoop-yarn-ui/pom.xml | 4 +-- 84 files changed, 266 insertions(+), 143 deletions(-) diff --git a/hadoop-client-modules/hadoop-client-minicluster/pom.xml b/hadoop-client-modules/hadoop-client-minicluster/pom.xml index af9d523560..b4a4948ef9 100644 --- a/hadoop-client-modules/hadoop-client-minicluster/pom.xml +++ b/hadoop-client-modules/hadoop-client-minicluster/pom.xml @@ -407,7 +407,7 @@ org.mockito - mockito-core + mockito-inline true @@ -765,7 +765,7 @@ - org.mockito:mockito-core + org.mockito:mockito-inline asm-license.txt cglib-license.txt @@ -777,6 +777,15 @@ org/objenesis/*.class + + + *:* + + mockito-extensions/** + win32-x86/** + win32-x86-64/** + + org.glassfish.grizzly:grizzly-http-servlet diff --git a/hadoop-cloud-storage-project/hadoop-huaweicloud/pom.xml b/hadoop-cloud-storage-project/hadoop-huaweicloud/pom.xml index 08ea91bd6e..566a117651 100755 --- a/hadoop-cloud-storage-project/hadoop-huaweicloud/pom.xml +++ b/hadoop-cloud-storage-project/hadoop-huaweicloud/pom.xml @@ -173,15 +173,27 @@ org.powermock - powermock-api-mockito - 1.7.4 + powermock-api-mockito2 + 2.0.9 test + + + org.mockito + mockito-core + + org.powermock powermock-module-junit4 - 1.7.4 + 2.0.9 test + + + org.mockito + mockito-core + + diff --git a/hadoop-common-project/hadoop-auth/pom.xml b/hadoop-common-project/hadoop-auth/pom.xml index f0d25df602..3d30eeb407 100644 --- a/hadoop-common-project/hadoop-auth/pom.xml +++ b/hadoop-common-project/hadoop-auth/pom.xml @@ -49,6 +49,7 @@ org.mockito mockito-core + 4.11.0 test diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml index 6a09c46062..76ef1e1cca 100644 --- a/hadoop-common-project/hadoop-common/pom.xml +++ b/hadoop-common-project/hadoop-common/pom.xml @@ -251,7 +251,7 @@ org.mockito - mockito-core + mockito-inline test diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestServer.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestServer.java index 748d99e2a0..2011803a4e 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestServer.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestServer.java @@ -35,6 +35,8 @@ import org.junit.Test; import org.slf4j.Logger; +import static org.apache.hadoop.test.MockitoUtil.verifyZeroInteractions; + /** * This is intended to be a set of unit tests for the * org.apache.hadoop.ipc.Server class. diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/http/TestCrossOriginFilter.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/http/TestCrossOriginFilter.java index 0b396be48f..dc587bce61 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/http/TestCrossOriginFilter.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/http/TestCrossOriginFilter.java @@ -36,6 +36,8 @@ import org.junit.Test; import org.mockito.Mockito; +import static org.apache.hadoop.test.MockitoUtil.verifyZeroInteractions; + public class TestCrossOriginFilter { @Test @@ -59,7 +61,7 @@ public void testSameOrigin() throws ServletException, IOException { filter.init(filterConfig); filter.doFilter(mockReq, mockRes, mockChain); - Mockito.verifyZeroInteractions(mockRes); + verifyZeroInteractions(mockRes); Mockito.verify(mockChain).doFilter(mockReq, mockRes); } @@ -224,7 +226,7 @@ public void testDisallowedOrigin() throws ServletException, IOException { filter.init(filterConfig); filter.doFilter(mockReq, mockRes, mockChain); - Mockito.verifyZeroInteractions(mockRes); + verifyZeroInteractions(mockRes); Mockito.verify(mockChain).doFilter(mockReq, mockRes); } @@ -252,7 +254,7 @@ public void testDisallowedMethod() throws ServletException, IOException { filter.init(filterConfig); filter.doFilter(mockReq, mockRes, mockChain); - Mockito.verifyZeroInteractions(mockRes); + verifyZeroInteractions(mockRes); Mockito.verify(mockChain).doFilter(mockReq, mockRes); } @@ -283,7 +285,7 @@ public void testDisallowedHeader() throws ServletException, IOException { filter.init(filterConfig); filter.doFilter(mockReq, mockRes, mockChain); - Mockito.verifyZeroInteractions(mockRes); + verifyZeroInteractions(mockRes); Mockito.verify(mockChain).doFilter(mockReq, mockRes); } diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/http/TestRestCsrfPreventionFilter.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/http/TestRestCsrfPreventionFilter.java index 6052ef059a..b346e615ab 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/http/TestRestCsrfPreventionFilter.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/http/TestRestCsrfPreventionFilter.java @@ -32,6 +32,8 @@ import org.junit.Test; import org.mockito.Mockito; +import static org.apache.hadoop.test.MockitoUtil.verifyZeroInteractions; + /** * This class tests the behavior of the RestCsrfPreventionFilter. * @@ -75,7 +77,7 @@ public void testNoHeaderDefaultConfigBadRequest() verify(mockRes, atLeastOnce()).sendError( HttpServletResponse.SC_BAD_REQUEST, EXPECTED_MESSAGE); - Mockito.verifyZeroInteractions(mockChain); + verifyZeroInteractions(mockChain); } @Test @@ -110,7 +112,7 @@ public void testNoHeaderCustomAgentConfigBadRequest() verify(mockRes, atLeastOnce()).sendError( HttpServletResponse.SC_BAD_REQUEST, EXPECTED_MESSAGE); - Mockito.verifyZeroInteractions(mockChain); + verifyZeroInteractions(mockChain); } @Test @@ -228,7 +230,7 @@ public void testMissingHeaderWithCustomHeaderConfigBadRequest() filter.init(filterConfig); filter.doFilter(mockReq, mockRes, mockChain); - Mockito.verifyZeroInteractions(mockChain); + verifyZeroInteractions(mockChain); } @Test @@ -260,7 +262,7 @@ public void testMissingHeaderNoMethodsToIgnoreConfigBadRequest() filter.init(filterConfig); filter.doFilter(mockReq, mockRes, mockChain); - Mockito.verifyZeroInteractions(mockChain); + verifyZeroInteractions(mockChain); } @Test @@ -356,6 +358,6 @@ public void testMissingHeaderMultipleIgnoreMethodsConfigBadRequest() filter.init(filterConfig); filter.doFilter(mockReq, mockRes, mockChain); - Mockito.verifyZeroInteractions(mockChain); + verifyZeroInteractions(mockChain); } } diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/MockitoUtil.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/MockitoUtil.java index 32305b5ee7..f0232186bd 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/MockitoUtil.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/MockitoUtil.java @@ -61,4 +61,13 @@ public Object answer(InvocationOnMock invocation) throws Throwable { } }); } + + /** + * Verifies that there were no interactions with the given mock objects. + * + * @param mocks the mock objects to verify + */ + public static void verifyZeroInteractions(Object... mocks) { + Mockito.verifyNoInteractions(mocks); + } } diff --git a/hadoop-common-project/hadoop-kms/pom.xml b/hadoop-common-project/hadoop-kms/pom.xml index d3b6b2576e..bc95b963cc 100644 --- a/hadoop-common-project/hadoop-kms/pom.xml +++ b/hadoop-common-project/hadoop-kms/pom.xml @@ -45,7 +45,7 @@ org.mockito - mockito-core + mockito-inline test diff --git a/hadoop-common-project/hadoop-nfs/pom.xml b/hadoop-common-project/hadoop-nfs/pom.xml index bf6589fd6f..5be4b93d9d 100644 --- a/hadoop-common-project/hadoop-nfs/pom.xml +++ b/hadoop-common-project/hadoop-nfs/pom.xml @@ -60,7 +60,7 @@ org.mockito - mockito-core + mockito-inline test diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml index a02fcf5922..7c7b7c313f 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml @@ -66,7 +66,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.mockito - mockito-core + mockito-inline test diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml index 9cd438a397..411b06e0d8 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml @@ -49,7 +49,7 @@ org.mockito - mockito-core + mockito-inline test diff --git a/hadoop-hdfs-project/hadoop-hdfs-native-client/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-native-client/pom.xml index 65cb838afb..a154dd5f7a 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-native-client/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs-native-client/pom.xml @@ -69,7 +69,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.mockito - mockito-core + mockito-inline test diff --git a/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml index 3bb7b20130..28258127eb 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml @@ -160,7 +160,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.mockito - mockito-core + mockito-inline test diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml index 21c594f1e7..ee608a2a91 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml @@ -164,7 +164,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.mockito - mockito-core + mockito-inline test diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterAdmin.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterAdmin.java index c2eaddc17a..205f36dbb0 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterAdmin.java +++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterAdmin.java @@ -25,6 +25,7 @@ import static org.junit.Assert.assertTrue; import java.io.IOException; +import java.lang.reflect.Field; import java.security.PrivilegedExceptionAction; import java.util.Collections; import java.util.HashMap; @@ -68,7 +69,6 @@ import org.junit.BeforeClass; import org.junit.Test; import org.mockito.Mockito; -import org.mockito.internal.util.reflection.FieldSetter; /** * The administrator interface of the {@link Router} implemented by @@ -118,18 +118,25 @@ public static void globalSetUp() throws Exception { * @throws IOException * @throws NoSuchFieldException */ - private static void setUpMocks() throws IOException, NoSuchFieldException { + public static void setField(Object target, String fieldName, Object value) + throws NoSuchFieldException, IllegalAccessException { + Field field = target.getClass().getDeclaredField(fieldName); + field.setAccessible(true); + field.set(target, value); + } + + private static void setUpMocks() + throws IOException, NoSuchFieldException, IllegalAccessException { RouterRpcServer spyRpcServer = Mockito.spy(routerContext.getRouter().createRpcServer()); - FieldSetter.setField(routerContext.getRouter(), - Router.class.getDeclaredField("rpcServer"), spyRpcServer); + //Used reflection to set the 'rpcServer field' + setField(routerContext.getRouter(), "rpcServer", spyRpcServer); Mockito.doReturn(null).when(spyRpcServer).getFileInfo(Mockito.anyString()); // mock rpc client for destination check when editing mount tables. + //spy RPC client and used reflection to set the 'rpcClient' field mockRpcClient = Mockito.spy(spyRpcServer.getRPCClient()); - FieldSetter.setField(spyRpcServer, - RouterRpcServer.class.getDeclaredField("rpcClient"), - mockRpcClient); + setField(spyRpcServer, "rpcClient", mockRpcClient); RemoteLocation remoteLocation0 = new RemoteLocation("ns0", "/testdir", null); RemoteLocation remoteLocation1 = diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterRpcMultiDestination.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterRpcMultiDestination.java index f77ab2e9a7..ead7a1547b 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterRpcMultiDestination.java +++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterRpcMultiDestination.java @@ -24,7 +24,7 @@ import static org.junit.Assert.assertNotNull; 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.doThrow; import static org.mockito.Mockito.mock; import static org.apache.hadoop.test.Whitebox.getInternalState; diff --git a/hadoop-hdfs-project/hadoop-hdfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs/pom.xml index c3207ff7d2..dcb9f32c82 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs/pom.xml @@ -166,7 +166,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.mockito - mockito-core + mockito-inline test diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeFile.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeFile.java index 1bd315f177..dbadb908c5 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeFile.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeFile.java @@ -253,9 +253,8 @@ static long toLong(long preferredBlockSize, long layoutRedundancy, private BlockInfo[] blocks; - INodeFile(long id, byte[] name, PermissionStatus permissions, long mtime, - long atime, BlockInfo[] blklist, short replication, - long preferredBlockSize) { + public INodeFile(long id, byte[] name, PermissionStatus permissions, long mtime, long atime, + BlockInfo[] blklist, short replication, long preferredBlockSize) { this(id, name, permissions, mtime, atime, blklist, replication, null, preferredBlockSize, (byte) 0, CONTIGUOUS); } diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockManagerSafeMode.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockManagerSafeMode.java index d32cde8347..4a996d0e19 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockManagerSafeMode.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockManagerSafeMode.java @@ -365,6 +365,7 @@ public void testIncrementAndDecrementStripedSafeBlockCount() { for (long i = 1; i <= BLOCK_TOTAL; i++) { BlockInfoStriped blockInfo = mock(BlockInfoStriped.class); when(blockInfo.getRealDataBlockNum()).thenReturn(realDataBlockNum); + when(blockInfo.isStriped()).thenReturn(true); bmSafeMode.incrementSafeBlockCount(realDataBlockNum, blockInfo); bmSafeMode.decrementSafeBlockCount(blockInfo); diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestCacheDirectives.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestCacheDirectives.java index 1331c50e80..2d45ee81a6 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestCacheDirectives.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestCacheDirectives.java @@ -25,6 +25,7 @@ import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_NAMENODE_CACHING_ENABLED_KEY; import static org.apache.hadoop.hdfs.protocol.CachePoolInfo.RELATIVE_EXPIRY_NEVER; import static org.apache.hadoop.test.GenericTestUtils.assertExceptionContains; +import static org.apache.hadoop.test.MockitoUtil.verifyZeroInteractions; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -1575,7 +1576,7 @@ public void testNoLookupsWhenNotUsed() throws Exception { CacheManager cm = cluster.getNamesystem().getCacheManager(); LocatedBlocks locations = Mockito.mock(LocatedBlocks.class); cm.setCachedLocations(locations); - Mockito.verifyZeroInteractions(locations); + verifyZeroInteractions(locations); } @Test(timeout=120000) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestCommitBlockSynchronization.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestCommitBlockSynchronization.java index fd9fee5710..2c4f94abdb 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestCommitBlockSynchronization.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestCommitBlockSynchronization.java @@ -62,7 +62,6 @@ private FSNamesystem makeNameSystemSpy(Block block, INodeFile file) } namesystem.dir.getINodeMap().put(file); - FSNamesystem namesystemSpy = spy(namesystem); BlockInfo blockInfo = new BlockInfoContiguous(block, (short) 1); blockInfo.convertToBlockUnderConstruction( HdfsServerConstants.BlockUCState.UNDER_CONSTRUCTION, targets); @@ -73,8 +72,10 @@ private FSNamesystem makeNameSystemSpy(Block block, INodeFile file) doReturn(blockInfo).when(file).removeLastBlock(any(Block.class)); doReturn(true).when(file).isUnderConstruction(); doReturn(new BlockInfoContiguous[1]).when(file).getBlocks(); - - doReturn(blockInfo).when(namesystemSpy).getStoredBlock(any(Block.class)); + FSNamesystem namesystemSpy = spy(namesystem); + doReturn(blockInfo).when(namesystemSpy).getStoredBlock(nullable(Block.class)); + doReturn(file).when(namesystemSpy).getBlockCollection(any(BlockInfo.class)); + doReturn(false).when(namesystemSpy).isFileDeleted(any(INodeFile.class)); doReturn(blockInfo).when(file).getLastBlock(); doNothing().when(namesystemSpy).closeFileCommitBlocks( any(), any(INodeFile.class), any(BlockInfo.class)); diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSDirAttrOp.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSDirAttrOp.java index df7ab3dd9e..b1c061e8c1 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSDirAttrOp.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSDirAttrOp.java @@ -28,9 +28,12 @@ import org.mockito.Mockito; import java.io.FileNotFoundException; +import java.util.Random; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.Mockito.when; /** @@ -55,7 +58,8 @@ private boolean unprotectedSetTimes(long atime, long atime0, long precision, when(fsd.getAccessTimePrecision()).thenReturn(precision); when(fsd.hasWriteLock()).thenReturn(Boolean.TRUE); when(iip.getLastINode()).thenReturn(inode); - when(iip.getLatestSnapshotId()).thenReturn(Mockito.anyInt()); + when(iip.getLatestSnapshotId()).thenReturn(new Random().nextInt()); + when(inode.setModificationTime(anyLong(), anyInt())).thenReturn(inode); when(inode.getAccessTime()).thenReturn(atime0); return FSDirAttrOp.unprotectedSetTimes(fsd, iip, mtime, atime, force); diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestSnapshotPathINodes.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestSnapshotPathINodes.java index b62a4180d4..98dc6ce6c2 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestSnapshotPathINodes.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestSnapshotPathINodes.java @@ -41,6 +41,8 @@ import org.junit.Test; import org.mockito.Mockito; +import static org.apache.hadoop.test.MockitoUtil.verifyZeroInteractions; + /** Test snapshot related operations. */ public class TestSnapshotPathINodes { private static final long seed = 0; @@ -447,6 +449,6 @@ public void testShortCircuitSnapshotSearch() throws SnapshotException { INodesInPath iip = Mockito.mock(INodesInPath.class); List snapDirs = new ArrayList<>(); FSDirSnapshotOp.checkSnapshot(fsn.getFSDirectory(), iip, snapDirs); - Mockito.verifyZeroInteractions(iip); + verifyZeroInteractions(iip); } } diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/snapshot/TestFileWithSnapshotFeature.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/snapshot/TestFileWithSnapshotFeature.java index e864b91327..0c2a923586 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/snapshot/TestFileWithSnapshotFeature.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/snapshot/TestFileWithSnapshotFeature.java @@ -19,6 +19,8 @@ import java.util.ArrayList; +import org.apache.hadoop.fs.permission.FsPermission; +import org.apache.hadoop.fs.permission.PermissionStatus; import org.apache.hadoop.hdfs.protocol.Block; import org.apache.hadoop.hdfs.protocol.BlockStoragePolicy; import org.apache.hadoop.hdfs.server.blockmanagement.BlockInfo; @@ -40,6 +42,7 @@ import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.anyByte; import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; public class TestFileWithSnapshotFeature { @@ -60,7 +63,8 @@ public void testUpdateQuotaAndCollectBlocks() { BlockManager bm = mock(BlockManager.class); // No snapshot - INodeFile file = mock(INodeFile.class); + INodeFile inodeFileObj = createMockFile(REPL_1); + INodeFile file = spy(inodeFileObj); when(file.getFileWithSnapshotFeature()).thenReturn(sf); when(file.getBlocks()).thenReturn(blocks); when(file.getStoragePolicyID()).thenReturn((byte) 1); @@ -97,6 +101,16 @@ public void testUpdateQuotaAndCollectBlocks() { Assert.assertEquals(-BLOCK_SIZE, counts.getTypeSpaces().get(SSD)); } + private INodeFile createMockFile(short replication) { + BlockInfo[] blocks = new BlockInfo[] {}; + PermissionStatus perm = new PermissionStatus("foo", "bar", FsPermission + .createImmutable((short) 0x1ff)); + INodeFile iNodeFile = + new INodeFile(1, new byte[0], perm, 0, 0, blocks, replication, + BLOCK_SIZE); + return iNodeFile; + } + /** * Test update quota with same blocks. */ @@ -107,7 +121,8 @@ public void testUpdateQuotaDistinctBlocks() { BlockInfo[] blocks = new BlockInfo[] { new BlockInfoContiguous(new Block(1, BLOCK_SIZE, 1), REPL_3) }; - INodeFile file = mock(INodeFile.class); + INodeFile inodeFileObj = createMockFile(REPL_1); + INodeFile file = spy(inodeFileObj); when(file.getBlocks()).thenReturn(blocks); when(file.getStoragePolicyID()).thenReturn((byte) 1); when(file.getPreferredBlockReplication()).thenReturn((short) 3); diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/rm/TestRMCommunicator.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/rm/TestRMCommunicator.java index 52db7b5f77..bbfac68ae9 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/rm/TestRMCommunicator.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/rm/TestRMCommunicator.java @@ -45,7 +45,7 @@ protected void heartbeat() throws Exception { } } - @Test(timeout = 2000) + @Test(timeout = 6000) public void testRMContainerAllocatorExceptionIsHandled() throws Exception { ClientService mockClientService = mock(ClientService.class); AppContext mockContext = mock(AppContext.class); diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesAcls.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesAcls.java index bb25a97c6c..f6c96d9be7 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesAcls.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesAcls.java @@ -62,10 +62,10 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +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.times; import static org.mockito.Mockito.verify; diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestYarnClientProtocolProvider.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestYarnClientProtocolProvider.java index 53115e80ce..3f587c00b4 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestYarnClientProtocolProvider.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestYarnClientProtocolProvider.java @@ -20,7 +20,6 @@ import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.doNothing; @@ -35,6 +34,7 @@ import org.apache.hadoop.mapred.YARNRunner; import org.apache.hadoop.mapreduce.protocol.ClientProtocol; import org.apache.hadoop.security.token.Token; +import org.apache.hadoop.test.MockitoUtil; import org.apache.hadoop.yarn.api.ApplicationClientProtocol; import org.apache.hadoop.yarn.api.protocolrecords.GetDelegationTokenRequest; import org.apache.hadoop.yarn.api.protocolrecords.GetDelegationTokenResponse; @@ -105,7 +105,8 @@ public void testClusterGetDelegationToken() throws Exception { rmDTToken.setPassword(ByteBuffer.wrap("testcluster".getBytes())); rmDTToken.setService("0.0.0.0:8032"); getDTResponse.setRMDelegationToken(rmDTToken); - final ApplicationClientProtocol cRMProtocol = mock(ApplicationClientProtocol.class); + final ApplicationClientProtocol cRMProtocol = + MockitoUtil.mockProtocol(ApplicationClientProtocol.class); when(cRMProtocol.getDelegationToken(any( GetDelegationTokenRequest.class))).thenReturn(getDTResponse); ResourceMgrDelegate rmgrDelegate = new ResourceMgrDelegate( diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml index 7a3ee24795..e64dc8e405 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml @@ -96,6 +96,8 @@ org.mockito mockito-core + + 4.11.0 test diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index 2678f21a4b..0c76b3ad4b 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -227,7 +227,7 @@ 1.8.2 3.12.2 3.9.0 - 1.5.6 + 2.0.9 8.11.2 2.1.4.Final 1.0.2 @@ -1350,8 +1350,8 @@ org.mockito - mockito-core - 2.28.2 + mockito-inline + 4.11.0 log4j diff --git a/hadoop-tools/hadoop-archive-logs/pom.xml b/hadoop-tools/hadoop-archive-logs/pom.xml index 0c339d91ac..f2c2a57868 100644 --- a/hadoop-tools/hadoop-archive-logs/pom.xml +++ b/hadoop-tools/hadoop-archive-logs/pom.xml @@ -125,7 +125,7 @@ org.mockito - mockito-core + mockito-inline test diff --git a/hadoop-tools/hadoop-archives/pom.xml b/hadoop-tools/hadoop-archives/pom.xml index 990b61e39c..b28172194b 100644 --- a/hadoop-tools/hadoop-archives/pom.xml +++ b/hadoop-tools/hadoop-archives/pom.xml @@ -41,7 +41,7 @@ org.mockito - mockito-core + mockito-inline test diff --git a/hadoop-tools/hadoop-aws/pom.xml b/hadoop-tools/hadoop-aws/pom.xml index 997f63b0dc..eddcbd81fa 100644 --- a/hadoop-tools/hadoop-aws/pom.xml +++ b/hadoop-tools/hadoop-aws/pom.xml @@ -527,7 +527,7 @@ org.mockito - mockito-core + mockito-inline test diff --git a/hadoop-tools/hadoop-azure/pom.xml b/hadoop-tools/hadoop-azure/pom.xml index 460e0571a8..d00f1c5ef2 100644 --- a/hadoop-tools/hadoop-azure/pom.xml +++ b/hadoop-tools/hadoop-azure/pom.xml @@ -323,6 +323,7 @@ org.mockito mockito-core + 4.11.0 test diff --git a/hadoop-tools/hadoop-compat-bench/pom.xml b/hadoop-tools/hadoop-compat-bench/pom.xml index e8dbe65e8a..ed032b3db9 100644 --- a/hadoop-tools/hadoop-compat-bench/pom.xml +++ b/hadoop-tools/hadoop-compat-bench/pom.xml @@ -66,7 +66,7 @@ org.mockito - mockito-core + mockito-inline test diff --git a/hadoop-tools/hadoop-datajoin/pom.xml b/hadoop-tools/hadoop-datajoin/pom.xml index e85022aa29..31306a05dc 100644 --- a/hadoop-tools/hadoop-datajoin/pom.xml +++ b/hadoop-tools/hadoop-datajoin/pom.xml @@ -41,7 +41,7 @@ org.mockito - mockito-core + mockito-inline test diff --git a/hadoop-tools/hadoop-distcp/pom.xml b/hadoop-tools/hadoop-distcp/pom.xml index fdc2993a99..7c0241df54 100644 --- a/hadoop-tools/hadoop-distcp/pom.xml +++ b/hadoop-tools/hadoop-distcp/pom.xml @@ -106,7 +106,7 @@ org.mockito - mockito-core + mockito-inline test diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-blockgen/pom.xml b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-blockgen/pom.xml index 34a07c7773..cf43510500 100644 --- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-blockgen/pom.xml +++ b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-blockgen/pom.xml @@ -36,7 +36,7 @@ org.mockito - mockito-core + mockito-inline test diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/pom.xml b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/pom.xml index 23fbc2d003..a0967e5ce5 100644 --- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/pom.xml +++ b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/pom.xml @@ -80,7 +80,7 @@ org.mockito - mockito-core + mockito-inline test diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/pom.xml b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/pom.xml index 48dd35bbce..70177b689c 100644 --- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/pom.xml +++ b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/pom.xml @@ -41,7 +41,7 @@ org.mockito - mockito-core + mockito-inline test diff --git a/hadoop-tools/hadoop-extras/pom.xml b/hadoop-tools/hadoop-extras/pom.xml index 5daaf37759..35d2ac2bb5 100644 --- a/hadoop-tools/hadoop-extras/pom.xml +++ b/hadoop-tools/hadoop-extras/pom.xml @@ -41,7 +41,7 @@ org.mockito - mockito-core + mockito-inline test diff --git a/hadoop-tools/hadoop-federation-balance/pom.xml b/hadoop-tools/hadoop-federation-balance/pom.xml index 6669fb0428..54ca15daf9 100644 --- a/hadoop-tools/hadoop-federation-balance/pom.xml +++ b/hadoop-tools/hadoop-federation-balance/pom.xml @@ -111,7 +111,7 @@ org.mockito - mockito-core + mockito-inline test diff --git a/hadoop-tools/hadoop-fs2img/pom.xml b/hadoop-tools/hadoop-fs2img/pom.xml index 014c8c387f..bcb9766312 100644 --- a/hadoop-tools/hadoop-fs2img/pom.xml +++ b/hadoop-tools/hadoop-fs2img/pom.xml @@ -69,7 +69,7 @@ org.mockito - mockito-core + mockito-inline test diff --git a/hadoop-tools/hadoop-gridmix/pom.xml b/hadoop-tools/hadoop-gridmix/pom.xml index 19ad2a9959..7a26acc8a6 100644 --- a/hadoop-tools/hadoop-gridmix/pom.xml +++ b/hadoop-tools/hadoop-gridmix/pom.xml @@ -111,7 +111,7 @@ org.mockito - mockito-core + mockito-inline test diff --git a/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestGridMixClasses.java b/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestGridMixClasses.java index 372b2cab38..b3833fbf32 100644 --- a/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestGridMixClasses.java +++ b/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestGridMixClasses.java @@ -589,7 +589,7 @@ public FakeFSDataInputStream(InputStream in) throws IOException { /* * test LoadRecordReader. It class reads data from some files. */ - @Test (timeout=3000) + @Test (timeout=6100) public void testLoadJobLoadRecordReader() throws Exception { LoadJob.LoadRecordReader test = new LoadJob.LoadRecordReader(); Configuration conf = new Configuration(); diff --git a/hadoop-tools/hadoop-kafka/pom.xml b/hadoop-tools/hadoop-kafka/pom.xml index 7d77b89d13..fc9583b4ad 100644 --- a/hadoop-tools/hadoop-kafka/pom.xml +++ b/hadoop-tools/hadoop-kafka/pom.xml @@ -111,7 +111,7 @@ org.mockito - mockito-core + mockito-inline test diff --git a/hadoop-tools/hadoop-sls/pom.xml b/hadoop-tools/hadoop-sls/pom.xml index 6481729843..bb112f4ca7 100644 --- a/hadoop-tools/hadoop-sls/pom.xml +++ b/hadoop-tools/hadoop-sls/pom.xml @@ -75,7 +75,7 @@ org.mockito - mockito-core + mockito-inline test diff --git a/hadoop-tools/hadoop-streaming/pom.xml b/hadoop-tools/hadoop-streaming/pom.xml index 4b32a3f080..28c3901d42 100644 --- a/hadoop-tools/hadoop-streaming/pom.xml +++ b/hadoop-tools/hadoop-streaming/pom.xml @@ -42,7 +42,7 @@ org.mockito - mockito-core + mockito-inline test diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/pom.xml index 7cef2ec4db..4398a2572b 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/pom.xml @@ -112,7 +112,7 @@ org.mockito - mockito-core + mockito-inline test diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/pom.xml index b0bc4f9019..cf1d868613 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/pom.xml @@ -46,8 +46,8 @@ org.mockito - mockito-all - 1.9.5 + mockito-core + 4.11.0 test @@ -64,7 +64,7 @@ org.powermock - powermock-api-mockito + powermock-api-mockito2 ${powermock.version} diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/java/org/apache/hadoop/yarn/appcatalog/application/TestAppCatalogSolrClient.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/java/org/apache/hadoop/yarn/appcatalog/application/TestAppCatalogSolrClient.java index 72e8915130..a055e3d912 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/java/org/apache/hadoop/yarn/appcatalog/application/TestAppCatalogSolrClient.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/java/org/apache/hadoop/yarn/appcatalog/application/TestAppCatalogSolrClient.java @@ -22,18 +22,21 @@ import org.apache.hadoop.yarn.appcatalog.model.AppStoreEntry; import org.apache.hadoop.yarn.appcatalog.model.Application; import org.apache.solr.client.solrj.SolrClient; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.powermock.api.mockito.PowerMockito; + +import org.mockito.Mockito; + +import java.util.List; + import static org.powermock.api.mockito.PowerMockito.when; import static org.powermock.api.support.membermodification.MemberMatcher.method; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import java.util.List; - /** * Unit test for AppCatalogSolrClient. */ @@ -51,7 +54,7 @@ public void setup() throws Exception { String solrHome = targetLocation.split("/test-classes")[0] + "/solr"; solrClient = EmbeddedSolrServerFactory.create(solrHome, CONFIGSET_DIR, "exampleCollection"); - spy = PowerMockito.spy(new AppCatalogSolrClient()); + spy = Mockito.spy(new AppCatalogSolrClient()); when(spy, method(AppCatalogSolrClient.class, "getSolrClient")) .withNoArguments().thenReturn(solrClient); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/pom.xml index 7f616e0c46..f3cf90efa9 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/pom.xml @@ -119,7 +119,7 @@ org.mockito - mockito-core + mockito-inline test diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/pom.xml index aec8f7c7f5..e1e2c79562 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/pom.xml @@ -173,7 +173,7 @@ org.mockito - mockito-core + mockito-inline test diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/pom.xml index b70b2a6871..8d5afc68f1 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/pom.xml @@ -252,7 +252,7 @@ org.mockito - mockito-core + mockito-inline test diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/containerlaunch/TestAbstractLauncher.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/containerlaunch/TestAbstractLauncher.java index 31ca38297c..05eec6855b 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/containerlaunch/TestAbstractLauncher.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/containerlaunch/TestAbstractLauncher.java @@ -34,6 +34,7 @@ import java.io.IOException; import static org.apache.hadoop.fi.FiConfig.getConfig; +import static org.apache.hadoop.test.MockitoUtil.verifyZeroInteractions; import static org.apache.hadoop.yarn.service.conf.YarnServiceConf .DEFAULT_CONTAINER_FAILURES_VALIDITY_INTERVAL; import static org.apache.hadoop.yarn.service.conf.YarnServiceConf @@ -43,7 +44,6 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; /** diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/pom.xml index fdc2b6c274..7625414ba6 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/pom.xml @@ -81,7 +81,7 @@ org.mockito - mockito-core + mockito-inline test diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml index 1bce868fb3..c92f661b2c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml @@ -110,7 +110,7 @@ org.mockito - mockito-core + mockito-inline test diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/pom.xml index 28539ec8ad..95306a48f7 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/pom.xml @@ -55,7 +55,7 @@ org.mockito - mockito-core + mockito-inline test diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml index e768ad5e48..0446b7c358 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml @@ -98,7 +98,7 @@ org.mockito - mockito-core + mockito-inline test diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml index c138e6913c..2f4148d184 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml @@ -129,7 +129,7 @@ org.mockito - mockito-core + mockito-inline test diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/TestCGroupsHandlerImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/TestCGroupsHandlerImpl.java index 57638fe05f..a776b63405 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/TestCGroupsHandlerImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/TestCGroupsHandlerImpl.java @@ -42,13 +42,13 @@ import java.util.Set; import java.util.UUID; +import static org.apache.hadoop.test.MockitoUtil.verifyZeroInteractions; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; -import static org.mockito.Mockito.verifyZeroInteractions; /** * Tests for the CGroups handler implementation. diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/TestCGroupsV2HandlerImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/TestCGroupsV2HandlerImpl.java index 1ec952be04..d3667e917b 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/TestCGroupsV2HandlerImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/TestCGroupsV2HandlerImpl.java @@ -37,8 +37,8 @@ import java.util.Set; import java.util.UUID; +import static org.apache.hadoop.test.MockitoUtil.verifyZeroInteractions; import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.verifyZeroInteractions; /** * Tests for the CGroups handler implementation. diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/gpu/TestGpuResourceAllocator.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/gpu/TestGpuResourceAllocator.java index ba8a9309d0..ed8fe2df36 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/gpu/TestGpuResourceAllocator.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/gpu/TestGpuResourceAllocator.java @@ -16,6 +16,7 @@ package org.apache.hadoop.yarn.server.nodemanager.containermanager.linux.resources.gpu; +import static org.apache.hadoop.test.MockitoUtil.verifyZeroInteractions; import static org.apache.hadoop.yarn.api.records.ResourceInformation.GPU_URI; import static org.apache.hadoop.yarn.util.resource.CustomResourceTypesConfigurationProvider.initResourceTypes; import static org.junit.Assert.assertEquals; @@ -27,7 +28,6 @@ import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; import java.io.IOException; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/runtime/TestDockerContainerRuntime.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/runtime/TestDockerContainerRuntime.java index 5950a137d2..0e575f9ce2 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/runtime/TestDockerContainerRuntime.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/runtime/TestDockerContainerRuntime.java @@ -94,6 +94,7 @@ import java.util.Set; import java.util.concurrent.ConcurrentMap; +import static org.apache.hadoop.test.MockitoUtil.verifyZeroInteractions; import static org.apache.hadoop.yarn.conf.YarnConfiguration.NM_DOCKER_DEFAULT_RO_MOUNTS; import static org.apache.hadoop.yarn.conf.YarnConfiguration.NM_DOCKER_DEFAULT_RW_MOUNTS; import static org.apache.hadoop.yarn.conf.YarnConfiguration.NM_DOCKER_DEFAULT_TMPFS_MOUNTS; @@ -1272,7 +1273,7 @@ public void testCGroupParent() throws ContainerExecutionException { command); //no --cgroup-parent should be added here - Mockito.verifyZeroInteractions(command); + verifyZeroInteractions(command); String resourceOptionsCpu = "/sys/fs/cgroup/cpu/" + hierarchy + containerIdStr; @@ -1283,6 +1284,8 @@ public void testCGroupParent() throws ContainerExecutionException { String expectedPath = "/" + hierarchy + "/" + containerIdStr; Mockito.verify(command).setCGroupParent(expectedPath); + Mockito.reset(command); + //create a runtime with a 'null' cgroups handler - i.e no // cgroup-based resource handlers are in use. @@ -1296,7 +1299,10 @@ public void testCGroupParent() throws ContainerExecutionException { command); //no --cgroup-parent should be added in either case - Mockito.verifyZeroInteractions(command); + verifyZeroInteractions(command); + + //Ensure no further interaction + Mockito.verifyNoMoreInteractions(command); } @Test diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/com/nec/TestNECVEPlugin.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/com/nec/TestNECVEPlugin.java index 86ef9058f2..ef7ac700b7 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/com/nec/TestNECVEPlugin.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/com/nec/TestNECVEPlugin.java @@ -18,6 +18,7 @@ package org.apache.hadoop.yarn.server.nodemanager.containermanager.resourceplugin.com.nec; +import static org.apache.hadoop.test.MockitoUtil.verifyZeroInteractions; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; @@ -25,7 +26,6 @@ import static org.mockito.Mockito.when; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.anyString; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml index 6350c1aef3..ebee9c5fc4 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml @@ -62,15 +62,10 @@ assertj-core test - - org.mockito - mockito-core - test - org.mockito mockito-inline - 2.8.9 + 4.11.0 test diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/converter/TestFSConfigToCSConfigArgumentHandler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/converter/TestFSConfigToCSConfigArgumentHandler.java index cb8cc587f6..2641635085 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/converter/TestFSConfigToCSConfigArgumentHandler.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/converter/TestFSConfigToCSConfigArgumentHandler.java @@ -16,6 +16,7 @@ package org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.converter; +import static org.apache.hadoop.test.MockitoUtil.verifyZeroInteractions; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -23,7 +24,6 @@ import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; import java.io.File; import java.io.IOException; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/converter/TestFSConfigToCSConfigConverter.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/converter/TestFSConfigToCSConfigConverter.java index 8447261e61..99b1f6b4ef 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/converter/TestFSConfigToCSConfigConverter.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/converter/TestFSConfigToCSConfigConverter.java @@ -16,6 +16,7 @@ package org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.converter; +import static org.apache.hadoop.test.MockitoUtil.verifyZeroInteractions; import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.converter.FSConfigToCSConfigRuleHandler.DYNAMIC_MAX_ASSIGN; import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.converter.FSConfigToCSConfigRuleHandler.MAX_CAPACITY_PERCENTAGE; import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.converter.FSConfigToCSConfigRuleHandler.MAX_CHILD_CAPACITY; @@ -36,7 +37,6 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; import java.io.ByteArrayInputStream; import java.io.File; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/converter/TestQueuePlacementConverter.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/converter/TestQueuePlacementConverter.java index d74d469f5d..109f0e6270 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/converter/TestQueuePlacementConverter.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/converter/TestQueuePlacementConverter.java @@ -15,13 +15,13 @@ */ package org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.converter; +import static org.apache.hadoop.test.MockitoUtil.verifyZeroInteractions; import static org.junit.Assert.assertEquals; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; -import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; import java.util.List; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/pom.xml index 85cfc5be09..a9f005b6ba 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/pom.xml @@ -128,7 +128,7 @@ org.mockito - mockito-core + mockito-inline test diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/pom.xml index 9465c6f70d..e4b36b9ce8 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/pom.xml @@ -51,7 +51,7 @@ org.mockito - mockito-core + mockito-inline test diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/pom.xml index 09cd188455..18455a49d2 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/pom.xml @@ -57,7 +57,7 @@ org.mockito - mockito-core + mockito-inline test diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/pom.xml index 0feef65ed3..04b3714b03 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/pom.xml @@ -121,7 +121,7 @@ org.mockito - mockito-core + mockito-inline test diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-documentstore/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-documentstore/pom.xml index 565e860190..ae5b146bce 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-documentstore/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-documentstore/pom.xml @@ -58,8 +58,8 @@ org.mockito - mockito-core - 2.8.9 + mockito-inline + 4.11.0 test @@ -71,25 +71,45 @@ org.powermock powermock-api-mockito2 - 1.7.1 + 2.0.9 test org.mockito mockito-core + + net.bytebuddy + byte-buddy + + + net.bytebuddy + byte-buddy-agent + org.powermock powermock-module-junit4 - 1.7.1 + 2.0.9 test + + org.mockito + mockito-inline + org.mockito mockito-core + + net.bytebuddy + byte-buddy + + + net.bytebuddy + byte-buddy-agent + diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-documentstore/src/test/java/org/apache/hadoop/yarn/server/timelineservice/documentstore/TestDocumentStoreCollectionCreator.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-documentstore/src/test/java/org/apache/hadoop/yarn/server/timelineservice/documentstore/TestDocumentStoreCollectionCreator.java index 879b0ad6c7..3bfe784804 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-documentstore/src/test/java/org/apache/hadoop/yarn/server/timelineservice/documentstore/TestDocumentStoreCollectionCreator.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-documentstore/src/test/java/org/apache/hadoop/yarn/server/timelineservice/documentstore/TestDocumentStoreCollectionCreator.java @@ -27,11 +27,13 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.ArgumentMatchers; -import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.mockStatic; +import static org.mockito.Mockito.when; + /** * Test case for ${@link DocumentStoreCollectionCreator}. */ @@ -51,9 +53,8 @@ public void setUp() throws YarnException { "https://localhost:443"); conf.set(DocumentStoreUtils.TIMELINE_SERVICE_COSMOSDB_MASTER_KEY, "1234567"); - PowerMockito.mockStatic(DocumentStoreFactory.class); - PowerMockito.when(DocumentStoreFactory.createDocumentStoreWriter( - ArgumentMatchers.any(Configuration.class))) + mockStatic(DocumentStoreFactory.class); + when(DocumentStoreFactory.createDocumentStoreWriter(any(Configuration.class))) .thenReturn(documentStoreWriter); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-documentstore/src/test/java/org/apache/hadoop/yarn/server/timelineservice/documentstore/TestDocumentStoreTimelineReaderImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-documentstore/src/test/java/org/apache/hadoop/yarn/server/timelineservice/documentstore/TestDocumentStoreTimelineReaderImpl.java index 181e13431c..5879030426 100755 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-documentstore/src/test/java/org/apache/hadoop/yarn/server/timelineservice/documentstore/TestDocumentStoreTimelineReaderImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-documentstore/src/test/java/org/apache/hadoop/yarn/server/timelineservice/documentstore/TestDocumentStoreTimelineReaderImpl.java @@ -37,12 +37,16 @@ import org.apache.hadoop.yarn.server.timelineservice.storage.TimelineReader; import org.apache.hadoop.yarn.server.timelineservice.documentstore.collection.document.TimelineDocument; import org.apache.hadoop.yarn.server.timelineservice.documentstore.collection.document.entity.TimelineEntityDocument; + +import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; + import org.mockito.ArgumentMatchers; -import org.powermock.api.mockito.PowerMockito; +import org.mockito.MockedStatic; + import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; @@ -51,6 +55,8 @@ import java.util.List; import java.util.Set; +import static org.mockito.Mockito.mockStatic; +import static org.mockito.Mockito.when; /** * Test case for {@link DocumentStoreTimelineReaderImpl}. @@ -76,6 +82,8 @@ public class TestDocumentStoreTimelineReaderImpl { public TestDocumentStoreTimelineReaderImpl() throws IOException { } + private MockedStatic documentStoreFactoryMockedStatic; + @Before public void setUp() throws YarnException { conf.set(DocumentStoreUtils.TIMELINE_SERVICE_DOCUMENTSTORE_DATABASE_NAME, @@ -84,12 +92,17 @@ public void setUp() throws YarnException { "https://localhost:443"); conf.set(DocumentStoreUtils.TIMELINE_SERVICE_COSMOSDB_MASTER_KEY, "1234567"); - PowerMockito.mockStatic(DocumentStoreFactory.class); - PowerMockito.when(DocumentStoreFactory.createDocumentStoreReader( + documentStoreFactoryMockedStatic = mockStatic(DocumentStoreFactory.class); + when(DocumentStoreFactory.createDocumentStoreReader( ArgumentMatchers.any(Configuration.class))) .thenReturn(documentStoreReader); } + @After + public void close() { + documentStoreFactoryMockedStatic.close(); + } + @Test(expected = YarnException.class) public void testFailOnNoCosmosDBConfigs() throws Exception { DocumentStoreUtils.validateCosmosDBConf(new Configuration()); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-documentstore/src/test/java/org/apache/hadoop/yarn/server/timelineservice/documentstore/TestDocumentStoreTimelineWriterImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-documentstore/src/test/java/org/apache/hadoop/yarn/server/timelineservice/documentstore/TestDocumentStoreTimelineWriterImpl.java index b654de82e4..f98dbc6f14 100755 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-documentstore/src/test/java/org/apache/hadoop/yarn/server/timelineservice/documentstore/TestDocumentStoreTimelineWriterImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-documentstore/src/test/java/org/apache/hadoop/yarn/server/timelineservice/documentstore/TestDocumentStoreTimelineWriterImpl.java @@ -27,10 +27,16 @@ import org.apache.hadoop.yarn.server.timelineservice.documentstore.collection.document.TimelineDocument; import org.apache.hadoop.yarn.server.timelineservice.documentstore.writer.DocumentStoreWriter; import org.apache.hadoop.yarn.server.timelineservice.documentstore.writer.DummyDocumentStoreWriter; + +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; + import org.mockito.ArgumentMatchers; +import org.mockito.MockedStatic; +import org.mockito.Mockito; + import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; @@ -45,6 +51,7 @@ public class TestDocumentStoreTimelineWriterImpl { private final DocumentStoreWriter documentStoreWriter = new DummyDocumentStoreWriter<>(); private final Configuration conf = new Configuration(); + private MockedStatic mockedFactory; @Before public void setUp() throws YarnException { @@ -54,10 +61,17 @@ public void setUp() throws YarnException { "https://localhost:443"); conf.set(DocumentStoreUtils.TIMELINE_SERVICE_COSMOSDB_MASTER_KEY, "1234567"); - PowerMockito.mockStatic(DocumentStoreFactory.class); - PowerMockito.when(DocumentStoreFactory.createDocumentStoreWriter( - ArgumentMatchers.any(Configuration.class))) - .thenReturn(documentStoreWriter); + mockedFactory = Mockito.mockStatic(DocumentStoreFactory.class); + mockedFactory.when(() -> DocumentStoreFactory.createDocumentStoreWriter( + ArgumentMatchers.any(Configuration.class))) + .thenReturn(documentStoreWriter); + } + + @After + public void tearDown() { + if (mockedFactory != null) { + mockedFactory.close(); + } } @Test(expected = YarnException.class) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-documentstore/src/test/java/org/apache/hadoop/yarn/server/timelineservice/documentstore/reader/cosmosdb/TestCosmosDBDocumentStoreReader.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-documentstore/src/test/java/org/apache/hadoop/yarn/server/timelineservice/documentstore/reader/cosmosdb/TestCosmosDBDocumentStoreReader.java index 416f1b84d9..fc9eff885f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-documentstore/src/test/java/org/apache/hadoop/yarn/server/timelineservice/documentstore/reader/cosmosdb/TestCosmosDBDocumentStoreReader.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-documentstore/src/test/java/org/apache/hadoop/yarn/server/timelineservice/documentstore/reader/cosmosdb/TestCosmosDBDocumentStoreReader.java @@ -31,6 +31,9 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; +import static org.mockito.Mockito.mockStatic; +import static org.mockito.Mockito.when; + /** * Test case for {@link CosmosDBDocumentStoreReader}. */ @@ -42,13 +45,10 @@ public class TestCosmosDBDocumentStoreReader { public void setUp(){ AsyncDocumentClient asyncDocumentClient = Mockito.mock(AsyncDocumentClient.class); - PowerMockito.mockStatic(DocumentStoreUtils.class); - PowerMockito.when(DocumentStoreUtils.getCosmosDBDatabaseName( - ArgumentMatchers.any(Configuration.class))) - .thenReturn("FooBar"); - PowerMockito.when(DocumentStoreUtils.createCosmosDBAsyncClient( - ArgumentMatchers.any(Configuration.class))) - .thenReturn(asyncDocumentClient); + Configuration conf = Mockito.mock(Configuration.class); + mockStatic(DocumentStoreUtils.class); + when(DocumentStoreUtils.getCosmosDBDatabaseName(conf)).thenReturn("FooBar"); + when(DocumentStoreUtils.createCosmosDBAsyncClient(conf)).thenReturn(asyncDocumentClient); } @Test(expected = IllegalArgumentException.class) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-documentstore/src/test/java/org/apache/hadoop/yarn/server/timelineservice/documentstore/writer/cosmosdb/TestCosmosDBDocumentStoreWriter.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-documentstore/src/test/java/org/apache/hadoop/yarn/server/timelineservice/documentstore/writer/cosmosdb/TestCosmosDBDocumentStoreWriter.java index 783d04ecc3..ab3c2dad00 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-documentstore/src/test/java/org/apache/hadoop/yarn/server/timelineservice/documentstore/writer/cosmosdb/TestCosmosDBDocumentStoreWriter.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-documentstore/src/test/java/org/apache/hadoop/yarn/server/timelineservice/documentstore/writer/cosmosdb/TestCosmosDBDocumentStoreWriter.java @@ -28,14 +28,15 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.ArgumentMatchers; import org.mockito.Mockito; -import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import java.io.IOException; +import static org.mockito.Mockito.when; +import static org.mockito.Mockito.mockStatic; + /** * Test case for {@link CosmosDBDocumentStoreWriter}. */ @@ -47,13 +48,12 @@ public class TestCosmosDBDocumentStoreWriter { public void setUp() { AsyncDocumentClient asyncDocumentClient = Mockito.mock(AsyncDocumentClient.class); - PowerMockito.mockStatic(DocumentStoreUtils.class); - PowerMockito.when(DocumentStoreUtils.getCosmosDBDatabaseName( - ArgumentMatchers.any(Configuration.class))) - .thenReturn("FooBar"); - PowerMockito.when(DocumentStoreUtils.createCosmosDBAsyncClient( - ArgumentMatchers.any(Configuration.class))) - .thenReturn(asyncDocumentClient); + Configuration conf = Mockito.mock(Configuration.class); + mockStatic(DocumentStoreUtils.class); + when(DocumentStoreUtils.getCosmosDBDatabaseName(conf)). + thenReturn("FooBar"); + when(DocumentStoreUtils.createCosmosDBAsyncClient(conf)). + thenReturn(asyncDocumentClient); } @SuppressWarnings("unchecked") diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/pom.xml index 11433ed38c..c0d5e0f5f8 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/pom.xml @@ -446,7 +446,7 @@ org.mockito - mockito-core + mockito-inline test diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-client/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-client/pom.xml index e39edfd039..879ed4a74c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-client/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-client/pom.xml @@ -170,7 +170,7 @@ org.mockito - mockito-core + mockito-inline test diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/pom.xml index 04359b07ff..e8ec216666 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/pom.xml @@ -148,7 +148,7 @@ org.mockito - mockito-core + mockito-inline test diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/pom.xml index 868264b7ee..d0cd01d05c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/pom.xml @@ -66,7 +66,7 @@ org.mockito - mockito-core + mockito-inline test diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml index 9f602790e0..eadf3ba1f3 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml @@ -274,8 +274,8 @@ org.mockito - mockito-core - 2.18.0 + mockito-inline + 4.11.0