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 1b6cad9ac1 HDDS-10096. Improve assertTrue assertions in SCM
integration tests (#6098)
1b6cad9ac1 is described below
commit 1b6cad9ac17cad31a4b7c37732377aacd790f2d7
Author: Zhaohui Wang <[email protected]>
AuthorDate: Fri Jan 26 17:54:32 2024 +0800
HDDS-10096. Improve assertTrue assertions in SCM integration tests (#6098)
---
.../hadoop/hdds/scm/TestFailoverWithSCMHA.java | 22 ++++++-------
.../scm/TestGetCommittedBlockLengthAndPutKey.java | 8 ++---
.../hadoop/hdds/scm/TestRatisPipelineLeader.java | 12 +++-----
.../hdds/scm/TestSCMDbCheckpointServlet.java | 18 +++++------
.../hdds/scm/TestSCMInstallSnapshotWithHA.java | 9 +++---
.../org/apache/hadoop/hdds/scm/TestSCMMXBean.java | 10 +++---
.../hadoop/hdds/scm/TestSCMNodeManagerMXBean.java | 10 +++---
.../apache/hadoop/hdds/scm/TestSCMSnapshot.java | 8 ++---
.../hadoop/hdds/scm/TestSecretKeySnapshot.java | 7 +++--
.../apache/hadoop/hdds/scm/TestSecretKeysApi.java | 6 ++--
.../hdds/scm/TestStorageContainerManager.java | 24 +++++++--------
.../hadoop/hdds/scm/TestXceiverClientGrpc.java | 6 ++--
.../hadoop/hdds/scm/TestXceiverClientManager.java | 6 ++--
.../TestContainerStateManagerIntegration.java | 36 ++++++++++------------
.../scm/node/TestDecommissionAndMaintenance.java | 7 +++--
.../hdds/scm/pipeline/TestMultiRaftSetup.java | 7 ++---
.../hdds/scm/pipeline/TestNode2PipelineMap.java | 7 ++---
.../hdds/scm/pipeline/TestPipelineClose.java | 6 ++--
.../hdds/scm/pipeline/TestSCMPipelineMetrics.java | 2 +-
.../hadoop/hdds/scm/storage/TestCommitWatcher.java | 36 ++++++++++------------
.../hdds/scm/storage/TestContainerCommandsEC.java | 25 +++++++--------
21 files changed, 131 insertions(+), 141 deletions(-)
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestFailoverWithSCMHA.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestFailoverWithSCMHA.java
index 8880ab29d5..95d9f52b4c 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestFailoverWithSCMHA.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestFailoverWithSCMHA.java
@@ -54,10 +54,10 @@ import java.util.concurrent.TimeoutException;
import static
org.apache.hadoop.hdds.protocol.proto.HddsProtos.ContainerBalancerConfigurationProto;
import static org.apache.hadoop.hdds.scm.HddsTestUtils.getContainer;
import static
org.apache.hadoop.hdds.protocol.MockDatanodeDetails.randomDatanodeDetails;
+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.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests failover with SCM HA setup.
@@ -132,8 +132,8 @@ public class TestFailoverWithSCMHA {
.createProxy(scmBlockLocationClient, ScmBlockLocationProtocol.class,
conf);
scmBlockLocationProtocol.getScmInfo();
- assertTrue(logCapture.getOutput()
- .contains("Performing failover to suggested leader"));
+ assertThat(logCapture.getOutput())
+ .contains("Performing failover to suggested leader");
scm = getLeader(cluster);
SCMContainerLocationFailoverProxyProvider proxyProvider =
new SCMContainerLocationFailoverProxyProvider(conf, null);
@@ -149,8 +149,8 @@ public class TestFailoverWithSCMHA {
scmContainerClient.allocateContainer(HddsProtos.ReplicationType.RATIS,
HddsProtos.ReplicationFactor.ONE, "ozone");
- assertTrue(logCapture.getOutput()
- .contains("Performing failover to suggested leader"));
+ assertThat(logCapture.getOutput())
+ .contains("Performing failover to suggested leader");
}
@Test
@@ -191,8 +191,8 @@ public class TestFailoverWithSCMHA {
.createProxy(scmBlockLocationClient, ScmBlockLocationProtocol.class,
conf);
scmBlockLocationProtocol.getScmInfo();
- assertTrue(logCapture.getOutput()
- .contains("Performing failover to suggested leader"));
+ assertThat(logCapture.getOutput())
+ .contains("Performing failover to suggested leader");
scm = getLeader(cluster);
assertNotNull(scm);
@@ -200,7 +200,7 @@ public class TestFailoverWithSCMHA {
//get the same inflightMove
Map<ContainerID, MoveDataNodePair> inflightMove =
scm.getReplicationManager().getMoveScheduler().getInflightMove();
- assertTrue(inflightMove.containsKey(id));
+ assertThat(inflightMove).containsKey(id);
MoveDataNodePair mp = inflightMove.get(id);
assertEquals(dn2, mp.getTgt());
assertEquals(dn1, mp.getSrc());
@@ -224,8 +224,8 @@ public class TestFailoverWithSCMHA {
scmContainerClient.allocateContainer(HddsProtos.ReplicationType.RATIS,
HddsProtos.ReplicationFactor.ONE, "ozone");
- assertTrue(logCapture.getOutput()
- .contains("Performing failover to suggested leader"));
+ assertThat(logCapture.getOutput())
+ .contains("Performing failover to suggested leader");
//switch to the new leader successfully, new leader should
//get the same inflightMove , which should not contains
@@ -234,7 +234,7 @@ public class TestFailoverWithSCMHA {
assertNotNull(scm);
inflightMove = scm.getReplicationManager()
.getMoveScheduler().getInflightMove();
- assertFalse(inflightMove.containsKey(id));
+ assertThat(inflightMove).doesNotContainKey(id);
}
/**
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestGetCommittedBlockLengthAndPutKey.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestGetCommittedBlockLengthAndPutKey.java
index 4af53b2901..43fc45efd0 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestGetCommittedBlockLengthAndPutKey.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestGetCommittedBlockLengthAndPutKey.java
@@ -46,9 +46,9 @@ import java.io.IOException;
import java.util.concurrent.atomic.AtomicReference;
import static java.nio.charset.StandardCharsets.UTF_8;
+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.assertTrue;
/**
* Test Container calls.
@@ -144,7 +144,7 @@ public class TestGetCommittedBlockLengthAndPutKey {
Throwable t = assertThrows(StorageContainerException.class,
() -> ContainerProtocolCalls.getCommittedBlockLength(client, blockID,
null));
- assertTrue(t.getMessage().contains("Unable to find the block"));
+ assertThat(t.getMessage()).contains("Unable to find the block");
xceiverClientManager.releaseClient(client, false);
}
@@ -175,8 +175,8 @@ public class TestGetCommittedBlockLengthAndPutKey {
.getPutBlockRequest(pipeline, writeChunkRequest.getWriteChunk());
response = client.sendCommand(putKeyRequest).getPutBlock();
assertEquals(response.getCommittedBlockLength().getBlockLength(),
data.length);
- assertTrue(response.getCommittedBlockLength().getBlockID()
- .getBlockCommitSequenceId() > 0);
+
assertThat(response.getCommittedBlockLength().getBlockID().getBlockCommitSequenceId())
+ .isGreaterThan(0);
BlockID responseBlockID = BlockID
.getFromProtobuf(response.getCommittedBlockLength().getBlockID());
blockID
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestRatisPipelineLeader.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestRatisPipelineLeader.java
index e5053b3ec7..6f0bd40dde 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestRatisPipelineLeader.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestRatisPipelineLeader.java
@@ -33,7 +33,7 @@ import
org.apache.hadoop.ozone.container.common.transport.server.ratis.XceiverSe
import org.apache.ozone.test.GenericTestUtils;
import static
org.apache.hadoop.ozone.OzoneConfigKeys.DFS_RATIS_LEADER_ELECTION_MINIMUM_TIMEOUT_DURATION_KEY;
-import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
import org.apache.ratis.protocol.ClientId;
@@ -81,7 +81,7 @@ public class TestRatisPipelineLeader {
List<Pipeline> pipelines = cluster.getStorageContainerManager()
.getPipelineManager().getPipelines(RatisReplicationConfig.getInstance(
ReplicationFactor.THREE));
- assertFalse(pipelines.isEmpty());
+ assertThat(pipelines).isNotEmpty();
Optional<Pipeline> optional = pipelines.stream()
.filter(Pipeline::isHealthy)
.findFirst();
@@ -109,10 +109,8 @@ public class TestRatisPipelineLeader {
ContainerProtocolCalls.createContainer(xceiverClientRatis, 1L, null);
}
logCapturer.stopCapturing();
- assertFalse(
- logCapturer.getOutput().contains(
- "org.apache.ratis.protocol.NotLeaderException"),
- "Client should connect to pipeline leader on first try.");
+ assertThat(logCapturer.getOutput())
+ .doesNotContain("org.apache.ratis.protocol.NotLeaderException");
}
@Test @Timeout(unit = TimeUnit.MILLISECONDS, value = 120000)
@@ -120,7 +118,7 @@ public class TestRatisPipelineLeader {
List<Pipeline> pipelines = cluster.getStorageContainerManager()
.getPipelineManager().getPipelines(RatisReplicationConfig.getInstance(
ReplicationFactor.THREE));
- assertFalse(pipelines.isEmpty());
+ assertThat(pipelines).isNotEmpty();
Optional<Pipeline> optional = pipelines.stream()
.filter(Pipeline::isHealthy)
.findFirst();
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSCMDbCheckpointServlet.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSCMDbCheckpointServlet.java
index b92468da84..a545e39218 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSCMDbCheckpointServlet.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSCMDbCheckpointServlet.java
@@ -59,7 +59,7 @@ import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
import static
org.apache.hadoop.ozone.OzoneConsts.OZONE_DB_CHECKPOINT_REQUEST_TO_EXCLUDE_SST;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.params.provider.Arguments.arguments;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.anyBoolean;
@@ -203,15 +203,13 @@ public class TestSCMDbCheckpointServlet {
doEndpoint();
- assertTrue(outputPath.toFile().length() > 0);
- assertTrue(
- scmMetrics.getDBCheckpointMetrics().
- getLastCheckpointCreationTimeTaken() > 0);
- assertTrue(
- scmMetrics.getDBCheckpointMetrics().
- getLastCheckpointStreamingTimeTaken() > 0);
- assertTrue(scmMetrics.getDBCheckpointMetrics().
- getNumCheckpoints() > initialCheckpointCount);
+ assertThat(outputPath.toFile().length()).isGreaterThan(0);
+
assertThat(scmMetrics.getDBCheckpointMetrics().getLastCheckpointCreationTimeTaken())
+ .isGreaterThan(0);
+
assertThat(scmMetrics.getDBCheckpointMetrics().getLastCheckpointStreamingTimeTaken())
+ .isGreaterThan(0);
+ assertThat(scmMetrics.getDBCheckpointMetrics().getNumCheckpoints())
+ .isGreaterThan(initialCheckpointCount);
verify(scmDbCheckpointServletMock).writeDbDataToStream(any(),
any(), any(), eq(toExcludeList), any(), any());
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSCMInstallSnapshotWithHA.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSCMInstallSnapshotWithHA.java
index 8b2ac1935b..0fbf05fb58 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSCMInstallSnapshotWithHA.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSCMInstallSnapshotWithHA.java
@@ -47,6 +47,7 @@ import org.apache.ozone.test.GenericTestUtils;
import org.apache.ozone.test.tag.Flaky;
import org.apache.ratis.server.protocol.TermIndex;
+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;
@@ -149,7 +150,7 @@ public class TestSCMInstallSnapshotWithHA {
}, 100, 3000);
long followerLastAppliedIndex =
followerSM.getLastAppliedTermIndex().getIndex();
- assertTrue(followerLastAppliedIndex >= 200);
+ assertThat(followerLastAppliedIndex).isGreaterThanOrEqualTo(200);
assertFalse(followerSM.getLifeCycleState().isPausingOrPaused());
// Verify that the follower 's DB contains the transactions which were
@@ -206,7 +207,7 @@ public class TestSCMInstallSnapshotWithHA {
}
String errorMsg = "Reloading old state of SCM";
- assertTrue(logCapture.getOutput().contains(errorMsg));
+ assertThat(logCapture.getOutput()).contains(errorMsg);
assertNull(newTermIndex, " installed checkpoint even though checkpoint " +
"logIndex is less than it's lastAppliedIndex");
assertEquals(followerTermIndex, followerSM.getLastAppliedTermIndex());
@@ -271,8 +272,8 @@ public class TestSCMInstallSnapshotWithHA {
scmhaManager.installCheckpoint(leaderCheckpointLocation,
leaderCheckpointTrxnInfo);
- assertTrue(logCapture.getOutput()
- .contains("Failed to reload SCM state and instantiate services."));
+ assertThat(logCapture.getOutput())
+ .contains("Failed to reload SCM state and instantiate services.");
final LifeCycle.State s = followerSM.getLifeCycleState();
assertTrue(s == LifeCycle.State.NEW || s.isPausingOrPaused(), "Unexpected
lifeCycle state: " + s);
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSCMMXBean.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSCMMXBean.java
index 11c823ac74..598a65fb48 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSCMMXBean.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSCMMXBean.java
@@ -47,9 +47,10 @@ import java.util.concurrent.TimeoutException;
import javax.management.openmbean.CompositeData;
import javax.management.openmbean.TabularData;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
/**
*
@@ -183,16 +184,15 @@ public class TestSCMMXBean {
assertNotNull(expectedData);
for (Object obj : actualData.values()) {
// Each TabularData is a set of CompositeData
- assertTrue(obj instanceof CompositeData);
- CompositeData cds = (CompositeData) obj;
+ CompositeData cds = assertInstanceOf(CompositeData.class, obj);
assertEquals(2, cds.values().size());
Iterator<?> it = cds.values().iterator();
String key = it.next().toString();
String value = it.next().toString();
int num = Integer.parseInt(value);
- assertTrue(expectedData.containsKey(key));
+ assertThat(expectedData).containsKey(key);
assertEquals(expectedData.remove(key).intValue(), num);
}
- assertTrue(expectedData.isEmpty());
+ assertThat(expectedData).isEmpty();
}
}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSCMNodeManagerMXBean.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSCMNodeManagerMXBean.java
index 6083e7ca35..dcc9b3e8e3 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSCMNodeManagerMXBean.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSCMNodeManagerMXBean.java
@@ -40,9 +40,10 @@ import java.util.Map;
import java.util.concurrent.TimeoutException;
import static
org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_STALENODE_INTERVAL;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Class which tests the SCMNodeManagerInfo Bean.
@@ -128,17 +129,16 @@ public class TestSCMNodeManagerMXBean {
assertNotNull(actualData);
assertNotNull(expectedData);
for (Object obj : actualData.values()) {
- assertTrue(obj instanceof CompositeData);
- CompositeData cds = (CompositeData) obj;
+ CompositeData cds = assertInstanceOf(CompositeData.class, obj);
assertEquals(2, cds.values().size());
Iterator<?> it = cds.values().iterator();
String key = it.next().toString();
String value = it.next().toString();
long num = Long.parseLong(value);
- assertTrue(expectedData.containsKey(key));
+ assertThat(expectedData).containsKey(key);
assertEquals(expectedData.remove(key).longValue(), num);
}
- assertTrue(expectedData.isEmpty());
+ assertThat(expectedData).isEmpty();
}
}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSCMSnapshot.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSCMSnapshot.java
index 5fd91fa46f..6dcce0f52f 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSCMSnapshot.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSCMSnapshot.java
@@ -33,8 +33,8 @@ import java.util.UUID;
import static
org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationFactor.ONE;
import static
org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationFactor.THREE;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
-import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests snapshots in SCM HA.
@@ -76,14 +76,12 @@ public class TestSCMSnapshot {
long snapshotInfo2 = scm.getScmHAManager().asSCMHADBTransactionBuffer()
.getLatestTrxInfo().getTransactionIndex();
- assertTrue(snapshotInfo2 > snapshotInfo1,
- String.format("Snapshot index 2 %d should greater than Snapshot " +
- "index 1 %d", snapshotInfo2, snapshotInfo1));
+ assertThat(snapshotInfo2).isGreaterThan(snapshotInfo1);
cluster.restartStorageContainerManager(false);
TransactionInfo trxInfoAfterRestart =
scm.getScmHAManager().asSCMHADBTransactionBuffer().getLatestTrxInfo();
- assertTrue(trxInfoAfterRestart.getTransactionIndex() >= snapshotInfo2);
+
assertThat(trxInfoAfterRestart.getTransactionIndex()).isGreaterThanOrEqualTo(snapshotInfo2);
assertDoesNotThrow(() ->
pipelineManager.getPipeline(ratisPipeline1.getId()));
assertDoesNotThrow(() ->
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSecretKeySnapshot.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSecretKeySnapshot.java
index 3b3db59105..e1c1f4fa51 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSecretKeySnapshot.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSecretKeySnapshot.java
@@ -68,6 +68,7 @@ import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_HTTP_KERBEROS_PRI
import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_KERBEROS_KEYTAB_FILE_KEY;
import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_KERBEROS_PRINCIPAL_KEY;
import static
org.apache.hadoop.security.UserGroupInformation.AuthenticationMethod.KERBEROS;
+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;
@@ -237,7 +238,7 @@ public final class TestSecretKeySnapshot {
100, 3000);
long followerLastAppliedIndex =
followerSM.getLastAppliedTermIndex().getIndex();
- assertTrue(followerLastAppliedIndex >= 200);
+ assertThat(followerLastAppliedIndex).isGreaterThanOrEqualTo(200);
assertFalse(followerSM.getLifeCycleState().isPausingOrPaused());
// Verify that the follower has the secret keys created
@@ -248,8 +249,8 @@ public final class TestSecretKeySnapshot {
List<ManagedSecretKey> followerKeys =
followerSecretKeyManager.getSortedKeys();
LOG.info("Follower secret keys after snapshot: {}", followerKeys);
- assertTrue(followerKeys.size() >= 2);
- assertTrue(followerKeys.contains(currentKeyInLeader));
+ assertThat(followerKeys.size()).isGreaterThanOrEqualTo(2);
+ assertThat(followerKeys).contains(currentKeyInLeader);
assertEquals(leaderSecretKeyManager.getSortedKeys(), followerKeys);
// Wait for the next rotation, assert that the updates can be synchronized
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSecretKeysApi.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSecretKeysApi.java
index 10f656d005..e13bfc3bdb 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSecretKeysApi.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSecretKeysApi.java
@@ -74,11 +74,11 @@ import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_HTTP_KERBEROS_PRI
import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_KERBEROS_KEYTAB_FILE_KEY;
import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_KERBEROS_PRINCIPAL_KEY;
import static
org.apache.hadoop.security.UserGroupInformation.AuthenticationMethod.KERBEROS;
+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;
import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Integration test to verify symmetric SecretKeys APIs in a secure cluster.
@@ -309,9 +309,9 @@ public final class TestSecretKeysApi {
assertThrows(RemoteException.class,
secretKeyProtocol::getCurrentSecretKey);
assertEquals(AuthorizationException.class.getName(), ex.getClassName());
- assertTrue(ex.getMessage().contains(
+ assertThat(ex.getMessage()).contains(
"User [email protected] (auth:KERBEROS) is not authorized " +
- "for protocol"));
+ "for protocol");
}
@Test
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestStorageContainerManager.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestStorageContainerManager.java
index 501feed80f..3e9d15d490 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestStorageContainerManager.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestStorageContainerManager.java
@@ -326,7 +326,7 @@ public class TestStorageContainerManager {
delLog, keyLocations, helper);
// Verify a few TX gets created in the TX log.
- assertTrue(delLog.getNumOfValidTransactions() > 0);
+ assertThat(delLog.getNumOfValidTransactions()).isGreaterThan(0);
// Once TXs are written into the log, SCM starts to fetch TX
// entries from the log and schedule block deletions in HB interval,
@@ -359,7 +359,7 @@ public class TestStorageContainerManager {
}
// Verify a few TX gets created in the TX log.
- assertTrue(delLog.getNumOfValidTransactions() > 0);
+ assertThat(delLog.getNumOfValidTransactions()).isGreaterThan(0);
// These blocks cannot be found in the container, skip deleting them
// eventually these TX will success.
@@ -420,8 +420,8 @@ public class TestStorageContainerManager {
GenericTestUtils.LogCapturer versionEndPointTaskLog =
GenericTestUtils.LogCapturer.captureLogs(VersionEndpointTask.LOG);
// Initially empty
- assertTrue(scmDnHBDispatcherLog.getOutput().isEmpty());
- assertTrue(versionEndPointTaskLog.getOutput().isEmpty());
+ assertThat(scmDnHBDispatcherLog.getOutput()).isEmpty();
+ assertThat(versionEndPointTaskLog.getOutput()).isEmpty();
// start the new SCM
scm.start();
// Initially DatanodeStateMachine will be in Running state
@@ -451,9 +451,9 @@ public class TestStorageContainerManager {
5000);
assertEquals(DatanodeStateMachine.DatanodeStates.SHUTDOWN,
dsm.getContext().getState());
- assertTrue(versionEndPointTaskLog.getOutput().contains(
+ assertThat(versionEndPointTaskLog.getOutput()).contains(
"org.apache.hadoop.ozone.common" +
- ".InconsistentStorageStateException: Mismatched ClusterIDs"));
+ ".InconsistentStorageStateException: Mismatched ClusterIDs");
} finally {
cluster.shutdown();
}
@@ -508,7 +508,7 @@ public class TestStorageContainerManager {
createDeleteTXLog(cluster.getStorageContainerManager(),
delLog, keyLocations, helper);
// Verify a few TX gets created in the TX log.
- assertTrue(delLog.getNumOfValidTransactions() > 0);
+ assertThat(delLog.getNumOfValidTransactions()).isGreaterThan(0);
// Verify the size in delete commands is expected.
GenericTestUtils.waitFor(() -> {
@@ -562,7 +562,7 @@ public class TestStorageContainerManager {
for (OmKeyInfo info : keyLocations.values()) {
totalCreatedBlocks += info.getKeyLocationVersions().size();
}
- assertTrue(totalCreatedBlocks > 0);
+ assertThat(totalCreatedBlocks).isGreaterThan(0);
assertEquals(totalCreatedBlocks,
helper.getAllBlocks(containerNames).size());
@@ -831,7 +831,7 @@ public class TestStorageContainerManager {
for (DatanodeDetails node : allNodes) {
DatanodeInfo datanodeInfo = (DatanodeInfo) scm.getScmNodeManager()
.getNodeByUuid(node.getUuidString());
- assertTrue(datanodeInfo.getLastHeartbeatTime() > start);
+ assertThat(datanodeInfo.getLastHeartbeatTime()).isGreaterThan(start);
assertEquals(datanodeInfo.getUuidString(),
datanodeInfo.getNetworkName());
assertEquals("/rack1", datanodeInfo.getNetworkLocation());
@@ -975,7 +975,7 @@ public class TestStorageContainerManager {
eventQueue.fireEvent(SCMEvents.CONTAINER_REPORT, dndata);
eventQueue.fireEvent(SCMEvents.CONTAINER_REPORT, dndata);
eventQueue.fireEvent(SCMEvents.CONTAINER_REPORT, dndata);
- assertTrue(containerReportExecutors.droppedEvents() > 1);
+ assertThat(containerReportExecutors.droppedEvents()).isGreaterThan(1);
Thread.currentThread().sleep(1000);
assertEquals(containerReportExecutors.droppedEvents()
+ containerReportExecutors.scheduledEvents(),
@@ -1031,8 +1031,8 @@ public class TestStorageContainerManager {
= new ContainerReportFromDatanode(dn, report);
eventQueue.fireEvent(SCMEvents.CONTAINER_REPORT, dndata2);
semaphore.acquire(2);
- assertTrue(containerReportExecutors.longWaitInQueueEvents() >= 1);
- assertTrue(containerReportExecutors.longTimeExecutionEvents() >= 1);
+
assertThat(containerReportExecutors.longWaitInQueueEvents()).isGreaterThanOrEqualTo(1);
+
assertThat(containerReportExecutors.longTimeExecutionEvents()).isGreaterThanOrEqualTo(1);
containerReportExecutors.close();
semaphore.release(2);
}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestXceiverClientGrpc.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestXceiverClientGrpc.java
index b589be4b82..fb312dfb50 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestXceiverClientGrpc.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestXceiverClientGrpc.java
@@ -17,9 +17,9 @@
*/
package org.apache.hadoop.hdds.scm;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.hadoop.hdds.client.BlockID;
import org.apache.hadoop.hdds.client.RatisReplicationConfig;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
@@ -111,7 +111,7 @@ public class TestXceiverClientGrpc {
@Timeout(5)
public void testGetBlockRetryAlNodes() {
final ArrayList<DatanodeDetails> allDNs = new ArrayList<>(dns);
- assertTrue(allDNs.size() > 1);
+ assertThat(allDNs.size()).isGreaterThan(1);
try (XceiverClientGrpc client = new XceiverClientGrpc(pipeline, conf) {
@Override
public XceiverClientReply sendCommandAsync(
@@ -132,7 +132,7 @@ public class TestXceiverClientGrpc {
@Timeout(5)
public void testReadChunkRetryAllNodes() {
final ArrayList<DatanodeDetails> allDNs = new ArrayList<>(dns);
- assertTrue(allDNs.size() > 1);
+ assertThat(allDNs.size()).isGreaterThan(1);
try (XceiverClientGrpc client = new XceiverClientGrpc(pipeline, conf) {
@Override
public XceiverClientReply sendCommandAsync(
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestXceiverClientManager.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestXceiverClientManager.java
index 774501aecb..95a0b0e17f 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestXceiverClientManager.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestXceiverClientManager.java
@@ -42,12 +42,12 @@ import java.util.UUID;
import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_METADATA_DIR_NAME;
import static
org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_SECURITY_ENABLED_KEY;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
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.mockito.Mockito.mock;
/**
@@ -174,7 +174,7 @@ public class TestXceiverClientManager {
Throwable t = assertThrows(IOException.class,
() -> ContainerProtocolCalls.createContainer(client1,
container1.getContainerInfo().getContainerID(), null));
- assertTrue(t.getMessage().contains("This channel is not connected"));
+ assertThat(t.getMessage()).contains("This channel is not connected");
clientManager.releaseClient(client2, false);
}
@@ -225,7 +225,7 @@ public class TestXceiverClientManager {
Throwable t = assertThrows(IOException.class,
() -> ContainerProtocolCalls.createContainer(client1,
container1.getContainerInfo().getContainerID(), null));
- assertTrue(t.getMessage().contains("This channel is not connected"));
+ assertThat(t.getMessage()).contains("This channel is not connected");
clientManager.releaseClient(client2, false);
}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerStateManagerIntegration.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerStateManagerIntegration.java
index 72d1ebf438..df5281e424 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerStateManagerIntegration.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerStateManagerIntegration.java
@@ -50,12 +50,11 @@ import java.util.concurrent.Executors;
import java.util.concurrent.TimeoutException;
import static
org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_DATANODE_PIPELINE_LIMIT;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests for ContainerStateManager.
@@ -214,7 +213,7 @@ public class TestContainerStateManagerIntegration {
ContainerInfo info = containerManager
.getMatchingContainer(OzoneConsts.GB * 3, OzoneConsts.OZONE,
container1.getPipeline());
- assertTrue(info.getContainerID() > cid);
+ assertThat(info.getContainerID()).isGreaterThan(cid);
cid = info.getContainerID();
}
@@ -264,10 +263,9 @@ public class TestContainerStateManagerIntegration {
// TODO: #CLUTIL Look at the division of block allocations in different
// containers.
LOG.error("Total allocated block = " + matchedCount);
- assertTrue(matchedCount <=
- numBlockAllocates / container2MatchedCount.size() + threshold
- && matchedCount >=
- numBlockAllocates / container2MatchedCount.size() - threshold);
+ assertThat(matchedCount)
+ .isLessThanOrEqualTo(numBlockAllocates /
container2MatchedCount.size() + threshold)
+ .isGreaterThanOrEqualTo(numBlockAllocates /
container2MatchedCount.size() - threshold);
}
}
@@ -375,43 +373,43 @@ public class TestContainerStateManagerIntegration {
containerStateManager.updateContainerReplica(id, replicaTwo);
replicaSet = containerStateManager.getContainerReplicas(id);
assertEquals(2, replicaSet.size());
- assertTrue(replicaSet.contains(replicaOne));
- assertTrue(replicaSet.contains(replicaTwo));
+ assertThat(replicaSet).contains(replicaOne);
+ assertThat(replicaSet).contains(replicaTwo);
// Test 3: Remove one replica node and then test
containerStateManager.removeContainerReplica(id, replicaOne);
replicaSet = containerStateManager.getContainerReplicas(id);
assertEquals(1, replicaSet.size());
- assertFalse(replicaSet.contains(replicaOne));
- assertTrue(replicaSet.contains(replicaTwo));
+ assertThat(replicaSet).doesNotContain(replicaOne);
+ assertThat(replicaSet).contains(replicaTwo);
// Test 3: Remove second replica node and then test
containerStateManager.removeContainerReplica(id, replicaTwo);
replicaSet = containerStateManager.getContainerReplicas(id);
assertEquals(0, replicaSet.size());
- assertFalse(replicaSet.contains(replicaOne));
- assertFalse(replicaSet.contains(replicaTwo));
+ assertThat(replicaSet).doesNotContain(replicaOne);
+ assertThat(replicaSet).doesNotContain(replicaTwo);
// Test 4: Re-insert dn1
containerStateManager.updateContainerReplica(id, replicaOne);
replicaSet = containerStateManager.getContainerReplicas(id);
assertEquals(1, replicaSet.size());
- assertTrue(replicaSet.contains(replicaOne));
- assertFalse(replicaSet.contains(replicaTwo));
+ assertThat(replicaSet).contains(replicaOne);
+ assertThat(replicaSet).doesNotContain(replicaTwo);
// Re-insert dn2
containerStateManager.updateContainerReplica(id, replicaTwo);
replicaSet = containerStateManager.getContainerReplicas(id);
assertEquals(2, replicaSet.size());
- assertTrue(replicaSet.contains(replicaOne));
- assertTrue(replicaSet.contains(replicaTwo));
+ assertThat(replicaSet).contains(replicaOne);
+ assertThat(replicaSet).contains(replicaTwo);
// Re-insert dn1
containerStateManager.updateContainerReplica(id, replicaOne);
replicaSet = containerStateManager.getContainerReplicas(id);
assertEquals(2, replicaSet.size());
- assertTrue(replicaSet.contains(replicaOne));
- assertTrue(replicaSet.contains(replicaTwo));
+ assertThat(replicaSet).contains(replicaOne);
+ assertThat(replicaSet).contains(replicaTwo);
}
}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/node/TestDecommissionAndMaintenance.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/node/TestDecommissionAndMaintenance.java
index 40e6da5ed7..86aec28519 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/node/TestDecommissionAndMaintenance.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/node/TestDecommissionAndMaintenance.java
@@ -64,6 +64,7 @@ import java.util.concurrent.TimeoutException;
import java.util.stream.Collectors;
import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -420,7 +421,7 @@ public class TestDecommissionAndMaintenance {
// There should now be 5-6 replicas of the container we are tracking
Set<ContainerReplica> newReplicas =
cm.getContainerReplicas(container.containerID());
- assertTrue(newReplicas.size() >= 5);
+ assertThat(newReplicas.size()).isGreaterThanOrEqualTo(5);
scmClient.recommissionNodes(forMaintenance.stream()
.map(d -> getDNHostAndPort(d))
@@ -448,7 +449,7 @@ public class TestDecommissionAndMaintenance {
for (DatanodeDetails dn : ecMaintenance) {
waitForDnToReachPersistedOpState(dn, IN_MAINTENANCE);
}
- assertTrue(cm.getContainerReplicas(ecContainer.containerID()).size() >= 6);
+
assertThat(cm.getContainerReplicas(ecContainer.containerID()).size()).isGreaterThanOrEqualTo(6);
scmClient.recommissionNodes(ecMaintenance.stream()
.map(this::getDNHostAndPort)
.collect(Collectors.toList()));
@@ -500,7 +501,7 @@ public class TestDecommissionAndMaintenance {
// There should now be 5-6 replicas of the container we are tracking
Set<ContainerReplica> newReplicas =
cm.getContainerReplicas(container.containerID());
- assertTrue(newReplicas.size() >= 5);
+ assertThat(newReplicas.size()).isGreaterThanOrEqualTo(5);
}
@Test
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestMultiRaftSetup.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestMultiRaftSetup.java
index 698c6b99bd..cff6f03c1e 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestMultiRaftSetup.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestMultiRaftSetup.java
@@ -17,10 +17,9 @@
*/
package org.apache.hadoop.hdds.scm.pipeline;
+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.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.hadoop.hdds.HddsConfigKeys;
import org.apache.hadoop.hdds.client.ReplicationConfig;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
@@ -150,10 +149,10 @@ public class TestMultiRaftSetup {
private void assertNotSamePeers() {
nodeManager.getAllNodes().forEach((dn) -> {
Collection<DatanodeDetails> peers = nodeManager.getPeerList(dn);
- assertFalse(peers.contains(dn));
+ assertThat(peers).doesNotContain(dn);
List<DatanodeDetails> trimList = nodeManager.getAllNodes();
trimList.remove(dn);
- assertTrue(peers.containsAll(trimList));
+ assertThat(peers).containsAll(trimList);
});
}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestNode2PipelineMap.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestNode2PipelineMap.java
index 2c57ac0a6f..841d0ef168 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestNode2PipelineMap.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestNode2PipelineMap.java
@@ -17,9 +17,8 @@
*/
package org.apache.hadoop.hdds.scm.pipeline;
+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;
import org.apache.hadoop.hdds.client.RatisReplicationConfig;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.protocol.DatanodeDetails;
@@ -104,7 +103,7 @@ public class TestNode2PipelineMap {
// get pipeline details by dnid
Set<PipelineID> pipelines = scm.getScmNodeManager()
.getPipelines(dns.get(0));
- assertTrue(pipelines.contains(ratisContainer.getPipeline().getId()));
+ assertThat(pipelines).contains(ratisContainer.getPipeline().getId());
// Now close the container and it should not show up while fetching
// containers by pipeline
@@ -120,6 +119,6 @@ public class TestNode2PipelineMap {
pipelineManager.deletePipeline(ratisContainer.getPipeline().getId());
pipelines = scm.getScmNodeManager()
.getPipelines(dns.get(0));
- assertFalse(pipelines.contains(ratisContainer.getPipeline().getId()));
+ assertThat(pipelines).doesNotContain(ratisContainer.getPipeline().getId());
}
}
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 d46356fb8d..6200b1191c 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
@@ -58,9 +58,9 @@ import java.util.UUID;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertThrows;
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;
import static org.mockito.Mockito.any;
@@ -149,8 +149,8 @@ public class TestPipelineClose {
pipelineManager.deletePipeline(ratisContainer.getPipeline().getId());
for (DatanodeDetails dn : ratisContainer.getPipeline().getNodes()) {
// Assert that the pipeline has been removed from Node2PipelineMap as
well
- assertFalse(scm.getScmNodeManager().getPipelines(dn)
- .contains(ratisContainer.getPipeline().getId()));
+ assertThat(scm.getScmNodeManager().getPipelines(dn))
+ .doesNotContain(ratisContainer.getPipeline().getId());
}
}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestSCMPipelineMetrics.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestSCMPipelineMetrics.java
index 1a57dda4bc..cf41fc6093 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestSCMPipelineMetrics.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestSCMPipelineMetrics.java
@@ -74,7 +74,7 @@ public class TestSCMPipelineMetrics {
long numPipelineCreated =
getLongCounter("NumPipelineCreated", metrics);
// Pipelines are created in background when the cluster starts.
- assertTrue(numPipelineCreated > 0);
+ assertThat(numPipelineCreated).isGreaterThan(0);
}
/**
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/storage/TestCommitWatcher.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/storage/TestCommitWatcher.java
index 20fa713deb..f971dc6adb 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/storage/TestCommitWatcher.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/storage/TestCommitWatcher.java
@@ -56,8 +56,9 @@ import org.apache.hadoop.ozone.container.ContainerTestHelper;
import static java.util.Collections.singletonList;
import static
org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_STALENODE_INTERVAL;
+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 static org.junit.jupiter.api.Assertions.fail;
@@ -178,8 +179,7 @@ public class TestCommitWatcher {
long containerId = container.getContainerInfo().getContainerID();
try (XceiverClientSpi xceiverClient = mgr.acquireClient(pipeline)) {
assertEquals(1, xceiverClient.getRefcount());
- assertTrue(xceiverClient instanceof XceiverClientRatis);
- XceiverClientRatis ratisClient = (XceiverClientRatis) xceiverClient;
+ XceiverClientRatis ratisClient =
assertInstanceOf(XceiverClientRatis.class, xceiverClient);
CommitWatcher watcher = new CommitWatcher(bufferPool, ratisClient);
BlockID blockID = ContainerTestHelper.getTestBlockID(containerId);
List<XceiverClientReply> replies = new ArrayList<>();
@@ -225,17 +225,15 @@ public class TestCommitWatcher {
assertEquals(2, watcher.
getCommitIndexMap().size());
watcher.watchOnFirstIndex();
- assertFalse(watcher.getCommitIndexMap()
- .containsKey(replies.get(0).getLogIndex()));
- assertFalse(watcher.getFutureMap().containsKey((long) chunkSize));
- assertTrue(watcher.getTotalAckDataLength() >= chunkSize);
+
assertThat(watcher.getCommitIndexMap()).doesNotContainKey(replies.get(0).getLogIndex());
+ assertThat(watcher.getFutureMap()).doesNotContainKey((long) chunkSize);
+
assertThat(watcher.getTotalAckDataLength()).isGreaterThanOrEqualTo(chunkSize);
watcher.watchOnLastIndex();
- assertFalse(watcher.getCommitIndexMap()
- .containsKey(replies.get(1).getLogIndex()));
- assertFalse(watcher.getFutureMap().containsKey((long) 2 * chunkSize));
+
assertThat(watcher.getCommitIndexMap()).doesNotContainKey(replies.get(1).getLogIndex());
+ assertThat(watcher.getFutureMap()).doesNotContainKey((long) 2 *
chunkSize);
assertEquals(2 * chunkSize, watcher.getTotalAckDataLength());
- assertTrue(watcher.getFutureMap().isEmpty());
- assertTrue(watcher.getCommitIndexMap().isEmpty());
+ assertThat(watcher.getFutureMap()).isEmpty();
+ assertThat(watcher.getCommitIndexMap()).isEmpty();
}
}
}
@@ -252,8 +250,7 @@ public class TestCommitWatcher {
long containerId = container.getContainerInfo().getContainerID();
try (XceiverClientSpi xceiverClient = mgr.acquireClient(pipeline)) {
assertEquals(1, xceiverClient.getRefcount());
- assertTrue(xceiverClient instanceof XceiverClientRatis);
- XceiverClientRatis ratisClient = (XceiverClientRatis) xceiverClient;
+ XceiverClientRatis ratisClient =
assertInstanceOf(XceiverClientRatis.class, xceiverClient);
CommitWatcher watcher = new CommitWatcher(bufferPool, ratisClient);
BlockID blockID = ContainerTestHelper.getTestBlockID(containerId);
List<XceiverClientReply> replies = new ArrayList<>();
@@ -298,10 +295,9 @@ public class TestCommitWatcher {
assertEquals(future2, watcher.getFutureMap().get((long) 2 *
chunkSize));
assertEquals(2, watcher.getCommitIndexMap().size());
watcher.watchOnFirstIndex();
- assertFalse(watcher.getCommitIndexMap()
- .containsKey(replies.get(0).getLogIndex()));
- assertFalse(watcher.getFutureMap().containsKey((long) chunkSize));
- assertTrue(watcher.getTotalAckDataLength() >= chunkSize);
+
assertThat(watcher.getCommitIndexMap()).doesNotContainKey(replies.get(0).getLogIndex());
+ assertThat(watcher.getFutureMap()).doesNotContainKey((long) chunkSize);
+
assertThat(watcher.getTotalAckDataLength()).isGreaterThanOrEqualTo(chunkSize);
cluster.shutdownHddsDatanode(pipeline.getNodes().get(0));
cluster.shutdownHddsDatanode(pipeline.getNodes().get(1));
try {
@@ -331,8 +327,8 @@ public class TestCommitWatcher {
assertEquals(1, watcher.getFutureMap().size());
} else {
assertEquals(2 * chunkSize, watcher.getTotalAckDataLength());
- assertTrue(watcher.getFutureMap().isEmpty());
- assertTrue(watcher.getCommitIndexMap().isEmpty());
+ assertThat(watcher.getFutureMap()).isEmpty();
+ assertThat(watcher.getCommitIndexMap()).isEmpty();
}
}
}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/storage/TestContainerCommandsEC.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/storage/TestContainerCommandsEC.java
index 8ab7442251..2e90975258 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/storage/TestContainerCommandsEC.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/storage/TestContainerCommandsEC.java
@@ -112,10 +112,11 @@ import static
org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.Res
import static
org.apache.hadoop.hdds.protocol.proto.HddsProtos.BlockTokenSecretProto.AccessModeProto.READ;
import static
org.apache.hadoop.hdds.protocol.proto.HddsProtos.BlockTokenSecretProto.AccessModeProto.WRITE;
import static
org.apache.hadoop.ozone.container.ContainerTestHelper.newWriteChunkRequestBuilder;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* This class tests container commands on EC containers.
@@ -423,17 +424,17 @@ public class TestContainerCommandsEC {
ListBlockResponseProto response = ContainerProtocolCalls
.listBlock(clients.get(i), containerID, null, Integer.MAX_VALUE,
containerToken);
- assertTrue(
- minNumExpectedBlocks <= response.getBlockDataList().stream().filter(
+ assertThat(minNumExpectedBlocks)
+ .withFailMessage("blocks count should be same or more than min
expected" +
+ " blocks count on DN " + i)
+ .isLessThanOrEqualTo(response.getBlockDataList().stream().filter(
k -> k.getChunksCount() > 0 && k.getChunks(0).getLen() > 0)
- .collect(Collectors.toList()).size(),
- "blocks count should be same or more than min expected" +
- " blocks count on DN " + i);
- assertTrue(
- minNumExpectedChunks <= response.getBlockDataList().stream()
- .mapToInt(BlockData::getChunksCount).sum(),
- "chunks count should be same or more than min expected" +
- " chunks count on DN " + i);
+ .collect(Collectors.toList()).size());
+ assertThat(minNumExpectedChunks)
+ .withFailMessage("chunks count should be same or more than min
expected" +
+ " chunks count on DN " + i)
+ .isLessThanOrEqualTo(response.getBlockDataList().stream()
+ .mapToInt(BlockData::getChunksCount).sum());
}
}
@@ -797,7 +798,7 @@ public class TestContainerCommandsEC {
try (OzoneOutputStream out = bucket.createKey(keyString, 4096,
new ECReplicationConfig(3, 2, EcCodec.RS, EC_CHUNK_SIZE),
new HashMap<>())) {
- assertTrue(out.getOutputStream() instanceof KeyOutputStream);
+ assertInstanceOf(KeyOutputStream.class, out.getOutputStream());
for (int i = 0; i < numChunks; i++) {
out.write(inputChunks[i]);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
