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 c0f79c489e HDDS-9810. Migrate assertions in unit tests to JUnit5
(#5738)
c0f79c489e is described below
commit c0f79c489e978a3e21d52afd77e94fa50ac09f37
Author: Raju Balpande <[email protected]>
AuthorDate: Wed Dec 6 23:00:07 2023 +0530
HDDS-9810. Migrate assertions in unit tests to JUnit5 (#5738)
---
.../keyvalue/ContainerTestVersionInfo.java | 10 ++
.../keyvalue/TestKeyValueContainerCheck.java | 30 ++---
.../TestKeyValueContainerIntegrityChecks.java | 26 ++--
.../TestKeyValueContainerMetadataInspector.java | 149 ++++++++++++---------
.../TestSendContainerRequestHandler.java | 8 +-
.../scm/container/TestContainerReportHandler.java | 3 +-
.../TestIncrementalContainerReportHandler.java | 3 +-
.../hadoop/hdds/scm/node/TestSCMNodeManager.java | 9 +-
.../org/apache/ozone/test/GenericTestUtils.java | 11 +-
9 files changed, 140 insertions(+), 109 deletions(-)
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/ContainerTestVersionInfo.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/ContainerTestVersionInfo.java
index f6f454ac5b..f01ccb2972 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/ContainerTestVersionInfo.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/ContainerTestVersionInfo.java
@@ -24,6 +24,7 @@ import
org.apache.hadoop.ozone.container.common.impl.ContainerLayoutVersion;
import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Stream;
import static java.util.stream.Collectors.toList;
import static
org.apache.hadoop.ozone.container.keyvalue.helpers.KeyValueContainerUtil.isSameSchemaVersion;
@@ -72,6 +73,15 @@ public class ContainerTestVersionInfo {
.collect(toList());
}
+ /**
+ * This method is created to support the parameterized data during
+ * migration to Junit5.
+ * @return Stream of ContainerTestVersionInfo objects.
+ */
+ public static Stream<Object> versionParametersStream() {
+ return layoutList.stream().map(each -> new Object[] {each});
+ }
+
@Override
public String toString() {
return "schema=" + schemaVersion + ", layout=" + layout;
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueContainerCheck.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueContainerCheck.java
index c3a814b7c8..decfdf3a80 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueContainerCheck.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueContainerCheck.java
@@ -29,34 +29,31 @@ import
org.apache.hadoop.ozone.container.common.interfaces.DBHandle;
import org.apache.hadoop.ozone.container.keyvalue.helpers.BlockUtils;
import
org.apache.hadoop.ozone.container.keyvalue.helpers.KeyValueContainerLocationUtil;
import
org.apache.hadoop.ozone.container.ozoneimpl.ContainerScannerConfiguration;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
import java.io.File;
import java.io.RandomAccessFile;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
/**
* Basic sanity test for the KeyValueContainerCheck class.
*/
-@RunWith(Parameterized.class)
public class TestKeyValueContainerCheck
extends TestKeyValueContainerIntegrityChecks {
- public TestKeyValueContainerCheck(ContainerTestVersionInfo versionInfo) {
- super(versionInfo);
- }
-
/**
* Sanity test, when there are no corruptions induced.
*/
- @Test
- public void testKeyValueContainerCheckNoCorruption() throws Exception {
+ @ParameterizedTest
+ @MethodSource("data")
+ public void testKeyValueContainerCheckNoCorruption(
+ ContainerTestVersionInfo versionInfo) throws Exception {
+ setUp(versionInfo);
long containerID = 101;
int deletedBlocks = 1;
int normalBlocks = 3;
@@ -88,8 +85,11 @@ public class TestKeyValueContainerCheck
/**
* Sanity test, when there are corruptions induced.
*/
- @Test
- public void testKeyValueContainerCheckCorruption() throws Exception {
+ @ParameterizedTest
+ @MethodSource("data")
+ public void testKeyValueContainerCheckCorruption(
+ ContainerTestVersionInfo versionInfo) throws Exception {
+ setUp(versionInfo);
long containerID = 102;
int deletedBlocks = 1;
int normalBlocks = 3;
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueContainerIntegrityChecks.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueContainerIntegrityChecks.java
index 898ea74c27..dcf068909e 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueContainerIntegrityChecks.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueContainerIntegrityChecks.java
@@ -35,9 +35,7 @@ import
org.apache.hadoop.ozone.container.common.volume.RoundRobinVolumeChoosingP
import org.apache.hadoop.ozone.container.keyvalue.helpers.BlockUtils;
import org.apache.hadoop.ozone.container.keyvalue.interfaces.ChunkManager;
import org.apache.ozone.test.GenericTestUtils;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.AfterEach;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -46,13 +44,14 @@ import java.util.ArrayList;
import java.nio.ByteBuffer;
import java.util.List;
import java.util.UUID;
+import java.util.stream.Stream;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.apache.hadoop.hdds.scm.ScmConfigKeys.HDDS_DATANODE_DIR_KEY;
import static
org.apache.hadoop.ozone.container.common.ContainerTestUtils.COMMIT_STAGE;
import static
org.apache.hadoop.ozone.container.common.ContainerTestUtils.WRITE_STAGE;
import static
org.apache.hadoop.ozone.container.common.ContainerTestUtils.createDbInstancesForTestIfNeeded;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* Base class for tests identifying issues with key value container contents.
@@ -62,7 +61,7 @@ public class TestKeyValueContainerIntegrityChecks {
static final Logger LOG =
LoggerFactory.getLogger(TestKeyValueContainerIntegrityChecks.class);
- private final ContainerLayoutTestInfo containerLayoutTestInfo;
+ private ContainerLayoutTestInfo containerLayoutTestInfo;
private MutableVolumeSet volumeSet;
private OzoneConfiguration conf;
private File testRoot;
@@ -73,10 +72,9 @@ public class TestKeyValueContainerIntegrityChecks {
protected static final int CHUNK_LEN = 3 * UNIT_LEN;
protected static final int CHUNKS_PER_BLOCK = 4;
- public TestKeyValueContainerIntegrityChecks(
- ContainerTestVersionInfo versionInfo) {
- LOG.info("new {} for {}", getClass().getSimpleName(), versionInfo);
- this.conf = new OzoneConfiguration();
+ private void initialize(ContainerTestVersionInfo versionInfo) {
+ LOG.info("new TestKeyValueContainerIntegrityChecks for {}", versionInfo);
+ conf = new OzoneConfiguration();
ContainerTestVersionInfo.setTestSchemaVersion(
versionInfo.getSchemaVersion(), conf);
if (versionInfo.getLayout()
@@ -87,11 +85,12 @@ public class TestKeyValueContainerIntegrityChecks {
}
}
- @Parameterized.Parameters public static Iterable<Object[]> data() {
- return ContainerTestVersionInfo.versionParameters();
+ private static Stream<Object> data() {
+ return ContainerTestVersionInfo.versionParametersStream();
}
- @Before public void setUp() throws Exception {
+ public void setUp(ContainerTestVersionInfo versionInfo) throws Exception {
+ initialize(versionInfo);
LOG.info("Testing layout:{}", containerLayoutTestInfo.getLayout());
this.testRoot = GenericTestUtils.getRandomizedTestDir();
conf.set(HDDS_DATANODE_DIR_KEY, testRoot.getAbsolutePath());
@@ -103,7 +102,8 @@ public class TestKeyValueContainerIntegrityChecks {
chunkManager = containerLayoutTestInfo.createChunkManager(true, null);
}
- @After public void teardown() {
+ @AfterEach
+ public void teardown() {
BlockUtils.shutdownCache(conf);
volumeSet.shutdown();
FileUtil.fullyDelete(testRoot);
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueContainerMetadataInspector.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueContainerMetadataInspector.java
index eaf8939a91..9867ccb171 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueContainerMetadataInspector.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueContainerMetadataInspector.java
@@ -36,10 +36,8 @@ import
org.apache.hadoop.ozone.container.metadata.DatanodeStoreSchemaThreeImpl;
import org.apache.hadoop.ozone.container.metadata.DatanodeStoreSchemaTwoImpl;
import org.apache.log4j.PatternLayout;
import org.apache.ozone.test.GenericTestUtils;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
import java.util.ArrayList;
import java.util.Arrays;
@@ -47,22 +45,24 @@ import java.util.Collections;
import java.util.List;
import static org.apache.ozone.test.GenericTestUtils.toLog4j;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.fail;
/**
* Tests for {@link KeyValueContainerMetadataInspector}.
*/
-@RunWith(Parameterized.class)
public class TestKeyValueContainerMetadataInspector
extends TestKeyValueContainerIntegrityChecks {
private static final long CONTAINER_ID = 102;
- public TestKeyValueContainerMetadataInspector(
- ContainerTestVersionInfo versionInfo) {
- super(versionInfo);
- }
-
- @Test
- public void testRunDisabled() throws Exception {
+ @ParameterizedTest
+ @MethodSource("data")
+ public void testRunDisabled(ContainerTestVersionInfo versionInfo)
+ throws Exception {
+ setUp(versionInfo);
// Create incorrect container.
KeyValueContainer container = createClosedContainer(3);
KeyValueContainerData containerData = container.getContainerData();
@@ -71,53 +71,59 @@ public class TestKeyValueContainerMetadataInspector
// No system property set. Should not run.
System.clearProperty(KeyValueContainerMetadataInspector.SYSTEM_PROPERTY);
ContainerInspectorUtil.load();
- Assert.assertNull(runInspectorAndGetReport(containerData));
+ assertNull(runInspectorAndGetReport(containerData));
ContainerInspectorUtil.unload();
// Unloaded. Should not run even with system property.
System.setProperty(KeyValueContainerMetadataInspector.SYSTEM_PROPERTY,
KeyValueContainerMetadataInspector.Mode.INSPECT.toString());
- Assert.assertNull(runInspectorAndGetReport(containerData));
+ assertNull(runInspectorAndGetReport(containerData));
// Unloaded and no system property. Should not run.
System.clearProperty(KeyValueContainerMetadataInspector.SYSTEM_PROPERTY);
- Assert.assertNull(runInspectorAndGetReport(containerData));
+ assertNull(runInspectorAndGetReport(containerData));
}
- @Test
- public void testSystemPropertyAndReadOnly() {
+ @ParameterizedTest
+ @MethodSource("data")
+ public void testSystemPropertyAndReadOnly(
+ ContainerTestVersionInfo versionInfo) throws Exception {
+ setUp(versionInfo);
System.clearProperty(KeyValueContainerMetadataInspector.SYSTEM_PROPERTY);
ContainerInspector inspector = new KeyValueContainerMetadataInspector();
- Assert.assertFalse(inspector.load());
- Assert.assertTrue(inspector.isReadOnly());
+ assertFalse(inspector.load());
+ assertTrue(inspector.isReadOnly());
// Inspect mode: valid argument and readonly.
System.setProperty(KeyValueContainerMetadataInspector.SYSTEM_PROPERTY,
KeyValueContainerMetadataInspector.Mode.INSPECT.toString());
inspector = new KeyValueContainerMetadataInspector();
- Assert.assertTrue(inspector.load());
- Assert.assertTrue(inspector.isReadOnly());
+ assertTrue(inspector.load());
+ assertTrue(inspector.isReadOnly());
// Repair mode: valid argument and not readonly.
System.setProperty(KeyValueContainerMetadataInspector.SYSTEM_PROPERTY,
KeyValueContainerMetadataInspector.Mode.REPAIR.toString());
inspector = new KeyValueContainerMetadataInspector();
- Assert.assertTrue(inspector.load());
- Assert.assertFalse(inspector.isReadOnly());
+ assertTrue(inspector.load());
+ assertFalse(inspector.isReadOnly());
// Bad argument: invalid argument and readonly.
System.setProperty(KeyValueContainerMetadataInspector.SYSTEM_PROPERTY,
"badvalue");
inspector = new KeyValueContainerMetadataInspector();
- Assert.assertFalse(inspector.load());
- Assert.assertTrue(inspector.isReadOnly());
+ assertFalse(inspector.load());
+ assertTrue(inspector.isReadOnly());
// Clean slate for other tests.
System.clearProperty(KeyValueContainerMetadataInspector.SYSTEM_PROPERTY);
}
- @Test
- public void testIncorrectTotalsNoData() throws Exception {
+ @ParameterizedTest
+ @MethodSource("data")
+ public void testIncorrectTotalsNoData(ContainerTestVersionInfo versionInfo)
+ throws Exception {
+ setUp(versionInfo);
int createBlocks = 0;
int setBlocks = -3;
int setBytes = -2;
@@ -128,8 +134,11 @@ public class TestKeyValueContainerMetadataInspector
createBlocks, setBlocks, setBytes, 0, 0);
}
- @Test
- public void testIncorrectTotalsWithData() throws Exception {
+ @ParameterizedTest
+ @MethodSource("data")
+ public void testIncorrectTotalsWithData(ContainerTestVersionInfo versionInfo)
+ throws Exception {
+ setUp(versionInfo);
int createBlocks = 3;
int setBlocks = 4;
int setBytes = -2;
@@ -141,8 +150,12 @@ public class TestKeyValueContainerMetadataInspector
createBlocks, setBlocks, setBytes, 0, 0);
}
- @Test
- public void testCorrectTotalsNoData() throws Exception {
+ @ParameterizedTest
+ @MethodSource("data")
+ public void testCorrectTotalsNoData(ContainerTestVersionInfo versionInfo)
+ throws Exception {
+ setUp(versionInfo);
+
int createBlocks = 0;
int setBytes = 0;
@@ -152,8 +165,11 @@ public class TestKeyValueContainerMetadataInspector
inspectThenRepairOnCorrectContainer(container.getContainerData());
}
- @Test
- public void testCorrectTotalsWithData() throws Exception {
+ @ParameterizedTest
+ @MethodSource("data")
+ public void testCorrectTotalsWithData(ContainerTestVersionInfo versionInfo)
+ throws Exception {
+ setUp(versionInfo);
int createBlocks = 3;
int setBytes = CHUNK_LEN * CHUNKS_PER_BLOCK * createBlocks;
@@ -192,8 +208,11 @@ public class TestKeyValueContainerMetadataInspector
static final DeletedBlocksTransactionGeneratorForTesting GENERATOR
= new DeletedBlocksTransactionGeneratorForTesting();
- @Test
- public void testCorrectDeleteWithTransaction() throws Exception {
+ @ParameterizedTest
+ @MethodSource("data")
+ public void testCorrectDeleteWithTransaction(
+ ContainerTestVersionInfo versionInfo) throws Exception {
+ setUp(versionInfo);
final int createBlocks = 4;
final int setBytes = CHUNK_LEN * CHUNKS_PER_BLOCK * createBlocks;
final int deleteCount = 10;
@@ -206,15 +225,18 @@ public class TestKeyValueContainerMetadataInspector
.mapToLong(DeletedBlocksTransaction::getLocalIDCount).sum();
LOG.info("deleteTransactions = {}", deleteTransactions);
LOG.info("numDeletedLocalIds = {}", numDeletedLocalIds);
- Assert.assertEquals(deleteCount, numDeletedLocalIds);
+ assertEquals(deleteCount, numDeletedLocalIds);
setDB(container.getContainerData(), createBlocks,
setBytes, deleteCount, deleteTransactions);
inspectThenRepairOnCorrectContainer(container.getContainerData());
}
- @Test
- public void testIncorrectDeleteWithTransaction() throws Exception {
+ @ParameterizedTest
+ @MethodSource("data")
+ public void testIncorrectDeleteWithTransaction(
+ ContainerTestVersionInfo versionInfo) throws Exception {
+ setUp(versionInfo);
final int createBlocks = 4;
final int setBytes = CHUNK_LEN * CHUNKS_PER_BLOCK * createBlocks;
final int deleteCount = 10;
@@ -235,8 +257,11 @@ public class TestKeyValueContainerMetadataInspector
deleteCount, numDeletedLocalIds);
}
- @Test
- public void testIncorrectDeleteWithoutTransaction() throws Exception {
+ @ParameterizedTest
+ @MethodSource("data")
+ public void testIncorrectDeleteWithoutTransaction(
+ ContainerTestVersionInfo versionInfo) throws Exception {
+ setUp(versionInfo);
final int createBlocks = 4;
final int setBytes = CHUNK_LEN * CHUNKS_PER_BLOCK * createBlocks;
final int deleteCount = 10;
@@ -259,10 +284,10 @@ public class TestKeyValueContainerMetadataInspector
public void inspectThenRepairOnCorrectContainer(
KeyValueContainerData containerData) throws Exception {
// No output for correct containers.
- Assert.assertNull(runInspectorAndGetReport(containerData,
+ assertNull(runInspectorAndGetReport(containerData,
KeyValueContainerMetadataInspector.Mode.INSPECT));
- Assert.assertNull(runInspectorAndGetReport(containerData,
+ assertNull(runInspectorAndGetReport(containerData,
KeyValueContainerMetadataInspector.Mode.REPAIR));
}
@@ -292,7 +317,7 @@ public class TestKeyValueContainerMetadataInspector
createdFiles = createdBlocks * CHUNKS_PER_BLOCK;
break;
default:
- Assert.fail("Unrecognized chunk layout version.");
+ fail("Unrecognized chunk layout version.");
}
String containerState = containerData.getState().toString();
@@ -325,31 +350,31 @@ public class TestKeyValueContainerMetadataInspector
long setPendingDeleteCount, long createdPendingDeleteCount,
boolean shouldRepair) {
// Check main container properties.
- Assert.assertEquals(inspectJson.get("containerID").getAsLong(),
+ assertEquals(inspectJson.get("containerID").getAsLong(),
CONTAINER_ID);
- Assert.assertEquals(inspectJson.get("containerState").getAsString(),
+ assertEquals(inspectJson.get("containerState").getAsString(),
expectedContainerState);
// Check DB metadata.
JsonObject jsonDbMetadata = inspectJson.getAsJsonObject("dBMetadata");
- Assert.assertEquals(setBlocks,
+ assertEquals(setBlocks,
jsonDbMetadata.get(OzoneConsts.BLOCK_COUNT).getAsLong());
- Assert.assertEquals(setBytes,
+ assertEquals(setBytes,
jsonDbMetadata.get(OzoneConsts.CONTAINER_BYTES_USED).getAsLong());
// Check aggregate metadata values.
JsonObject jsonAggregates = inspectJson.getAsJsonObject("aggregates");
- Assert.assertEquals(createdBlocks,
+ assertEquals(createdBlocks,
jsonAggregates.get("blockCount").getAsLong());
- Assert.assertEquals(createdBytes,
+ assertEquals(createdBytes,
jsonAggregates.get("usedBytes").getAsLong());
- Assert.assertEquals(createdPendingDeleteCount,
+ assertEquals(createdPendingDeleteCount,
jsonAggregates.get("pendingDeleteBlocks").getAsLong());
// Check chunks directory.
JsonObject jsonChunksDir = inspectJson.getAsJsonObject("chunksDirectory");
- Assert.assertTrue(jsonChunksDir.get("present").getAsBoolean());
- Assert.assertEquals(createdFiles,
+ assertTrue(jsonChunksDir.get("present").getAsBoolean());
+ assertEquals(createdFiles,
jsonChunksDir.get("fileCount").getAsLong());
// Check errors.
@@ -382,7 +407,7 @@ public class TestKeyValueContainerMetadataInspector
String propertyValue, JsonPrimitive correctExpected,
JsonPrimitive correctActual, boolean correctRepair) {
- Assert.assertFalse(jsonReport.get("correct").getAsBoolean());
+ assertFalse(jsonReport.get("correct").getAsBoolean());
JsonArray jsonErrors = jsonReport.getAsJsonArray("errors");
boolean matchFound = false;
@@ -396,20 +421,20 @@ public class TestKeyValueContainerMetadataInspector
JsonPrimitive expectedJsonPrim =
jsonErrorObject.get("expected").getAsJsonPrimitive();
- Assert.assertEquals(correctExpected, expectedJsonPrim);
+ assertEquals(correctExpected, expectedJsonPrim);
JsonPrimitive actualJsonPrim =
jsonErrorObject.get("actual").getAsJsonPrimitive();
- Assert.assertEquals(correctActual, actualJsonPrim);
+ assertEquals(correctActual, actualJsonPrim);
boolean repaired =
jsonErrorObject.get("repaired").getAsBoolean();
- Assert.assertEquals(correctRepair, repaired);
+ assertEquals(correctRepair, repaired);
break;
}
}
- Assert.assertTrue(matchFound);
+ assertTrue(matchFound);
}
public void setDBBlockAndByteCounts(KeyValueContainerData containerData,
@@ -471,14 +496,14 @@ public class TestKeyValueContainerMetadataInspector
Table<String, Long> metadataTable = db.getStore().getMetadataTable();
long bytesUsed = metadataTable.get(containerData.getBytesUsedKey());
- Assert.assertEquals(expectedBytesUsed, bytesUsed);
+ assertEquals(expectedBytesUsed, bytesUsed);
long blockCount = metadataTable.get(containerData.getBlockCountKey());
- Assert.assertEquals(expectedBlockCount, blockCount);
+ assertEquals(expectedBlockCount, blockCount);
final long deleteCount = metadataTable.get(
containerData.getPendingDeleteBlockCountKey());
- Assert.assertEquals(expectedDeletedCount, deleteCount);
+ assertEquals(expectedDeletedCount, deleteCount);
}
}
@@ -525,8 +550,8 @@ public class TestKeyValueContainerMetadataInspector
private void containsAllStrings(String logOutput, String[] expectedMessages)
{
for (String expectedMessage : expectedMessages) {
- Assert.assertTrue("Log output did not contain \"" +
- expectedMessage + "\"", logOutput.contains(expectedMessage));
+ assertTrue(logOutput.contains(expectedMessage),
+ "Log output did not contain \"" + expectedMessage + "\"");
}
}
}
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/replication/TestSendContainerRequestHandler.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/replication/TestSendContainerRequestHandler.java
index f6b1512da9..80b1029d23 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/replication/TestSendContainerRequestHandler.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/replication/TestSendContainerRequestHandler.java
@@ -29,7 +29,7 @@ import
org.apache.hadoop.ozone.container.keyvalue.KeyValueContainerData;
import org.apache.hadoop.ozone.container.ozoneimpl.ContainerController;
import org.apache.ratis.thirdparty.com.google.protobuf.ByteString;
import org.apache.ratis.thirdparty.io.grpc.stub.StreamObserver;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -68,9 +68,9 @@ class TestSendContainerRequestHandler {
StreamObserver observer = mock(StreamObserver.class);
doAnswer(invocation -> {
Object arg = invocation.getArgument(0);
- Assert.assertTrue(arg instanceof StorageContainerException);
- Assert.assertEquals(((StorageContainerException) arg).getResult(),
- ContainerProtos.Result.CONTAINER_EXISTS);
+ Assertions.assertTrue(arg instanceof StorageContainerException);
+ Assertions.assertEquals(ContainerProtos.Result.CONTAINER_EXISTS,
+ ((StorageContainerException) arg).getResult());
return null;
}).when(observer).onError(any());
SendContainerRequestHandler sendContainerRequestHandler
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerReportHandler.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerReportHandler.java
index 9627092fa6..30a5c13ea2 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerReportHandler.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerReportHandler.java
@@ -49,7 +49,6 @@ import
org.apache.hadoop.ozone.common.statemachine.InvalidStateTransitionExcepti
import org.apache.hadoop.ozone.container.common.SCMTestUtils;
import org.apache.hadoop.ozone.protocol.commands.CommandForDatanode;
import org.apache.ozone.test.GenericTestUtils;
-import org.junit.Assert;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
@@ -177,7 +176,7 @@ public class TestContainerReportHandler {
final ContainerReportHandler reportHandler = new ContainerReportHandler(
nodeManager, containerManager);
reportHandler.onMessage(containerReportFromDatanode, publisher);
- Assert.assertEquals(containerStateManager
+ assertEquals(containerStateManager
.getContainerReplicas(container.containerID()).stream()
.collect(Collectors.toMap(ContainerReplica::getDatanodeDetails,
ContainerReplica::getReplicaIndex)), expectedReplicaMap);
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestIncrementalContainerReportHandler.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestIncrementalContainerReportHandler.java
index cc2620b4f0..2a95447075 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestIncrementalContainerReportHandler.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestIncrementalContainerReportHandler.java
@@ -56,7 +56,6 @@ import org.apache.hadoop.hdds.utils.db.DBStore;
import org.apache.hadoop.hdds.utils.db.DBStoreBuilder;
import
org.apache.hadoop.ozone.common.statemachine.InvalidStateTransitionException;
import org.apache.ozone.test.GenericTestUtils;
-import org.junit.Assert;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
@@ -654,7 +653,7 @@ public class TestIncrementalContainerReportHandler {
new IncrementalContainerReportHandler(nodeManager,
containerManager, scmContext);
reportHandler.onMessage(containerReportFromDatanode, publisher);
- Assert.assertEquals(containerStateManager
+ Assertions.assertEquals(containerStateManager
.getContainerReplicas(container.containerID()).stream()
.collect(Collectors.toMap(ContainerReplica::getDatanodeDetails,
ContainerReplica::getReplicaIndex)), expectedReplicaMap);
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestSCMNodeManager.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestSCMNodeManager.java
index d13cd8952a..e3da551c3e 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestSCMNodeManager.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestSCMNodeManager.java
@@ -79,7 +79,6 @@ import
org.apache.hadoop.ozone.protocol.commands.SetNodeOperationalStateCommand;
import
org.apache.hadoop.security.authentication.client.AuthenticationException;
import org.apache.ozone.test.GenericTestUtils;
import org.apache.hadoop.test.PathUtils;
-import org.junit.Assert;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
@@ -1073,14 +1072,14 @@ public class TestSCMNodeManager {
nodeManager.onMessage(
new CommandForDatanode<>(datanode1, createPipelineCommand), null);
- Assert.assertEquals(2, nodeManager.getCommandQueueCount(
+ assertEquals(2, nodeManager.getCommandQueueCount(
datanode1, SCMCommandProto.Type.closeContainerCommand));
- Assert.assertEquals(1, nodeManager.getCommandQueueCount(
+ assertEquals(1, nodeManager.getCommandQueueCount(
datanode1, SCMCommandProto.Type.createPipelineCommand));
- Assert.assertEquals(0, nodeManager.getCommandQueueCount(
+ assertEquals(0, nodeManager.getCommandQueueCount(
datanode1, SCMCommandProto.Type.closePipelineCommand));
- Assert.assertEquals(0, nodeManager.getCommandQueueCount(
+ assertEquals(0, nodeManager.getCommandQueueCount(
datanode2, SCMCommandProto.Type.closeContainerCommand));
}
diff --git
a/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/GenericTestUtils.java
b/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/GenericTestUtils.java
index 66647bfba5..2be39ea9b9 100644
---
a/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/GenericTestUtils.java
+++
b/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/GenericTestUtils.java
@@ -37,7 +37,7 @@ import org.apache.log4j.Layout;
import org.apache.log4j.Level;
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.mockito.Mockito;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
@@ -47,7 +47,6 @@ import java.util.stream.Collectors;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric;
import static org.apache.logging.log4j.util.StackLocatorUtil.getCallerClass;
-import static org.junit.Assert.assertTrue;
/**
* Provides some very generic helpers which might be used across the tests.
@@ -151,15 +150,15 @@ public abstract class GenericTestUtils {
* Assert that a given file exists.
*/
public static void assertExists(File f) {
- assertTrue("File " + f + " should exist", f.exists());
+ Assertions.assertTrue(f.exists(), "File " + f + " should exist");
}
/**
* Assert that a given dir can be created or it already exists.
*/
public static void assertDirCreation(File f) {
- assertTrue("Could not create dir " + f + ", nor does it exist",
- f.mkdirs() || f.exists());
+ Assertions.assertTrue(f.mkdirs() || f.exists(),
+ "Could not create dir " + f + ", nor does it exist");
}
public static void assertExceptionContains(String expectedText, Throwable t)
{
@@ -168,7 +167,7 @@ public abstract class GenericTestUtils {
public static void assertExceptionContains(String expectedText, Throwable t,
String message) {
- Assert.assertNotNull("Null Throwable", t);
+ Assertions.assertNotNull(t, "Null Throwable");
String msg = t.toString();
if (msg == null) {
throw new AssertionError("Null Throwable.toString() value", t);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
