Skip to content

Commit 1d1b268

Browse files
ggivoggivo
authored
Migrate test to JUnit5 (#4139)
* Use junit5 for new test Add juint5 dependencies to enable writing new tests using juint5 Added junit.vintage module to make sure existing junit4 tests are running till we migrate them. Migrated BuilderTest.java as example * Add Junit5 Conditions - RedisVersionCondition - EnabledOnCommandCondition * Refactor junit conditions to use AnnotationUtils - RedisVersionCondition - EnabledOnCommandCondition * Migrate commands.commandobjects tests * Rebase * Migrate collections tests * junit 5.13.0-M1 introduces support for parameterised Class tests * Migrate redis.clients.jedis to JUnit5 * clean up warnings * Migrate commands/unified tests * Delete EnabledOnCommandRule.java * migrate ExceptionsTest * migrate csc tests * migrate misc tests * migrate authentication tests * migrate examples tests * migrate mocked tests * Migrate module tests * Migrate parameters tests * Migrate prefix tests * Migrate providers tests * Migrate scenariou & remaining tests * Migrate examples tests * Remove junit4 & junit-vintage * Clean up * Use mockito-junit-jupiter:4.11.0 for java 1.8 compatibility * Rebase * Fix ACLJedisPoolTest, ACLJedisSentinelPoolTest tests * Fix ACLJedisSentinelPoolTest tests
1 parent 8e78a93 commit 1d1b268

File tree

313 files changed

+2975
-2810
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

313 files changed

+2975
-2810
lines changed

‎pom.xml‎

Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,21 @@
5151
<resilience4j.version>1.7.1</resilience4j.version>
5252
<jackson.version>2.18.3</jackson.version>
5353
<maven.surefire.version>3.5.2</maven.surefire.version>
54+
<junit.version>5.13.0-M1</junit.version>
5455
</properties>
5556

57+
<dependencyManagement>
58+
<dependencies>
59+
<dependency>
60+
<groupId>org.junit</groupId>
61+
<artifactId>junit-bom</artifactId>
62+
<version>${junit.version}</version>
63+
<type>pom</type>
64+
<scope>import</scope>
65+
</dependency>
66+
</dependencies>
67+
</dependencyManagement>
68+
5669
<dependencies>
5770
<dependency>
5871
<groupId>org.slf4j</groupId>
@@ -101,9 +114,24 @@
101114

102115
<!-- test -->
103116
<dependency>
104-
<groupId>junit</groupId>
105-
<artifactId>junit</artifactId>
106-
<version>4.13.2</version>
117+
<groupId>org.junit.jupiter</groupId>
118+
<artifactId>junit-jupiter-api</artifactId>
119+
<scope>test</scope>
120+
</dependency>
121+
<dependency>
122+
<groupId>org.junit.jupiter</groupId>
123+
<artifactId>junit-jupiter-params</artifactId>
124+
<scope>test</scope>
125+
</dependency>
126+
<dependency>
127+
<groupId>org.mockito</groupId>
128+
<artifactId>mockito-junit-jupiter</artifactId>
129+
<version>4.11.0</version>
130+
<scope>test</scope>
131+
</dependency>
132+
<dependency>
133+
<groupId>org.junit.jupiter</groupId>
134+
<artifactId>junit-jupiter-engine</artifactId>
107135
<scope>test</scope>
108136
</dependency>
109137
<dependency>

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

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@
22
// HIDE_START
33
package io.redis.examples;
44

5-
import org.junit.Assert;
6-
import org.junit.Test;
5+
import org.junit.jupiter.api.Test;
76
import redis.clients.jedis.UnifiedJedis;
87

8+
import static org.junit.jupiter.api.Assertions.assertEquals;
9+
import static org.junit.jupiter.api.Assertions.assertFalse;
10+
import static org.junit.jupiter.api.Assertions.assertTrue;
11+
912
public class BitMapsExample {
1013

1114
@Test
@@ -29,9 +32,9 @@ public void run() {
2932
// STEP_END
3033

3134
// REMOVE_START
32-
Assert.assertFalse(res1);
33-
Assert.assertTrue(res2);
34-
Assert.assertFalse(res3);
35+
assertFalse(res1);
36+
assertTrue(res2);
37+
assertFalse(res3);
3538
// REMOVE_END
3639

3740
// STEP_START bitcount
@@ -40,7 +43,7 @@ public void run() {
4043
// STEP_END
4144

4245
// REMOVE_START
43-
Assert.assertEquals(1, res4);
46+
assertEquals(1, res4);
4447
// REMOVE_END
4548

4649
// HIDE_START

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22
// REMOVE_START
33
package io.redis.examples;
44

5-
import org.junit.Assert;
6-
import org.junit.Test;
5+
import org.junit.jupiter.api.Test;
76
import java.util.List;
87
// REMOVE_END
98

109
// HIDE_START
1110
import redis.clients.jedis.UnifiedJedis;
11+
12+
import static org.junit.jupiter.api.Assertions.assertEquals;
1213
// HIDE_END
1314

1415
// HIDE_START
@@ -40,10 +41,10 @@ public void run() {
4041

4142
// Tests for 'bf' step.
4243
// REMOVE_START
43-
Assert.assertEquals("[0]", res1.toString());
44-
Assert.assertEquals("[950, 1]", res2.toString());
45-
Assert.assertEquals("[1450, 2]", res3.toString());
46-
Assert.assertEquals("[1450, 2]", res4.toString());
44+
assertEquals("[0]", res1.toString());
45+
assertEquals("[950, 1]", res2.toString());
46+
assertEquals("[1450, 2]", res3.toString());
47+
assertEquals("[1450, 2]", res4.toString());
4748
// REMOVE_END
4849

4950
// HIDE_START

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@
44
package io.redis.examples;
55

66
import redis.clients.jedis.UnifiedJedis;
7-
import org.junit.Test;
8-
import org.junit.Assert;
7+
import org.junit.jupiter.api.Test;
98
import java.util.List;
109

10+
import static org.junit.jupiter.api.Assertions.assertEquals;
11+
1112
public class BloomFilterExample {
1213

1314
@Test
@@ -24,7 +25,7 @@ public void run() {
2425
System.out.println(res1); // >>> OK
2526

2627
// REMOVE_START
27-
Assert.assertEquals("OK", res1);
28+
assertEquals("OK", res1);
2829
// REMOVE_END
2930

3031
boolean res2 = jedis.bfAdd("bikes:models", "Smoky Mountain Striker");

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
//REMOVE_START
77
import redis.clients.jedis.UnifiedJedis;
8-
import org.junit.Test;
8+
import org.junit.jupiter.api.Test;
99

1010
import java.util.HashMap;
1111
import java.util.List;

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@
22
// REMOVE_START
33
package io.redis.examples;
44

5-
import org.junit.Assert;
6-
import org.junit.Test;
5+
import org.junit.jupiter.api.Test;
76
// REMOVE_END
87

98
import redis.clients.jedis.Jedis;
109

10+
import static org.junit.jupiter.api.Assertions.assertEquals;
11+
1112
// HIDE_START
1213
public class CmdsCnxmgmtExample {
1314
@Test
@@ -24,7 +25,7 @@ public void run() {
2425
String authResult1 = jedis.auth("default", "temp_pass");
2526
System.out.println(authResult1); // >>> OK
2627
// REMOVE_START
27-
Assert.assertEquals("OK", authResult1);
28+
assertEquals("OK", authResult1);
2829
jedis.configSet("requirepass", "");
2930
// REMOVE_END
3031
// STEP_END
@@ -38,7 +39,7 @@ public void run() {
3839
String authResult2 = jedis.auth("test-user", "strong_password");
3940
System.out.println(authResult2); // >>> OK
4041
// REMOVE_START
41-
Assert.assertEquals("OK", authResult2);
42+
assertEquals("OK", authResult2);
4243
jedis.aclDelUser("test-user");
4344
// REMOVE_END
4445
// STEP_END

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

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22
// REMOVE_START
33
package io.redis.examples;
44

5-
import org.junit.Assert;
6-
import org.junit.Test;
5+
import org.junit.jupiter.api.Test;
76
// REMOVE_END
87

98
// HIDE_START
109
import redis.clients.jedis.UnifiedJedis;
1110
import redis.clients.jedis.args.ExpiryOption;
11+
12+
import static org.junit.jupiter.api.Assertions.assertEquals;
1213
// HIDE_END
1314

1415
// HIDE_START
@@ -36,9 +37,9 @@ public void run() {
3637

3738
// Tests for 'del' step.
3839
// REMOVE_START
39-
Assert.assertEquals("OK", delResult1);
40-
Assert.assertEquals("OK", delResult2);
41-
Assert.assertEquals(2, delResult3);
40+
assertEquals("OK", delResult1);
41+
assertEquals("OK", delResult2);
42+
assertEquals(2, delResult3);
4243
// REMOVE_END
4344

4445

@@ -73,15 +74,15 @@ public void run() {
7374

7475
// Tests for 'expire' step.
7576
// REMOVE_START
76-
Assert.assertEquals("OK", expireResult1);
77-
Assert.assertEquals(1, expireResult2);
78-
Assert.assertEquals(10, expireResult3);
79-
Assert.assertEquals("OK", expireResult4);
80-
Assert.assertEquals(-1, expireResult5);
81-
Assert.assertEquals(0, expireResult6);
82-
Assert.assertEquals(-1, expireResult7);
83-
Assert.assertEquals(1, expireResult8);
84-
Assert.assertEquals(10, expireResult9);
77+
assertEquals("OK", expireResult1);
78+
assertEquals(1, expireResult2);
79+
assertEquals(10, expireResult3);
80+
assertEquals("OK", expireResult4);
81+
assertEquals(-1, expireResult5);
82+
assertEquals(0, expireResult6);
83+
assertEquals(-1, expireResult7);
84+
assertEquals(1, expireResult8);
85+
assertEquals(10, expireResult9);
8586
jedis.del("mykey");
8687
// REMOVE_END
8788

@@ -99,9 +100,9 @@ public void run() {
99100

100101
// Tests for 'ttl' step.
101102
// REMOVE_START
102-
Assert.assertEquals("OK", ttlResult1);
103-
Assert.assertEquals(1, ttlResult2);
104-
Assert.assertEquals(10, ttlResult3);
103+
assertEquals("OK", ttlResult1);
104+
assertEquals(1, ttlResult2);
105+
assertEquals(10, ttlResult3);
105106
jedis.del("mykey");
106107
// REMOVE_END
107108

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

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
// REMOVE_START
33
package io.redis.examples;
44

5-
import org.junit.Assert;
6-
import org.junit.Test;
5+
import org.junit.jupiter.api.Test;
76
// REMOVE_END
87

98
import java.util.HashMap;
@@ -16,6 +15,8 @@
1615
// HIDE_END
1716

1817
import static java.util.stream.Collectors.toList;
18+
import static org.junit.jupiter.api.Assertions.assertEquals;
19+
import static org.junit.jupiter.api.Assertions.assertNull;
1920

2021
// HIDE_START
2122
public class CmdsHashExample {
@@ -45,9 +46,9 @@ public void run() {
4546
// STEP_END
4647
// REMOVE_START
4748
// Tests for 'hget' step.
48-
Assert.assertEquals(1, hGetResult1);
49-
Assert.assertEquals("foo", hGetResult2);
50-
Assert.assertNull(hGetResult3);
49+
assertEquals(1, hGetResult1);
50+
assertEquals("foo", hGetResult2);
51+
assertNull(hGetResult3);
5152
jedis.del("myhash");
5253
// REMOVE_END
5354

@@ -70,8 +71,8 @@ public void run() {
7071
// STEP_END
7172
// REMOVE_START
7273
// Tests for 'hgetall' step.
73-
Assert.assertEquals(2, hGetAllResult1);
74-
Assert.assertEquals("[field1=Hello, field2=World]",
74+
assertEquals(2, hGetAllResult1);
75+
assertEquals("[field1=Hello, field2=World]",
7576
hGetAllResult2.entrySet().stream()
7677
.sorted((s1, s2)-> s1.getKey().compareTo(s2.getKey()))
7778
.collect(toList())
@@ -112,15 +113,15 @@ public void run() {
112113
// STEP_END
113114
// REMOVE_START
114115
// Tests for 'hset' step.
115-
Assert.assertEquals(1, hSetResult1);
116-
Assert.assertEquals("Hello", hSetResult2);
117-
Assert.assertEquals(2, hSetResult3);
118-
Assert.assertEquals("Hi", hSetResult4);
119-
Assert.assertEquals("World", hSetResult5);
120-
Assert.assertEquals(3, hSetResult6.size());
121-
Assert.assertEquals("Hello", hSetResult6.get("field1"));
122-
Assert.assertEquals("Hi", hSetResult6.get("field2"));
123-
Assert.assertEquals("World", hSetResult6.get("field3"));
116+
assertEquals(1, hSetResult1);
117+
assertEquals("Hello", hSetResult2);
118+
assertEquals(2, hSetResult3);
119+
assertEquals("Hi", hSetResult4);
120+
assertEquals("World", hSetResult5);
121+
assertEquals(3, hSetResult6.size());
122+
assertEquals("Hello", hSetResult6.get("field1"));
123+
assertEquals("Hi", hSetResult6.get("field2"));
124+
assertEquals("World", hSetResult6.get("field3"));
124125
jedis.del("myhash");
125126
// REMOVE_END
126127

@@ -139,8 +140,8 @@ public void run() {
139140
// STEP_END
140141
// REMOVE_START
141142
// Tests for 'hvals' step.
142-
Assert.assertEquals(2, hValsResult1);
143-
Assert.assertEquals("[Hello, World]", hValsResult2.toString());
143+
assertEquals(2, hValsResult1);
144+
assertEquals("[Hello, World]", hValsResult2.toString());
144145
jedis.del("myhash");
145146
// REMOVE_END
146147

0 commit comments

Comments
 (0)