This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new faaef16436 HDDS-10034. Improve assertTrue assertions in ozone-recon
(#5943)
faaef16436 is described below
commit faaef164367b77cc3d44e95f1f9056a85f3c5d43
Author: Zhaohui Wang <[email protected]>
AuthorDate: Mon Jan 8 19:54:59 2024 +0800
HDDS-10034. Improve assertTrue assertions in ozone-recon (#5943)
---
.../ozone/recon/api/TestContainerEndpoint.java | 28 +++++++++++-----------
.../hadoop/ozone/recon/api/TestEndpoints.java | 3 ++-
.../ozone/recon/api/TestFeaturesEndPoint.java | 6 ++---
.../ozone/recon/api/TestOmDBInsightEndPoint.java | 4 ++--
.../ozone/recon/api/filters/TestAdminFilter.java | 5 ++--
.../ozone/recon/fsck/TestContainerHealthTask.java | 12 ++++------
.../ozone/recon/heatmap/TestHeatMapInfo.java | 9 ++++---
.../ozone/recon/scm/TestReconContainerManager.java | 3 ++-
.../ozone/recon/scm/TestReconNodeManager.java | 6 ++---
.../ozone/recon/scm/TestReconPipelineManager.java | 9 +++----
.../recon/tasks/TestContainerKeyMapperTask.java | 22 ++++++++---------
.../recon/tasks/TestOmUpdateEventValidator.java | 3 ++-
.../recon/tasks/TestReconTaskControllerImpl.java | 15 ++++++------
13 files changed, 63 insertions(+), 62 deletions(-)
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestContainerEndpoint.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestContainerEndpoint.java
index 38522a7b82..6733bce59b 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestContainerEndpoint.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestContainerEndpoint.java
@@ -99,6 +99,7 @@ import static
org.apache.hadoop.ozone.recon.OMMetadataManagerTestUtils.getTestRe
import static
org.apache.hadoop.ozone.recon.OMMetadataManagerTestUtils.initializeNewOmMetadataManager;
import static
org.apache.hadoop.ozone.recon.OMMetadataManagerTestUtils.writeDataToOm;
import static
org.apache.hadoop.ozone.recon.OMMetadataManagerTestUtils.writeKeyToOm;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
@@ -449,8 +450,7 @@ public class TestContainerEndpoint {
keyMetadata = iterator.next();
assertEquals("key_two", keyMetadata.getKey());
assertEquals(2, keyMetadata.getVersions().size());
- assertTrue(keyMetadata.getVersions().contains(0L) && keyMetadata
- .getVersions().contains(1L));
+ assertThat(keyMetadata.getVersions()).contains(0L, 1L);
assertEquals(2, keyMetadata.getBlockIds().size());
blockIds = keyMetadata.getBlockIds();
assertEquals(103, blockIds.get(0L).iterator().next().getLocalID());
@@ -459,7 +459,7 @@ public class TestContainerEndpoint {
response = containerEndpoint.getKeysForContainer(3L, -1, "");
data = (KeysResponse) response.getEntity();
keyMetadataList = data.getKeys();
- assertTrue(keyMetadataList.isEmpty());
+ assertThat(keyMetadataList).isEmpty();
assertEquals(0, data.getTotalCount());
// test if limit works as expected
@@ -759,7 +759,7 @@ public class TestContainerEndpoint {
new HashSet<>(Arrays.asList("host2", "host3", "host4")));
List<ContainerHistory> containerReplicas = container.getReplicas();
containerReplicas.forEach(history -> {
- assertTrue(datanodes.contains(history.getDatanodeHost()));
+ assertThat(datanodes).contains(history.getDatanodeHost());
});
}
@@ -838,7 +838,7 @@ public class TestContainerEndpoint {
new HashSet<>(Arrays.asList("host2", "host3", "host4")));
List<ContainerHistory> containerReplicas = missing.get(0).getReplicas();
containerReplicas.forEach(history -> {
- assertTrue(datanodes.contains(history.getDatanodeHost()));
+ assertThat(datanodes).contains(history.getDatanodeHost());
});
List<UnhealthyContainerMetadata> overRep = records
@@ -999,7 +999,7 @@ public class TestContainerEndpoint {
u1.toString(), u2.toString(), u3.toString(), u4.toString())));
assertEquals(4, histories.size());
histories.forEach(history -> {
- assertTrue(datanodes.contains(history.getDatanodeUuid()));
+ assertThat(datanodes).contains(history.getDatanodeUuid());
if (history.getDatanodeUuid().equals(u1.toString())) {
assertEquals("host1", history.getDatanodeHost());
assertEquals(1L, history.getFirstSeenTime());
@@ -1010,11 +1010,11 @@ public class TestContainerEndpoint {
// Check getLatestContainerHistory
List<ContainerHistory> hist1 = reconContainerManager
.getLatestContainerHistory(1L, 10);
- assertTrue(hist1.size() <= 10);
+ assertThat(hist1.size()).isLessThanOrEqualTo(10);
// Descending order by last report timestamp
for (int i = 0; i < hist1.size() - 1; i++) {
- assertTrue(hist1.get(i).getLastSeenTime()
- >= hist1.get(i + 1).getLastSeenTime());
+ assertThat(hist1.get(i).getLastSeenTime())
+ .isGreaterThanOrEqualTo(hist1.get(i + 1).getLastSeenTime());
}
}
@@ -1477,16 +1477,16 @@ public class TestContainerEndpoint {
.map(ContainerDiscrepancyInfo::getContainerID)
.collect(Collectors.toList());
// ContainerID 1 and 2 are missing in OM but present in SCM
- assertTrue(missingContainerIdsOM.contains(3L));
- assertTrue(missingContainerIdsOM.contains(4L));
- assertTrue(missingContainerIdsOM.contains(5L));
+ assertThat(missingContainerIdsOM).contains(3L);
+ assertThat(missingContainerIdsOM).contains(4L);
+ assertThat(missingContainerIdsOM).contains(5L);
List<Long> missingContainerIdsSCM =
containerDiscrepancyInfoListSCM.stream()
.map(ContainerDiscrepancyInfo::getContainerID)
.collect(Collectors.toList());
// ContainerID 1 and 2 are missing in SCM but present in OM
- assertTrue(missingContainerIdsSCM.contains(1L));
- assertTrue(missingContainerIdsSCM.contains(2L));
+ assertThat(missingContainerIdsSCM).contains(1L);
+ assertThat(missingContainerIdsSCM).contains(2L);
}
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestEndpoints.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestEndpoints.java
index 497bf51a2d..6bd0cba4df 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestEndpoints.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestEndpoints.java
@@ -113,6 +113,7 @@ import static
org.apache.hadoop.ozone.recon.OMMetadataManagerTestUtils.writeData
import static
org.apache.hadoop.ozone.recon.OMMetadataManagerTestUtils.writeDeletedKeysToOm;
import static
org.apache.hadoop.ozone.recon.spi.impl.PrometheusServiceProviderImpl.PROMETHEUS_INSTANT_QUERY_API;
import static
org.hadoop.ozone.recon.schema.tables.GlobalStatsTable.GLOBAL_STATS;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -899,7 +900,7 @@ public class TestEndpoints extends AbstractReconSqlDBTest {
// Test fetching non-existent container size
response = utilizationEndpoint.getContainerCounts(8192L);
resultSet = (List<ContainerCountBySize>) response.getEntity();
- assertTrue(resultSet.isEmpty());
+ assertThat(resultSet).isEmpty();
}
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestFeaturesEndPoint.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestFeaturesEndPoint.java
index cb655578fd..59329ebfeb 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestFeaturesEndPoint.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestFeaturesEndPoint.java
@@ -40,9 +40,9 @@ import static
org.apache.hadoop.hdds.recon.ReconConfigKeys.OZONE_RECON_HEATMAP_E
import static
org.apache.hadoop.hdds.recon.ReconConfigKeys.OZONE_RECON_HEATMAP_PROVIDER_KEY;
import static
org.apache.hadoop.ozone.recon.OMMetadataManagerTestUtils.getTestReconOmMetadataManager;
import static
org.apache.hadoop.ozone.recon.OMMetadataManagerTestUtils.initializeNewOmMetadataManager;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
/**
@@ -100,7 +100,7 @@ public class TestFeaturesEndPoint {
List<FeatureProvider.Feature> allDisabledFeatures =
(List<FeatureProvider.Feature>) disabledFeatures.getEntity();
assertNotNull(allDisabledFeatures);
- assertTrue(allDisabledFeatures.size() > 0);
+ assertThat(allDisabledFeatures.size()).isGreaterThan(0);
assertEquals(FeatureProvider.Feature.HEATMAP.getFeatureName(),
allDisabledFeatures.get(0).getFeatureName());
}
@@ -128,7 +128,7 @@ public class TestFeaturesEndPoint {
List<FeatureProvider.Feature> allDisabledFeatures =
(List<FeatureProvider.Feature>) disabledFeatures.getEntity();
assertNotNull(allDisabledFeatures);
- assertTrue(allDisabledFeatures.size() > 0);
+ assertThat(allDisabledFeatures.size()).isGreaterThan(0);
assertEquals(FeatureProvider.Feature.HEATMAP.getFeatureName(),
allDisabledFeatures.get(0).getFeatureName());
}
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestOmDBInsightEndPoint.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestOmDBInsightEndPoint.java
index bf3a172c7a..2c6253cc78 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestOmDBInsightEndPoint.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestOmDBInsightEndPoint.java
@@ -69,8 +69,8 @@ import static
org.apache.hadoop.ozone.recon.OMMetadataManagerTestUtils.getRandom
import static
org.apache.hadoop.ozone.recon.OMMetadataManagerTestUtils.getTestReconOmMetadataManager;
import static
org.apache.hadoop.ozone.recon.OMMetadataManagerTestUtils.initializeNewOmMetadataManager;
import static
org.apache.hadoop.ozone.recon.OMMetadataManagerTestUtils.writeDataToOm;
+import static org.assertj.core.api.Assertions.assertThat;
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.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -589,7 +589,7 @@ public class TestOmDBInsightEndPoint extends
AbstractReconSqlDBTest {
repeatedOmKeyInfo ->
repeatedOmKeyInfo.getOmKeyInfoList().get(0)
.getKeyName())
.collect(Collectors.toList());
- assertFalse(pendingDeleteKeys.contains("key_one"));
+ assertThat(pendingDeleteKeys).doesNotContain("key_one");
}
@Test
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/filters/TestAdminFilter.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/filters/TestAdminFilter.java
index a9811a584b..e30590df55 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/filters/TestAdminFilter.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/filters/TestAdminFilter.java
@@ -17,6 +17,7 @@
*/
package org.apache.hadoop.ozone.recon.api.filters;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
@@ -67,7 +68,7 @@ public class TestAdminFilter {
Set<Class<?>> allEndpoints =
reflections.getTypesAnnotatedWith(Path.class);
- assertFalse(allEndpoints.isEmpty());
+ assertThat(allEndpoints).isNotEmpty();
// If an endpoint is added, it must be explicitly added to this set or be
// marked with @AdminOnly for this test to pass.
@@ -80,7 +81,7 @@ public class TestAdminFilter {
nonAdminEndpoints.add(TaskStatusService.class);
nonAdminEndpoints.add(TriggerDBSyncEndpoint.class);
- assertTrue(allEndpoints.containsAll(nonAdminEndpoints));
+ assertThat(allEndpoints).containsAll(nonAdminEndpoints);
Set<Class<?>> adminEndpoints = Sets.difference(allEndpoints,
nonAdminEndpoints);
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/fsck/TestContainerHealthTask.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/fsck/TestContainerHealthTask.java
index 1c98402ef0..ea8f9f2a4b 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/fsck/TestContainerHealthTask.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/fsck/TestContainerHealthTask.java
@@ -19,9 +19,9 @@
package org.apache.hadoop.ozone.recon.fsck;
import static
org.hadoop.ozone.recon.schema.ContainerSchemaDefinition.UnHealthyContainerStates.ALL_REPLICAS_UNHEALTHY;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -137,7 +137,7 @@ public class TestContainerHealthTask extends
AbstractReconSqlDBTest {
.thenReturn(Collections.emptySet());
List<UnhealthyContainers> all = unHealthyContainersTableHandle.findAll();
- assertTrue(all.isEmpty());
+ assertThat(all).isEmpty();
long currentTime = System.currentTimeMillis();
ReconTaskStatusDao reconTaskStatusDao = getDao(ReconTaskStatusDao.class);
@@ -192,8 +192,7 @@ public class TestContainerHealthTask extends
AbstractReconSqlDBTest {
ReconTaskStatus taskStatus =
reconTaskStatusDao.findById(containerHealthTask.getTaskName());
- assertTrue(taskStatus.getLastUpdatedTimestamp() >
- currentTime);
+
assertThat(taskStatus.getLastUpdatedTimestamp()).isGreaterThan(currentTime);
// Now run the job again, to check that relevant records are updated or
// removed as appropriate. Need to adjust the return value for all the
mocks
@@ -300,7 +299,7 @@ public class TestContainerHealthTask extends
AbstractReconSqlDBTest {
.thenReturn(new ContainerWithPipeline(mockContainers.get(0), null));
List<UnhealthyContainers> all = unHealthyContainersTableHandle.findAll();
- assertTrue(all.isEmpty());
+ assertThat(all).isEmpty();
long currentTime = System.currentTimeMillis();
ReconTaskStatusDao reconTaskStatusDao = getDao(ReconTaskStatusDao.class);
@@ -328,8 +327,7 @@ public class TestContainerHealthTask extends
AbstractReconSqlDBTest {
ReconTaskStatus taskStatus =
reconTaskStatusDao.findById(containerHealthTask.getTaskName());
- assertTrue(taskStatus.getLastUpdatedTimestamp() >
- currentTime);
+
assertThat(taskStatus.getLastUpdatedTimestamp()).isGreaterThan(currentTime);
}
private Set<ContainerReplica> getMockReplicas(
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/heatmap/TestHeatMapInfo.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/heatmap/TestHeatMapInfo.java
index 885df32b7c..856b556e8a 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/heatmap/TestHeatMapInfo.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/heatmap/TestHeatMapInfo.java
@@ -45,9 +45,9 @@ import java.util.stream.Collectors;
import static
org.apache.hadoop.ozone.recon.OMMetadataManagerTestUtils.getTestReconOmMetadataManager;
import static
org.apache.hadoop.ozone.recon.OMMetadataManagerTestUtils.initializeNewOmMetadataManager;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
/**
@@ -761,7 +761,7 @@ public class TestHeatMapInfo {
Arrays.stream(entities).collect(Collectors.toList());
EntityReadAccessHeatMapResponse entityReadAccessHeatMapResponse =
heatMapUtil.generateHeatMap(entityMetaDataList);
- assertTrue(entityReadAccessHeatMapResponse.getChildren().size() > 0);
+
assertThat(entityReadAccessHeatMapResponse.getChildren().size()).isGreaterThan(0);
assertEquals(12, entityReadAccessHeatMapResponse.getChildren().size());
assertEquals(25600, entityReadAccessHeatMapResponse.getSize());
assertEquals(2924, entityReadAccessHeatMapResponse.getMinAccessCount());
@@ -870,7 +870,7 @@ public class TestHeatMapInfo {
//}
EntityReadAccessHeatMapResponse entityReadAccessHeatMapResponse =
heatMapUtil.generateHeatMap(entityMetaDataList);
- assertTrue(entityReadAccessHeatMapResponse.getChildren().size() > 0);
+
assertThat(entityReadAccessHeatMapResponse.getChildren().size()).isGreaterThan(0);
assertEquals(2, entityReadAccessHeatMapResponse.getChildren().size());
assertEquals(512, entityReadAccessHeatMapResponse.getSize());
assertEquals(8590, entityReadAccessHeatMapResponse.getMinAccessCount());
@@ -1098,8 +1098,7 @@ public class TestHeatMapInfo {
//}
EntityReadAccessHeatMapResponse entityReadAccessHeatMapResponse =
heatMapUtil.generateHeatMap(entityMetaDataList);
- assertTrue(
- entityReadAccessHeatMapResponse.getChildren().size() > 0);
+
assertThat(entityReadAccessHeatMapResponse.getChildren().size()).isGreaterThan(0);
assertEquals(2,
entityReadAccessHeatMapResponse.getChildren().size());
assertEquals(0.0,
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/scm/TestReconContainerManager.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/scm/TestReconContainerManager.java
index 642ed7a096..0ed9b1318a 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/scm/TestReconContainerManager.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/scm/TestReconContainerManager.java
@@ -23,6 +23,7 @@ import static
org.apache.hadoop.hdds.protocol.proto.HddsProtos.LifeCycleState.CL
import static
org.apache.hadoop.hdds.protocol.proto.HddsProtos.LifeCycleState.CLOSING;
import static
org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.ContainerReplicaProto.State.OPEN;
import static
org.apache.hadoop.ozone.recon.OMMetadataManagerTestUtils.getRandomPipeline;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -247,7 +248,7 @@ public class TestReconContainerManager
// Should still have 1 entry in the replica history map
assertEquals(1, repHistMap.size());
// Now last seen time should be larger than first seen time
- assertTrue(repHist1.getLastSeenTime() > repHist1.getFirstSeenTime());
+
assertThat(repHist1.getLastSeenTime()).isGreaterThan(repHist1.getFirstSeenTime());
assertEquals(1051L, repHist1.getBcsId());
// Init DN02
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/scm/TestReconNodeManager.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/scm/TestReconNodeManager.java
index 2e52b707df..17f2556e59 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/scm/TestReconNodeManager.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/scm/TestReconNodeManager.java
@@ -24,10 +24,10 @@ import static
org.apache.hadoop.hdds.protocol.proto.HddsProtos.NodeOperationalSt
import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_NAMES;
import static
org.apache.hadoop.ozone.container.upgrade.UpgradeUtils.defaultLayoutVersionProto;
import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_METADATA_DIRS;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -99,7 +99,7 @@ public class TestReconNodeManager {
scmStorageConfig, eventQueue, clusterMap, nodeTable, versionManager);
ReconNewNodeHandler reconNewNodeHandler =
new ReconNewNodeHandler(reconNodeManager);
- assertTrue(reconNodeManager.getAllNodes().isEmpty());
+ assertThat(reconNodeManager.getAllNodes()).isEmpty();
DatanodeDetails datanodeDetails = randomDatanodeDetails();
String uuidString = datanodeDetails.getUuidString();
@@ -219,7 +219,7 @@ public class TestReconNodeManager {
scmStorageConfig, eventQueue, clusterMap, nodeTable, versionManager);
ReconNewNodeHandler reconNewNodeHandler =
new ReconNewNodeHandler(reconNodeManager);
- assertTrue(reconNodeManager.getAllNodes().isEmpty());
+ assertThat(reconNodeManager.getAllNodes()).isEmpty();
DatanodeDetails datanodeDetails = randomDatanodeDetails();
datanodeDetails.setHostName("hostname1");
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/scm/TestReconPipelineManager.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/scm/TestReconPipelineManager.java
index 1363cdf63d..92af652c25 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/scm/TestReconPipelineManager.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/scm/TestReconPipelineManager.java
@@ -57,8 +57,10 @@ import static
org.apache.hadoop.hdds.upgrade.HDDSLayoutVersionManager.maxLayoutV
import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_METADATA_DIRS;
import static
org.apache.hadoop.ozone.recon.OMMetadataManagerTestUtils.getRandomPipeline;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertTrue;
import org.junit.jupiter.api.AfterEach;
@@ -221,14 +223,13 @@ public class TestReconPipelineManager {
scmContext);
PipelineFactory pipelineFactory =
reconPipelineManager.getPipelineFactory();
- assertTrue(pipelineFactory instanceof ReconPipelineFactory);
ReconPipelineFactory reconPipelineFactory =
- (ReconPipelineFactory) pipelineFactory;
- assertTrue(reconPipelineFactory.getProviders().isEmpty());
+ assertInstanceOf(ReconPipelineFactory.class, pipelineFactory);
+ assertThat(reconPipelineFactory.getProviders()).isEmpty();
for (ReplicationType type : reconPipelineFactory.getProviders().keySet())
{
PipelineProvider pipelineProvider =
reconPipelineFactory.getProviders().get(type);
- assertTrue(pipelineProvider instanceof ReconPipelineProvider);
+ assertInstanceOf(ReconPipelineProvider.class, pipelineProvider);
}
}
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestContainerKeyMapperTask.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestContainerKeyMapperTask.java
index 390b9821aa..67f962f186 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestContainerKeyMapperTask.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestContainerKeyMapperTask.java
@@ -26,8 +26,8 @@ import static
org.apache.hadoop.ozone.recon.OMMetadataManagerTestUtils.getTestRe
import static
org.apache.hadoop.ozone.recon.OMMetadataManagerTestUtils.initializeNewOmMetadataManager;
import static
org.apache.hadoop.ozone.recon.OMMetadataManagerTestUtils.writeDataToOm;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.IOException;
import java.nio.file.Path;
@@ -106,11 +106,11 @@ public class TestContainerKeyMapperTask {
Map<ContainerKeyPrefix, Integer> keyPrefixesForContainer =
reconContainerMetadataManager.getKeyPrefixesForContainer(1);
- assertTrue(keyPrefixesForContainer.isEmpty());
+ assertThat(keyPrefixesForContainer).isEmpty();
keyPrefixesForContainer = reconContainerMetadataManager
.getKeyPrefixesForContainer(2);
- assertTrue(keyPrefixesForContainer.isEmpty());
+ assertThat(keyPrefixesForContainer).isEmpty();
Pipeline pipeline = getRandomPipeline();
@@ -172,12 +172,12 @@ public class TestContainerKeyMapperTask {
// Make sure the key prefixes are empty for container 1
Map<ContainerKeyPrefix, Integer> keyPrefixesForContainer =
reconContainerMetadataManager.getKeyPrefixesForContainer(1L);
- assertTrue(keyPrefixesForContainer.isEmpty());
+ assertThat(keyPrefixesForContainer).isEmpty();
// Make sure the key prefixes are empty for container 2
keyPrefixesForContainer =
reconContainerMetadataManager.getKeyPrefixesForContainer(2L);
- assertTrue(keyPrefixesForContainer.isEmpty());
+ assertThat(keyPrefixesForContainer).isEmpty();
// Create a random pipeline and a list of OmKeyLocationInfo objects
Pipeline pipeline = getRandomPipeline();
@@ -246,11 +246,11 @@ public class TestContainerKeyMapperTask {
public void testKeyTableProcess() throws IOException {
Map<ContainerKeyPrefix, Integer> keyPrefixesForContainer =
reconContainerMetadataManager.getKeyPrefixesForContainer(1);
- assertTrue(keyPrefixesForContainer.isEmpty());
+ assertThat(keyPrefixesForContainer).isEmpty();
keyPrefixesForContainer = reconContainerMetadataManager
.getKeyPrefixesForContainer(2);
- assertTrue(keyPrefixesForContainer.isEmpty());
+ assertThat(keyPrefixesForContainer).isEmpty();
Pipeline pipeline = getRandomPipeline();
@@ -328,7 +328,7 @@ public class TestContainerKeyMapperTask {
keyPrefixesForContainer = reconContainerMetadataManager
.getKeyPrefixesForContainer(2);
- assertTrue(keyPrefixesForContainer.isEmpty());
+ assertThat(keyPrefixesForContainer).isEmpty();
keyPrefixesForContainer = reconContainerMetadataManager
.getKeyPrefixesForContainer(3);
@@ -351,7 +351,7 @@ public class TestContainerKeyMapperTask {
keyPrefixesForContainer = reconContainerMetadataManager
.getKeyPrefixesForContainer(3);
- assertTrue(keyPrefixesForContainer.isEmpty());
+ assertThat(keyPrefixesForContainer).isEmpty();
assertEquals(1, reconContainerMetadataManager.getKeyCountForContainer(1L));
assertEquals(1, reconContainerMetadataManager.getKeyCountForContainer(2L));
@@ -366,11 +366,11 @@ public class TestContainerKeyMapperTask {
// Verify that keyPrefixesForContainer is empty for container 1 and 2
Map<ContainerKeyPrefix, Integer> keyPrefixesForContainer =
reconContainerMetadataManager.getKeyPrefixesForContainer(1);
- assertTrue(keyPrefixesForContainer.isEmpty());
+ assertThat(keyPrefixesForContainer).isEmpty();
keyPrefixesForContainer = reconContainerMetadataManager
.getKeyPrefixesForContainer(2);
- assertTrue(keyPrefixesForContainer.isEmpty());
+ assertThat(keyPrefixesForContainer).isEmpty();
// Create a random pipeline and a list of OmKeyLocationInfo objects
Pipeline pipeline = getRandomPipeline();
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestOmUpdateEventValidator.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestOmUpdateEventValidator.java
index 3438afe9e6..014bdaf822 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestOmUpdateEventValidator.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestOmUpdateEventValidator.java
@@ -38,6 +38,7 @@ import java.util.List;
import static
org.apache.hadoop.ozone.recon.OMMetadataManagerTestUtils.initializeNewOmMetadataManager;
import static
org.apache.hadoop.ozone.recon.tasks.OMDBUpdateEvent.OMDBUpdateAction.PUT;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.anyString;
@@ -139,7 +140,7 @@ public class TestOmUpdateEventValidator {
// Assert that the captured log messages are not empty
List<String> logMessages = captor.getAllValues();
for (String logMessage : logMessages) {
- assertFalse(logMessage.isEmpty(), "Warning message is empty");
+ assertThat(logMessage).isNotEmpty();
}
}
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestReconTaskControllerImpl.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestReconTaskControllerImpl.java
index d79c90662a..e6cdae9b85 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestReconTaskControllerImpl.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestReconTaskControllerImpl.java
@@ -18,10 +18,9 @@
package org.apache.hadoop.ozone.recon.tasks;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertSame;
-import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
@@ -92,7 +91,7 @@ public class TestReconTaskControllerImpl extends
AbstractReconSqlDBTest {
long taskTimeStamp = reconTaskStatus.getLastUpdatedTimestamp();
long seqNumber = reconTaskStatus.getLastUpdatedSeqNumber();
- assertTrue(startTime <= taskTimeStamp && taskTimeStamp <= endTime);
+
assertThat(taskTimeStamp).isGreaterThanOrEqualTo(startTime).isLessThanOrEqualTo(endTime);
assertEquals(seqNumber, omUpdateEventBatchMock.getLastSequenceNumber());
}
@@ -111,7 +110,7 @@ public class TestReconTaskControllerImpl extends
AbstractReconSqlDBTest {
reconTaskController.consumeOMEvents(omUpdateEventBatchMock,
mock(OMMetadataManager.class));
- assertFalse(reconTaskController.getRegisteredTasks().isEmpty());
+ assertThat(reconTaskController.getRegisteredTasks()).isNotEmpty();
assertEquals(dummyReconDBTask, reconTaskController.getRegisteredTasks()
.get(dummyReconDBTask.getTaskName()));
@@ -119,7 +118,7 @@ public class TestReconTaskControllerImpl extends
AbstractReconSqlDBTest {
ReconTaskStatus dbRecord = reconTaskStatusDao.findById(taskName);
assertEquals(taskName, dbRecord.getTaskName());
- assertTrue(dbRecord.getLastUpdatedTimestamp() > currentTime);
+ assertThat(dbRecord.getLastUpdatedTimestamp()).isGreaterThan(currentTime);
assertEquals(Long.valueOf(100L), dbRecord.getLastUpdatedSeqNumber());
}
@@ -140,7 +139,7 @@ public class TestReconTaskControllerImpl extends
AbstractReconSqlDBTest {
reconTaskController.consumeOMEvents(omUpdateEventBatchMock,
omMetadataManagerMock);
- assertFalse(reconTaskController.getRegisteredTasks().isEmpty());
+ assertThat(reconTaskController.getRegisteredTasks()).isNotEmpty();
assertEquals(dummyReconDBTask, reconTaskController.getRegisteredTasks()
.get(dummyReconDBTask.getTaskName()));
}
@@ -148,7 +147,7 @@ public class TestReconTaskControllerImpl extends
AbstractReconSqlDBTest {
//Should be ignored now.
reconTaskController.consumeOMEvents(omUpdateEventBatchMock,
omMetadataManagerMock);
- assertTrue(reconTaskController.getRegisteredTasks().isEmpty());
+ assertThat(reconTaskController.getRegisteredTasks()).isEmpty();
reconTaskStatusDao = getDao(ReconTaskStatusDao.class);
ReconTaskStatus dbRecord = reconTaskStatusDao.findById(taskName);
@@ -186,7 +185,7 @@ public class TestReconTaskControllerImpl extends
AbstractReconSqlDBTest {
long taskTimeStamp = reconTaskStatus.getLastUpdatedTimestamp();
long seqNumber = reconTaskStatus.getLastUpdatedSeqNumber();
- assertTrue(startTime <= taskTimeStamp && taskTimeStamp <= endTime);
+
assertThat(taskTimeStamp).isGreaterThanOrEqualTo(startTime).isLessThanOrEqualTo(endTime);
assertEquals(seqNumber,
omMetadataManagerMock.getLastSequenceNumberFromDB());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
