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 55836a608b HDDS-9497. Migrate TestRpcClient to JUnit5 (#5699)
55836a608b is described below
commit 55836a608b24337493234ee66269d291478ed9c0
Author: VarshaRavi <[email protected]>
AuthorDate: Wed Nov 29 22:38:15 2023 +0530
HDDS-9497. Migrate TestRpcClient to JUnit5 (#5699)
---
hadoop-ozone/client/pom.xml | 7 ++++
.../hadoop/ozone/client/rpc/TestRpcClient.java | 42 ++++++++--------------
2 files changed, 22 insertions(+), 27 deletions(-)
diff --git a/hadoop-ozone/client/pom.xml b/hadoop-ozone/client/pom.xml
index e3e4a0655b..fc130a4f8a 100644
--- a/hadoop-ozone/client/pom.xml
+++ b/hadoop-ozone/client/pom.xml
@@ -27,6 +27,9 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<description>Apache Ozone Client</description>
<name>Apache Ozone Client</name>
<packaging>jar</packaging>
+ <properties>
+ <allow.junit4>false</allow.junit4>
+ </properties>
<dependencies>
<dependency>
@@ -57,6 +60,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-params</artifactId>
+ </dependency>
<dependency>
<groupId>ch.qos.reload4j</groupId>
<artifactId>reload4j</artifactId>
diff --git
a/hadoop-ozone/client/src/test/java/org/apache/hadoop/ozone/client/rpc/TestRpcClient.java
b/hadoop-ozone/client/src/test/java/org/apache/hadoop/ozone/client/rpc/TestRpcClient.java
index f7010eaef1..0f4c4769a7 100644
---
a/hadoop-ozone/client/src/test/java/org/apache/hadoop/ozone/client/rpc/TestRpcClient.java
+++
b/hadoop-ozone/client/src/test/java/org/apache/hadoop/ozone/client/rpc/TestRpcClient.java
@@ -22,22 +22,19 @@ package org.apache.hadoop.ozone.client.rpc;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
import org.apache.hadoop.ozone.OzoneManagerVersion;
import org.apache.hadoop.ozone.om.helpers.ServiceInfo;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.util.Arrays;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.EnumSource;
import java.util.LinkedList;
import java.util.List;
import static org.apache.hadoop.ozone.client.rpc.RpcClient.validateOmVersion;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertThrows;
/**
* Run RPC Client tests.
*/
-@RunWith(Parameterized.class)
public class TestRpcClient {
private enum ValidateOmVersionTestCases {
NULL_EXPECTED_NO_OM(
@@ -62,10 +59,10 @@ public class TestRpcClient {
true
),
NULL_EXPECTED_ONE_CURRENT_ONE_FUTURE_OM(
- null,
- OzoneManagerVersion.CURRENT,
- OzoneManagerVersion.FUTURE_VERSION,
- true
+ null,
+ OzoneManagerVersion.CURRENT,
+ OzoneManagerVersion.FUTURE_VERSION,
+ true
),
NULL_EXPECTED_TWO_FUTURE_OM(
null,
@@ -193,19 +190,9 @@ public class TestRpcClient {
}
}
- @Parameterized.Parameters(name = "{0}")
- public static Iterable<ValidateOmVersionTestCases> parameters() {
- return Arrays.asList(ValidateOmVersionTestCases.values());
- }
-
- private ValidateOmVersionTestCases testCase;
-
- public TestRpcClient(ValidateOmVersionTestCases testCase) {
- this.testCase = testCase;
- }
-
- @Test
- public void testValidateOmVersion() {
+ @ParameterizedTest
+ @EnumSource(ValidateOmVersionTestCases.class)
+ public void testValidateOmVersion(ValidateOmVersionTestCases testCase) {
List<ServiceInfo> serviceInfoList = new LinkedList<>();
ServiceInfo.Builder b1 = new ServiceInfo.Builder();
ServiceInfo.Builder b2 = new ServiceInfo.Builder();
@@ -219,8 +206,9 @@ public class TestRpcClient {
b2.setOmVersion(testCase.om2Version);
serviceInfoList.add(b2.build());
}
- Assert.assertEquals("Running test " + testCase, testCase.validation,
- validateOmVersion(testCase.expectedVersion, serviceInfoList));
+ Assertions.assertEquals(testCase.validation,
+ validateOmVersion(testCase.expectedVersion, serviceInfoList),
+ "Running test " + testCase);
}
@Test
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
