Migrate test to JUnit5

pom.xml

@@ -51,8 +51,21 @@
 		<resilience4j.version>1.7.1</resilience4j.version>
 		<jackson.version>2.18.3</jackson.version>
 		<maven.surefire.version>3.5.2</maven.surefire.version>
+		<junit.version>5.13.0-M1</junit.version>
 	</properties>
 
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.junit</groupId>
+				<artifactId>junit-bom</artifactId>
+				<version>${junit.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+
 	<dependencies>
 		<dependency>
 			<groupId>org.slf4j</groupId>
@@ -101,9 +114,24 @@
 
 		<!-- test -->
 		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.13.2</version>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-api</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-params</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-junit-jupiter</artifactId>
+			<version>4.11.0</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-engine</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

src/test/java/io/redis/examples/BitMapsExample.java

@@ -2,10 +2,13 @@
 // HIDE_START
 package io.redis.examples;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import redis.clients.jedis.UnifiedJedis;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 public class BitMapsExample {
 
     @Test
@@ -29,9 +32,9 @@ public void run() {
         // STEP_END
 
         // REMOVE_START
-        Assert.assertFalse(res1);
-        Assert.assertTrue(res2);
-        Assert.assertFalse(res3);
+        assertFalse(res1);
+        assertTrue(res2);
+        assertFalse(res3);
         // REMOVE_END
 
         // STEP_START bitcount
@@ -40,7 +43,7 @@ public void run() {
         // STEP_END
 
         // REMOVE_START
-        Assert.assertEquals(1, res4);
+        assertEquals(1, res4);
         // REMOVE_END
 
 // HIDE_START

src/test/java/io/redis/examples/BitfieldExample.java

@@ -2,13 +2,14 @@
 // REMOVE_START
 package io.redis.examples;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import java.util.List;
 // REMOVE_END
 
 // HIDE_START
 import redis.clients.jedis.UnifiedJedis;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 // HIDE_END
 
 // HIDE_START
@@ -40,10 +41,10 @@ public void run() {
 
         // Tests for 'bf' step.
         // REMOVE_START
-        Assert.assertEquals("[0]", res1.toString());
-        Assert.assertEquals("[950, 1]", res2.toString());
-        Assert.assertEquals("[1450, 2]", res3.toString());
-        Assert.assertEquals("[1450, 2]", res4.toString());
+        assertEquals("[0]", res1.toString());
+        assertEquals("[950, 1]", res2.toString());
+        assertEquals("[1450, 2]", res3.toString());
+        assertEquals("[1450, 2]", res4.toString());
         // REMOVE_END
 
 // HIDE_START

src/test/java/io/redis/examples/BloomFilterExample.java

@@ -4,10 +4,11 @@
 package io.redis.examples;
 
 import redis.clients.jedis.UnifiedJedis;
-import org.junit.Test;
-import org.junit.Assert;
+import org.junit.jupiter.api.Test;
 import java.util.List;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class BloomFilterExample {
 
     @Test
@@ -24,7 +25,7 @@ public void run() {
         System.out.println(res1); // >>> OK
 
         // REMOVE_START
-        Assert.assertEquals("OK", res1);
+        assertEquals("OK", res1);
         // REMOVE_END
 
         boolean res2 = jedis.bfAdd("bikes:models", "Smoky Mountain Striker");

src/test/java/io/redis/examples/CMSExample.java

@@ -5,7 +5,7 @@
 
 //REMOVE_START
 import redis.clients.jedis.UnifiedJedis;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.HashMap;
 import java.util.List;

src/test/java/io/redis/examples/CmdsCnxmgmtExample.java

@@ -2,12 +2,13 @@
 // REMOVE_START
 package io.redis.examples;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 // REMOVE_END
 
 import redis.clients.jedis.Jedis;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 // HIDE_START
 public class CmdsCnxmgmtExample {
     @Test
@@ -24,7 +25,7 @@ public void run() {
         String authResult1 = jedis.auth("default",  "temp_pass");
         System.out.println(authResult1); // >>> OK
         // REMOVE_START
-        Assert.assertEquals("OK", authResult1);
+        assertEquals("OK", authResult1);
         jedis.configSet("requirepass", "");
         // REMOVE_END
         // STEP_END
@@ -38,7 +39,7 @@ public void run() {
         String authResult2 = jedis.auth("test-user", "strong_password");
         System.out.println(authResult2); // >>> OK
         // REMOVE_START
-        Assert.assertEquals("OK", authResult2);
+        assertEquals("OK", authResult2);
         jedis.aclDelUser("test-user");
         // REMOVE_END
         // STEP_END

src/test/java/io/redis/examples/CmdsGenericExample.java

@@ -2,13 +2,14 @@
 // REMOVE_START
 package io.redis.examples;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 // REMOVE_END
 
 // HIDE_START
 import redis.clients.jedis.UnifiedJedis;
 import redis.clients.jedis.args.ExpiryOption;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 // HIDE_END
 
 // HIDE_START
@@ -36,9 +37,9 @@ public void run() {
 
         // Tests for 'del' step.
         // REMOVE_START
-        Assert.assertEquals("OK", delResult1);
-        Assert.assertEquals("OK", delResult2);
-        Assert.assertEquals(2, delResult3);
+        assertEquals("OK", delResult1);
+        assertEquals("OK", delResult2);
+        assertEquals(2, delResult3);
         // REMOVE_END
 
 
@@ -73,15 +74,15 @@ public void run() {
 
         // Tests for 'expire' step.
         // REMOVE_START
-        Assert.assertEquals("OK", expireResult1);
-        Assert.assertEquals(1, expireResult2);
-        Assert.assertEquals(10, expireResult3);
-        Assert.assertEquals("OK", expireResult4);
-        Assert.assertEquals(-1, expireResult5);
-        Assert.assertEquals(0, expireResult6);
-        Assert.assertEquals(-1, expireResult7);
-        Assert.assertEquals(1, expireResult8);
-        Assert.assertEquals(10, expireResult9);
+        assertEquals("OK", expireResult1);
+        assertEquals(1, expireResult2);
+        assertEquals(10, expireResult3);
+        assertEquals("OK", expireResult4);
+        assertEquals(-1, expireResult5);
+        assertEquals(0, expireResult6);
+        assertEquals(-1, expireResult7);
+        assertEquals(1, expireResult8);
+        assertEquals(10, expireResult9);
         jedis.del("mykey");
         // REMOVE_END
 
@@ -99,9 +100,9 @@ public void run() {
 
         // Tests for 'ttl' step.
         // REMOVE_START
-        Assert.assertEquals("OK", ttlResult1);
-        Assert.assertEquals(1, ttlResult2);
-        Assert.assertEquals(10, ttlResult3);
+        assertEquals("OK", ttlResult1);
+        assertEquals(1, ttlResult2);
+        assertEquals(10, ttlResult3);
         jedis.del("mykey");
         // REMOVE_END
 

src/test/java/io/redis/examples/CmdsHashExample.java

@@ -2,8 +2,7 @@
 // REMOVE_START
 package io.redis.examples;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 // REMOVE_END
 
 import java.util.HashMap;
@@ -16,6 +15,8 @@
 // HIDE_END
 
 import static java.util.stream.Collectors.toList;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 // HIDE_START
 public class CmdsHashExample {
@@ -45,9 +46,9 @@ public void run() {
         // STEP_END
         // REMOVE_START
         // Tests for 'hget' step.
-        Assert.assertEquals(1, hGetResult1);
-        Assert.assertEquals("foo", hGetResult2);
-        Assert.assertNull(hGetResult3);
+        assertEquals(1, hGetResult1);
+        assertEquals("foo", hGetResult2);
+        assertNull(hGetResult3);
         jedis.del("myhash");
         // REMOVE_END
 
@@ -70,8 +71,8 @@ public void run() {
         // STEP_END
         // REMOVE_START
         // Tests for 'hgetall' step.
-        Assert.assertEquals(2, hGetAllResult1);
-        Assert.assertEquals("[field1=Hello, field2=World]",
+        assertEquals(2, hGetAllResult1);
+        assertEquals("[field1=Hello, field2=World]",
             hGetAllResult2.entrySet().stream()
                     .sorted((s1, s2)-> s1.getKey().compareTo(s2.getKey()))
                     .collect(toList())
@@ -112,15 +113,15 @@ public void run() {
         // STEP_END
         // REMOVE_START
         // Tests for 'hset' step.
-        Assert.assertEquals(1, hSetResult1);
-        Assert.assertEquals("Hello", hSetResult2);
-        Assert.assertEquals(2, hSetResult3);
-        Assert.assertEquals("Hi", hSetResult4);
-        Assert.assertEquals("World", hSetResult5);
-        Assert.assertEquals(3, hSetResult6.size());
-        Assert.assertEquals("Hello", hSetResult6.get("field1"));
-        Assert.assertEquals("Hi", hSetResult6.get("field2"));
-        Assert.assertEquals("World", hSetResult6.get("field3"));
+        assertEquals(1, hSetResult1);
+        assertEquals("Hello", hSetResult2);
+        assertEquals(2, hSetResult3);
+        assertEquals("Hi", hSetResult4);
+        assertEquals("World", hSetResult5);
+        assertEquals(3, hSetResult6.size());
+        assertEquals("Hello", hSetResult6.get("field1"));
+        assertEquals("Hi", hSetResult6.get("field2"));
+        assertEquals("World", hSetResult6.get("field3"));
         jedis.del("myhash");
         // REMOVE_END
 
@@ -139,8 +140,8 @@ public void run() {
         // STEP_END
         // REMOVE_START       
         // Tests for 'hvals' step.
-        Assert.assertEquals(2, hValsResult1);
-        Assert.assertEquals("[Hello, World]", hValsResult2.toString());
+        assertEquals(2, hValsResult1);
+        assertEquals("[Hello, World]", hValsResult2.toString());
         jedis.del("myhash");
         // REMOVE_END