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 60aa0ca8ad HDDS-10031. Improve assertTrue assertions in ozone-client
(#5956)
60aa0ca8ad is described below
commit 60aa0ca8ad4f4b003c7372b919988026f0596dd3
Author: Zhaohui Wang <[email protected]>
AuthorDate: Tue Jan 9 19:56:48 2024 +0800
HDDS-10031. Improve assertTrue assertions in ozone-client (#5956)
---
.../org/apache/hadoop/ozone/client/TestOzoneECClient.java | 12 +++++-------
.../client/checksum/TestReplicatedFileChecksumHelper.java | 9 ++++-----
2 files changed, 9 insertions(+), 12 deletions(-)
diff --git
a/hadoop-ozone/client/src/test/java/org/apache/hadoop/ozone/client/TestOzoneECClient.java
b/hadoop-ozone/client/src/test/java/org/apache/hadoop/ozone/client/TestOzoneECClient.java
index 5d7dee236e..a2287ecc52 100644
---
a/hadoop-ozone/client/src/test/java/org/apache/hadoop/ozone/client/TestOzoneECClient.java
+++
b/hadoop-ozone/client/src/test/java/org/apache/hadoop/ozone/client/TestOzoneECClient.java
@@ -65,8 +65,8 @@ import java.util.stream.Collectors;
import java.util.stream.IntStream;
import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.fail;
-import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
@@ -225,7 +225,7 @@ public class TestOzoneECClient {
// create key without mentioning replication config. Since we set EC
// replication in bucket, key should be EC key.
try (OzoneOutputStream out = bucket.createKey("mykey", inputSize)) {
- assertTrue(out.getOutputStream() instanceof ECKeyOutputStream);
+ assertInstanceOf(ECKeyOutputStream.class, out.getOutputStream());
for (int i = 0; i < inputChunks.length; i++) {
out.write(inputChunks[i]);
}
@@ -467,7 +467,7 @@ public class TestOzoneECClient {
// create key without mentioning replication config. Since we set EC
// replication in bucket, key should be EC key.
try (OzoneOutputStream out = bucket.createKey("mykey", 6 * inputSize)) {
- assertTrue(out.getOutputStream() instanceof ECKeyOutputStream);
+ assertInstanceOf(ECKeyOutputStream.class, out.getOutputStream());
// Block Size is 2kb, so to create 3 blocks we need 6 iterations here
for (int j = 0; j < 6; j++) {
for (int i = 0; i < inputChunks.length; i++) {
@@ -863,8 +863,7 @@ public class TestOzoneECClient {
try (OzoneOutputStream out = bucket.createKey(keyName,
2L * dataBlocks * chunkSize, repConfig, new HashMap<>())) {
- assertTrue(out.getOutputStream() instanceof ECKeyOutputStream);
- ECKeyOutputStream ecKeyOut = (ECKeyOutputStream) out.getOutputStream();
+ ECKeyOutputStream ecKeyOut = assertInstanceOf(ECKeyOutputStream.class,
out.getOutputStream());
List<HddsProtos.DatanodeDetailsProto> dns = blkAllocator.getClusterDns();
@@ -1065,8 +1064,7 @@ public class TestOzoneECClient {
new ECReplicationConfig(dataBlocks, parityBlocks,
ECReplicationConfig.EcCodec.RS,
chunkSize), new HashMap<>())) {
- assertTrue(out.getOutputStream() instanceof ECKeyOutputStream);
- ECKeyOutputStream kos = (ECKeyOutputStream) out.getOutputStream();
+ ECKeyOutputStream kos = assertInstanceOf(ECKeyOutputStream.class,
out.getOutputStream());
List<OmKeyLocationInfo> blockInfos = getAllLocationInfoList(kos);
assertEquals(1, blockInfos.size());
diff --git
a/hadoop-ozone/client/src/test/java/org/apache/hadoop/ozone/client/checksum/TestReplicatedFileChecksumHelper.java
b/hadoop-ozone/client/src/test/java/org/apache/hadoop/ozone/client/checksum/TestReplicatedFileChecksumHelper.java
index 92f78d342f..fa80f72b7f 100644
---
a/hadoop-ozone/client/src/test/java/org/apache/hadoop/ozone/client/checksum/TestReplicatedFileChecksumHelper.java
+++
b/hadoop-ozone/client/src/test/java/org/apache/hadoop/ozone/client/checksum/TestReplicatedFileChecksumHelper.java
@@ -70,8 +70,8 @@ import static java.nio.charset.StandardCharsets.UTF_8;
import static org.apache.hadoop.hdds.client.ReplicationFactor.ONE;
import static
org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.ChecksumType.CRC32;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.when;
import static org.mockito.Mockito.mock;
import static org.mockito.ArgumentMatchers.any;
@@ -157,7 +157,7 @@ public class TestReplicatedFileChecksumHelper {
mockVolume, bucket, "dummy", 10, combineMode, mockRpcClient);
helper.compute();
FileChecksum fileChecksum = helper.getFileChecksum();
- assertTrue(fileChecksum instanceof MD5MD5CRC32GzipFileChecksum);
+ assertInstanceOf(MD5MD5CRC32GzipFileChecksum.class, fileChecksum);
assertEquals(DataChecksum.Type.CRC32,
((MD5MD5CRC32GzipFileChecksum)fileChecksum).getCrcType());
@@ -244,7 +244,7 @@ public class TestReplicatedFileChecksumHelper {
helper.compute();
FileChecksum fileChecksum = helper.getFileChecksum();
- assertTrue(fileChecksum instanceof MD5MD5CRC32GzipFileChecksum);
+ assertInstanceOf(MD5MD5CRC32GzipFileChecksum.class, fileChecksum);
assertEquals(1, helper.getKeyLocationInfoList().size());
FileChecksum cachedChecksum = new MD5MD5CRC32GzipFileChecksum();
@@ -274,7 +274,7 @@ public class TestReplicatedFileChecksumHelper {
helper.compute();
fileChecksum = helper.getFileChecksum();
- assertTrue(fileChecksum instanceof MD5MD5CRC32GzipFileChecksum);
+ assertInstanceOf(MD5MD5CRC32GzipFileChecksum.class, fileChecksum);
assertEquals(1, helper.getKeyLocationInfoList().size());
}
@@ -362,7 +362,6 @@ public class TestReplicatedFileChecksumHelper {
helper.compute();
FileChecksum fileChecksum = helper.getFileChecksum();
- //assertTrue(fileChecksum instanceof MD5MD5CRC32GzipFileChecksum);
assertEquals(DataChecksum.Type.CRC32C,
((MD5MD5CRC32FileChecksum)fileChecksum).getCrcType());
assertEquals(1, helper.getKeyLocationInfoList().size());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
