Skip to content

Commit d740e51

Browse files
authored
RATIS-2255. Migrate ratis-grpc to junit 5. (#1233)
1 parent 09ff1e1 commit d740e51

File tree

4 files changed

+6
-16
lines changed

4 files changed

+6
-16
lines changed

ratis-grpc/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@
7575
</dependency>
7676

7777
<dependency>
78-
<groupId>junit</groupId>
79-
<artifactId>junit</artifactId>
78+
<groupId>org.junit.jupiter</groupId>
79+
<artifactId>junit-jupiter-api</artifactId>
8080
<scope>test</scope>
8181
</dependency>
8282
<dependency>

ratis-grpc/src/test/java/org/apache/ratis/grpc/MiniRaftClusterWithGrpc.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import org.apache.ratis.server.impl.RaftServerTestUtil;
3434
import org.apache.ratis.util.NetUtils;
3535
import org.apache.ratis.util.ReferenceCountedLeakDetector;
36-
import org.junit.Assert;
36+
import org.junit.jupiter.api.Assertions;
3737

3838
import java.util.Optional;
3939

@@ -104,9 +104,9 @@ public void assertZeroCopyMetrics() {
104104
RaftServer.Division division = RaftServerTestUtil.getDivision(server, id);
105105
final GrpcServicesImpl service = (GrpcServicesImpl) RaftServerTestUtil.getServerRpc(division);
106106
ZeroCopyMetrics zeroCopyMetrics = service.getZeroCopyMetrics();
107-
Assert.assertEquals(0, zeroCopyMetrics.nonZeroCopyMessages());
108-
Assert.assertEquals("Zero copy messages are not released, please check logs to find leaks. ",
109-
zeroCopyMetrics.zeroCopyMessages(), zeroCopyMetrics.releasedMessages());
107+
Assertions.assertEquals(0, zeroCopyMetrics.nonZeroCopyMessages());
108+
Assertions.assertEquals(zeroCopyMetrics.zeroCopyMessages(), zeroCopyMetrics.releasedMessages(),
109+
"Unreleased zero copy messages: please check logs to find the leaks. ");
110110
}));
111111
}
112112
}

ratis-metrics-default/pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,6 @@
4949
<artifactId>slf4j-api</artifactId>
5050
</dependency>
5151

52-
<dependency>
53-
<groupId>junit</groupId>
54-
<artifactId>junit</artifactId>
55-
<scope>test</scope>
56-
</dependency>
5752
<dependency>
5853
<groupId>org.junit.jupiter</groupId>
5954
<artifactId>junit-jupiter-engine</artifactId>

ratis-metrics-dropwizard3/pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,6 @@
5353
<artifactId>slf4j-api</artifactId>
5454
</dependency>
5555

56-
<dependency>
57-
<groupId>junit</groupId>
58-
<artifactId>junit</artifactId>
59-
<scope>test</scope>
60-
</dependency>
6156
<dependency>
6257
<groupId>org.junit.jupiter</groupId>
6358
<artifactId>junit-jupiter-engine</artifactId>

0 commit comments

Comments
 (0)