diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/health/TestVulnerableUnhealthyReplicasHandler.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/health/TestVulnerableUnhealthyReplicasHandler.java index 8fa4c974e1ba..28eccd5211c3 100644 --- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/health/TestVulnerableUnhealthyReplicasHandler.java +++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/health/TestVulnerableUnhealthyReplicasHandler.java @@ -35,7 +35,6 @@ import org.apache.hadoop.hdds.scm.node.states.NodeNotFoundException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.mockito.Mockito; import java.util.Collections; import java.util.HashSet; @@ -190,7 +189,7 @@ public void testReturnsTrueForQuasiClosedContainerWithVulnerableReplicaWhenAllRe ContainerReplica unhealthy = createContainerReplica(container.containerID(), 0, DECOMMISSIONING, State.UNHEALTHY, sequenceId); replicas.add(unhealthy); - Mockito.when(replicationManager.getNodeStatus(Mockito.any(DatanodeDetails.class))) + when(replicationManager.getNodeStatus(any(DatanodeDetails.class))) .thenAnswer(invocation -> { DatanodeDetails dn = invocation.getArgument(0); if (dn.equals(unhealthy.getDatanodeDetails())) { diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestDatanodeAdminMonitor.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestDatanodeAdminMonitor.java index 523d4226cb43..a2df04742f55 100644 --- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestDatanodeAdminMonitor.java +++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestDatanodeAdminMonitor.java @@ -41,7 +41,6 @@ import org.apache.hadoop.security.authentication.client.AuthenticationException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.mockito.Mockito; import java.io.IOException; import java.util.Collections; @@ -406,7 +405,7 @@ public void testDecommissionWaitsForUnhealthyReplicaWithUniqueOriginToReplicateN replicas.add(unhealthy); nodeManager.setContainers(dn1, ImmutableSet.of(containerID)); - Mockito.when(repManager.getContainerReplicaCount(Mockito.eq(containerID))) + when(repManager.getContainerReplicaCount(eq(containerID))) .thenReturn(new RatisContainerReplicaCount(container, replicas, Collections.emptyList(), 2, false)); DatanodeAdminMonitorTestUtil.mockCheckContainerState(repManager, true); @@ -430,7 +429,7 @@ public void testDecommissionWaitsForUnhealthyReplicaWithUniqueOriginToReplicateN .setDatanodeDetails(MockDatanodeDetails.randomDatanodeDetails()) .build(); replicas.add(copyOfUnhealthyOnNewNode); - Mockito.when(repManager.getContainerReplicaCount(Mockito.eq(containerID))) + when(repManager.getContainerReplicaCount(eq(containerID))) .thenReturn(new RatisContainerReplicaCount(container, replicas, Collections.emptyList(), 2, false)); DatanodeAdminMonitorTestUtil.mockCheckContainerState(repManager, false); diff --git a/hadoop-ozone/insight/src/test/java/org/apache/hadoop/ozone/insight/TestBaseInsightPoint.java b/hadoop-ozone/insight/src/test/java/org/apache/hadoop/ozone/insight/TestBaseInsightPoint.java index b2d68545d06f..85faf99419a4 100644 --- a/hadoop-ozone/insight/src/test/java/org/apache/hadoop/ozone/insight/TestBaseInsightPoint.java +++ b/hadoop-ozone/insight/src/test/java/org/apache/hadoop/ozone/insight/TestBaseInsightPoint.java @@ -17,12 +17,14 @@ */ package org.apache.hadoop.ozone.insight; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import java.util.HashMap; import java.util.Map; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + /** * Test common insight point utility methods. */ @@ -42,14 +44,14 @@ public String getDescription() { Map filters = new HashMap<>(); filters.put("datanode", "123"); - Assertions.assertTrue(insightPoint + assertTrue(insightPoint .filterLog(filters, "This a log specific to [datanode=123]")); - Assertions.assertFalse(insightPoint + assertFalse(insightPoint .filterLog(filters, "This a log specific to [datanode=234]")); //with empty filters - Assertions.assertTrue(insightPoint + assertTrue(insightPoint .filterLog(new HashMap<>(), "This a log specific to [datanode=234]")); //with multiple filters @@ -57,14 +59,14 @@ public String getDescription() { filters.put("datanode", "123"); filters.put("pipeline", "abcd"); - Assertions.assertFalse(insightPoint + assertFalse(insightPoint .filterLog(filters, "This a log specific to [datanode=123]")); - Assertions.assertTrue(insightPoint + assertTrue(insightPoint .filterLog(filters, "This a log specific to [datanode=123] [pipeline=abcd]")); - Assertions.assertFalse(insightPoint + assertFalse(insightPoint .filterLog(filters, "This a log specific to [datanode=456] [pipeline=abcd]")); diff --git a/hadoop-ozone/insight/src/test/java/org/apache/hadoop/ozone/insight/TestConfigurationSubCommand.java b/hadoop-ozone/insight/src/test/java/org/apache/hadoop/ozone/insight/TestConfigurationSubCommand.java index 9be82ebc41d6..701652bee09c 100644 --- a/hadoop-ozone/insight/src/test/java/org/apache/hadoop/ozone/insight/TestConfigurationSubCommand.java +++ b/hadoop-ozone/insight/src/test/java/org/apache/hadoop/ozone/insight/TestConfigurationSubCommand.java @@ -27,11 +27,12 @@ import org.apache.hadoop.hdds.conf.ConfigTag; import org.apache.hadoop.hdds.conf.OzoneConfiguration; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; +import static org.assertj.core.api.Assertions.assertThat; + /** * Test insight report which prints out configs. */ @@ -60,12 +61,12 @@ public void testPrintConfig() throws UnsupportedEncodingException { subCommand.printConfig(CustomConfig.class, conf); final String output = out.toString(StandardCharsets.UTF_8.name()); - Assertions.assertTrue(output.contains(">>> ozone.scm.client.address")); - Assertions.assertTrue(output.contains("default: localhost")); - Assertions.assertTrue(output.contains("current: omclient")); - Assertions.assertTrue(output.contains(">>> ozone.scm.client.secure")); - Assertions.assertTrue(output.contains("default: true")); - Assertions.assertTrue(output.contains("current: true")); + assertThat(output).contains(">>> ozone.scm.client.address"); + assertThat(output).contains("default: localhost"); + assertThat(output).contains("current: omclient"); + assertThat(output).contains(">>> ozone.scm.client.secure"); + assertThat(output).contains("default: true"); + assertThat(output).contains("current: true"); } /** diff --git a/hadoop-ozone/insight/src/test/java/org/apache/hadoop/ozone/insight/TestLogSubcommand.java b/hadoop-ozone/insight/src/test/java/org/apache/hadoop/ozone/insight/TestLogSubcommand.java index 01402085861d..f895a91c5376 100644 --- a/hadoop-ozone/insight/src/test/java/org/apache/hadoop/ozone/insight/TestLogSubcommand.java +++ b/hadoop-ozone/insight/src/test/java/org/apache/hadoop/ozone/insight/TestLogSubcommand.java @@ -17,9 +17,10 @@ */ package org.apache.hadoop.ozone.insight; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; + /** * Testing utility methods of the log subcommand test. */ @@ -36,6 +37,6 @@ public void filterLog() { + "storageLocation: \"/tmp/hadoop-neo/dfs/data\"\\n capacity: " + "250438021120\\n scmUsed: 16384\\n remaining: 212041244672\\n " + "storageType: DISK\\n failed: false\\n}\\n"); - Assertions.assertEquals(10, result.split("\n").length); + assertEquals(10, result.split("\n").length); } } diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/TestECContainerRecovery.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/TestECContainerRecovery.java index b50f2ac8d68a..5a7e404f507b 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/TestECContainerRecovery.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/TestECContainerRecovery.java @@ -52,7 +52,6 @@ import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.mockito.Mockito; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -72,6 +71,8 @@ import static java.nio.charset.StandardCharsets.UTF_8; import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_RECOVERING_CONTAINER_TIMEOUT; import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_RECOVERING_CONTAINER_TIMEOUT_DEFAULT; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.doAnswer; /** * Tests the EC recovery and over replication processing. @@ -308,7 +309,7 @@ public void testECContainerRecoveryWithTimedOutRecovery() throws Exception { .mockFieldReflection(handler, "coordinator"); - Mockito.doAnswer(invocation -> { + doAnswer(invocation -> { GenericTestUtils.waitFor(() -> dn.getDatanodeStateMachine() .getContainer() @@ -320,8 +321,8 @@ public void testECContainerRecoveryWithTimedOutRecovery() throws Exception { reconstructedDN.set(dn); invocation.callRealMethod(); return null; - }).when(coordinator).reconstructECBlockGroup(Mockito.any(), Mockito.any(), - Mockito.any(), Mockito.any()); + }).when(coordinator).reconstructECBlockGroup(any(), any(), + any(), any()); } // Shutting down DN triggers close pipeline and close container. diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestBlockDeletion.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestBlockDeletion.java index 5dec1799b406..e5c0d5d2532e 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestBlockDeletion.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestBlockDeletion.java @@ -72,7 +72,6 @@ import org.apache.ozone.test.GenericTestUtils.LogCapturer; import org.apache.ozone.test.tag.Flaky; import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -95,14 +94,19 @@ import static java.lang.Math.max; import static java.nio.charset.StandardCharsets.UTF_8; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_COMMAND_STATUS_REPORT_INTERVAL; -import static org.apache.hadoop.hdds - .HddsConfigKeys.HDDS_CONTAINER_REPORT_INTERVAL; +import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_CONTAINER_REPORT_INTERVAL; import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_HEARTBEAT_INTERVAL; import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_EXPIRED_CONTAINER_REPLICA_OP_SCRUB_INTERVAL; import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_PIPELINE_OWNER_CONTAINER_COUNT; import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_STALENODE_INTERVAL; -import static org.apache.hadoop.ozone - .OzoneConfigKeys.OZONE_BLOCK_DELETING_SERVICE_INTERVAL; +import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_BLOCK_DELETING_SERVICE_INTERVAL; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; /** * Tests for Block deletion. @@ -246,23 +250,23 @@ public void testBlockDeletion(ReplicationConfig repConfig) throws Exception { } }, 1000, 10000); // No containers with deleted blocks - Assertions.assertTrue(containerIdsWithDeletedBlocks.isEmpty()); + assertTrue(containerIdsWithDeletedBlocks.isEmpty()); // Delete transactionIds for the containers should be 0. // NOTE: this test assumes that all the container is KetValueContainer. If // other container types is going to be added, this test should be checked. matchContainerTransactionIds(); - Assertions.assertEquals(0L, + assertEquals(0L, metrics.getNumBlockDeletionTransactionCreated()); writeClient.deleteKey(keyArgs); Thread.sleep(5000); // The blocks should not be deleted in the DN as the container is open - Throwable e = Assertions.assertThrows(AssertionError.class, + Throwable e = assertThrows(AssertionError.class, () -> verifyBlocksDeleted(omKeyLocationInfoGroupList)); - Assertions.assertTrue( + assertTrue( e.getMessage().startsWith("expected: but was:")); - Assertions.assertEquals(0L, metrics.getNumBlockDeletionTransactionSent()); + assertEquals(0L, metrics.getNumBlockDeletionTransactionSent()); // close the containers which hold the blocks for the key OzoneTestUtils.closeAllContainers(scm.getEventQueue(), scm); @@ -291,7 +295,7 @@ public void testBlockDeletion(ReplicationConfig repConfig) throws Exception { }, 2000, 30000); // Few containers with deleted blocks - Assertions.assertFalse(containerIdsWithDeletedBlocks.isEmpty()); + assertFalse(containerIdsWithDeletedBlocks.isEmpty()); // Containers in the DN and SCM should have same delete transactionIds matchContainerTransactionIds(); @@ -312,12 +316,12 @@ public void testBlockDeletion(ReplicationConfig repConfig) throws Exception { cluster.restartHddsDatanode(0, true); matchContainerTransactionIds(); - Assertions.assertEquals(metrics.getNumBlockDeletionTransactionCreated(), + assertEquals(metrics.getNumBlockDeletionTransactionCreated(), metrics.getNumBlockDeletionTransactionCompleted()); - Assertions.assertTrue(metrics.getNumBlockDeletionCommandSent() >= + assertTrue(metrics.getNumBlockDeletionCommandSent() >= metrics.getNumBlockDeletionCommandSuccess() + metrics.getBNumBlockDeletionCommandFailure()); - Assertions.assertTrue(metrics.getNumBlockDeletionTransactionSent() >= + assertTrue(metrics.getNumBlockDeletionTransactionSent() >= metrics.getNumBlockDeletionTransactionFailure() + metrics.getNumBlockDeletionTransactionSuccess()); LOG.info(metrics.toString()); @@ -326,7 +330,7 @@ public void testBlockDeletion(ReplicationConfig repConfig) throws Exception { for (int i = 5; i >= 0; i--) { if (logCapturer.getOutput().contains("1(" + i + ")")) { for (int j = 0; j <= i; j++) { - Assertions.assertTrue(logCapturer.getOutput() + assertTrue(logCapturer.getOutput() .contains("1(" + i + ")")); } break; @@ -367,8 +371,8 @@ public void testContainerStatisticsAfterDelete() throws Exception { final int valueSize = value.getBytes(UTF_8).length; final int keyCount = 1; containerInfos.stream().forEach(container -> { - Assertions.assertEquals(valueSize, container.getUsedBytes()); - Assertions.assertEquals(keyCount, container.getNumberOfKeys()); + assertEquals(valueSize, container.getUsedBytes()); + assertEquals(keyCount, container.getNumberOfKeys()); }); OzoneTestUtils.closeAllContainers(scm.getEventQueue(), scm); @@ -389,7 +393,7 @@ public void testContainerStatisticsAfterDelete() throws Exception { containerMap.values().forEach(container -> { KeyValueContainerData containerData = (KeyValueContainerData)container.getContainerData(); - Assertions.assertEquals(0, containerData.getNumPendingDeletionBlocks()); + assertEquals(0, containerData.getNumPendingDeletionBlocks()); }); }); @@ -398,7 +402,7 @@ public void testContainerStatisticsAfterDelete() throws Exception { ((EventQueue)scm.getEventQueue()).processAll(1000); containerInfos = scm.getContainerManager().getContainers(); containerInfos.stream().forEach(container -> - Assertions.assertEquals(HddsProtos.LifeCycleState.DELETING, + assertEquals(HddsProtos.LifeCycleState.DELETING, container.getState())); LogCapturer logCapturer = LogCapturer.captureLogs( legacyEnabled ? LegacyReplicationManager.LOG : ReplicationManager.LOG); @@ -422,14 +426,14 @@ public void testContainerStatisticsAfterDelete() throws Exception { List infos = scm.getContainerManager().getContainers(); try { infos.stream().forEach(container -> { - Assertions.assertEquals(HddsProtos.LifeCycleState.DELETED, + assertEquals(HddsProtos.LifeCycleState.DELETED, container.getState()); try { - Assertions.assertEquals(HddsProtos.LifeCycleState.DELETED, + assertEquals(HddsProtos.LifeCycleState.DELETED, scm.getScmMetadataStore().getContainerTable() .get(container.containerID()).getState()); } catch (IOException e) { - Assertions.fail( + fail( "Container from SCM DB should be marked as DELETED"); } }); @@ -477,8 +481,8 @@ public void testContainerStateAfterDNRestart() throws Exception { final int keyCount = 1; List containerIdList = new ArrayList<>(); containerInfos.stream().forEach(container -> { - Assertions.assertEquals(valueSize, container.getUsedBytes()); - Assertions.assertEquals(keyCount, container.getNumberOfKeys()); + assertEquals(valueSize, container.getUsedBytes()); + assertEquals(keyCount, container.getNumberOfKeys()); containerIdList.add(container.getContainerID()); }); @@ -499,14 +503,14 @@ public void testContainerStateAfterDNRestart() throws Exception { ContainerID containerId = ContainerID.valueOf( containerInfos.get(0).getContainerID()); // Before restart container state is non-empty - Assertions.assertFalse(getContainerFromDN( + assertFalse(getContainerFromDN( cluster.getHddsDatanodes().get(0), containerId.getId()) .getContainerData().isEmpty()); // Restart DataNode cluster.restartHddsDatanode(0, true); // After restart also container state remains non-empty. - Assertions.assertFalse(getContainerFromDN( + assertFalse(getContainerFromDN( cluster.getHddsDatanodes().get(0), containerId.getId()) .getContainerData().isEmpty()); @@ -526,14 +530,14 @@ public void testContainerStateAfterDNRestart() throws Exception { 100, 10 * 1000); // Container state should be empty now as key got deleted - Assertions.assertTrue(getContainerFromDN( + assertTrue(getContainerFromDN( cluster.getHddsDatanodes().get(0), containerId.getId()) .getContainerData().isEmpty()); // Restart DataNode cluster.restartHddsDatanode(0, true); // Container state should be empty even after restart - Assertions.assertTrue(getContainerFromDN( + assertTrue(getContainerFromDN( cluster.getHddsDatanodes().get(0), containerId.getId()) .getContainerData().isEmpty()); @@ -543,14 +547,14 @@ public void testContainerStateAfterDNRestart() throws Exception { List infos = scm.getContainerManager().getContainers(); try { infos.stream().forEach(container -> { - Assertions.assertEquals(HddsProtos.LifeCycleState.DELETED, + assertEquals(HddsProtos.LifeCycleState.DELETED, container.getState()); try { - Assertions.assertEquals(HddsProtos.LifeCycleState.DELETED, + assertEquals(HddsProtos.LifeCycleState.DELETED, scm.getScmMetadataStore().getContainerTable() .get(container.containerID()).getState()); } catch (IOException e) { - Assertions.fail( + fail( "Container from SCM DB should be marked as DELETED"); } }); @@ -607,8 +611,8 @@ public void testContainerDeleteWithInvalidKeyCount() final int keyCount = 1; List containerIdList = new ArrayList<>(); containerInfos.stream().forEach(container -> { - Assertions.assertEquals(valueSize, container.getUsedBytes()); - Assertions.assertEquals(keyCount, container.getNumberOfKeys()); + assertEquals(valueSize, container.getUsedBytes()); + assertEquals(keyCount, container.getNumberOfKeys()); containerIdList.add(container.getContainerID()); }); @@ -635,7 +639,7 @@ public void testContainerDeleteWithInvalidKeyCount() = scm.getContainerManager().getContainerReplicas(containerId); // Ensure for all replica isEmpty are false in SCM - Assertions.assertTrue(scm.getContainerManager().getContainerReplicas( + assertTrue(scm.getContainerManager().getContainerReplicas( containerId).stream(). allMatch(replica -> !replica.isEmpty())); @@ -680,14 +684,14 @@ public void testContainerDeleteWithInvalidKeyCount() List infos = scm.getContainerManager().getContainers(); try { infos.stream().forEach(container -> { - Assertions.assertEquals(HddsProtos.LifeCycleState.DELETED, + assertEquals(HddsProtos.LifeCycleState.DELETED, container.getState()); try { - Assertions.assertEquals(HddsProtos.LifeCycleState.DELETED, + assertEquals(HddsProtos.LifeCycleState.DELETED, scm.getScmMetadataStore().getContainerTable() .get(container.containerID()).getState()); } catch (IOException e) { - Assertions.fail( + fail( "Container from SCM DB should be marked as DELETED"); } }); @@ -702,7 +706,7 @@ public void testContainerDeleteWithInvalidKeyCount() private void verifyTransactionsCommitted() throws IOException { scm.getScmBlockManager().getDeletedBlockLog(); for (long txnID = 1; txnID <= maxTransactionId; txnID++) { - Assertions.assertNull( + assertNull( scm.getScmMetadataStore().getDeletedBlocksTXTable().get(txnID)); } } @@ -716,15 +720,15 @@ private void matchContainerTransactionIds() throws IOException { for (ContainerData containerData : containerDataList) { long containerId = containerData.getContainerID(); if (containerIdsWithDeletedBlocks.contains(containerId)) { - Assertions.assertTrue( + assertTrue( scm.getContainerInfo(containerId).getDeleteTransactionId() > 0); maxTransactionId = max(maxTransactionId, scm.getContainerInfo(containerId).getDeleteTransactionId()); } else { - Assertions.assertEquals( + assertEquals( scm.getContainerInfo(containerId).getDeleteTransactionId(), 0); } - Assertions.assertEquals( + assertEquals( ((KeyValueContainerData) dnContainerSet.getContainer(containerId) .getContainerData()).getDeleteTransactionId(), scm.getContainerInfo(containerId).getDeleteTransactionId()); @@ -741,7 +745,7 @@ private void verifyBlocksCreated( KeyValueContainerData cData = (KeyValueContainerData) dnContainerSet .getContainer(blockID.getContainerID()).getContainerData(); try (DBHandle db = BlockUtils.getDB(cData, conf)) { - Assertions.assertNotNull(db.getStore().getBlockDataTable() + assertNotNull(db.getStore().getBlockDataTable() .get(cData.getBlockKey(blockID.getLocalID()))); } }, omKeyLocationInfoGroups); @@ -763,11 +767,11 @@ private void verifyBlocksDeleted( String blockKey = cData.getBlockKey(blockID.getLocalID()); BlockData blockData = blockDataTable.get(blockKey); - Assertions.assertNull(blockData); + assertNull(blockData); String deletingKey = cData.getDeletingBlockKey( blockID.getLocalID()); - Assertions.assertNull(blockDataTable.get(deletingKey)); + assertNull(blockDataTable.get(deletingKey)); } containerIdsWithDeletedBlocks.add(blockID.getContainerID()); }, omKeyLocationInfoGroups); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestCloseContainerHandler.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestCloseContainerHandler.java index ec47c76d94d2..7cb3c7797fa0 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestCloseContainerHandler.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestCloseContainerHandler.java @@ -45,9 +45,10 @@ import static org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationFactor.ONE; import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_DATANODE_RATIS_VOLUME_FREE_SPACE_MIN; import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_CONTAINER_SIZE; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; @@ -117,7 +118,7 @@ public void test() throws Exception { Pipeline pipeline = cluster.getStorageContainerManager() .getPipelineManager().getPipeline(container.getPipelineID()); - Assertions.assertFalse(isContainerClosed(cluster, containerId.getId())); + assertFalse(isContainerClosed(cluster, containerId.getId())); DatanodeDetails datanodeDetails = cluster.getHddsDatanodes().get(0).getDatanodeDetails(); @@ -135,7 +136,7 @@ public void test() throws Exception { 5 * 1000); //double check if it's really closed (waitFor also throws an exception) - Assertions.assertTrue(isContainerClosed(cluster, containerId.getId())); + assertTrue(isContainerClosed(cluster, containerId.getId())); } private static Boolean isContainerClosed(MiniOzoneCluster cluster, diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestDeleteContainerHandler.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestDeleteContainerHandler.java index 332683658b14..b74e6f3c9116 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestDeleteContainerHandler.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestDeleteContainerHandler.java @@ -57,7 +57,6 @@ import org.apache.hadoop.ozone.protocol.commands.SCMCommand; import org.apache.ozone.test.GenericTestUtils; import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; @@ -77,6 +76,9 @@ import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_DATANODE_RATIS_VOLUME_FREE_SPACE_MIN; import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_CONTAINER_SIZE; import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_BLOCK_DELETING_SERVICE_INTERVAL; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Tests DeleteContainerCommand Handler. @@ -165,8 +167,7 @@ public void testDeleteNonEmptyContainerOnDirEmptyCheckTrue() HddsDatanodeService hddsDatanodeService = cluster.getHddsDatanodes().get(0); - Assertions.assertFalse(isContainerClosed(hddsDatanodeService, - containerId.getId())); + assertFalse(isContainerClosed(hddsDatanodeService, containerId.getId())); DatanodeDetails datanodeDetails = hddsDatanodeService.getDatanodeDetails(); @@ -189,8 +190,7 @@ public void testDeleteNonEmptyContainerOnDirEmptyCheckTrue() 500, 5 * 1000); //double check if it's really closed (waitFor also throws an exception) - Assertions.assertTrue(isContainerClosed(hddsDatanodeService, - containerId.getId())); + assertTrue(isContainerClosed(hddsDatanodeService, containerId.getId())); // Delete key, which will make isEmpty flag to true in containerData objectStore.getVolume(volumeName) @@ -217,8 +217,7 @@ public void testDeleteNonEmptyContainerOnDirEmptyCheckTrue() lingeringBlock.createNewFile(); // Check container exists before sending delete container command - Assertions.assertFalse(isContainerDeleted(hddsDatanodeService, - containerId.getId())); + assertFalse(isContainerDeleted(hddsDatanodeService, containerId.getId())); // Set container blockCount to 0 to mock that it is empty as per RocksDB getContainerfromDN(hddsDatanodeService, containerId.getId()) @@ -243,10 +242,8 @@ public void testDeleteNonEmptyContainerOnDirEmptyCheckTrue() contains("Files still part of the container on delete"), 500, 5 * 2000); - Assertions.assertTrue(!isContainerDeleted(hddsDatanodeService, - containerId.getId())); - Assertions.assertTrue(beforeDeleteFailedCount < - metrics.getContainerDeleteFailedNonEmpty()); + assertTrue(!isContainerDeleted(hddsDatanodeService, containerId.getId())); + assertTrue(beforeDeleteFailedCount < metrics.getContainerDeleteFailedNonEmpty()); // Send the delete command. It should pass with force flag. // Deleting a non-empty container should pass on the DN when the force flag // is true @@ -260,10 +257,8 @@ public void testDeleteNonEmptyContainerOnDirEmptyCheckTrue() GenericTestUtils.waitFor(() -> isContainerDeleted(hddsDatanodeService, containerId.getId()), 500, 5 * 1000); - Assertions.assertTrue(isContainerDeleted(hddsDatanodeService, - containerId.getId())); - Assertions.assertTrue(beforeForceCount < - metrics.getContainerForceDelete()); + assertTrue(isContainerDeleted(hddsDatanodeService, containerId.getId())); + assertTrue(beforeForceCount < metrics.getContainerForceDelete()); kv.setCheckChunksFilePath(false); } @@ -297,8 +292,7 @@ public void testDeleteNonEmptyContainerOnDirEmptyCheckFalse() HddsDatanodeService hddsDatanodeService = cluster.getHddsDatanodes().get(0); - Assertions.assertFalse(isContainerClosed(hddsDatanodeService, - containerId.getId())); + assertFalse(isContainerClosed(hddsDatanodeService, containerId.getId())); DatanodeDetails datanodeDetails = hddsDatanodeService.getDatanodeDetails(); @@ -313,8 +307,7 @@ public void testDeleteNonEmptyContainerOnDirEmptyCheckFalse() 500, 5 * 1000); //double check if it's really closed (waitFor also throws an exception) - Assertions.assertTrue(isContainerClosed(hddsDatanodeService, - containerId.getId())); + assertTrue(isContainerClosed(hddsDatanodeService, containerId.getId())); // Delete key, which will make isEmpty flag to true in containerData objectStore.getVolume(volumeName) @@ -341,8 +334,7 @@ public void testDeleteNonEmptyContainerOnDirEmptyCheckFalse() lingeringBlock.createNewFile(); // Check container exists before sending delete container command - Assertions.assertFalse(isContainerDeleted(hddsDatanodeService, - containerId.getId())); + assertFalse(isContainerDeleted(hddsDatanodeService, containerId.getId())); // send delete container to the datanode SCMCommand command = new DeleteContainerCommand(containerId.getId(), @@ -357,8 +349,7 @@ public void testDeleteNonEmptyContainerOnDirEmptyCheckFalse() GenericTestUtils.waitFor(() -> isContainerDeleted(hddsDatanodeService, containerId.getId()), 500, 5 * 1000); - Assertions.assertTrue(isContainerDeleted(hddsDatanodeService, - containerId.getId())); + assertTrue(isContainerDeleted(hddsDatanodeService, containerId.getId())); } @Test @@ -384,8 +375,7 @@ public void testDeleteNonEmptyContainerBlockTable() HddsDatanodeService hddsDatanodeService = cluster.getHddsDatanodes().get(0); - Assertions.assertFalse(isContainerClosed(hddsDatanodeService, - containerId.getId())); + assertFalse(isContainerClosed(hddsDatanodeService, containerId.getId())); DatanodeDetails datanodeDetails = hddsDatanodeService.getDatanodeDetails(); @@ -418,11 +408,11 @@ public void testDeleteNonEmptyContainerBlockTable() 500, 5 * 1000); //double check if it's really closed (waitFor also throws an exception) - Assertions.assertTrue(isContainerClosed(hddsDatanodeService, + assertTrue(isContainerClosed(hddsDatanodeService, containerId.getId())); // Check container exists before sending delete container command - Assertions.assertFalse(isContainerDeleted(hddsDatanodeService, + assertFalse(isContainerDeleted(hddsDatanodeService, containerId.getId())); long containerDeleteFailedNonEmptyBlockDB = @@ -446,9 +436,9 @@ public void testDeleteNonEmptyContainerBlockTable() contains("the container is not empty with blockCount"), 500, 5 * 2000); - Assertions.assertTrue(!isContainerDeleted(hddsDatanodeService, + assertTrue(!isContainerDeleted(hddsDatanodeService, containerId.getId())); - Assertions.assertTrue(containerDeleteFailedNonEmptyBlockDB < + assertTrue(containerDeleteFailedNonEmptyBlockDB < metrics.getContainerDeleteFailedNonEmpty()); // Now empty the container Dir and try with a non-empty block table @@ -470,8 +460,7 @@ public void testDeleteNonEmptyContainerBlockTable() cluster.getStorageContainerManager().getScmContext().getTermOfLeader()); nodeManager.addDatanodeCommand(datanodeDetails.getUuid(), command); Thread.sleep(5000); - Assertions.assertTrue(!isContainerDeleted(hddsDatanodeService, - containerId.getId())); + assertFalse(isContainerDeleted(hddsDatanodeService, containerId.getId())); // Send the delete command. It should pass with force flag. long beforeForceCount = metrics.getContainerForceDelete(); command = new DeleteContainerCommand(containerId.getId(), true); @@ -483,9 +472,9 @@ public void testDeleteNonEmptyContainerBlockTable() GenericTestUtils.waitFor(() -> isContainerDeleted(hddsDatanodeService, containerId.getId()), 500, 5 * 1000); - Assertions.assertTrue(isContainerDeleted(hddsDatanodeService, + assertTrue(isContainerDeleted(hddsDatanodeService, containerId.getId())); - Assertions.assertTrue(beforeForceCount < + assertTrue(beforeForceCount < metrics.getContainerForceDelete()); } @@ -507,8 +496,7 @@ public void testContainerDeleteWithInvalidBlockCount() HddsDatanodeService hddsDatanodeService = cluster.getHddsDatanodes().get(0); - Assertions.assertFalse(isContainerClosed(hddsDatanodeService, - containerId.getId())); + assertFalse(isContainerClosed(hddsDatanodeService, containerId.getId())); DatanodeDetails datanodeDetails = hddsDatanodeService.getDatanodeDetails(); NodeManager nodeManager = @@ -525,12 +513,10 @@ public void testContainerDeleteWithInvalidBlockCount() 500, 5 * 1000); //double check if it's really closed (waitFor also throws an exception) - Assertions.assertTrue(isContainerClosed(hddsDatanodeService, - containerId.getId())); + assertTrue(isContainerClosed(hddsDatanodeService, containerId.getId())); // Check container exists before sending delete container command - Assertions.assertFalse(isContainerDeleted(hddsDatanodeService, - containerId.getId())); + assertFalse(isContainerDeleted(hddsDatanodeService, containerId.getId())); // Clear block table clearBlocksTable(getContainerfromDN(hddsDatanodeService, @@ -561,8 +547,7 @@ public void testContainerDeleteWithInvalidBlockCount() GenericTestUtils.waitFor(() -> isContainerDeleted(hddsDatanodeService, containerId.getId()), 500, 5 * 1000); - Assertions.assertTrue(isContainerDeleted(hddsDatanodeService, - containerId.getId())); + assertTrue(isContainerDeleted(hddsDatanodeService, containerId.getId())); } @@ -612,8 +597,7 @@ public void testDeleteContainerRequestHandlerOnClosedContainer() HddsDatanodeService hddsDatanodeService = cluster.getHddsDatanodes().get(0); - Assertions.assertFalse(isContainerClosed(hddsDatanodeService, - containerId.getId())); + assertFalse(isContainerClosed(hddsDatanodeService, containerId.getId())); DatanodeDetails datanodeDetails = hddsDatanodeService.getDatanodeDetails(); @@ -630,12 +614,10 @@ public void testDeleteContainerRequestHandlerOnClosedContainer() 500, 5 * 1000); //double check if it's really closed (waitFor also throws an exception) - Assertions.assertTrue(isContainerClosed(hddsDatanodeService, - containerId.getId())); + assertTrue(isContainerClosed(hddsDatanodeService, containerId.getId())); // Check container exists before sending delete container command - Assertions.assertFalse(isContainerDeleted(hddsDatanodeService, - containerId.getId())); + assertFalse(isContainerDeleted(hddsDatanodeService, containerId.getId())); // send delete container to the datanode SCMCommand command = new DeleteContainerCommand(containerId.getId(), @@ -656,8 +638,7 @@ public void testDeleteContainerRequestHandlerOnClosedContainer() ContainerMetrics metrics = hddsDatanodeService .getDatanodeStateMachine().getContainer().getMetrics(); - Assertions.assertEquals(1, - metrics.getContainerDeleteFailedNonEmpty()); + assertEquals(1, metrics.getContainerDeleteFailedNonEmpty()); // Delete key, which will make isEmpty flag to true in containerData objectStore.getVolume(volumeName) @@ -678,7 +659,7 @@ public void testDeleteContainerRequestHandlerOnClosedContainer() isContainerDeleted(hddsDatanodeService, containerId.getId()), 500, 5 * 1000); - Assertions.assertTrue(isContainerDeleted(hddsDatanodeService, + assertTrue(isContainerDeleted(hddsDatanodeService, containerId.getId())); } @@ -723,7 +704,7 @@ public void testDeleteContainerRequestHandlerOnOpenContainer() } } - Assertions.assertFalse(isContainerDeleted(hddsDatanodeService, + assertFalse(isContainerDeleted(hddsDatanodeService, containerId.getId())); @@ -738,7 +719,7 @@ public void testDeleteContainerRequestHandlerOnOpenContainer() isContainerDeleted(hddsDatanodeService, containerId.getId()), 500, 5 * 1000); - Assertions.assertTrue(isContainerDeleted(hddsDatanodeService, + assertTrue(isContainerDeleted(hddsDatanodeService, containerId.getId())); } diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestRefreshVolumeUsageHandler.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestRefreshVolumeUsageHandler.java index c47f09930993..23382b2abe6c 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestRefreshVolumeUsageHandler.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestRefreshVolumeUsageHandler.java @@ -30,7 +30,6 @@ import org.apache.hadoop.ozone.client.io.OzoneOutputStream; import org.apache.ozone.test.GenericTestUtils; import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; @@ -43,6 +42,7 @@ import static org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationFactor.ONE; import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_DATANODE_RATIS_VOLUME_FREE_SPACE_MIN; import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_CONTAINER_SIZE; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Test the behaviour of the datanode and scm when communicating @@ -101,7 +101,7 @@ public void test() throws Exception { //a new key is created, but the datanode default REFRESH_PERIOD is 1 hour, //still the cache is updated, so the scm will eventually get the new //used space from the datanode through node report. - Assertions.assertTrue(cluster.getStorageContainerManager() + assertTrue(cluster.getStorageContainerManager() .getScmNodeManager().getUsageInfo(datanodeDetails) .getScmNodeStat().getScmUsed().isEqual(currentScmUsed)); @@ -116,7 +116,7 @@ public void test() throws Exception { //after waiting for several node report , this usage info //in SCM should be updated as we have updated the DN's cached usage info. - Assertions.assertTrue(cluster.getStorageContainerManager() + assertTrue(cluster.getStorageContainerManager() .getScmNodeManager().getUsageInfo(datanodeDetails) .getScmNodeStat().getScmUsed().isGreater(currentScmUsed)); diff --git a/hadoop-ozone/interface-storage/src/test/java/org/apache/hadoop/ozone/om/helpers/TestOmPrefixInfoCodec.java b/hadoop-ozone/interface-storage/src/test/java/org/apache/hadoop/ozone/om/helpers/TestOmPrefixInfoCodec.java index 6015491468c0..f3ad1d8c7628 100644 --- a/hadoop-ozone/interface-storage/src/test/java/org/apache/hadoop/ozone/om/helpers/TestOmPrefixInfoCodec.java +++ b/hadoop-ozone/interface-storage/src/test/java/org/apache/hadoop/ozone/om/helpers/TestOmPrefixInfoCodec.java @@ -22,7 +22,6 @@ import org.apache.hadoop.ozone.OzoneAcl; import org.apache.hadoop.ozone.security.acl.IAccessAuthorizer.ACLIdentityType; import org.apache.hadoop.ozone.security.acl.IAccessAuthorizer.ACLType; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import java.io.IOException; @@ -30,6 +29,7 @@ import java.util.List; import static org.apache.hadoop.ozone.OzoneAcl.AclScope.ACCESS; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Test {@link OmPrefixInfo#getCodec()}. @@ -57,6 +57,6 @@ public void testToAndFromPersistedFormat() throws IOException { OmPrefixInfo opiLoad = codec.fromPersistedFormat( codec.toPersistedFormat(opiSave)); - Assertions.assertEquals(opiSave, opiLoad, "Loaded not equals to saved"); + assertEquals(opiSave, opiLoad, "Loaded not equals to saved"); } } diff --git a/hadoop-ozone/interface-storage/src/test/java/org/apache/hadoop/ozone/om/helpers/TestS3SecretValueCodec.java b/hadoop-ozone/interface-storage/src/test/java/org/apache/hadoop/ozone/om/helpers/TestS3SecretValueCodec.java index 19cb68619715..d1c4372ca915 100644 --- a/hadoop-ozone/interface-storage/src/test/java/org/apache/hadoop/ozone/om/helpers/TestS3SecretValueCodec.java +++ b/hadoop-ozone/interface-storage/src/test/java/org/apache/hadoop/ozone/om/helpers/TestS3SecretValueCodec.java @@ -22,9 +22,12 @@ import org.apache.hadoop.hdds.utils.db.Codec; import org.apache.hadoop.hdds.utils.db.Proto2CodecTestBase; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + + /** * Test {@link S3SecretValue#getCodec()}. */ @@ -44,10 +47,10 @@ public void testCodecWithCorrectData() throws Exception { UUID.randomUUID().toString()); byte[] data = codec.toPersistedFormat(s3SecretValue); - Assertions.assertNotNull(data); + assertNotNull(data); S3SecretValue docdedS3Secret = codec.fromPersistedFormat(data); - Assertions.assertEquals(s3SecretValue, docdedS3Secret); + assertEquals(s3SecretValue, docdedS3Secret); } } diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyDeleteRequest.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyDeleteRequest.java index cb585caefd94..00d1883d749c 100644 --- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyDeleteRequest.java +++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyDeleteRequest.java @@ -28,7 +28,6 @@ import org.apache.hadoop.ozone.om.exceptions.OMException; import org.apache.hadoop.ozone.om.helpers.BucketLayout; import org.apache.hadoop.ozone.om.request.OMRequestTestUtils; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.apache.hadoop.ozone.om.helpers.OmKeyInfo; @@ -52,7 +51,7 @@ public void testPreExecute(String testKeyName) throws Exception { OMRequestTestUtils.addVolumeAndBucketToDB(volumeName, bucketName, omMetadataManager, getBucketLayout()); String ozoneKey = addKeyToTable(testKeyName); OmKeyInfo omKeyInfo = omMetadataManager.getKeyTable(getBucketLayout()).get(ozoneKey); - Assertions.assertNotNull(omKeyInfo); + assertNotNull(omKeyInfo); doPreExecute(createDeleteKeyRequest(testKeyName)); } diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyDeleteRequestWithFSO.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyDeleteRequestWithFSO.java index 96483fb587ce..9dafab090295 100644 --- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyDeleteRequestWithFSO.java +++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyDeleteRequestWithFSO.java @@ -21,8 +21,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.fail; + import org.apache.hadoop.hdds.protocol.proto.HddsProtos; import org.apache.hadoop.ozone.om.OzonePrefixPathImpl; import org.apache.hadoop.ozone.om.exceptions.OMException; @@ -33,7 +34,6 @@ import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMRequest; import org.apache.hadoop.ozone.security.acl.OzonePrefixPath; import org.apache.hadoop.util.Time; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; @@ -112,7 +112,7 @@ public void testPreExecute(String testKeyName) throws Exception { OMRequestTestUtils.addVolumeAndBucketToDB(volumeName, bucketName, omMetadataManager, getBucketLayout()); String ozoneKey = addKeyToTable(); OmKeyInfo omKeyInfo = omMetadataManager.getKeyTable(getBucketLayout()).get(ozoneKey); - Assertions.assertNotNull(omKeyInfo); + assertNotNull(omKeyInfo); doPreExecute(createDeleteKeyRequest()); } @@ -142,19 +142,14 @@ public void testOzonePrefixPathViewer() throws Exception { verifyPath(ozonePrefixPath, "c/d", "c/d/e"); verifyPath(ozonePrefixPath, "c/d/e", "c/d/e/file1"); - try { - ozonePrefixPath.getChildren("c/d/e/file1"); - fail("Should throw INVALID_KEY_NAME as the given " + - "path is a file."); - } catch (OMException ome) { - assertEquals(OMException.ResultCodes.INVALID_KEY_NAME, - ome.getResult()); - } + OMException ome = assertThrows(OMException.class, () -> ozonePrefixPath.getChildren("c/d/e/file1"), + "Should throw INVALID_KEY_NAME as the given path is a file."); + assertEquals(OMException.ResultCodes.INVALID_KEY_NAME, ome.getResult()); // OzonePrefixPathImpl on a file - ozonePrefixPath = new OzonePrefixPathImpl(volumeName, + OzonePrefixPathImpl ozonePrefixPathFile1 = new OzonePrefixPathImpl(volumeName, bucketName, "c/d/e/file1", keyManager); - status = ozonePrefixPath.getOzoneFileStatus(); + status = ozonePrefixPathFile1.getOzoneFileStatus(); assertNotNull(status); assertEquals("c/d/e/file1", status.getTrimmedName()); assertEquals("c/d/e/file1", status.getKeyInfo().getKeyName()); @@ -168,12 +163,7 @@ private void verifyPath(OzonePrefixPath ozonePrefixPath, String pathName, pathName); assertTrue(pathItr.hasNext(), "Failed to list keyPaths"); assertEquals(expectedPath, pathItr.next().getTrimmedName()); - try { - pathItr.next(); - fail("Reached end of the list!"); - } catch (NoSuchElementException nse) { - // expected - } + assertThrows(NoSuchElementException.class, () -> pathItr.next(), "Reached end of the list!"); } @Test diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/acl/TestSharedTmpDirAuthorizer.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/acl/TestSharedTmpDirAuthorizer.java index ff3609b810cd..ce5aa12c568b 100644 --- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/acl/TestSharedTmpDirAuthorizer.java +++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/acl/TestSharedTmpDirAuthorizer.java @@ -22,10 +22,12 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import org.mockito.Mockito; import java.util.stream.Stream; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; + /** * Tests for {@link SharedTmpDirAuthorizer}. */ @@ -37,8 +39,8 @@ public class TestSharedTmpDirAuthorizer { @BeforeAll public static void setUp() { - nativeAuthorizer = Mockito.mock(OzoneNativeAuthorizer.class); - authorizer = Mockito.mock(TestOzoneAuthorizerFactory + nativeAuthorizer = mock(OzoneNativeAuthorizer.class); + authorizer = mock(TestOzoneAuthorizerFactory .MockThirdPartyAuthorizer.class); sharedTmpDirAuthorizer = @@ -65,13 +67,13 @@ public void testCheckAccess(String volumeName, .setKeyName("key1") .build(); - RequestContext context = Mockito.mock(RequestContext.class); + RequestContext context = mock(RequestContext.class); sharedTmpDirAuthorizer.checkAccess(objInfo, context); if (isNative) { - Mockito.verify(nativeAuthorizer).checkAccess(objInfo, context); + verify(nativeAuthorizer).checkAccess(objInfo, context); } else { - Mockito.verify(authorizer).checkAccess(objInfo, context); + verify(authorizer).checkAccess(objInfo, context); } } } diff --git a/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/freon/containergenerator/TestGeneratorDatanode.java b/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/freon/containergenerator/TestGeneratorDatanode.java index 7792e03e1160..35a1ba20bb58 100644 --- a/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/freon/containergenerator/TestGeneratorDatanode.java +++ b/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/freon/containergenerator/TestGeneratorDatanode.java @@ -16,12 +16,13 @@ */ package org.apache.hadoop.ozone.freon.containergenerator; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.HashSet; +import static org.junit.jupiter.api.Assertions.assertEquals; + /** * Test datanode container generation placement. */ @@ -64,7 +65,7 @@ public void compare( int maxDatanodes, int overlap, Integer... expectations) { - Assertions.assertEquals( + assertEquals( new HashSet(Arrays.asList(expectations)), GeneratorDatanode.getPlacement(containerId, maxDatanodes, overlap)); } diff --git a/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/scm/TestDecommissionScmSubcommand.java b/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/scm/TestDecommissionScmSubcommand.java index 2cb3be1d0b48..77191df75a2e 100644 --- a/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/scm/TestDecommissionScmSubcommand.java +++ b/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/scm/TestDecommissionScmSubcommand.java @@ -25,14 +25,14 @@ import java.io.IOException; import java.util.UUID; - import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertTrue; -import org.mockito.Mockito; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.Mockito.any; import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + import picocli.CommandLine; /** @@ -66,7 +66,7 @@ public void testDecommissionScmInputParams() throws Exception { .setSuccess(true) .build(); - Mockito.when(client.decommissionScm(any())) + when(client.decommissionScm(any())) .thenAnswer(invocation -> ( response)); @@ -94,7 +94,7 @@ public void testDecommissionScmScmRemoveErrors() throws Exception { .setErrorMsg("Cannot remove current leader.") .build(); - Mockito.when(client.decommissionScm(any())) + when(client.decommissionScm(any())) .thenAnswer(invocation -> ( response)); diff --git a/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneAddress.java b/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneAddress.java index e831bf5f671a..8ace369b8c9f 100644 --- a/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneAddress.java +++ b/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneAddress.java @@ -23,10 +23,14 @@ import org.apache.hadoop.ozone.client.OzoneClientException; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + /** * Test ozone URL parsing. @@ -60,7 +64,7 @@ public void checkRootUrlType(String prefix) throws OzoneClientException { public void checkVolumeUrlType(String prefix) throws OzoneClientException { address = new OzoneAddress(prefix + "vol1"); address.ensureVolumeAddress(); - Assertions.assertEquals("vol1", address.getVolumeName()); + assertEquals("vol1", address.getVolumeName()); } @ParameterizedTest @@ -68,13 +72,13 @@ public void checkVolumeUrlType(String prefix) throws OzoneClientException { public void checkBucketUrlType(String prefix) throws OzoneClientException { address = new OzoneAddress(prefix + "vol1/bucket"); address.ensureBucketAddress(); - Assertions.assertEquals("vol1", address.getVolumeName()); - Assertions.assertEquals("bucket", address.getBucketName()); + assertEquals("vol1", address.getVolumeName()); + assertEquals("bucket", address.getBucketName()); address = new OzoneAddress(prefix + "vol1/bucket/"); address.ensureBucketAddress(); - Assertions.assertEquals("vol1", address.getVolumeName()); - Assertions.assertEquals("bucket", address.getBucketName()); + assertEquals("vol1", address.getVolumeName()); + assertEquals("bucket", address.getBucketName()); } @ParameterizedTest @@ -82,22 +86,22 @@ public void checkBucketUrlType(String prefix) throws OzoneClientException { public void checkKeyUrlType(String prefix) throws OzoneClientException { address = new OzoneAddress(prefix + "vol1/bucket/key"); address.ensureKeyAddress(); - Assertions.assertEquals("vol1", address.getVolumeName()); - Assertions.assertEquals("bucket", address.getBucketName()); - Assertions.assertEquals("key", address.getKeyName()); + assertEquals("vol1", address.getVolumeName()); + assertEquals("bucket", address.getBucketName()); + assertEquals("key", address.getKeyName()); address = new OzoneAddress(prefix + "vol1/bucket/key/"); address.ensureKeyAddress(); - Assertions.assertEquals("vol1", address.getVolumeName()); - Assertions.assertEquals("bucket", address.getBucketName()); - Assertions.assertEquals("key/", address.getKeyName()); + assertEquals("vol1", address.getVolumeName()); + assertEquals("bucket", address.getBucketName()); + assertEquals("key/", address.getKeyName()); address = new OzoneAddress(prefix + "vol1/bucket/key1/key3/key"); address.ensureKeyAddress(); - Assertions.assertEquals("vol1", address.getVolumeName()); - Assertions.assertEquals("bucket", address.getBucketName()); - Assertions.assertEquals("key1/key3/key", address.getKeyName()); - Assertions.assertFalse(address.isPrefix(), "this should not be a prefix"); + assertEquals("vol1", address.getVolumeName()); + assertEquals("bucket", address.getBucketName()); + assertEquals("key1/key3/key", address.getKeyName()); + assertFalse(address.isPrefix(), "this should not be a prefix"); } @ParameterizedTest @@ -105,10 +109,10 @@ public void checkKeyUrlType(String prefix) throws OzoneClientException { public void checkPrefixUrlType(String prefix) throws OzoneClientException { address = new OzoneAddress(prefix + "vol1/bucket/prefix"); address.ensurePrefixAddress(); - Assertions.assertEquals("vol1", address.getVolumeName()); - Assertions.assertEquals("bucket", address.getBucketName()); - Assertions.assertEquals("prefix", address.getKeyName()); - Assertions.assertTrue(address.isPrefix(), "this should be a prefix"); + assertEquals("vol1", address.getVolumeName()); + assertEquals("bucket", address.getBucketName()); + assertEquals("prefix", address.getKeyName()); + assertTrue(address.isPrefix(), "this should be a prefix"); } @ParameterizedTest @@ -116,11 +120,10 @@ public void checkPrefixUrlType(String prefix) throws OzoneClientException { public void checkSnapshotUrlType(String prefix) throws OzoneClientException { address = new OzoneAddress(prefix + "vol1/bucket/.snapshot/snap1"); address.ensureSnapshotAddress(); - Assertions.assertEquals("vol1", address.getVolumeName()); - Assertions.assertEquals("bucket", address.getBucketName()); - Assertions.assertEquals(".snapshot/snap1", - address.getSnapshotNameWithIndicator()); - Assertions.assertEquals(".snapshot/snap1", address.getKeyName()); + assertEquals("vol1", address.getVolumeName()); + assertEquals("bucket", address.getBucketName()); + assertEquals(".snapshot/snap1", address.getSnapshotNameWithIndicator()); + assertEquals(".snapshot/snap1", address.getKeyName()); String message = "Only a snapshot name with " + @@ -128,9 +131,8 @@ public void checkSnapshotUrlType(String prefix) throws OzoneClientException { address = new OzoneAddress(prefix + "vol1/bucket/.snapshot"); - OzoneClientException exception = Assertions - .assertThrows(OzoneClientException.class, + OzoneClientException exception = assertThrows(OzoneClientException.class, () -> address.ensureSnapshotAddress()); - Assertions.assertTrue(exception.getMessage().contains(message)); + assertTrue(exception.getMessage().contains(message)); } } diff --git a/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneAddressClientCreation.java b/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneAddressClientCreation.java index 02bc2cade061..2457a00fe52c 100644 --- a/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneAddressClientCreation.java +++ b/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneAddressClientCreation.java @@ -27,7 +27,10 @@ import org.apache.hadoop.hdds.conf.InMemoryConfiguration; import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_SERVICE_IDS_KEY; -import org.junit.jupiter.api.Assertions; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.Test; @@ -41,7 +44,7 @@ public void implicitNonHA() throws OzoneClientException, IOException { TestableOzoneAddress address = new TestableOzoneAddress("/vol1/bucket1/key1"); address.createClient(new InMemoryConfiguration()); - Assertions.assertTrue(address.simpleCreation); + assertTrue(address.simpleCreation); } @Test @@ -51,8 +54,8 @@ public void implicitHAOneServiceId() new TestableOzoneAddress("/vol1/bucket1/key1"); address.createClient( new InMemoryConfiguration(OZONE_OM_SERVICE_IDS_KEY, "service1")); - Assertions.assertFalse(address.simpleCreation); - Assertions.assertEquals("service1", address.serviceId); + assertFalse(address.simpleCreation); + assertEquals("service1", address.serviceId); } @Test @@ -60,7 +63,7 @@ public void implicitHaMultipleServiceId() throws OzoneClientException, IOException { TestableOzoneAddress address = new TestableOzoneAddress("/vol1/bucket1/key1"); - Assertions.assertThrows(OzoneClientException.class, () -> + assertThrows(OzoneClientException.class, () -> address.createClient(new InMemoryConfiguration(OZONE_OM_SERVICE_IDS_KEY, "service1,service2"))); } @@ -73,8 +76,8 @@ public void explicitHaMultipleServiceId() address.createClient( new InMemoryConfiguration(OZONE_OM_SERVICE_IDS_KEY, "service1,service2")); - Assertions.assertFalse(address.simpleCreation); - Assertions.assertEquals("service1", address.serviceId); + assertFalse(address.simpleCreation); + assertEquals("service1", address.serviceId); } @Test @@ -82,9 +85,9 @@ public void explicitNonHAHostPort() throws OzoneClientException, IOException { TestableOzoneAddress address = new TestableOzoneAddress("o3://om:9862/vol1/bucket1/key1"); address.createClient(new InMemoryConfiguration()); - Assertions.assertFalse(address.simpleCreation); - Assertions.assertEquals("om", address.host); - Assertions.assertEquals(9862, address.port); + assertFalse(address.simpleCreation); + assertEquals("om", address.host); + assertEquals(9862, address.port); } @Test @@ -94,9 +97,9 @@ public void explicitHAHostPortWithServiceId() new TestableOzoneAddress("o3://om:9862/vol1/bucket1/key1"); address.createClient( new InMemoryConfiguration(OZONE_OM_SERVICE_IDS_KEY, "service1")); - Assertions.assertFalse(address.simpleCreation); - Assertions.assertEquals("om", address.host); - Assertions.assertEquals(9862, address.port); + assertFalse(address.simpleCreation); + assertEquals("om", address.host); + assertEquals(9862, address.port); } @Test @@ -107,9 +110,9 @@ public void explicitAHostPortWithServiceIds() address.createClient( new InMemoryConfiguration(OZONE_OM_SERVICE_IDS_KEY, "service1,service2")); - Assertions.assertFalse(address.simpleCreation); - Assertions.assertEquals("om", address.host); - Assertions.assertEquals(9862, address.port); + assertFalse(address.simpleCreation); + assertEquals("om", address.host); + assertEquals(9862, address.port); } @Test @@ -118,8 +121,8 @@ public void explicitNonHAHost() throws OzoneClientException, IOException { new TestableOzoneAddress("o3://om/vol1/bucket1/key1"); address.createClient( new InMemoryConfiguration(OZONE_OM_SERVICE_IDS_KEY, "service1")); - Assertions.assertFalse(address.simpleCreation); - Assertions.assertEquals("om", address.host); + assertFalse(address.simpleCreation); + assertEquals("om", address.host); } @Test @@ -127,16 +130,16 @@ public void explicitHAHostPort() throws OzoneClientException, IOException { TestableOzoneAddress address = new TestableOzoneAddress("o3://om:1234/vol1/bucket1/key1"); address.createClient(new InMemoryConfiguration()); - Assertions.assertFalse(address.simpleCreation); - Assertions.assertEquals("om", address.host); - Assertions.assertEquals(1234, address.port); + assertFalse(address.simpleCreation); + assertEquals("om", address.host); + assertEquals(1234, address.port); } @Test public void explicitWrongScheme() throws OzoneClientException, IOException { TestableOzoneAddress address = new TestableOzoneAddress("ssh://host/vol1/bucket1/key1"); - Assertions.assertThrows(OzoneClientException.class, () -> + assertThrows(OzoneClientException.class, () -> address.createClient(new InMemoryConfiguration())); } diff --git a/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/shell/keys/TestChecksumKeyHandler.java b/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/shell/keys/TestChecksumKeyHandler.java index c55cb9f55ac4..d4fa929614fb 100644 --- a/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/shell/keys/TestChecksumKeyHandler.java +++ b/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/shell/keys/TestChecksumKeyHandler.java @@ -32,10 +32,8 @@ import org.apache.hadoop.ozone.client.checksum.CrcUtil; import org.apache.hadoop.util.DataChecksum; import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.mockito.Mockito; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -43,8 +41,10 @@ import java.io.UnsupportedEncodingException; import java.nio.charset.StandardCharsets; -import static org.mockito.ArgumentMatchers.anyString; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.Mockito.anyString; import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; /** * Tests for ChecksumKeyHandler. @@ -91,32 +91,30 @@ public void testChecksumKeyHandler() ObjectStore objectStore = mock(ObjectStore.class); OzoneClient client = mock(OzoneClient.class); - Mockito.when(client.getObjectStore()).thenReturn(objectStore); + when(client.getObjectStore()).thenReturn(objectStore); OzoneVolume volume = mock(OzoneVolume.class); OzoneBucket bucket = mock(OzoneBucket.class); OzoneKeyDetails key = mock(OzoneKeyDetails.class); - Mockito.when(volume.getBucket(anyString())).thenReturn(bucket); - Mockito.when(bucket.getKey(anyString())) - .thenReturn(key); - Mockito.when(objectStore.getVolume(anyString())). - thenReturn(volume); - Mockito.when(key.getDataSize()).thenReturn(keySize); + when(volume.getBucket(anyString())).thenReturn(bucket); + when(bucket.getKey(anyString())).thenReturn(key); + when(objectStore.getVolume(anyString())).thenReturn(volume); + when(key.getDataSize()).thenReturn(keySize); cmd.execute(client, address); ObjectMapper mapper = new ObjectMapper(); JsonNode json = mapper.readTree(outContent.toString("UTF-8")); - Assertions.assertEquals("volume", json.get("volumeName").asText()); - Assertions.assertEquals("bucket", json.get("bucketName").asText()); - Assertions.assertEquals("key", json.get("name").asText()); - Assertions.assertEquals(keySize, json.get("dataSize").asLong()); - Assertions.assertEquals("COMPOSITE-CRC32", json.get("algorithm").asText()); + assertEquals("volume", json.get("volumeName").asText()); + assertEquals("bucket", json.get("bucketName").asText()); + assertEquals("key", json.get("name").asText()); + assertEquals(keySize, json.get("dataSize").asLong()); + assertEquals("COMPOSITE-CRC32", json.get("algorithm").asText()); String expectedChecksum = javax.xml.bind.DatatypeConverter.printHexBinary( CrcUtil.intToBytes(Integer.valueOf(CHECKSUM))); - Assertions.assertEquals(expectedChecksum, json.get("checksum").asText()); + assertEquals(expectedChecksum, json.get("checksum").asText()); } }