diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestRootedOzoneFileSystem.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestRootedOzoneFileSystem.java index 272a12a492b..168d315a497 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestRootedOzoneFileSystem.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestRootedOzoneFileSystem.java @@ -1886,9 +1886,9 @@ public void testFileDelete() throws Exception { ContractTestUtils.touch(fs, childFolderFile); } - assertTrue(fs.listStatus(grandparent).length == 1); - assertTrue(fs.listStatus(parent).length == 9); - assertTrue(fs.listStatus(childFolder).length == 8); + assertEquals(1, fs.listStatus(grandparent).length); + assertEquals(9, fs.listStatus(parent).length); + assertEquals(8, fs.listStatus(childFolder).length); Boolean successResult = fs.delete(grandparent, true); assertTrue(successResult); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestRootedOzoneFileSystemWithFSO.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestRootedOzoneFileSystemWithFSO.java index 49da3e72188..73060701b75 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestRootedOzoneFileSystemWithFSO.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestRootedOzoneFileSystemWithFSO.java @@ -201,7 +201,7 @@ public void testDeleteVolumeAndBucket() throws IOException { assertTrue(getFs().delete(bucketPath2, true)); assertTrue(getFs().delete(volumePath1, false)); long deletes = getOMMetrics().getNumKeyDeletes(); - assertTrue(deletes == prevDeletes + 1); + assertEquals(prevDeletes + 1, deletes); } /** diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestLeaderChoosePolicy.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestLeaderChoosePolicy.java index a695038d444..725b17ee9d6 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestLeaderChoosePolicy.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestLeaderChoosePolicy.java @@ -94,9 +94,9 @@ private void checkLeaderBalance(int dnNum, int leaderNumOfEachDn) leaderCount.put(leader, leaderCount.get(leader) + 1); } - assertTrue(leaderCount.size() == dnNum); + assertEquals(dnNum, leaderCount.size()); for (Map.Entry entry: leaderCount.entrySet()) { - assertTrue(leaderCount.get(entry.getKey()) == leaderNumOfEachDn); + assertEquals(leaderNumOfEachDn, leaderCount.get(entry.getKey())); } } diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineClose.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineClose.java index 99dd1d1768d..6d523b21df0 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineClose.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineClose.java @@ -63,6 +63,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; /** * Tests for Pipeline Closing. @@ -229,7 +230,7 @@ public void testPipelineCloseWithLogFailure() try { pipelineManager.getPipeline(openPipeline.getId()); } catch (PipelineNotFoundException e) { - assertTrue(false, "pipeline should exist"); + fail("pipeline should exist"); } DatanodeDetails datanodeDetails = openPipeline.getNodes().get(0); @@ -275,6 +276,6 @@ private boolean verifyCloseForPipeline(Pipeline pipeline, } assertTrue(found, "SCM did not receive a Close action for the Pipeline"); - return found; + return true; } } diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClientAbstract.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClientAbstract.java index 1e5dc26d841..6d19c1ad381 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClientAbstract.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClientAbstract.java @@ -634,7 +634,7 @@ public void testCreateBucketWithVersioning() volume.createBucket(bucketName, builder.build()); OzoneBucket bucket = volume.getBucket(bucketName); assertEquals(bucketName, bucket.getName()); - assertEquals(true, bucket.getVersioning()); + assertTrue(bucket.getVersioning()); } @Test @@ -708,7 +708,7 @@ public void testCreateBucketWithAllArgument() volume.createBucket(bucketName, builder.build()); OzoneBucket bucket = volume.getBucket(bucketName); assertEquals(bucketName, bucket.getName()); - assertEquals(true, bucket.getVersioning()); + assertTrue(bucket.getVersioning()); assertEquals(StorageType.SSD, bucket.getStorageType()); assertTrue(bucket.getAcls().contains(userAcl)); assertEquals(repConfig, bucket.getReplicationConfig()); @@ -812,7 +812,7 @@ public void testSetBucketVersioning() bucket.setVersioning(true); OzoneBucket newBucket = volume.getBucket(bucketName); assertEquals(bucketName, newBucket.getName()); - assertEquals(true, newBucket.getVersioning()); + assertTrue(newBucket.getVersioning()); } @Test @@ -830,7 +830,7 @@ public void testAclsAfterCallingSetBucketProperty() throws Exception { OzoneBucket newBucket = volume.getBucket(bucketName); assertEquals(bucketName, newBucket.getName()); - assertEquals(true, newBucket.getVersioning()); + assertTrue(newBucket.getVersioning()); List aclsAfterSet = newBucket.getAcls(); assertEquals(currentAcls, aclsAfterSet); @@ -3796,7 +3796,7 @@ private void doMultipartUpload(OzoneBucket bucket, String keyName, byte val, assertTrue(latestVersionLocations.isMultipartKey()); latestVersionLocations.getBlocksLatestVersionOnly() .forEach(omKeyLocationInfo -> - assertTrue(omKeyLocationInfo.getPartNumber() != -1)); + assertNotEquals(-1, omKeyLocationInfo.getPartNumber())); } private String initiateMultipartUpload(OzoneBucket bucket, String keyName, @@ -3996,7 +3996,7 @@ public void testDeletedKeyForGDPR() throws Exception { assertEquals("true", key.getMetadata().get(OzoneConsts.GDPR_FLAG)); assertEquals("AES", key.getMetadata().get(OzoneConsts.GDPR_ALGORITHM)); - assertTrue(key.getMetadata().get(OzoneConsts.GDPR_SECRET) != null); + assertNotNull(key.getMetadata().get(OzoneConsts.GDPR_SECRET)); try (OzoneInputStream is = bucket.readKey(keyName)) { assertInputStreamContent(text, is); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClientForAclAuditLog.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClientForAclAuditLog.java index 3f7c590bf6e..d2ace27dc34 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClientForAclAuditLog.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClientForAclAuditLog.java @@ -64,6 +64,7 @@ import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_ADMINISTRATORS_WILDCARD; import static org.apache.hadoop.ozone.security.acl.OzoneObj.ResourceType.VOLUME; import static org.apache.hadoop.ozone.security.acl.OzoneObj.StoreType.OZONE; +import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertTrue; /** @@ -287,7 +288,7 @@ private void verifyLog(String... expected) throws Exception { try { // When log entry is expected, the log file will contain one line and // that must be equal to the expected string - assertTrue(lines.size() != 0); + assertNotEquals(0, lines.size()); for (String exp: expected) { assertTrue(lines.get(0).contains(exp)); } diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmBlockVersioning.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmBlockVersioning.java index 428bfa73059..7b8d6653d9b 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmBlockVersioning.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmBlockVersioning.java @@ -39,7 +39,6 @@ import static org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationFactor.ONE; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; @@ -144,7 +143,7 @@ public void testAllocateCommit() throws Exception { List locationInfoList = openKey.getKeyInfo().getLatestVersionLocations() .getBlocksLatestVersionOnly(); - assertTrue(locationInfoList.size() == 1); + assertEquals(1, locationInfoList.size()); locationInfoList.add(locationInfo); keyArgs.setLocationInfoList(locationInfoList); writeClient.commitKey(keyArgs, openKey.getId()); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerListVolumesSecure.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerListVolumesSecure.java index 977bb0d4e9b..1c751bc99a5 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerListVolumesSecure.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerListVolumesSecure.java @@ -294,7 +294,7 @@ private static void doAs(UserGroupInformation ugi, Callable callable) { // Some thread (eg: HeartbeatEndpointTask) will use the login ugi, // so we could not use loginUserFromKeytabAndReturnUGI to switch user. - assertEquals(true, ugi.doAs((PrivilegedAction) () -> { + assertTrue(ugi.doAs((PrivilegedAction) () -> { try { return callable.call(); } catch (Throwable ex) { diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestScmSafeMode.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestScmSafeMode.java index 1d3aaf351fc..d682c7f8f31 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestScmSafeMode.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestScmSafeMode.java @@ -272,7 +272,7 @@ public void testSCMSafeMode() throws Exception { scm = cluster.getStorageContainerManager(); assertTrue(scm.isInSafeMode()); assertFalse(logCapturer.getOutput().contains("SCM exiting safe mode.")); - assertTrue(scm.getCurrentContainerThreshold() == 0); + assertEquals(0, scm.getCurrentContainerThreshold()); for (HddsDatanodeService dn : cluster.getHddsDatanodes()) { dn.start(); } diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestSnapshotDeletingService.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestSnapshotDeletingService.java index 98c23b8076f..a14255d3c15 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestSnapshotDeletingService.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestSnapshotDeletingService.java @@ -407,7 +407,7 @@ public void testSnapshotWithFSO() throws Exception { RepeatedOmKeyInfo activeDBDeleted = next.getValue(); OMMetadataManager metadataManager = cluster.getOzoneManager().getMetadataManager(); - assertEquals(activeDBDeleted.getOmKeyInfoList().size(), 1); + assertEquals(1, activeDBDeleted.getOmKeyInfoList().size()); OmKeyInfo activeDbDeletedKeyInfo = activeDBDeleted.getOmKeyInfoList().get(0); long volumeId = metadataManager diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestContainerReportWithKeys.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestContainerReportWithKeys.java index bdbe4107fbe..a30e3db2218 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestContainerReportWithKeys.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestContainerReportWithKeys.java @@ -140,9 +140,8 @@ public void testContainerReportKeyWrite() throws Exception { Set replicas = scm.getContainerManager().getContainerReplicas( ContainerID.valueOf(keyInfo.getContainerID())); - Assert.assertTrue(replicas.size() == 1); - replicas.stream().forEach(rp -> - Assert.assertTrue(rp.getDatanodeDetails().getParent() != null)); + Assert.assertEquals(1, replicas.size()); + replicas.stream().forEach(rp -> Assert.assertNotNull(rp.getDatanodeDetails().getParent())); LOG.info("SCM Container Info keyCount: {} usedBytes: {}", cinfo.getNumberOfKeys(), cinfo.getUsedBytes()); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestFailoverWithSCMHA.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestFailoverWithSCMHA.java index e1d1ba31d74..43a2e2603e9 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestFailoverWithSCMHA.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestFailoverWithSCMHA.java @@ -115,7 +115,7 @@ public void testFailover() throws Exception { scmClientConfig.setRetryCount(1); scmClientConfig.setRetryInterval(100); scmClientConfig.setMaxRetryTimeout(1500); - assertEquals(scmClientConfig.getRetryCount(), 15); + assertEquals(15, scmClientConfig.getRetryCount()); conf.setFromObject(scmClientConfig); StorageContainerManager scm = getLeader(cluster); assertNotNull(scm); @@ -161,7 +161,7 @@ public void testMoveFailover() throws Exception { scmClientConfig.setRetryCount(1); scmClientConfig.setRetryInterval(100); scmClientConfig.setMaxRetryTimeout(1500); - assertEquals(scmClientConfig.getRetryCount(), 15); + assertEquals(15, scmClientConfig.getRetryCount()); conf.setFromObject(scmClientConfig); StorageContainerManager scm = getLeader(cluster); assertNotNull(scm); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestSCMMXBean.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestSCMMXBean.java index a3314f59e7d..94019ed1d62 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestSCMMXBean.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestSCMMXBean.java @@ -159,12 +159,12 @@ public void testSCMContainerStateCount() throws Exception { containerStateCount.forEach((k, v) -> { if (k.equals(HddsProtos.LifeCycleState.CLOSING.toString())) { - assertEquals((int)v, 5); + assertEquals(5, (int)v); } else if (k.equals(HddsProtos.LifeCycleState.CLOSED.toString())) { - assertEquals((int)v, 5); + assertEquals(5, (int)v); } else { // Remaining all container state count should be zero. - assertEquals((int)v, 0); + assertEquals(0, (int)v); } }); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestStorageContainerManager.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestStorageContainerManager.java index 6916e8cfb84..9286cfe521d 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestStorageContainerManager.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestStorageContainerManager.java @@ -1073,7 +1073,7 @@ public void testIncrementalContainerReportQueue() throws Exception { eventQueue.fireEvent(SCMEvents.INCREMENTAL_CONTAINER_REPORT, dndata); eventQueue.fireEvent(SCMEvents.INCREMENTAL_CONTAINER_REPORT, dndata); eventQueue.fireEvent(SCMEvents.INCREMENTAL_CONTAINER_REPORT, dndata); - Assert.assertTrue(containerReportExecutors.droppedEvents() == 0); + Assert.assertEquals(0, containerReportExecutors.droppedEvents()); Thread.currentThread().sleep(3000); Assert.assertEquals(containerReportExecutors.scheduledEvents(), containerReportExecutors.queuedEvents()); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestXceiverClientManager.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestXceiverClientManager.java index 9130a87b1a5..ca85c5cf9e3 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestXceiverClientManager.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestXceiverClientManager.java @@ -117,7 +117,7 @@ public void testCaching(boolean securityEnabled) throws IOException { clientManager.releaseClient(client1, true); clientManager.releaseClient(client2, true); clientManager.releaseClient(client3, true); - Assertions.assertTrue(clientManager.getClientCache().size() == 0); + Assertions.assertEquals(0, clientManager.getClientCache().size()); } } @@ -159,7 +159,7 @@ public void testFreeByReference() throws IOException { XceiverClientSpi nonExistent1 = cache.getIfPresent( container1.getContainerInfo().getPipelineID().getId().toString() + container1.getContainerInfo().getReplicationType()); - Assertions.assertEquals(null, nonExistent1); + Assertions.assertNull(nonExistent1); // However container call should succeed because of refcount on the client ContainerProtocolCalls.createContainer(client1, container1.getContainerInfo().getContainerID(), null); @@ -218,7 +218,7 @@ public void testFreeByEviction() throws IOException { XceiverClientSpi nonExistent = cache.getIfPresent( container1.getContainerInfo().getPipelineID().getId().toString() + container1.getContainerInfo().getReplicationType()); - Assertions.assertEquals(null, nonExistent); + Assertions.assertNull(nonExistent); // Any container operation should now fail Throwable t = Assertions.assertThrows(IOException.class, diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/pipeline/TestSCMPipelineMetrics.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/pipeline/TestSCMPipelineMetrics.java index 53f4ce5e16a..568d9679d17 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/pipeline/TestSCMPipelineMetrics.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/pipeline/TestSCMPipelineMetrics.java @@ -109,7 +109,7 @@ public void testNumBlocksAllocated() throws IOException, TimeoutException { Pipeline pipeline = block.getPipeline(); long numBlocksAllocated = getLongCounter( SCMPipelineMetrics.getBlockAllocationMetricName(pipeline), metrics); - Assertions.assertEquals(numBlocksAllocated, 1); + Assertions.assertEquals(1, numBlocksAllocated); // destroy the pipeline Assertions.assertDoesNotThrow(() ->