diff --git a/pom.xml b/pom.xml index 431a80b36d..597784a694 100644 --- a/pom.xml +++ b/pom.xml @@ -51,8 +51,21 @@ 1.7.1 2.18.3 3.5.2 + 5.13.0-M1 + + + + org.junit + junit-bom + ${junit.version} + pom + import + + + + org.slf4j @@ -101,9 +114,24 @@ - junit - junit - 4.13.2 + org.junit.jupiter + junit-jupiter-api + test + + + org.junit.jupiter + junit-jupiter-params + test + + + org.mockito + mockito-junit-jupiter + 4.11.0 + test + + + org.junit.jupiter + junit-jupiter-engine test diff --git a/src/test/java/io/redis/examples/BitMapsExample.java b/src/test/java/io/redis/examples/BitMapsExample.java index 96dab5adea..c356d0de72 100644 --- a/src/test/java/io/redis/examples/BitMapsExample.java +++ b/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 diff --git a/src/test/java/io/redis/examples/BitfieldExample.java b/src/test/java/io/redis/examples/BitfieldExample.java index 27977b237e..9b3f3b2370 100644 --- a/src/test/java/io/redis/examples/BitfieldExample.java +++ b/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 diff --git a/src/test/java/io/redis/examples/BloomFilterExample.java b/src/test/java/io/redis/examples/BloomFilterExample.java index 09e8fdfc13..77757fa3bc 100644 --- a/src/test/java/io/redis/examples/BloomFilterExample.java +++ b/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"); diff --git a/src/test/java/io/redis/examples/CMSExample.java b/src/test/java/io/redis/examples/CMSExample.java index 42290cd841..ee66412c04 100644 --- a/src/test/java/io/redis/examples/CMSExample.java +++ b/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; diff --git a/src/test/java/io/redis/examples/CmdsCnxmgmtExample.java b/src/test/java/io/redis/examples/CmdsCnxmgmtExample.java index 78de2cfb4a..17d6876777 100644 --- a/src/test/java/io/redis/examples/CmdsCnxmgmtExample.java +++ b/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 diff --git a/src/test/java/io/redis/examples/CmdsGenericExample.java b/src/test/java/io/redis/examples/CmdsGenericExample.java index 8f8094d22b..f12d5be5e8 100644 --- a/src/test/java/io/redis/examples/CmdsGenericExample.java +++ b/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 diff --git a/src/test/java/io/redis/examples/CmdsHashExample.java b/src/test/java/io/redis/examples/CmdsHashExample.java index 9801f0e472..064fdf099e 100644 --- a/src/test/java/io/redis/examples/CmdsHashExample.java +++ b/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 diff --git a/src/test/java/io/redis/examples/CmdsListExample.java b/src/test/java/io/redis/examples/CmdsListExample.java index 703aeb204b..a3628196d5 100644 --- a/src/test/java/io/redis/examples/CmdsListExample.java +++ b/src/test/java/io/redis/examples/CmdsListExample.java @@ -2,14 +2,15 @@ // 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.List; // HIDE_START import redis.clients.jedis.UnifiedJedis; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class CmdsListExample { @Test @@ -31,9 +32,9 @@ public void run() { System.out.println(lLenResult3); // >>> 2 // STEP_END // REMOVE_START - Assert.assertEquals(1, lLenResult1); - Assert.assertEquals(2, lLenResult2); - Assert.assertEquals(2, lLenResult3); + assertEquals(1, lLenResult1); + assertEquals(2, lLenResult2); + assertEquals(2, lLenResult3); jedis.del("mylist"); // REMOVE_END @@ -53,10 +54,10 @@ public void run() { System.out.println(lPopResult4); // >>> [four, five] // STEP_END // REMOVE_START - Assert.assertEquals(5, lPopResult1); - Assert.assertEquals("one", lPopResult2); - Assert.assertEquals("[two, three]", lPopResult3.toString()); - Assert.assertEquals("[four, five]", lPopResult4.toString()); + assertEquals(5, lPopResult1); + assertEquals("one", lPopResult2); + assertEquals("[two, three]", lPopResult3.toString()); + assertEquals("[four, five]", lPopResult4.toString()); jedis.del("mylist"); // REMOVE_END @@ -72,9 +73,9 @@ public void run() { // >>> [Hello, World] // STEP_END // REMOVE_START - Assert.assertEquals(1, lPushResult1); - Assert.assertEquals(2, lPushResult2); - Assert.assertEquals("[Hello, World]", lPushResult3.toString()); + assertEquals(1, lPushResult1); + assertEquals(2, lPushResult2); + assertEquals("[Hello, World]", lPushResult3.toString()); jedis.del("mylist"); // REMOVE_END @@ -95,11 +96,11 @@ public void run() { System.out.println(lRangeResult5); // >>> [] // STEP_END // REMOVE_START - Assert.assertEquals(3, lRangeResult1); - Assert.assertEquals("[one]", lRangeResult2.toString()); - Assert.assertEquals("[one, two, three]", lRangeResult3.toString()); - Assert.assertEquals("[one, two, three]", lRangeResult4.toString()); - Assert.assertEquals("[]", lRangeResult5.toString()); + assertEquals(3, lRangeResult1); + assertEquals("[one]", lRangeResult2.toString()); + assertEquals("[one, two, three]", lRangeResult3.toString()); + assertEquals("[one, two, three]", lRangeResult4.toString()); + assertEquals("[]", lRangeResult5.toString()); jedis.del("mylist"); // REMOVE_END @@ -119,10 +120,10 @@ public void run() { System.out.println(rPopResult4); // >>> [one, two] // STEP_END // REMOVE_START - Assert.assertEquals(5, rPopResult1); - Assert.assertEquals("five", rPopResult2); - Assert.assertEquals("[four, three]", rPopResult3.toString()); - Assert.assertEquals("[one, two]", rPopResult4.toString()); + assertEquals(5, rPopResult1); + assertEquals("five", rPopResult2); + assertEquals("[four, three]", rPopResult3.toString()); + assertEquals("[one, two]", rPopResult4.toString()); jedis.del("mylist"); // REMOVE_END @@ -137,9 +138,9 @@ public void run() { System.out.println(rPushResult3); // >>> [hello, world] // STEP_END // REMOVE_START - Assert.assertEquals(1, rPushResult1); - Assert.assertEquals(2, rPushResult2); - Assert.assertEquals("[hello, world]", rPushResult3.toString()); + assertEquals(1, rPushResult1); + assertEquals(2, rPushResult2); + assertEquals("[hello, world]", rPushResult3.toString()); jedis.del("mylist"); // REMOVE_END diff --git a/src/test/java/io/redis/examples/CmdsServerMgmtExample.java b/src/test/java/io/redis/examples/CmdsServerMgmtExample.java index 3894dc4287..2da0e3756a 100644 --- a/src/test/java/io/redis/examples/CmdsServerMgmtExample.java +++ b/src/test/java/io/redis/examples/CmdsServerMgmtExample.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.Set; @@ -11,6 +10,8 @@ // HIDE_START import redis.clients.jedis.UnifiedJedis; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class CmdsServerMgmtExample { @Test public void run() { @@ -30,8 +31,8 @@ public void run() { System.out.println(flushAllResult2); // >>> [] // STEP_END // REMOVE_START - Assert.assertEquals("OK", flushAllResult1); - Assert.assertEquals("[]", flushAllResult2.toString()); + assertEquals("OK", flushAllResult1); + assertEquals("[]", flushAllResult2.toString()); // REMOVE_END // STEP_START info @@ -48,7 +49,7 @@ public void run() { jedis2.close(); // STEP_END // REMOVE_START - Assert.assertEquals("# Server", infoResult.substring(0, 8)); + assertEquals("# Server", infoResult.substring(0, 8)); // REMOVE_END // HIDE_START diff --git a/src/test/java/io/redis/examples/CmdsSetExample.java b/src/test/java/io/redis/examples/CmdsSetExample.java index 78f49012ae..7e47ccfa76 100644 --- a/src/test/java/io/redis/examples/CmdsSetExample.java +++ b/src/test/java/io/redis/examples/CmdsSetExample.java @@ -2,10 +2,11 @@ // REMOVE_START package io.redis.examples; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; // REMOVE_END import static java.util.stream.Collectors.toList; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.Set; @@ -37,10 +38,10 @@ public void run() { // >>> [Hello, World] // STEP_END // REMOVE_START - Assert.assertEquals(1, sAddResult1); - Assert.assertEquals(1, sAddResult2); - Assert.assertEquals(0, sAddResult3); - Assert.assertArrayEquals(new String[] {"Hello", "World"}, sAddResult4.stream().sorted().toArray()); + assertEquals(1, sAddResult1); + assertEquals(1, sAddResult2); + assertEquals(0, sAddResult3); + assertArrayEquals(new String[] {"Hello", "World"}, sAddResult4.stream().sorted().toArray()); jedis.del("myset"); // REMOVE_END @@ -53,8 +54,8 @@ public void run() { // >>> [Hello, World] // STEP_END // REMOVE_START - Assert.assertEquals(2, sMembersResult1); - Assert.assertArrayEquals(new String[] {"Hello", "World"}, sMembersResult2.stream().sorted().toArray()); + assertEquals(2, sMembersResult1); + assertArrayEquals(new String[] {"Hello", "World"}, sMembersResult2.stream().sorted().toArray()); // REMOVE_END // HIDE_START diff --git a/src/test/java/io/redis/examples/CmdsSortedSetExample.java b/src/test/java/io/redis/examples/CmdsSortedSetExample.java index cb7badb0b1..8412803226 100644 --- a/src/test/java/io/redis/examples/CmdsSortedSetExample.java +++ b/src/test/java/io/redis/examples/CmdsSortedSetExample.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; @@ -13,6 +12,8 @@ import redis.clients.jedis.params.ZRangeParams; import redis.clients.jedis.resps.Tuple; +import static org.junit.jupiter.api.Assertions.assertEquals; + // HIDE_START public class CmdsSortedSetExample { @@ -87,13 +88,13 @@ public void run() { // Tests for 'zadd' step. // REMOVE_START - Assert.assertEquals(1, zAddResult1); - Assert.assertEquals(1, zAddResult2); - Assert.assertEquals(2, zAddResult3); - Assert.assertEquals(new Tuple("one", 1.0), zAddResult4.get(0)); - Assert.assertEquals(new Tuple("uno", 1.0), zAddResult4.get(1)); - Assert.assertEquals(new Tuple("two", 2.0), zAddResult4.get(2)); - Assert.assertEquals(new Tuple("three", 3.0), zAddResult4.get(3)); + assertEquals(1, zAddResult1); + assertEquals(1, zAddResult2); + assertEquals(2, zAddResult3); + assertEquals(new Tuple("one", 1.0), zAddResult4.get(0)); + assertEquals(new Tuple("uno", 1.0), zAddResult4.get(1)); + assertEquals(new Tuple("two", 2.0), zAddResult4.get(2)); + assertEquals(new Tuple("three", 3.0), zAddResult4.get(3)); jedis.del("myzset"); // REMOVE_END @@ -258,10 +259,10 @@ public void run() { // Tests for 'zrange1' step. // REMOVE_START - Assert.assertEquals(3, zRangeResult1); - Assert.assertEquals("one, two, three", String.join(", ", zRangeResult2)); - Assert.assertEquals("three", String.join(", ", zRangeResult3)); - Assert.assertEquals("two, three", String.join(", ", zRangeResult4)); + assertEquals(3, zRangeResult1); + assertEquals("one, two, three", String.join(", ", zRangeResult2)); + assertEquals("three", String.join(", ", zRangeResult3)); + assertEquals("two, three", String.join(", ", zRangeResult4)); jedis.del("myzset"); // REMOVE_END @@ -285,9 +286,9 @@ public void run() { // Tests for 'zrange2' step. // REMOVE_START - Assert.assertEquals(3, zRangeResult5); - Assert.assertEquals(new Tuple("one", 1.0), zRangeResult6.get(0)); - Assert.assertEquals(new Tuple("two", 2.0), zRangeResult6.get(1)); + assertEquals(3, zRangeResult5); + assertEquals(new Tuple("one", 1.0), zRangeResult6.get(0)); + assertEquals(new Tuple("two", 2.0), zRangeResult6.get(1)); jedis.del("myzset"); // REMOVE_END @@ -306,8 +307,8 @@ public void run() { // Tests for 'zrange3' step. // REMOVE_START - Assert.assertEquals(3, zRangeResult7); - Assert.assertEquals("three", String.join(", ", zRangeResult8)); + assertEquals(3, zRangeResult7); + assertEquals("three", String.join(", ", zRangeResult8)); jedis.del("myzset"); // REMOVE_END diff --git a/src/test/java/io/redis/examples/CmdsStringExample.java b/src/test/java/io/redis/examples/CmdsStringExample.java index a791f77ad8..4b252f0778 100644 --- a/src/test/java/io/redis/examples/CmdsStringExample.java +++ b/src/test/java/io/redis/examples/CmdsStringExample.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 // HIDE_START import redis.clients.jedis.UnifiedJedis; + +import static org.junit.jupiter.api.Assertions.assertEquals; // HIDE_END // HIDE_START @@ -36,9 +37,9 @@ public void run() { // Tests for 'incr' step. // REMOVE_START - Assert.assertEquals("OK", incrResult1); - Assert.assertEquals(11, incrResult2); - Assert.assertEquals("11", incrResult3); + assertEquals("OK", incrResult1); + assertEquals(11, incrResult2); + assertEquals("11", incrResult3); jedis.del("mykey"); // REMOVE_END diff --git a/src/test/java/io/redis/examples/CuckooFilterExample.java b/src/test/java/io/redis/examples/CuckooFilterExample.java index ca225a89d6..26b1be6b7a 100644 --- a/src/test/java/io/redis/examples/CuckooFilterExample.java +++ b/src/test/java/io/redis/examples/CuckooFilterExample.java @@ -3,10 +3,12 @@ // 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.assertTrue; + public class CuckooFilterExample { @Test @@ -23,7 +25,7 @@ public void run() { System.out.println(res1); // >>> OK // REMOVE_START - Assert.assertEquals(res1, "OK"); + assertEquals(res1, "OK"); // REMOVE_END boolean res2 = jedis.cfAdd("bikes:models", "Smoky Mountain Striker"); @@ -39,7 +41,7 @@ public void run() { System.out.println(res5); // >>> True // REMOVE_START - Assert.assertTrue(res5); + assertTrue(res5); // REMOVE_END // STEP_END diff --git a/src/test/java/io/redis/examples/GeoExample.java b/src/test/java/io/redis/examples/GeoExample.java index a1eb848005..d171b92b95 100644 --- a/src/test/java/io/redis/examples/GeoExample.java +++ b/src/test/java/io/redis/examples/GeoExample.java @@ -2,7 +2,7 @@ package io.redis.examples; // REMOVE_START -import org.junit.Test; +import org.junit.jupiter.api.Test; // REMOVE_END import redis.clients.jedis.GeoCoordinate; import redis.clients.jedis.UnifiedJedis; @@ -12,7 +12,7 @@ import java.util.List; import java.util.stream.Collectors; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class GeoExample { diff --git a/src/test/java/io/redis/examples/GeoIndexExample.java b/src/test/java/io/redis/examples/GeoIndexExample.java index ddfb05dc60..6254eaab7b 100644 --- a/src/test/java/io/redis/examples/GeoIndexExample.java +++ b/src/test/java/io/redis/examples/GeoIndexExample.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 // HIDE_START @@ -19,6 +18,8 @@ import redis.clients.jedis.search.schemafields.GeoShapeField.CoordinateSystem; import redis.clients.jedis.search.SearchResult; import redis.clients.jedis.exceptions.JedisDataException; + +import static org.junit.jupiter.api.Assertions.assertEquals; // HIDE_END // HIDE_START @@ -54,7 +55,7 @@ public void run() { ); // STEP_END // REMOVE_START - Assert.assertEquals("OK", geoIdxCreateResult); + assertEquals("OK", geoIdxCreateResult); // REMOVE_END // STEP_START add_geo_json @@ -77,8 +78,8 @@ public void run() { System.out.println(jsonAddResult2); // >>> OK // STEP_END // REMOVE_START - Assert.assertEquals("OK", jsonAddResult1); - Assert.assertEquals("OK", jsonAddResult2); + assertEquals("OK", jsonAddResult1); + assertEquals("OK", jsonAddResult2); // REMOVE_END // STEP_START geo_query @@ -94,9 +95,9 @@ public void run() { // >>> product:46885 // STEP_END // REMOVE_START - Assert.assertEquals("OK", jsonAddResult1); - Assert.assertEquals("OK", jsonAddResult2); - Assert.assertEquals("product:46885", geoResult.getDocuments().get(0).getId()); + assertEquals("OK", jsonAddResult1); + assertEquals("OK", jsonAddResult2); + assertEquals("product:46885", geoResult.getDocuments().get(0).getId()); // REMOVE_END // STEP_START create_gshape_idx @@ -114,7 +115,7 @@ public void run() { System.out.println(geomIndexCreateResult); // >>> OK // STEP_END // REMOVE_START - Assert.assertEquals("OK", geomIndexCreateResult); + assertEquals("OK", geomIndexCreateResult); // REMOVE_END // STEP_START add_gshape_json @@ -147,10 +148,10 @@ public void run() { System.out.println(gmJsonRes4); // >>> OK // STEP_END // REMOVE_START - Assert.assertEquals("OK", gmJsonRes1); - Assert.assertEquals("OK", gmJsonRes2); - Assert.assertEquals("OK", gmJsonRes3); - Assert.assertEquals("OK", gmJsonRes4); + assertEquals("OK", gmJsonRes1); + assertEquals("OK", gmJsonRes2); + assertEquals("OK", gmJsonRes3); + assertEquals("OK", gmJsonRes4); // REMOVE_END // STEP_START gshape_query @@ -169,8 +170,8 @@ public void run() { // shape:4 // STEP_END // REMOVE_START - Assert.assertEquals(1, geomResult.getTotalResults()); - Assert.assertEquals("shape:4", geomResult.getDocuments().get(0).getId()); + assertEquals(1, geomResult.getTotalResults()); + assertEquals("shape:4", geomResult.getDocuments().get(0).getId()); // REMOVE_END // HIDE_START diff --git a/src/test/java/io/redis/examples/HashExample.java b/src/test/java/io/redis/examples/HashExample.java index c6cc2da701..7ba473ef97 100644 --- a/src/test/java/io/redis/examples/HashExample.java +++ b/src/test/java/io/redis/examples/HashExample.java @@ -8,8 +8,8 @@ import java.util.Map; //REMOVE_START -import org.junit.Test; -import static org.junit.Assert.assertEquals; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; //REMOVE_END public class HashExample { diff --git a/src/test/java/io/redis/examples/HomeJsonExample.java b/src/test/java/io/redis/examples/HomeJsonExample.java index 7f70bdda65..eaa39bc67b 100644 --- a/src/test/java/io/redis/examples/HomeJsonExample.java +++ b/src/test/java/io/redis/examples/HomeJsonExample.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 // STEP_START import @@ -15,6 +14,9 @@ import redis.clients.jedis.search.schemafields.*; import org.json.JSONObject; import java.util.List; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; // STEP_END // HIDE_START @@ -70,7 +72,7 @@ public void run() { System.out.println(createResult); // >>> OK // STEP_END // REMOVE_START - Assert.assertEquals("OK", createResult); + assertEquals("OK", createResult); // REMOVE_END // STEP_START add_data @@ -79,9 +81,9 @@ public void run() { String user3Set = jedis.jsonSet("user:3", new Path2("$"), user3); // STEP_END // REMOVE_START - Assert.assertEquals("OK", user1Set); - Assert.assertEquals("OK", user2Set); - Assert.assertEquals("OK", user3Set); + assertEquals("OK", user1Set); + assertEquals("OK", user2Set); + assertEquals("OK", user3Set); // REMOVE_END // STEP_START query1 @@ -99,7 +101,7 @@ public void run() { // >>> user:3 // STEP_END // REMOVE_START - Assert.assertEquals("user:3", paulDocs.get(0).getId()); + assertEquals("user:3", paulDocs.get(0).getId()); // REMOVE_END // STEP_START query2 @@ -118,7 +120,7 @@ public void run() { // >>> user:3 // STEP_END // REMOVE_START - Assert.assertArrayEquals( + assertArrayEquals( new String[] {"user:1", "user:3"}, citiesResult.getDocuments().stream().map(Document::getId).sorted().toArray() ); @@ -142,7 +144,7 @@ public void run() { // >>> Tel Aviv - 2 // STEP_END // REMOVE_START - Assert.assertArrayEquals( + assertArrayEquals( new String[] {"London - 1", "Tel Aviv - 2"}, aggResult.getRows().stream() .map(r -> r.getString("city") + " - " + r.getString("count")) diff --git a/src/test/java/io/redis/examples/HyperLogLogExample.java b/src/test/java/io/redis/examples/HyperLogLogExample.java index 9a72c2376f..bc3232f6f8 100644 --- a/src/test/java/io/redis/examples/HyperLogLogExample.java +++ b/src/test/java/io/redis/examples/HyperLogLogExample.java @@ -1,10 +1,11 @@ // EXAMPLE: hll_tutorial 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; + public class HyperLogLogExample { @Test @@ -31,7 +32,7 @@ public void run() { System.out.println(res4); // >>> OK // REMOVE_START - Assert.assertEquals("OK", res4); + assertEquals("OK", res4); // REMOVE_END long res5 = jedis.pfcount("all_bikes"); diff --git a/src/test/java/io/redis/examples/JsonExample.java b/src/test/java/io/redis/examples/JsonExample.java index 014d4213da..2e4a8c5bdf 100644 --- a/src/test/java/io/redis/examples/JsonExample.java +++ b/src/test/java/io/redis/examples/JsonExample.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; import java.util.List; // REMOVE_END @@ -14,6 +13,8 @@ import org.json.JSONArray; import org.json.JSONObject; + +import static org.junit.jupiter.api.Assertions.assertEquals; // HIDE_END // HIDE_START @@ -41,9 +42,9 @@ public void run() { // Tests for 'set_get' step. // REMOVE_START - Assert.assertEquals("OK", res1); - Assert.assertEquals("[\"Hyperion\"]", res2.toString()); - Assert.assertEquals("[class java.lang.String]", res3.toString()); + assertEquals("OK", res1); + assertEquals("[\"Hyperion\"]", res2.toString()); + assertEquals("[class java.lang.String]", res3.toString()); // REMOVE_END @@ -60,9 +61,9 @@ public void run() { // Tests for 'str' step. // REMOVE_START - Assert.assertEquals("[8]", res4.toString()); - Assert.assertEquals("[23]", res5.toString()); - Assert.assertEquals("[\"Hyperion (Enduro bikes)\"]", res6.toString()); + assertEquals("[8]", res4.toString()); + assertEquals("[23]", res5.toString()); + assertEquals("[\"Hyperion (Enduro bikes)\"]", res6.toString()); // REMOVE_END @@ -82,10 +83,10 @@ public void run() { // Tests for 'num' step. // REMOVE_START - Assert.assertEquals("OK", res7); - Assert.assertEquals("[1]", res8.toString()); - Assert.assertEquals("[2.5]", res9.toString()); - Assert.assertEquals("[1.75]", res10.toString()); + assertEquals("OK", res7); + assertEquals("[1]", res8.toString()); + assertEquals("[2.5]", res9.toString()); + assertEquals("[1.75]", res10.toString()); // REMOVE_END @@ -113,11 +114,11 @@ public void run() { // Tests for 'arr' step. // REMOVE_START - Assert.assertEquals("OK", res11); - Assert.assertEquals("[[\"Deimos\",{\"crashes\":0},null]]", res12.toString()); - Assert.assertEquals("[0]", res13.toString()); - Assert.assertEquals(1, res14); - Assert.assertEquals("[[\"Deimos\",{\"crashes\":0}]]", res15.toString()); + assertEquals("OK", res11); + assertEquals("[[\"Deimos\",{\"crashes\":0},null]]", res12.toString()); + assertEquals("[0]", res13.toString()); + assertEquals(1, res14); + assertEquals("[[\"Deimos\",{\"crashes\":0}]]", res15.toString()); // REMOVE_END @@ -155,15 +156,15 @@ public void run() { // Tests for 'arr2' step. // REMOVE_START - Assert.assertEquals("OK", res16); - Assert.assertEquals("[1]", res17.toString()); - Assert.assertEquals("[[\"Norem\"]]", res18.toString()); - Assert.assertEquals("[4]", res19.toString()); - Assert.assertEquals("[[\"Norem\",\"Prickett\",\"Royce\",\"Castilla\"]]", res20.toString()); - Assert.assertEquals("[1]", res21.toString()); - Assert.assertEquals("[[\"Prickett\"]]", res22.toString()); - Assert.assertEquals("[Prickett]", res23.toString()); - Assert.assertEquals("[null]", res24.toString()); + assertEquals("OK", res16); + assertEquals("[1]", res17.toString()); + assertEquals("[[\"Norem\"]]", res18.toString()); + assertEquals("[4]", res19.toString()); + assertEquals("[[\"Norem\",\"Prickett\",\"Royce\",\"Castilla\"]]", res20.toString()); + assertEquals("[1]", res21.toString()); + assertEquals("[[\"Prickett\"]]", res22.toString()); + assertEquals("[Prickett]", res23.toString()); + assertEquals("[null]", res24.toString()); // REMOVE_END @@ -185,9 +186,9 @@ public void run() { // Tests for 'obj' step. // REMOVE_START - Assert.assertEquals("OK", res25); - Assert.assertEquals("[3]", res26.toString()); - Assert.assertEquals("[[price, model, brand]]", res27.toString()); + assertEquals("OK", res25); + assertEquals("[3]", res26.toString()); + assertEquals("[[price, model, brand]]", res27.toString()); // REMOVE_END // STEP_START set_bikes @@ -265,7 +266,7 @@ public void run() { // Tests for 'set_bikes' step. // REMOVE_START - Assert.assertEquals("OK", res28); + assertEquals("OK", res28); // REMOVE_END @@ -277,7 +278,7 @@ public void run() { // Tests for 'get_bikes' step. // REMOVE_START - Assert.assertEquals( + assertEquals( "[[{\"specs\":{\"material\":\"carbon\",\"weight\":13.1},\"price\":1920," + "\"description\":\"This is a mid-travel trail slayer that is a " + "fantastic daily driver or one bike quiver. The Shimano Claris 8-speed " @@ -338,9 +339,9 @@ public void run() { // Tests for 'get_mtnbikes' step. // REMOVE_START - Assert.assertEquals("[\"Phoebe\",\"Quaoar\",\"Weywot\"]", res30.toString()); - Assert.assertEquals("[\"Phoebe\",\"Quaoar\",\"Weywot\"]", res31.toString()); - Assert.assertEquals("[\"Phoebe\",\"Quaoar\",\"Weywot\"]", res32.toString()); + assertEquals("[\"Phoebe\",\"Quaoar\",\"Weywot\"]", res30.toString()); + assertEquals("[\"Phoebe\",\"Quaoar\",\"Weywot\"]", res31.toString()); + assertEquals("[\"Phoebe\",\"Quaoar\",\"Weywot\"]", res32.toString()); // REMOVE_END @@ -352,7 +353,7 @@ public void run() { // Tests for 'get_models' step. // REMOVE_START - Assert.assertEquals("[\"Phoebe\",\"Quaoar\",\"Weywot\",\"Salacia\",\"Mimas\"]", res33.toString()); + assertEquals("[\"Phoebe\",\"Quaoar\",\"Weywot\",\"Salacia\",\"Mimas\"]", res33.toString()); // REMOVE_END @@ -365,7 +366,7 @@ public void run() { // Tests for 'get2mtnbikes' step. // REMOVE_START - Assert.assertEquals("[\"Phoebe\",\"Quaoar\"]", res34.toString()); + assertEquals("[\"Phoebe\",\"Quaoar\"]", res34.toString()); // REMOVE_END @@ -380,7 +381,7 @@ public void run() { // Tests for 'filter1' step. // REMOVE_START - Assert.assertEquals( + assertEquals( "[{\"specs\":{\"material\":\"aluminium\",\"weight\":7.9},\"price\":2072," + "\"description\":\"Redesigned for the 2020 model year, this bike impressed " + "our testers and is the best all-around trail bike we've ever tested. The " @@ -402,7 +403,7 @@ public void run() { // Tests for 'filter2' step. // REMOVE_START - Assert.assertEquals("[\"Weywot\",\"Mimas\"]", res36.toString()); + assertEquals("[\"Weywot\",\"Mimas\"]", res36.toString()); // REMOVE_END @@ -416,7 +417,7 @@ public void run() { // Tests for 'filter3' step. // REMOVE_START - Assert.assertEquals("[\"Quaoar\",\"Weywot\",\"Salacia\",\"Mimas\"]", res37.toString()); + assertEquals("[\"Quaoar\",\"Weywot\",\"Salacia\",\"Mimas\"]", res37.toString()); // REMOVE_END @@ -443,7 +444,7 @@ public void run() { // Tests for 'filter4' step. // REMOVE_START - Assert.assertEquals("[\"Quaoar\",\"Weywot\"]", res38.toString()); + assertEquals("[\"Quaoar\",\"Weywot\"]", res38.toString()); // REMOVE_END @@ -461,9 +462,9 @@ public void run() { // Tests for 'update_bikes' step. // REMOVE_START - Assert.assertEquals("[1920,2072,3264,1475,3941]", res39.toString()); - Assert.assertEquals("[1820,1972,3164,1375,3841]", res40.toString()); - Assert.assertEquals("[1920,2072,3264,1475,3941]", res41.toString()); + assertEquals("[1920,2072,3264,1475,3941]", res39.toString()); + assertEquals("[1820,1972,3164,1375,3841]", res40.toString()); + assertEquals("[1920,2072,3264,1475,3941]", res41.toString()); // REMOVE_END @@ -475,7 +476,7 @@ public void run() { // Tests for 'update_filters1' step. // REMOVE_START - Assert.assertEquals("[1500,2072,3264,1500,3941]", res42.toString()); + assertEquals("[1500,2072,3264,1500,3941]", res42.toString()); // REMOVE_END @@ -493,8 +494,8 @@ public void run() { // Tests for 'update_filters2' step. // REMOVE_START - Assert.assertEquals("[3, 3]", res43.toString()); - Assert.assertEquals( + assertEquals("[3, 3]", res43.toString()); + assertEquals( "[[\"black\",\"silver\",\"\\\"pink\\\"\"],[\"black\",\"white\"]," + "[\"black\",\"silver\",\"\\\"pink\\\"\"]]", res44.toString()); diff --git a/src/test/java/io/redis/examples/ListExample.java b/src/test/java/io/redis/examples/ListExample.java index 7ea316cd17..ac82e6d611 100644 --- a/src/test/java/io/redis/examples/ListExample.java +++ b/src/test/java/io/redis/examples/ListExample.java @@ -2,11 +2,11 @@ // HIDE_START package io.redis.examples; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.UnifiedJedis; import redis.clients.jedis.args.ListDirection; import java.util.List; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class ListExample { diff --git a/src/test/java/io/redis/examples/PipeTransExample.java b/src/test/java/io/redis/examples/PipeTransExample.java index c5dd62bf7e..71c2d83842 100644 --- a/src/test/java/io/redis/examples/PipeTransExample.java +++ b/src/test/java/io/redis/examples/PipeTransExample.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.List; @@ -12,6 +11,8 @@ import redis.clients.jedis.AbstractTransaction; import redis.clients.jedis.Response; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class PipeTransExample { @Test @@ -53,9 +54,9 @@ public void run() { // REMOVE_START - Assert.assertEquals("#0", resp0.get()); - Assert.assertEquals("#3", resp3.get()); - Assert.assertEquals("#4", resp4.get()); + assertEquals("#0", resp0.get()); + assertEquals("#3", resp3.get()); + assertEquals("#4", resp4.get()); // REMOVE_END } // STEP_END @@ -74,9 +75,9 @@ public void run() { System.out.println(jedis.get("counter:3")); // >>> 3 // STEP_END // REMOVE_START - Assert.assertEquals("1", jedis.get("counter:1")); - Assert.assertEquals("2", jedis.get("counter:2")); - Assert.assertEquals("3", jedis.get("counter:3")); + assertEquals("1", jedis.get("counter:1")); + assertEquals("2", jedis.get("counter:2")); + assertEquals("3", jedis.get("counter:3")); // REMOVE_END // STEP_START trans_watch @@ -112,10 +113,10 @@ public void run() { // >>> /usr/syscmds/:/usr/mycmds/ } // REMOVE_START - Assert.assertEquals("/usr/syscmds/:/usr/mycmds/", jedis.get("shellpath")); - Assert.assertEquals("OK", setResult.get()); - Assert.assertEquals(1, transResults.size()); - Assert.assertEquals("OK", transResults.get(0).toString()); + assertEquals("/usr/syscmds/:/usr/mycmds/", jedis.get("shellpath")); + assertEquals("OK", setResult.get()); + assertEquals(1, transResults.size()); + assertEquals("OK", transResults.get(0).toString()); // REMOVE_END } // STEP_END diff --git a/src/test/java/io/redis/examples/QueryAggExample.java b/src/test/java/io/redis/examples/QueryAggExample.java index 552b0254e1..d6073699a9 100644 --- a/src/test/java/io/redis/examples/QueryAggExample.java +++ b/src/test/java/io/redis/examples/QueryAggExample.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 // HIDE_START @@ -17,6 +16,10 @@ import redis.clients.jedis.search.schemafields.*; import redis.clients.jedis.search.aggr.*; import redis.clients.jedis.exceptions.JedisDataException; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; // HIDE_END // HIDE_START @@ -234,8 +237,8 @@ public void run() { // Tests for 'agg1' step. // REMOVE_START - Assert.assertEquals(5, rows1.size()); - Assert.assertArrayEquals( + assertEquals(5, rows1.size()); + assertArrayEquals( new String[]{"bicycle:0", "bicycle:5", "bicycle:6", "bicycle:7", "bicycle:8"}, rows1.stream().map(e->e.get("__key")).sorted().toArray() ); @@ -264,8 +267,8 @@ public void run() { // Tests for 'agg2' step. // REMOVE_START - Assert.assertEquals(3, rows2.size()); - Assert.assertArrayEquals( + assertEquals(3, rows2.size()); + assertArrayEquals( new String[] { "new, 3", "refurbished, 1", "used, 1" }, rows2.stream().map(e->e.get("condition") + ", " + e.get("num_affordable")) .sorted().toArray() @@ -291,8 +294,8 @@ public void run() { // Tests for 'agg3' step. // REMOVE_START - Assert.assertEquals(1, rows3.size()); - Assert.assertEquals("{type=bicycle, num_total=10}", rows3.get(0).toString()); + assertEquals(1, rows3.size()); + assertEquals("{type=bicycle, num_total=10}", rows3.get(0).toString()); // REMOVE_END @@ -317,35 +320,35 @@ public void run() { // Tests for 'agg4' step. // REMOVE_START - Assert.assertEquals(3, rows4.size()); + assertEquals(3, rows4.size()); Row test4Row = rows4.get(0); - Assert.assertEquals("refurbished", test4Row.getString("condition")); + assertEquals("refurbished", test4Row.getString("condition")); ArrayList test4Bikes = (ArrayList) test4Row.get("bicycles"); - Assert.assertEquals(1, test4Bikes.size()); - Assert.assertTrue(test4Bikes.contains("bicycle:9")); + assertEquals(1, test4Bikes.size()); + assertTrue(test4Bikes.contains("bicycle:9")); test4Row = rows4.get(1); - Assert.assertEquals("used", test4Row.getString("condition")); + assertEquals("used", test4Row.getString("condition")); test4Bikes = (ArrayList) test4Row.get("bicycles"); - Assert.assertEquals(4, test4Bikes.size()); - Assert.assertTrue(test4Bikes.contains("bicycle:1")); - Assert.assertTrue(test4Bikes.contains("bicycle:2")); - Assert.assertTrue(test4Bikes.contains("bicycle:3")); - Assert.assertTrue(test4Bikes.contains("bicycle:4")); + assertEquals(4, test4Bikes.size()); + assertTrue(test4Bikes.contains("bicycle:1")); + assertTrue(test4Bikes.contains("bicycle:2")); + assertTrue(test4Bikes.contains("bicycle:3")); + assertTrue(test4Bikes.contains("bicycle:4")); test4Row = rows4.get(2); - Assert.assertEquals("new", test4Row.getString("condition")); + assertEquals("new", test4Row.getString("condition")); test4Bikes = (ArrayList) test4Row.get("bicycles"); - Assert.assertEquals(5, test4Bikes.size()); - Assert.assertTrue(test4Bikes.contains("bicycle:0")); - Assert.assertTrue(test4Bikes.contains("bicycle:5")); - Assert.assertTrue(test4Bikes.contains("bicycle:6")); - Assert.assertTrue(test4Bikes.contains("bicycle:7")); - Assert.assertTrue(test4Bikes.contains("bicycle:8")); + assertEquals(5, test4Bikes.size()); + assertTrue(test4Bikes.contains("bicycle:0")); + assertTrue(test4Bikes.contains("bicycle:5")); + assertTrue(test4Bikes.contains("bicycle:6")); + assertTrue(test4Bikes.contains("bicycle:7")); + assertTrue(test4Bikes.contains("bicycle:8")); // REMOVE_END // HIDE_START diff --git a/src/test/java/io/redis/examples/QueryEmExample.java b/src/test/java/io/redis/examples/QueryEmExample.java index 121c207f1d..5c866439c6 100644 --- a/src/test/java/io/redis/examples/QueryEmExample.java +++ b/src/test/java/io/redis/examples/QueryEmExample.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 // HIDE_START @@ -15,6 +14,9 @@ import redis.clients.jedis.search.schemafields.*; import redis.clients.jedis.exceptions.JedisDataException; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class QueryEmExample { @Test @@ -237,11 +239,11 @@ public void run() { // Tests for 'em1' step. // REMOVE_START - Assert.assertEquals(1, res1.getTotalResults()); - Assert.assertEquals("bicycle:0", docs1.get(0).getId()); + assertEquals(1, res1.getTotalResults()); + assertEquals("bicycle:0", docs1.get(0).getId()); - Assert.assertEquals(1, res2.getTotalResults()); - Assert.assertEquals("bicycle:0", docs2.get(0).getId()); + assertEquals(1, res2.getTotalResults()); + assertEquals("bicycle:0", docs2.get(0).getId()); // REMOVE_END @@ -263,8 +265,8 @@ public void run() { // Tests for 'em2' step. // REMOVE_START - Assert.assertEquals(5, res3.getTotalResults()); - Assert.assertArrayEquals( + assertEquals(5, res3.getTotalResults()); + assertArrayEquals( new String[] {"bicycle:0", "bicycle:5", "bicycle:6", "bicycle:7", "bicycle:8" }, docs3.stream().map(Document::getId).sorted().toArray() ); @@ -314,8 +316,8 @@ public void run() { // Tests for 'em4' step. // REMOVE_START - Assert.assertEquals(1, res5.getTotalResults()); - Assert.assertEquals("bicycle:8", docs5.get(0).getId()); + assertEquals(1, res5.getTotalResults()); + assertEquals("bicycle:8", docs5.get(0).getId()); // REMOVE_END // HIDE_START diff --git a/src/test/java/io/redis/examples/QueryFtExample.java b/src/test/java/io/redis/examples/QueryFtExample.java index 26fc7966ce..e15c2a4b0b 100644 --- a/src/test/java/io/redis/examples/QueryFtExample.java +++ b/src/test/java/io/redis/examples/QueryFtExample.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 // HIDE_START import java.util.List; @@ -12,6 +11,9 @@ import redis.clients.jedis.search.schemafields.*; import redis.clients.jedis.exceptions.JedisDataException; import redis.clients.jedis.json.Path2; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; // HIDE_END // HIDE_START @@ -221,8 +223,8 @@ public void run() { // Tests for 'ft1' step. // REMOVE_START - Assert.assertEquals(2, res1.getTotalResults()); - Assert.assertArrayEquals( + assertEquals(2, res1.getTotalResults()); + assertArrayEquals( new String[] {"bicycle:1", "bicycle:2" }, docs1.stream().map(Document::getId).sorted().toArray() ); @@ -243,8 +245,8 @@ public void run() { // Tests for 'ft2' step. // REMOVE_START - Assert.assertEquals(1, res2.getTotalResults()); - Assert.assertEquals("bicycle:4", docs2.get(0).getId()); + assertEquals(1, res2.getTotalResults()); + assertEquals("bicycle:4", docs2.get(0).getId()); // REMOVE_END @@ -263,8 +265,8 @@ public void run() { // Tests for 'ft3' step. // REMOVE_START - Assert.assertEquals(2, res3.getTotalResults()); - Assert.assertArrayEquals( + assertEquals(2, res3.getTotalResults()); + assertArrayEquals( new String[] {"bicycle:4", "bicycle:6" }, docs3.stream().map(Document::getId).sorted().toArray() ); @@ -285,8 +287,8 @@ public void run() { // Tests for 'ft4' step. // REMOVE_START - Assert.assertEquals(1, res4.getTotalResults()); - Assert.assertEquals("bicycle:3", docs4.get(0).getId()); + assertEquals(1, res4.getTotalResults()); + assertEquals("bicycle:3", docs4.get(0).getId()); // REMOVE_END @@ -304,8 +306,8 @@ public void run() { // Tests for 'ft5' step. // REMOVE_START - Assert.assertEquals(1, res5.getTotalResults()); - Assert.assertEquals("bicycle:3", docs5.get(0).getId()); + assertEquals(1, res5.getTotalResults()); + assertEquals("bicycle:3", docs5.get(0).getId()); // REMOVE_END // HIDE_START diff --git a/src/test/java/io/redis/examples/QueryGeoExample.java b/src/test/java/io/redis/examples/QueryGeoExample.java index b740d078de..2fd6334224 100644 --- a/src/test/java/io/redis/examples/QueryGeoExample.java +++ b/src/test/java/io/redis/examples/QueryGeoExample.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 // HIDE_START @@ -16,6 +15,9 @@ import redis.clients.jedis.search.schemafields.GeoShapeField.CoordinateSystem; import redis.clients.jedis.exceptions.JedisDataException; import redis.clients.jedis.json.Path2; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; // HIDE_END // HIDE_START @@ -235,8 +237,8 @@ public void run() { // Tests for 'geo1' step. // REMOVE_START - Assert.assertEquals(1, res1.getTotalResults()); - Assert.assertEquals("bicycle:5", docs1.get(0).getId()); + assertEquals(1, res1.getTotalResults()); + assertEquals("bicycle:5", docs1.get(0).getId()); // REMOVE_END @@ -259,8 +261,8 @@ public void run() { // Tests for 'geo2' step. // REMOVE_START - Assert.assertEquals(1, res2.getTotalResults()); - Assert.assertEquals("bicycle:5", docs2.get(0).getId()); + assertEquals(1, res2.getTotalResults()); + assertEquals("bicycle:5", docs2.get(0).getId()); // REMOVE_END @@ -287,8 +289,8 @@ public void run() { // Tests for 'geo3' step. // REMOVE_START - Assert.assertEquals(5, res3.getTotalResults()); - Assert.assertArrayEquals( + assertEquals(5, res3.getTotalResults()); + assertArrayEquals( Stream.of("bicycle:5", "bicycle:6", "bicycle:7", "bicycle:8", "bicycle:9").sorted() .toArray(), docs3.stream().map(Document::getId).sorted().toArray()); // REMOVE_END diff --git a/src/test/java/io/redis/examples/QueryRangeExample.java b/src/test/java/io/redis/examples/QueryRangeExample.java index c3caf0525e..4ff9f960bb 100644 --- a/src/test/java/io/redis/examples/QueryRangeExample.java +++ b/src/test/java/io/redis/examples/QueryRangeExample.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 // HIDE_START @@ -18,6 +17,9 @@ import redis.clients.jedis.exceptions.JedisDataException; import redis.clients.jedis.json.Path2; import redis.clients.jedis.args.SortingOrder; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; // HIDE_END // HIDE_START @@ -232,8 +234,8 @@ public void run() { // Tests for 'range1' step. // REMOVE_START - Assert.assertEquals(3, res1.getTotalResults()); - Assert.assertArrayEquals( + assertEquals(3, res1.getTotalResults()); + assertArrayEquals( Stream.of("bicycle:5", "bicycle:9", "bicycle:2").sorted().toArray(), docs1.stream().map(Document::getId).sorted().toArray() ); @@ -261,8 +263,8 @@ public void run() { // Tests for 'range2' step. // REMOVE_START - Assert.assertEquals(3, res2.getTotalResults()); - Assert.assertArrayEquals( + assertEquals(3, res2.getTotalResults()); + assertArrayEquals( Stream.of("bicycle:5", "bicycle:9", "bicycle:2").sorted().toArray(), docs2.stream().map(Document::getId).sorted().toArray() ); @@ -292,8 +294,8 @@ public void run() { // Tests for 'range3' step. // REMOVE_START - Assert.assertEquals(5, res3.getTotalResults()); - Assert.assertArrayEquals( + assertEquals(5, res3.getTotalResults()); + assertArrayEquals( Stream.of("bicycle:1", "bicycle:4", "bicycle:6", "bicycle:3", "bicycle:8") .sorted().toArray(), docs3.stream().map(Document::getId).sorted().toArray()); @@ -324,8 +326,8 @@ public void run() { // Tests for 'range4' step. // REMOVE_START - Assert.assertEquals(7, res4.getTotalResults()); - Assert.assertArrayEquals( + assertEquals(7, res4.getTotalResults()); + assertArrayEquals( new String[] {"bicycle:0", "bicycle:2", "bicycle:5", "bicycle:7", "bicycle:9"}, docs4.stream().map(Document::getId).sorted().toArray() ); diff --git a/src/test/java/io/redis/examples/SearchQuickstartExample.java b/src/test/java/io/redis/examples/SearchQuickstartExample.java index 7b67d08698..8fbe5d7f32 100644 --- a/src/test/java/io/redis/examples/SearchQuickstartExample.java +++ b/src/test/java/io/redis/examples/SearchQuickstartExample.java @@ -10,9 +10,9 @@ import redis.clients.jedis.search.aggr.*; import redis.clients.jedis.search.schemafields.*; // REMOVE_START -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; // REMOVE_END class Bicycle { @@ -217,7 +217,7 @@ public void run() { // Prints: Documents found: 10 // STEP_END // REMOVE_START - assertEquals("Validate total results", 10, result1.size()); + assertEquals(10, result1.size(), "Validate total results"); // REMOVE_END // STEP_START query_single_term @@ -228,7 +228,7 @@ public void run() { // properties:[$={"brand":"Velorim","model":"Jigger","price":270,"description":"Small and powerful, the Jigger is the best ride for the smallest of tikes! This is the tiniest kids’ pedal bike on the market available without a coaster brake, the Jigger is the vehicle of choice for the rare tenacious little rider raring to go.","condition":"new"}]] // STEP_END // REMOVE_START - assertEquals("Validate bike id", "bicycle:0", result2.get(0).getId()); + assertEquals("bicycle:0", result2.get(0).getId(), "Validate bike id"); // REMOVE_END // STEP_START query_single_term_limit_fields @@ -238,7 +238,7 @@ public void run() { // Prints: [id:bicycle:0, score: 1.0, payload:null, properties:[price=270]] // STEP_END // REMOVE_START - assertEquals("Validate cargo bike id", "bicycle:0", result3.get(0).getId()); + assertEquals("bicycle:0", result3.get(0).getId(),"Validate cargo bike id"); // REMOVE_END // STEP_START query_single_term_and_num_range @@ -249,7 +249,7 @@ public void run() { // properties:[$={"brand":"Breakout","model":"XBN 2.1 Alloy","price":810,"description":"The XBN 2.1 Alloy is our entry-level road bike – but that’s not to say that it’s a basic machine. With an internal weld aluminium frame, a full carbon fork, and the slick-shifting Claris gears from Shimano’s, this is a bike which doesn’t break the bank and delivers craved performance.","condition":"new"}]] // STEP_END // REMOVE_START - assertEquals("Validate bike id", "bicycle:5", result4.get(0).getId()); + assertEquals("bicycle:5", result4.get(0).getId(), "Validate bike id"); // REMOVE_END // STEP_START query_exact_matching @@ -260,7 +260,7 @@ public void run() { // properties:[$={"brand":"Noka Bikes","model":"Kahuna","price":3200,"description":"Whether you want to try your hand at XC racing or are looking for a lively trail bike that's just as inspiring on the climbs as it is over rougher ground, the Wilder is one heck of a bike built specifically for short women. Both the frames and components have been tweaked to include a women’s saddle, different bars and unique colourway.","condition":"used"}]] // STEP_END // REMOVE_START - assertEquals("Validate bike id", "bicycle:4", result5.get(0).getId()); + assertEquals("bicycle:4", result5.get(0).getId(), "Validate bike id"); // REMOVE_END // STEP_START simple_aggregation @@ -275,7 +275,7 @@ public void run() { // refurbished - 1 // used - 5 // new - 4 - assertEquals("Validate aggregation results", 3, ar.getTotalResults()); + assertEquals(3, ar.getTotalResults(), "Validate aggregation results"); // STEP_END jedis.close(); diff --git a/src/test/java/io/redis/examples/SetGetExample.java b/src/test/java/io/redis/examples/SetGetExample.java index aff2ec4a8c..f75fda040e 100644 --- a/src/test/java/io/redis/examples/SetGetExample.java +++ b/src/test/java/io/redis/examples/SetGetExample.java @@ -5,8 +5,8 @@ import redis.clients.jedis.UnifiedJedis; // REMOVE_START -import org.junit.Test; -import static org.junit.Assert.assertEquals; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; // REMOVE_END public class SetGetExample { diff --git a/src/test/java/io/redis/examples/SetsExample.java b/src/test/java/io/redis/examples/SetsExample.java index 0b81e28832..e3f45ad0d2 100644 --- a/src/test/java/io/redis/examples/SetsExample.java +++ b/src/test/java/io/redis/examples/SetsExample.java @@ -3,13 +3,13 @@ package io.redis.examples; import redis.clients.jedis.UnifiedJedis; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import java.util.Set; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertEquals; public class SetsExample { diff --git a/src/test/java/io/redis/examples/SortedSetsExample.java b/src/test/java/io/redis/examples/SortedSetsExample.java index 54064af7a0..ee7a9af4ac 100644 --- a/src/test/java/io/redis/examples/SortedSetsExample.java +++ b/src/test/java/io/redis/examples/SortedSetsExample.java @@ -7,11 +7,11 @@ //HIDE_END //REMOVE_START -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.HashMap; import java.util.List; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; //REMOVE_END public class SortedSetsExample { diff --git a/src/test/java/io/redis/examples/StreamsExample.java b/src/test/java/io/redis/examples/StreamsExample.java index 6c19985bc3..7fa10b35e4 100644 --- a/src/test/java/io/redis/examples/StreamsExample.java +++ b/src/test/java/io/redis/examples/StreamsExample.java @@ -7,14 +7,14 @@ //HIDE_END //REMOVE_START -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.exceptions.JedisDataException; import redis.clients.jedis.params.*; import redis.clients.jedis.resps.*; import java.util.*; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; //REMOVE_END public class StreamsExample { diff --git a/src/test/java/io/redis/examples/StringExample.java b/src/test/java/io/redis/examples/StringExample.java index 8f5de8a09b..d027a3329d 100644 --- a/src/test/java/io/redis/examples/StringExample.java +++ b/src/test/java/io/redis/examples/StringExample.java @@ -2,9 +2,9 @@ package io.redis.examples; //REMOVE_START -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; //REMOVE_END import redis.clients.jedis.UnifiedJedis; diff --git a/src/test/java/io/redis/examples/TDigestExample.java b/src/test/java/io/redis/examples/TDigestExample.java index c7680132a0..e6e6b6b2fd 100644 --- a/src/test/java/io/redis/examples/TDigestExample.java +++ b/src/test/java/io/redis/examples/TDigestExample.java @@ -5,9 +5,10 @@ //REMOVE_START import java.util.List; -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; //REMOVE_END public class TDigestExample { @@ -35,7 +36,7 @@ public void run(){ //STEP_END //REMOVE_START - Assert.assertEquals("OK","OK"); + assertEquals("OK","OK"); //REMOVE_END //STEP_START tdig_cdf diff --git a/src/test/java/io/redis/examples/TopKExample.java b/src/test/java/io/redis/examples/TopKExample.java index c1ca2ebce1..34e03aa510 100644 --- a/src/test/java/io/redis/examples/TopKExample.java +++ b/src/test/java/io/redis/examples/TopKExample.java @@ -5,7 +5,7 @@ //REMOVE_START import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.UnifiedJedis; //REMOVE_END diff --git a/src/test/java/redis/clients/jedis/ACLJedisPoolTest.java b/src/test/java/redis/clients/jedis/ACLJedisPoolTest.java index 56138ea7ad..4ea7457075 100644 --- a/src/test/java/redis/clients/jedis/ACLJedisPoolTest.java +++ b/src/test/java/redis/clients/jedis/ACLJedisPoolTest.java @@ -2,10 +2,12 @@ import static java.util.concurrent.TimeUnit.MILLISECONDS; import static org.awaitility.Awaitility.await; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import java.net.URI; import java.net.URISyntaxException; @@ -13,12 +15,13 @@ import io.redis.test.annotations.SinceRedisVersion; import org.apache.commons.pool2.impl.GenericObjectPoolConfig; -import org.junit.ClassRule; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; import redis.clients.jedis.exceptions.InvalidURIException; +import redis.clients.jedis.exceptions.JedisAccessControlException; import redis.clients.jedis.exceptions.JedisException; -import redis.clients.jedis.util.RedisVersionRule; +import redis.clients.jedis.util.RedisVersionCondition; /** * This test class is a copy of {@link JedisPoolTest}. @@ -31,8 +34,8 @@ public class ACLJedisPoolTest { private static final EndpointConfig endpointWithDefaultUser = HostAndPorts.getRedisEndpoint("standalone0"); - @ClassRule - public static RedisVersionRule versionRule = new RedisVersionRule(endpoint); + @RegisterExtension + public static RedisVersionCondition versionCondition = new RedisVersionCondition(endpoint); @Test public void checkConnections() { @@ -116,7 +119,7 @@ public void checkPoolRepairedWhenJedisIsBroken() { assertTrue(pool.isClosed()); } - @Test(expected = JedisException.class) + @Test public void checkPoolOverflow() { GenericObjectPoolConfig config = new GenericObjectPoolConfig<>(); config.setMaxTotal(1); @@ -125,9 +128,11 @@ public void checkPoolOverflow() { Jedis jedis = pool.getResource()) { jedis.auth(endpoint.getUsername(), endpoint.getPassword()); - try (Jedis jedis2 = pool.getResource()) { - jedis2.auth(endpoint.getUsername(), endpoint.getPassword()); - } + assertThrows(JedisException.class, () -> { + try (Jedis jedis2 = pool.getResource()) { + jedis2.auth(endpoint.getUsername(), endpoint.getPassword()); + } + }); } } @@ -207,9 +212,11 @@ public void startWithUrl() throws URISyntaxException { } } - @Test(expected = InvalidURIException.class) - public void shouldThrowInvalidURIExceptionForInvalidURI() throws URISyntaxException { - new JedisPool(new URI("localhost:6379")).close(); + @Test + public void shouldThrowInvalidURIExceptionForInvalidURI() { + assertThrows(InvalidURIException.class, () -> { + new JedisPool(new URI("redis://localhost:")).close(); + }); } @Test @@ -232,7 +239,7 @@ public void selectDatabaseOnActivation() { jedis0.close(); Jedis jedis1 = pool.getResource(); - assertTrue("Jedis instance was not reused", jedis1 == jedis0); + assertSame(jedis1, jedis0); assertEquals(0, jedis1.getDB()); jedis1.close(); @@ -267,14 +274,11 @@ public void testCloseConnectionOnMakeObject() { Jedis jedis = new Jedis(endpointWithDefaultUser.getURIBuilder() .credentials("", endpointWithDefaultUser.getPassword()).build())) { int currentClientCount = getClientCount(jedis.clientList()); - try { - pool.getResource(); - fail("Should throw exception as password is incorrect."); - } catch (Exception e) { - await().pollDelay(Duration.ofMillis(10)).atMost(50, MILLISECONDS) - .until(() -> getClientCount(jedis.clientList()) == currentClientCount); - assertEquals(currentClientCount, getClientCount(jedis.clientList())); - } + assertThrows(JedisAccessControlException.class, pool::getResource); + // wait for the redis server to close the connection + await().pollDelay(Duration.ofMillis(10)).atMost(50, MILLISECONDS) + .until(() -> getClientCount(jedis.clientList()) == currentClientCount); + assertEquals(currentClientCount, getClientCount(jedis.clientList())); } } diff --git a/src/test/java/redis/clients/jedis/ACLJedisSentinelPoolTest.java b/src/test/java/redis/clients/jedis/ACLJedisSentinelPoolTest.java index 6ea2ba32ce..bc619be987 100644 --- a/src/test/java/redis/clients/jedis/ACLJedisSentinelPoolTest.java +++ b/src/test/java/redis/clients/jedis/ACLJedisSentinelPoolTest.java @@ -1,6 +1,9 @@ package redis.clients.jedis; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.HashSet; import java.util.Set; @@ -8,13 +11,13 @@ import io.redis.test.annotations.SinceRedisVersion; import org.apache.commons.pool2.impl.GenericObjectPoolConfig; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; import redis.clients.jedis.exceptions.JedisConnectionException; import redis.clients.jedis.exceptions.JedisException; -import redis.clients.jedis.util.RedisVersionRule; +import redis.clients.jedis.util.RedisVersionCondition; /** * This test class is mostly a copy of {@link JedisSentinelPoolTest}. @@ -30,17 +33,17 @@ public class ACLJedisSentinelPoolTest { protected Set sentinels = new HashSet<>(); - @ClassRule - public static RedisVersionRule versionRule = new RedisVersionRule(HostAndPorts.getRedisEndpoint("standalone2-primary")); + @RegisterExtension + public static RedisVersionCondition versionCondition = new RedisVersionCondition(HostAndPorts.getRedisEndpoint("standalone2-primary")); - @Before + @BeforeEach public void setUp() throws Exception { sentinels.clear(); sentinels.add(sentinel1); } private static Set toStrings(Set hostAndPorts) { - return hostAndPorts.stream().map(hap -> hap.toString()).collect(Collectors.toSet()); + return hostAndPorts.stream().map(HostAndPort::toString).collect(Collectors.toSet()); } @Test @@ -77,40 +80,45 @@ public void repeatedSentinelPoolInitializationWithConfig() { } } - @Test(expected = JedisConnectionException.class) + @Test public void initializeWithNotAvailableSentinelsShouldThrowException() { GenericObjectPoolConfig poolConfig = new GenericObjectPoolConfig<>(); JedisClientConfig masterConfig = DefaultJedisClientConfig.builder() - .connectionTimeoutMillis(1000).socketTimeoutMillis(1000).database(2) - .user("acljedis").password("fizzbuzz").build(); + .connectionTimeoutMillis(1000).socketTimeoutMillis(1000).database(2).user("acljedis") + .password("fizzbuzz").build(); JedisClientConfig sentinelConfig = DefaultJedisClientConfig.builder() - .connectionTimeoutMillis(1000).socketTimeoutMillis(1000) - .user("default").password("foobared").build(); - - JedisSentinelPool pool = new JedisSentinelPool(MASTER_NAME, sentinels, poolConfig, masterConfig, sentinelConfig); - pool.getResource().close(); - pool.destroy(); + .connectionTimeoutMillis(1000).socketTimeoutMillis(1000).user("default") + .password("foobared").build(); + assertThrows(JedisConnectionException.class, () -> { + try (JedisSentinelPool ignored = new JedisSentinelPool(MASTER_NAME, sentinels, poolConfig, + masterConfig, sentinelConfig)) { + // do nothing + } + }); } - @Test(expected = JedisException.class) + @Test public void initializeWithNotMonitoredMasterNameShouldThrowException() { GenericObjectPoolConfig poolConfig = new GenericObjectPoolConfig<>(); JedisClientConfig masterConfig = DefaultJedisClientConfig.builder() - .connectionTimeoutMillis(1000).socketTimeoutMillis(1000).database(2) - .user("acljedis").password("fizzbuzz").build(); + .connectionTimeoutMillis(1000).socketTimeoutMillis(1000).database(2).user("acljedis") + .password("fizzbuzz").build(); JedisClientConfig sentinelConfig = DefaultJedisClientConfig.builder() - .connectionTimeoutMillis(1000).socketTimeoutMillis(1000) - .user("sentinel").password("foobared").build(); + .connectionTimeoutMillis(1000).socketTimeoutMillis(1000).user("sentinel") + .password("foobared").build(); - JedisSentinelPool pool = new JedisSentinelPool("wrongMasterName", sentinels, poolConfig, masterConfig, sentinelConfig); - pool.getResource().close(); - pool.destroy(); + assertThrows(JedisException.class, () -> { + try (JedisSentinelPool ignored = new JedisSentinelPool("wrongMasterName", sentinels, poolConfig, + masterConfig, sentinelConfig)) { + // do nothing + } + }); } @Test diff --git a/src/test/java/redis/clients/jedis/ACLJedisTest.java b/src/test/java/redis/clients/jedis/ACLJedisTest.java index b9b35326e1..86378e55ae 100644 --- a/src/test/java/redis/clients/jedis/ACLJedisTest.java +++ b/src/test/java/redis/clients/jedis/ACLJedisTest.java @@ -1,35 +1,37 @@ package redis.clients.jedis; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assumptions.assumeTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; import static redis.clients.jedis.util.RedisVersionUtil.getRedisVersion; import io.redis.test.utils.RedisVersion; import java.net.URISyntaxException; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; -import redis.clients.jedis.commands.jedis.JedisCommandsTestBase; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; + +import redis.clients.jedis.commands.jedis.JedisCommandsTestBase; /** * This test class is a copy of {@link JedisTest}. *

* This test is only executed when the server/cluster is Redis 6. or more. */ -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class ACLJedisTest extends JedisCommandsTestBase { protected static final EndpointConfig endpoint = HostAndPorts.getRedisEndpoint("standalone0-acl"); /** * Use to check if the ACL test should be ran. ACL are available only in 6.0 and later - * @throws Exception */ - @BeforeClass - public static void prepare() throws Exception { - org.junit.Assume.assumeTrue("Not running ACL test on this version of Redis", - getRedisVersion(endpoint).isGreaterThanOrEqualTo(RedisVersion.of("6.0.0"))); + @BeforeAll + public static void prepare() { + assumeTrue(getRedisVersion(endpoint).isGreaterThanOrEqualTo(RedisVersion.of("6.0.0")), + "Not running ACL test on this version of Redis"); } public ACLJedisTest(RedisProtocol redisProtocol) { diff --git a/src/test/java/redis/clients/jedis/BuilderTest.java b/src/test/java/redis/clients/jedis/BuilderTest.java index 4efdca7102..8076a181a5 100644 --- a/src/test/java/redis/clients/jedis/BuilderTest.java +++ b/src/test/java/redis/clients/jedis/BuilderTest.java @@ -1,9 +1,9 @@ package redis.clients.jedis; -import static org.junit.Assert.assertEquals; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; -import org.junit.Assert; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; public class BuilderTest { @@ -20,9 +20,9 @@ public void buildDouble() { try { BuilderFactory.DOUBLE.build("".getBytes()); - Assert.fail("Empty String should throw NumberFormatException."); + Assertions.fail("Empty String should throw NumberFormatException."); } catch (NumberFormatException expected) { - Assert.assertEquals("empty String", expected.getMessage()); + assertEquals("empty String", expected.getMessage()); } } } diff --git a/src/test/java/redis/clients/jedis/ClusterCommandExecutorTest.java b/src/test/java/redis/clients/jedis/ClusterCommandExecutorTest.java index 4601bf0b6f..d6437e84ea 100644 --- a/src/test/java/redis/clients/jedis/ClusterCommandExecutorTest.java +++ b/src/test/java/redis/clients/jedis/ClusterCommandExecutorTest.java @@ -1,8 +1,9 @@ package redis.clients.jedis; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; @@ -13,7 +14,7 @@ import java.util.function.LongConsumer; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentMatchers; import org.mockito.InOrder; import org.mockito.Mockito; @@ -192,7 +193,7 @@ public void runMovedThenAllNodesFailing() { final Connection failer = mock(Connection.class); when(connectionHandler.getConnection(ArgumentMatchers.any(HostAndPort.class))).thenReturn(failer); - Mockito.doAnswer((Answer) (InvocationOnMock invocation) -> { + Mockito.doAnswer((InvocationOnMock invocation) -> { when(connectionHandler.getConnection(STR_COM_OBJECT.getArguments())).thenReturn(failer); return null; }).when(connectionHandler).renewSlotCache(); @@ -260,7 +261,7 @@ public void runMasterFailingReplicaRecovering() { when(connectionHandler.getConnection(STR_COM_OBJECT.getArguments())).thenReturn(master); - Mockito.doAnswer((Answer) (InvocationOnMock invocation) -> { + Mockito.doAnswer((InvocationOnMock invocation) -> { when(connectionHandler.getConnection(STR_COM_OBJECT.getArguments())).thenReturn(replica); return null; }).when(connectionHandler).renewSlotCache(); @@ -297,13 +298,14 @@ protected void sleep(long sleepMillis) { MatcherAssert.assertThat(totalSleepMs.get(), Matchers.greaterThan(0L)); } - @Test(expected = JedisClusterOperationException.class) + @Test public void runRethrowsJedisNoReachableClusterNodeException() { ClusterConnectionProvider connectionHandler = mock(ClusterConnectionProvider.class); when(connectionHandler.getConnection(STR_COM_OBJECT.getArguments())).thenThrow( - JedisClusterOperationException.class); + JedisClusterOperationException.class); - ClusterCommandExecutor testMe = new ClusterCommandExecutor(connectionHandler, 10, Duration.ZERO) { + ClusterCommandExecutor testMe = new ClusterCommandExecutor(connectionHandler, 10, + Duration.ZERO) { @Override public T execute(Connection connection, CommandObject commandObject) { return null; @@ -315,7 +317,7 @@ protected void sleep(long ignored) { } }; - testMe.executeCommand(STR_COM_OBJECT); + assertThrows(JedisClusterOperationException.class, () -> testMe.executeCommand(STR_COM_OBJECT)); } @Test diff --git a/src/test/java/redis/clients/jedis/ClusterPipeliningTest.java b/src/test/java/redis/clients/jedis/ClusterPipeliningTest.java index e186702e81..0c6667d2f9 100644 --- a/src/test/java/redis/clients/jedis/ClusterPipeliningTest.java +++ b/src/test/java/redis/clients/jedis/ClusterPipeliningTest.java @@ -2,19 +2,27 @@ import static org.hamcrest.Matchers.contains; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import static redis.clients.jedis.Protocol.CLUSTER_HASHSLOTS; import java.util.*; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Timeout; import redis.clients.jedis.args.*; import redis.clients.jedis.exceptions.JedisDataException; import redis.clients.jedis.params.*; @@ -44,7 +52,7 @@ public class ClusterPipeliningTest { private static HostAndPort nodeInfo3 = HostAndPorts.getClusterServers().get(2); private Set nodes = new HashSet<>(Arrays.asList(nodeInfo1, nodeInfo2, nodeInfo3)); - @BeforeClass + @BeforeAll public static void setUp() throws InterruptedException { node1 = new Jedis(nodeInfo1); node1.auth("cluster"); @@ -84,21 +92,21 @@ public static void setUp() throws InterruptedException { JedisClusterTestUtil.waitForClusterReady(node1, node2, node3); } - @Before + @BeforeEach public void prepare() { node1.flushAll(); node2.flushAll(); node3.flushAll(); } - @After + @AfterEach public void cleanUp() { node1.flushDB(); node2.flushDB(); node3.flushDB(); } - @AfterClass + @AfterAll public static void tearDown() throws InterruptedException { node1.flushDB(); node2.flushDB(); @@ -355,12 +363,12 @@ private void verifyHasBothValues(byte[] firstKey, byte[] secondKey, byte[] value assertTrue(Arrays.equals(secondKey, value1) || Arrays.equals(secondKey, value2)); } - @Test(expected = IllegalStateException.class) + @Test public void pipelineResponseWithinPipeline() { try (ClusterConnectionProvider provider = new ClusterConnectionProvider(nodes, DEFAULT_CLIENT_CONFIG)) { ClusterPipeline p = new ClusterPipeline(provider); Response string = p.get("string"); - string.get(); + assertThrows(IllegalStateException.class,string::get); p.sync(); } } @@ -893,9 +901,11 @@ public void testEvalKeyAndArg() { try (ClusterConnectionProvider provider = new ClusterConnectionProvider(nodes, DEFAULT_CLIENT_CONFIG)) { ClusterPipeline p = new ClusterPipeline(provider); p.set(key, "0"); - Response result0 = p.eval(script, Arrays.asList(key), Arrays.asList(arg)); + Response result0 = p.eval(script, Collections.singletonList(key), + Collections.singletonList(arg)); p.incr(key); - Response result1 = p.eval(script, Arrays.asList(key), Arrays.asList(arg)); + Response result1 = p.eval(script, Collections.singletonList(key), + Collections.singletonList(arg)); Response result2 = p.get(key); p.sync(); @@ -915,9 +925,11 @@ public void testEvalKeyAndArgWithBinary() { try (ClusterConnectionProvider provider = new ClusterConnectionProvider(nodes, DEFAULT_CLIENT_CONFIG)) { ClusterPipeline bP = new ClusterPipeline(provider); bP.set(bKey, SafeEncoder.encode("0")); - Response bResult0 = bP.eval(bScript, Arrays.asList(bKey), Arrays.asList(bArg)); + Response bResult0 = bP.eval(bScript, Collections.singletonList(bKey), + Collections.singletonList(bArg)); bP.incr(bKey); - Response bResult1 = bP.eval(bScript, Arrays.asList(bKey), Arrays.asList(bArg)); + Response bResult1 = bP.eval(bScript, Collections.singletonList(bKey), + Collections.singletonList(bArg)); Response bResult2 = bP.get(bKey); bP.sync(); @@ -1081,7 +1093,8 @@ public void transaction() { } } - @Test(timeout = 10_000L) + @Test + @Timeout(10) public void multiple() { final int maxTotal = 100; ConnectionPoolConfig poolConfig = new ConnectionPoolConfig(); diff --git a/src/test/java/redis/clients/jedis/ConnectionTest.java b/src/test/java/redis/clients/jedis/ConnectionTest.java index 2fce9d62ac..5168f22e32 100644 --- a/src/test/java/redis/clients/jedis/ConnectionTest.java +++ b/src/test/java/redis/clients/jedis/ConnectionTest.java @@ -1,34 +1,35 @@ package redis.clients.jedis; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; import org.hamcrest.Matchers; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; import redis.clients.jedis.exceptions.JedisConnectionException; public class ConnectionTest { private Connection client; - @After + @AfterEach public void tearDown() throws Exception { if (client != null) { client.close(); } } - @Test(expected = JedisConnectionException.class) + @Test public void checkUnknownHost() { client = new Connection("someunknownhost", Protocol.DEFAULT_PORT); - client.connect(); + assertThrows(JedisConnectionException.class, ()->client.connect()); } - @Test(expected = JedisConnectionException.class) + @Test public void checkWrongPort() { client = new Connection(Protocol.DEFAULT_HOST, 55665); - client.connect(); + assertThrows(JedisConnectionException.class, ()->client.connect()); } @Test diff --git a/src/test/java/redis/clients/jedis/HostAndPortTest.java b/src/test/java/redis/clients/jedis/HostAndPortTest.java index 14fe573e6b..ef2c6c56aa 100644 --- a/src/test/java/redis/clients/jedis/HostAndPortTest.java +++ b/src/test/java/redis/clients/jedis/HostAndPortTest.java @@ -1,8 +1,9 @@ package redis.clients.jedis; -import static org.junit.Assert.assertEquals; +import org.junit.jupiter.api.Test; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; public class HostAndPortTest { @@ -15,9 +16,8 @@ public void checkFrom() throws Exception { assertEquals(port, hp.getPort()); } - @Test(expected = IllegalArgumentException.class) + @Test public void checkFromWithoutPort() throws Exception { - String host = "localhost"; - HostAndPort.from(host + ":"); + assertThrows(IllegalArgumentException.class, () -> HostAndPort.from("localhost:")); } } \ No newline at end of file diff --git a/src/test/java/redis/clients/jedis/JedisClusterCommandTest.java b/src/test/java/redis/clients/jedis/JedisClusterCommandTest.java index d357562c5f..53c88e7abe 100644 --- a/src/test/java/redis/clients/jedis/JedisClusterCommandTest.java +++ b/src/test/java/redis/clients/jedis/JedisClusterCommandTest.java @@ -1,9 +1,9 @@ //package redis.clients.jedis; // -//import static org.junit.Assert.assertEquals; -//import static org.junit.Assert.assertNotNull; -//import static org.junit.Assert.assertTrue; -//import static org.junit.Assert.fail; +//import static org.junit.jupiter.api.Assertions.assertEquals; +//import static org.junit.jupiter.api.Assertions.assertNotNull; +//import static org.junit.jupiter.api.Assertions.assertTrue; +//import static org.junit.jupiter.api.Assertions.fail; //import static org.mockito.ArgumentMatchers.any; //import static org.mockito.ArgumentMatchers.anyInt; //import static org.mockito.ArgumentMatchers.anyLong; diff --git a/src/test/java/redis/clients/jedis/JedisClusterTest.java b/src/test/java/redis/clients/jedis/JedisClusterTest.java index 32fce366f8..0d7682cf27 100644 --- a/src/test/java/redis/clients/jedis/JedisClusterTest.java +++ b/src/test/java/redis/clients/jedis/JedisClusterTest.java @@ -1,12 +1,14 @@ package redis.clients.jedis; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import static redis.clients.jedis.Protocol.CLUSTER_HASHSLOTS; import java.io.IOException; @@ -28,8 +30,9 @@ import io.redis.test.annotations.SinceRedisVersion; import org.apache.commons.pool2.impl.GenericObjectPoolConfig; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Timeout; import redis.clients.jedis.args.ClusterResetType; import redis.clients.jedis.exceptions.*; import redis.clients.jedis.util.ClientKillerUtil; @@ -39,15 +42,15 @@ public class JedisClusterTest extends JedisClusterTestBase { - private static final int DEFAULT_TIMEOUT = 2000; + private static final int DEFAULT_TIMEOUT = 2000; //sec private static final int DEFAULT_REDIRECTIONS = 5; private static final ConnectionPoolConfig DEFAULT_POOL_CONFIG = new ConnectionPoolConfig(); private static final DefaultJedisClientConfig DEFAULT_CLIENT_CONFIG = DefaultJedisClientConfig.builder().password("cluster").build(); - @Test(expected = JedisMovedDataException.class) + @Test public void testThrowMovedException() { - node1.set("foo", "bar"); + assertThrows(JedisMovedDataException.class, ()->node1.set("foo", "bar")); } @Test @@ -62,12 +65,12 @@ public void testMovedExceptionParameters() { fail(); } - @Test(expected = JedisAskDataException.class) + @Test public void testThrowAskException() { int keySlot = JedisClusterCRC16.getSlot("test"); String node3Id = JedisClusterTestUtil.getNodeId(node3.clusterNodes()); node2.clusterSetSlotMigrating(keySlot, node3Id); - node2.get("test"); + assertThrows(JedisAskDataException.class, ()->node2.get("test")); } @Test @@ -372,22 +375,23 @@ public void testAskResponseWithConfig() { } // @Test(expected = JedisClusterMaxAttemptsException.class) - @Test(expected = JedisClusterOperationException.class) + @Test public void testRedisClusterMaxRedirections() { Set jedisClusterNode = new HashSet<>(); jedisClusterNode.add(new HostAndPort("127.0.0.1", 7379)); - - try (JedisCluster jc = new JedisCluster(jedisClusterNode, DEFAULT_TIMEOUT, DEFAULT_TIMEOUT, - DEFAULT_REDIRECTIONS, "cluster", DEFAULT_POOL_CONFIG)) { - int slot51 = JedisClusterCRC16.getSlot("51"); - // This will cause an infinite redirection loop - node2.clusterSetSlotMigrating(slot51, JedisClusterTestUtil.getNodeId(node3.clusterNodes())); - jc.set("51", "foo"); - } + assertThrows(JedisClusterOperationException.class,()-> { + try (JedisCluster jc = new JedisCluster(jedisClusterNode, DEFAULT_TIMEOUT, DEFAULT_TIMEOUT, + DEFAULT_REDIRECTIONS, "cluster", DEFAULT_POOL_CONFIG)) { + int slot51 = JedisClusterCRC16.getSlot("51"); + // This will cause an infinite redirection loop + node2.clusterSetSlotMigrating(slot51, JedisClusterTestUtil.getNodeId(node3.clusterNodes())); + jc.set("51", "foo"); + } + }); } // @Test(expected = JedisClusterMaxAttemptsException.class) - @Test(expected = JedisClusterOperationException.class) + @Test public void testRedisClusterMaxRedirectionsWithConfig() { HostAndPort hp = new HostAndPort("127.0.0.1", 7379); try (JedisCluster jc = new JedisCluster(Collections.singleton(hp), DEFAULT_CLIENT_CONFIG, @@ -395,12 +399,12 @@ public void testRedisClusterMaxRedirectionsWithConfig() { int slot51 = JedisClusterCRC16.getSlot("51"); // This will cause an infinite redirection loop node2.clusterSetSlotMigrating(slot51, JedisClusterTestUtil.getNodeId(node3.clusterNodes())); - jc.set("51", "foo"); + assertThrows(JedisClusterOperationException.class, ()->jc.set("51", "foo")); } } @Test - public void testClusterForgetNode() throws InterruptedException { + public void testClusterForgetNode() { // at first, join node4 to cluster node1.clusterMeet("127.0.0.1", nodeInfo4.getPort()); node2.clusterMeet("127.0.0.1", nodeInfo4.getPort()); @@ -499,7 +503,7 @@ public void testStableSlotWhenMigratingNodeOrImportingNodeIsNotSpecified() } } - @Test(expected = JedisException.class) + @Test public void testIfPoolConfigAppliesToClusterPools() { GenericObjectPoolConfig config = new GenericObjectPoolConfig<>(); config.setMaxTotal(0); @@ -508,7 +512,7 @@ public void testIfPoolConfigAppliesToClusterPools() { jedisClusterNode.add(new HostAndPort("127.0.0.1", 7379)); try (JedisCluster jc = new JedisCluster(jedisClusterNode, DEFAULT_TIMEOUT, DEFAULT_TIMEOUT, DEFAULT_REDIRECTIONS, "cluster", config)) { - jc.set("52", "poolTestValue"); + assertThrows(JedisException.class, ()->jc.set("52", "poolTestValue")); } } @@ -599,7 +603,8 @@ public String call() throws Exception { jc.close(); } - @Test(timeout = DEFAULT_TIMEOUT * 2) + @Test + @Timeout(value = DEFAULT_TIMEOUT * 2, unit = TimeUnit.MILLISECONDS) public void testReturnConnectionOnJedisConnectionException() throws InterruptedException { Set jedisClusterNode = new HashSet<>(); jedisClusterNode.add(new HostAndPort("127.0.0.1", 7379)); @@ -618,7 +623,8 @@ public void testReturnConnectionOnJedisConnectionException() throws InterruptedE } } - @Test(expected = JedisClusterOperationException.class, timeout = DEFAULT_TIMEOUT) + @Test + @Timeout(value = DEFAULT_TIMEOUT, unit = TimeUnit.MILLISECONDS) public void testReturnConnectionOnRedirection() { Set jedisClusterNode = new HashSet<>(); jedisClusterNode.add(new HostAndPort("127.0.0.1", 7379)); @@ -629,7 +635,7 @@ public void testReturnConnectionOnRedirection() { // This will cause an infinite redirection between node 2 and 3 node3.clusterSetSlotMigrating(15363, JedisClusterTestUtil.getNodeId(node2.clusterNodes())); - jc.get("e"); + assertThrows(JedisClusterOperationException.class, ()->jc.get("e")); } } @@ -738,7 +744,8 @@ public void clusterRefreshNodes() throws Exception { } } - @Test(timeout = 30_000) + @Test + @Timeout(30) public void clusterPeriodTopologyRefreshTest() throws Exception { Set jedisClusterNode = new HashSet<>(); jedisClusterNode.add(nodeInfo1); diff --git a/src/test/java/redis/clients/jedis/JedisClusterTestBase.java b/src/test/java/redis/clients/jedis/JedisClusterTestBase.java index 05e8f3bb70..1b30a1e02d 100644 --- a/src/test/java/redis/clients/jedis/JedisClusterTestBase.java +++ b/src/test/java/redis/clients/jedis/JedisClusterTestBase.java @@ -2,11 +2,11 @@ import static redis.clients.jedis.Protocol.CLUSTER_HASHSLOTS; -import redis.clients.jedis.util.EnabledOnCommandRule; -import redis.clients.jedis.util.RedisVersionRule; -import org.junit.After; -import org.junit.Before; -import org.junit.Rule; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.extension.RegisterExtension; +import redis.clients.jedis.util.EnabledOnCommandCondition; +import redis.clients.jedis.util.RedisVersionCondition; import redis.clients.jedis.args.ClusterResetType; import redis.clients.jedis.util.JedisClusterTestUtil; @@ -26,12 +26,12 @@ public abstract class JedisClusterTestBase { protected static final String LOCAL_IP = "127.0.0.1"; - @Rule - public RedisVersionRule versionRule = new RedisVersionRule(nodeInfo1,DefaultJedisClientConfig.builder().password("cluster").build()); - @Rule - public EnabledOnCommandRule enabledOnCommandRule = new EnabledOnCommandRule(nodeInfo1, DefaultJedisClientConfig.builder().password("cluster").build()); + @RegisterExtension + public RedisVersionCondition versionCondition = new RedisVersionCondition(nodeInfo1,DefaultJedisClientConfig.builder().password("cluster").build()); + @RegisterExtension + public EnabledOnCommandCondition enabledOnCommandCondition = new EnabledOnCommandCondition(nodeInfo1, DefaultJedisClientConfig.builder().password("cluster").build()); - @Before + @BeforeEach public void setUp() throws InterruptedException { node1 = new Jedis(nodeInfo1); node1.auth("cluster"); @@ -91,7 +91,7 @@ protected void cleanUp() { node4.clusterReset(ClusterResetType.HARD); } - @After + @AfterEach public void tearDown() { cleanUp(); } diff --git a/src/test/java/redis/clients/jedis/JedisClusterWithoutSetupTest.java b/src/test/java/redis/clients/jedis/JedisClusterWithoutSetupTest.java index f683908653..0e40e96f21 100644 --- a/src/test/java/redis/clients/jedis/JedisClusterWithoutSetupTest.java +++ b/src/test/java/redis/clients/jedis/JedisClusterWithoutSetupTest.java @@ -1,10 +1,10 @@ package redis.clients.jedis; import static java.util.Collections.emptySet; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThrows; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.exceptions.JedisClusterOperationException; public class JedisClusterWithoutSetupTest { @@ -20,8 +20,10 @@ public void noStartNodes() { @Test public void uselessStartNodes() { JedisClusterOperationException operationException = assertThrows( - JedisClusterOperationException.class, () -> new JedisCluster(new HostAndPort("localhost", 7378))); + JedisClusterOperationException.class, + () -> new JedisCluster(new HostAndPort("localhost", 7378))); assertEquals("Could not initialize cluster slots cache.", operationException.getMessage()); assertEquals(1, operationException.getSuppressed().length); } + } diff --git a/src/test/java/redis/clients/jedis/JedisPoolTest.java b/src/test/java/redis/clients/jedis/JedisPoolTest.java index f54adb52aa..958a01ca5e 100644 --- a/src/test/java/redis/clients/jedis/JedisPoolTest.java +++ b/src/test/java/redis/clients/jedis/JedisPoolTest.java @@ -1,13 +1,5 @@ package redis.clients.jedis; -import static java.util.concurrent.TimeUnit.MILLISECONDS; -import static org.awaitility.Awaitility.await; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - import java.net.URI; import java.net.URISyntaxException; import java.time.Duration; @@ -16,13 +8,23 @@ import org.apache.commons.pool2.PooledObjectFactory; import org.apache.commons.pool2.impl.DefaultPooledObject; import org.apache.commons.pool2.impl.GenericObjectPoolConfig; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.exceptions.InvalidURIException; +import redis.clients.jedis.exceptions.JedisAccessControlException; import redis.clients.jedis.exceptions.JedisConnectionException; import redis.clients.jedis.exceptions.JedisException; +import static java.util.concurrent.TimeUnit.MILLISECONDS; +import static org.awaitility.Awaitility.await; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; + public class JedisPoolTest { private static final EndpointConfig endpointStandalone0 = HostAndPorts.getRedisEndpoint("standalone0"); @@ -49,7 +51,6 @@ public void checkResourceWithConfig() { try (Jedis jedis = pool.getResource()) { assertEquals("PONG", jedis.ping()); assertEquals(5000, jedis.getClient().getSoTimeout()); - jedis.close(); } } } @@ -91,7 +92,7 @@ public void checkResourceIsClosableAndReusable() { jedis.close(); Jedis jedis2 = pool.getResource(); - assertEquals(jedis, jedis2); + assertSame(jedis, jedis2); assertEquals("jedis", jedis2.get("hello")); jedis2.close(); } @@ -114,7 +115,7 @@ public void checkPoolRepairedWhenJedisIsBroken() { assertTrue(pool.isClosed()); } - @Test(expected = JedisException.class) + @Test public void checkPoolOverflow() { GenericObjectPoolConfig config = new GenericObjectPoolConfig<>(); config.setMaxTotal(1); @@ -123,9 +124,7 @@ public void checkPoolOverflow() { Jedis jedis = pool.getResource()) { jedis.auth(endpointStandalone0.getPassword()); - try (Jedis jedis2 = pool.getResource()) { - jedis2.auth(endpointStandalone0.getPassword()); - } + assertThrows(JedisException.class, pool::getResource); } } @@ -186,9 +185,9 @@ public void startWithUrl() throws URISyntaxException { } } - @Test(expected = InvalidURIException.class) + @Test public void shouldThrowInvalidURIExceptionForInvalidURI() throws URISyntaxException { - new JedisPool(new URI("localhost:6380")).close(); + assertThrows(InvalidURIException.class, ()->new JedisPool(new URI("localhost:6380")).close()); } @Test @@ -211,7 +210,7 @@ public void selectDatabaseOnActivation() { jedis0.close(); Jedis jedis1 = pool.getResource(); - assertTrue("Jedis instance was not reused", jedis1 == jedis0); + assertSame(jedis1, jedis0); assertEquals(0, jedis1.getDB()); jedis1.close(); @@ -233,7 +232,7 @@ public void invalidClientName() { endpointStandalone0.getPassword(), 0, "invalid client name"); Jedis jedis = pool.getResource()) { } catch (Exception e) { if (!e.getMessage().startsWith("client info cannot contain space")) { - Assert.fail("invalid client name test fail"); + fail("invalid client name test fail"); } } } @@ -305,12 +304,9 @@ public void returnResourceShouldResetState() { jedis.close(); } - Jedis jedis2 = pool.getResource(); - try { - assertTrue(jedis == jedis2); + try (Jedis jedis2 = pool.getResource()) { + assertSame(jedis, jedis2); assertEquals("jedis", jedis2.get("hello")); - } finally { - jedis2.close(); } pool.close(); @@ -383,7 +379,7 @@ public void closeBrokenResourceTwice() { j.getClient().getOne(); fail(); } catch (Exception e) { - assertTrue(e instanceof JedisConnectionException); + assertInstanceOf(JedisConnectionException.class, e); } assertTrue(j.isBroken()); j.close(); @@ -399,14 +395,11 @@ public void testCloseConnectionOnMakeObject() { endpointStandalone0.getPort(), 2000, "wrong pass"); Jedis jedis = new Jedis(endpointStandalone0.getURIBuilder().defaultCredentials().build())) { int currentClientCount = getClientCount(jedis.clientList()); - try { - pool.getResource(); - fail("Should throw exception as password is incorrect."); - } catch (Exception e) { - await().pollDelay(Duration.ofMillis(10)).atMost(50, MILLISECONDS) - .until(() -> getClientCount(jedis.clientList()) == currentClientCount); - assertEquals(currentClientCount, getClientCount(jedis.clientList())); - } + assertThrows(JedisAccessControlException.class, pool::getResource); + // wait for the redis server to close the connection + await().pollDelay(Duration.ofMillis(10)).atMost(50, MILLISECONDS) + .until(() -> getClientCount(jedis.clientList()) == currentClientCount); + assertEquals(currentClientCount, getClientCount(jedis.clientList())); } } @@ -436,7 +429,9 @@ public void testResetInvalidCredentials() { credentialsProvider.setCredentials(new DefaultRedisCredentials(null, "wrong password")); try (Jedis obj2 = pool.getResource()) { fail("Should not get resource from pool"); - } catch (JedisException e) { } + } catch (JedisException e) { + //ignore + } assertEquals(1, pool.getNumActive()); } assertEquals(0, pool.getNumActive()); @@ -453,7 +448,9 @@ public void testResetValidCredentials() { try (JedisPool pool = new JedisPool(new JedisPoolConfig(), factory)) { try (Jedis obj1 = pool.getResource()) { fail("Should not get resource from pool"); - } catch (JedisException e) { } + } catch (JedisException e) { + //ignore + } assertEquals(0, pool.getNumActive()); credentialsProvider.setCredentials(new DefaultRedisCredentials(null, endpointStandalone0.getPassword())); diff --git a/src/test/java/redis/clients/jedis/JedisPooledTest.java b/src/test/java/redis/clients/jedis/JedisPooledTest.java index 12fa2c0e3e..16cd50cc47 100644 --- a/src/test/java/redis/clients/jedis/JedisPooledTest.java +++ b/src/test/java/redis/clients/jedis/JedisPooledTest.java @@ -4,18 +4,19 @@ import static org.hamcrest.Matchers.anything; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThanOrEqualTo; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import java.net.URI; import java.net.URISyntaxException; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import org.apache.commons.pool2.impl.GenericObjectPoolConfig; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.exceptions.JedisConnectionException; import redis.clients.jedis.exceptions.JedisException; @@ -48,16 +49,14 @@ public void checkResourceWithConfig() { } } - @Test(expected = JedisException.class) + @Test public void checkPoolOverflow() { GenericObjectPoolConfig config = new GenericObjectPoolConfig<>(); config.setMaxTotal(1); config.setBlockWhenExhausted(false); try (JedisPooled pool = new JedisPooled(endpointStandalone7.getHostAndPort(), config); Connection jedis = pool.getPool().getResource()) { - - try (Connection jedis2 = pool.getPool().getResource()) { - } + assertThrows(JedisException.class, () -> pool.getPool().getResource()); } } @@ -90,9 +89,9 @@ public void startWithUrl() throws URISyntaxException { } } - @Test(expected = Exception.class) - public void shouldThrowExceptionForInvalidURI() throws URISyntaxException { - new JedisPooled(new URI("localhost:6380")).close(); + @Test + public void shouldThrowExceptionForInvalidURI() { + assertThrows(Exception.class, ()->new JedisPooled(new URI("localhost:6380"))); } @Test @@ -117,7 +116,7 @@ public void invalidClientName() { Connection jedis = pool.getPool().getResource()) { } catch (Exception e) { if (!e.getMessage().startsWith("client info cannot contain space")) { - Assert.fail("invalid client name test fail"); + fail("invalid client name test fail"); } } } @@ -174,7 +173,7 @@ public void closeBrokenResourceTwice() { j.getOne(); fail(); } catch (Exception e) { - assertTrue(e instanceof JedisConnectionException); + assertInstanceOf(JedisConnectionException.class, e); } assertTrue(j.isBroken()); j.close(); @@ -253,6 +252,7 @@ public void cleanUp() { pool.get("foo"); fail("Should not get resource from pool"); } catch (JedisException e) { + //ignore } assertEquals(0, pool.getPool().getNumActive() + pool.getPool().getNumIdle() + pool.getPool().getNumWaiters()); assertThat(prepareCount.getAndSet(0), greaterThanOrEqualTo(1)); diff --git a/src/test/java/redis/clients/jedis/JedisPubSubBaseTest.java b/src/test/java/redis/clients/jedis/JedisPubSubBaseTest.java index a7910bd6a3..98b0907735 100644 --- a/src/test/java/redis/clients/jedis/JedisPubSubBaseTest.java +++ b/src/test/java/redis/clients/jedis/JedisPubSubBaseTest.java @@ -1,6 +1,6 @@ package redis.clients.jedis; -import junit.framework.TestCase; +import org.junit.jupiter.api.Test; import redis.clients.jedis.util.SafeEncoder; import java.util.Arrays; @@ -8,13 +8,15 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import static redis.clients.jedis.Protocol.ResponseKeyword.MESSAGE; import static redis.clients.jedis.Protocol.ResponseKeyword.SUBSCRIBE; -public class JedisPubSubBaseTest extends TestCase { - +public class JedisPubSubBaseTest { + @Test public void testProceed_givenThreadInterrupt_exitLoop() throws InterruptedException { // setup final JedisPubSubBase pubSub = new JedisPubSubBase() { @@ -54,6 +56,5 @@ protected String encode(byte[] raw) { thread.start(); assertTrue(countDownLatch.await(10, TimeUnit.MILLISECONDS)); - } } diff --git a/src/test/java/redis/clients/jedis/JedisSentinelPoolTest.java b/src/test/java/redis/clients/jedis/JedisSentinelPoolTest.java index 3329c45647..af16d11746 100644 --- a/src/test/java/redis/clients/jedis/JedisSentinelPoolTest.java +++ b/src/test/java/redis/clients/jedis/JedisSentinelPoolTest.java @@ -1,16 +1,17 @@ package redis.clients.jedis; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.assertSame; import java.util.HashSet; import java.util.Set; import org.apache.commons.pool2.impl.GenericObjectPoolConfig; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import redis.clients.jedis.exceptions.JedisConnectionException; import redis.clients.jedis.exceptions.JedisException; @@ -23,7 +24,7 @@ public class JedisSentinelPoolTest { protected final Set sentinels = new HashSet<>(); - @Before + @BeforeEach public void setUp() throws Exception { sentinels.clear(); @@ -44,21 +45,20 @@ public void repeatedSentinelPoolInitialization() { } } - @Test(expected = JedisConnectionException.class) + @Test public void initializeWithNotAvailableSentinelsShouldThrowException() { Set wrongSentinels = new HashSet(); wrongSentinels.add(new HostAndPort("localhost", 65432).toString()); wrongSentinels.add(new HostAndPort("localhost", 65431).toString()); - JedisSentinelPool pool = new JedisSentinelPool(MASTER_NAME, wrongSentinels); - pool.destroy(); + assertThrows(JedisConnectionException.class, + () -> new JedisSentinelPool(MASTER_NAME, wrongSentinels).close()); } - @Test(expected = JedisException.class) + @Test public void initializeWithNotMonitoredMasterNameShouldThrowException() { final String wrongMasterName = "wrongMasterName"; - JedisSentinelPool pool = new JedisSentinelPool(wrongMasterName, sentinels); - pool.destroy(); + assertThrows(JedisException.class, ()-> new JedisSentinelPool(wrongMasterName, sentinels).close()); } @Test diff --git a/src/test/java/redis/clients/jedis/JedisSentinelTest.java b/src/test/java/redis/clients/jedis/JedisSentinelTest.java index eb956d5eb1..1ffbab3a68 100644 --- a/src/test/java/redis/clients/jedis/JedisSentinelTest.java +++ b/src/test/java/redis/clients/jedis/JedisSentinelTest.java @@ -1,21 +1,21 @@ package redis.clients.jedis; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - import java.util.HashMap; import java.util.List; import java.util.Map; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import redis.clients.jedis.exceptions.JedisDataException; import redis.clients.jedis.util.JedisSentinelTestUtil; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; + public class JedisSentinelTest { private static final String MASTER_NAME = "mymaster"; @@ -29,11 +29,11 @@ public class JedisSentinelTest { protected static HostAndPort sentinelForFailover = HostAndPorts.getSentinelServers().get(2); - @Before + @BeforeEach public void setup() throws InterruptedException { } - @After + @AfterEach public void clear() throws InterruptedException { // New Sentinel (after 2.8.1) // when slave promoted to master (slave of no one), New Sentinel force @@ -60,11 +60,10 @@ public void sentinel() { List masterHostAndPort = j.sentinelGetMasterAddrByName(MASTER_NAME); HostAndPort masterFromSentinel = new HostAndPort(masterHostAndPort.get(0), Integer.parseInt(masterHostAndPort.get(1))); -// assertEquals(master, masterFromSentinel); assertEquals(master.getPort(), masterFromSentinel.getPort()); List> slaves = j.sentinelReplicas(MASTER_NAME); - assertTrue(!slaves.isEmpty()); + assertFalse(slaves.isEmpty()); assertEquals(master.getPort(), Integer.parseInt(slaves.get(0).get("master-port"))); // DO NOT RE-RUN TEST TOO FAST, RESET TAKES SOME TIME TO... RESET @@ -171,12 +170,11 @@ public void sentinelSet() { private void ensureMonitored(HostAndPort sentinel, String masterName, String ip, int port, int quorum) { - Jedis j = new Jedis(sentinel); - try { + + try (Jedis j = new Jedis(sentinel)) { j.sentinelMonitor(masterName, ip, port, quorum); } catch (JedisDataException e) { - } finally { - j.close(); + // ignore } } diff --git a/src/test/java/redis/clients/jedis/JedisShardedPubSubBaseTest.java b/src/test/java/redis/clients/jedis/JedisShardedPubSubBaseTest.java index 68d8455392..6803d44e96 100644 --- a/src/test/java/redis/clients/jedis/JedisShardedPubSubBaseTest.java +++ b/src/test/java/redis/clients/jedis/JedisShardedPubSubBaseTest.java @@ -1,19 +1,22 @@ package redis.clients.jedis; -import junit.framework.TestCase; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import static redis.clients.jedis.Protocol.ResponseKeyword.SMESSAGE; import static redis.clients.jedis.Protocol.ResponseKeyword.SSUBSCRIBE; -public class JedisShardedPubSubBaseTest extends TestCase { +public class JedisShardedPubSubBaseTest { + @Test public void testProceed_givenThreadInterrupt_exitLoop() throws InterruptedException { // setup final JedisShardedPubSubBase pubSub = new JedisShardedPubSubBase() { diff --git a/src/test/java/redis/clients/jedis/JedisTest.java b/src/test/java/redis/clients/jedis/JedisTest.java index 7e353d3441..b156c02d35 100644 --- a/src/test/java/redis/clients/jedis/JedisTest.java +++ b/src/test/java/redis/clients/jedis/JedisTest.java @@ -1,10 +1,11 @@ package redis.clients.jedis; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import java.io.IOException; import java.net.ServerSocket; @@ -17,9 +18,9 @@ import java.util.Map; import io.redis.test.annotations.SinceRedisVersion; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import redis.clients.jedis.exceptions.InvalidURIException; import redis.clients.jedis.exceptions.JedisConnectionException; @@ -27,7 +28,8 @@ import redis.clients.jedis.commands.jedis.JedisCommandsTestBase; import redis.clients.jedis.util.SafeEncoder; -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class JedisTest extends JedisCommandsTestBase { public JedisTest(RedisProtocol protocol) { @@ -148,15 +150,17 @@ public void infiniteTimeout() throws Exception { } } - @Test(expected = IllegalArgumentException.class) + @Test public void failWhenSendingNullValues() { - jedis.set("foo", null); + assertThrows(IllegalArgumentException.class, () -> jedis.set("foo", null)); } - @Test(expected = InvalidURIException.class) - public void shouldThrowInvalidURIExceptionForInvalidURI() throws URISyntaxException { - Jedis j = new Jedis(new URI("localhost:6380")); + @Test + public void shouldThrowInvalidURIExceptionForInvalidURI() { + assertThrows(InvalidURIException.class, + () -> new Jedis(new URI("redis://localhost")).close()); } + // // @Test // public void shouldReconnectToSameDB() throws IOException { diff --git a/src/test/java/redis/clients/jedis/ManagedConnectionProviderTest.java b/src/test/java/redis/clients/jedis/ManagedConnectionProviderTest.java index 44ca793ef5..d38efd184e 100644 --- a/src/test/java/redis/clients/jedis/ManagedConnectionProviderTest.java +++ b/src/test/java/redis/clients/jedis/ManagedConnectionProviderTest.java @@ -1,24 +1,26 @@ package redis.clients.jedis; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import redis.clients.jedis.providers.ManagedConnectionProvider; import redis.clients.jedis.util.IOUtils; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.fail; + public class ManagedConnectionProviderTest { private Connection connection; - @Before + @BeforeEach public void setUp() { EndpointConfig endpoint = HostAndPorts.getRedisEndpoint("standalone0"); connection = new Connection(endpoint.getHostAndPort(), endpoint.getClientConfigBuilder().build()); } - @After + @AfterEach public void tearDown() { IOUtils.closeQuietly(connection); } @@ -29,10 +31,10 @@ public void test() { try (UnifiedJedis jedis = new UnifiedJedis(managed)) { try { jedis.get("any"); - Assert.fail("Should get NPE."); + fail("Should get NPE."); } catch (NullPointerException npe) { } managed.setConnection(connection); - Assert.assertNull(jedis.get("any")); + assertNull(jedis.get("any")); } } } diff --git a/src/test/java/redis/clients/jedis/MigratePipeliningTest.java b/src/test/java/redis/clients/jedis/MigratePipeliningTest.java index 8cac62c1f0..b5a1213574 100644 --- a/src/test/java/redis/clients/jedis/MigratePipeliningTest.java +++ b/src/test/java/redis/clients/jedis/MigratePipeliningTest.java @@ -7,21 +7,22 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasToString; import static org.hamcrest.Matchers.instanceOf; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import redis.clients.jedis.commands.jedis.JedisCommandsTestBase; import redis.clients.jedis.exceptions.JedisDataException; import redis.clients.jedis.params.MigrateParams; -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class MigratePipeliningTest extends JedisCommandsTestBase { private static final byte[] bfoo = { 0x01, 0x02, 0x03 }; @@ -55,7 +56,7 @@ public MigratePipeliningTest(RedisProtocol protocol) { super(protocol); } - @Before + @BeforeEach @Override public void setUp() throws Exception { super.setUp(); @@ -70,7 +71,7 @@ public void setUp() throws Exception { destAuth.select(dbAuth); } - @After + @AfterEach @Override public void tearDown() throws Exception { dest.close(); diff --git a/src/test/java/redis/clients/jedis/PipeliningTest.java b/src/test/java/redis/clients/jedis/PipeliningTest.java index fede809686..4cf105a9e0 100644 --- a/src/test/java/redis/clients/jedis/PipeliningTest.java +++ b/src/test/java/redis/clients/jedis/PipeliningTest.java @@ -5,13 +5,14 @@ import static org.hamcrest.Matchers.hasItems; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.matchesPattern; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import java.io.IOException; import java.util.Arrays; @@ -24,9 +25,9 @@ import org.hamcrest.Matcher; import org.hamcrest.Matchers; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import org.awaitility.Awaitility; import redis.clients.jedis.commands.ProtocolCommand; @@ -36,7 +37,8 @@ import redis.clients.jedis.resps.Tuple; import redis.clients.jedis.util.SafeEncoder; -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class PipeliningTest extends JedisCommandsTestBase { private static final byte[] bfoo = { 0x01, 0x02, 0x03, 0x04 }; @@ -248,13 +250,13 @@ public void pipelineResponseWithoutData() { assertNull(score.get()); } - @Test(expected = IllegalStateException.class) + @Test public void pipelineResponseWithinPipeline() { jedis.set("string", "foo"); Pipeline p = jedis.pipelined(); Response string = p.get("string"); - string.get(); + assertThrows(IllegalStateException.class,string::get); p.sync(); } @@ -292,12 +294,11 @@ public void piplineWithError() { assertEquals(r.get(), "bar"); } - @Test(expected = IllegalStateException.class) + @Test public void testJedisThrowExceptionWhenInPipeline() { Pipeline pipeline = jedis.pipelined(); pipeline.set("foo", "3"); - jedis.get("somekey"); - fail("Can't use jedis instance when in Pipeline"); + assertThrows(IllegalStateException.class, () -> jedis.get("somekey")); } @Test diff --git a/src/test/java/redis/clients/jedis/ProtocolTest.java b/src/test/java/redis/clients/jedis/ProtocolTest.java index 0fd7fc143a..e9891b3a93 100644 --- a/src/test/java/redis/clients/jedis/ProtocolTest.java +++ b/src/test/java/redis/clients/jedis/ProtocolTest.java @@ -1,10 +1,12 @@ package redis.clients.jedis; +import org.junit.jupiter.api.Test; import redis.clients.jedis.util.FragmentedByteArrayInputStream; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.fail; import static redis.clients.jedis.util.AssertUtil.assertByteArrayListEquals; import java.io.BufferedInputStream; @@ -17,7 +19,6 @@ import java.util.ArrayList; import java.util.List; -import org.junit.Test; import redis.clients.jedis.exceptions.JedisBusyException; import redis.clients.jedis.util.RedisInputStream; @@ -47,7 +48,7 @@ public void buildACommand() throws IOException { assertEquals(expectedCommand, sb.toString()); } - @Test(expected = IOException.class) + @Test public void writeOverflow() throws IOException { RedisOutputStream ros = new RedisOutputStream(new OutputStream() { @@ -63,10 +64,9 @@ public void write(int b) throws IOException { try { ros.write((byte) '*'); } catch (IOException ioe) { + //ignore } - - ros.write((byte) '*'); - + assertThrows(IOException.class, ()-> ros.write((byte) '*')); } @Test diff --git a/src/test/java/redis/clients/jedis/ReliableTransactionTest.java b/src/test/java/redis/clients/jedis/ReliableTransactionTest.java index e3218d02d2..9f995402a0 100644 --- a/src/test/java/redis/clients/jedis/ReliableTransactionTest.java +++ b/src/test/java/redis/clients/jedis/ReliableTransactionTest.java @@ -1,6 +1,12 @@ package redis.clients.jedis; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import static redis.clients.jedis.Protocol.Command.INCR; import static redis.clients.jedis.Protocol.Command.GET; import static redis.clients.jedis.Protocol.Command.SET; @@ -8,9 +14,10 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; + +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import redis.clients.jedis.exceptions.JedisDataException; import redis.clients.jedis.util.SafeEncoder; @@ -28,7 +35,7 @@ public class ReliableTransactionTest { private Connection conn; private Jedis nj; - @Before + @BeforeEach public void setUp() throws Exception { conn = new Connection(endpoint.getHostAndPort(), endpoint.getClientConfigBuilder().timeoutMillis(500).build()); @@ -38,7 +45,7 @@ public void setUp() throws Exception { nj.flushAll(); } - @After + @AfterEach public void tearDown() throws Exception { nj.close(); conn.close(); @@ -184,13 +191,13 @@ public void transactionResponseBinary() { assertArrayEquals("foo".getBytes(), set.get()); } - @Test(expected = IllegalStateException.class) + @Test public void transactionResponseWithinPipeline() { nj.set("string", "foo"); ReliableTransaction t = new ReliableTransaction(conn); Response string = t.get("string"); - string.get(); + assertThrows(IllegalStateException.class, string::get); t.exec(); } diff --git a/src/test/java/redis/clients/jedis/SSLACLJedisClusterTest.java b/src/test/java/redis/clients/jedis/SSLACLJedisClusterTest.java index cd48cd2411..116a5337f3 100644 --- a/src/test/java/redis/clients/jedis/SSLACLJedisClusterTest.java +++ b/src/test/java/redis/clients/jedis/SSLACLJedisClusterTest.java @@ -1,7 +1,9 @@ package redis.clients.jedis; -import static org.junit.Assert.assertEquals; -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.fail; import static redis.clients.jedis.util.TlsUtil.*; import java.nio.file.Path; @@ -14,11 +16,10 @@ import io.redis.test.annotations.SinceRedisVersion; import io.redis.test.utils.RedisVersion; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import redis.clients.jedis.util.RedisVersionUtil; import redis.clients.jedis.util.TlsUtil; import redis.clients.jedis.exceptions.JedisClusterOperationException; @@ -53,7 +54,7 @@ public class SSLACLJedisClusterTest extends JedisClusterTestBase { private static final String trustStoreName = SSLACLJedisClusterTest.class.getSimpleName(); - @BeforeClass + @BeforeAll public static void prepare() { List trustedCertLocation = Collections.singletonList(Paths.get("cluster-unbound/work/tls")); Path trustStorePath = TlsUtil.createAndSaveTestTruststore(trustStoreName, trustedCertLocation,"changeit"); @@ -61,7 +62,7 @@ public static void prepare() { TlsUtil.setCustomTrustStore(trustStorePath, "changeit"); } - @AfterClass + @AfterAll public static void teardownTrustStore() { TlsUtil.restoreOriginalTrustStore(); } @@ -149,7 +150,7 @@ public void connectToNodesFailsWithSSLParametersAndNoHostMapping() { .sslParameters(sslParameters).hostAndPortMapper(portMap).build(), DEFAULT_REDIRECTIONS, DEFAULT_POOL_CONFIG)) { jc.get("foo"); - Assert.fail("It should fail after all cluster attempts."); + fail("It should fail after all cluster attempts."); // } catch (JedisClusterMaxAttemptsException e) { } catch (JedisClusterOperationException e) { // initial connection to localhost works, but subsequent connections to nodes use 127.0.0.1 @@ -199,7 +200,7 @@ public void connectWithCustomHostNameVerifier() { .hostnameVerifier(hostnameVerifier).hostAndPortMapper(portMap).build(), DEFAULT_REDIRECTIONS, DEFAULT_POOL_CONFIG)) { jc.get("foo"); - Assert.fail("It should fail after all cluster attempts."); + fail("It should fail after all cluster attempts."); // } catch (JedisClusterMaxAttemptsException e) { } catch (JedisClusterOperationException e) { // initial connection made with 'localhost' but subsequent connections to nodes use 127.0.0.1 diff --git a/src/test/java/redis/clients/jedis/SSLACLJedisTest.java b/src/test/java/redis/clients/jedis/SSLACLJedisTest.java index 6e185c6505..a79b71ec59 100644 --- a/src/test/java/redis/clients/jedis/SSLACLJedisTest.java +++ b/src/test/java/redis/clients/jedis/SSLACLJedisTest.java @@ -1,20 +1,19 @@ package redis.clients.jedis; -import static org.junit.Assert.*; - import io.redis.test.annotations.SinceRedisVersion; import java.nio.file.Path; import java.util.Arrays; import java.util.List; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.ClassRule; -import org.junit.Test; - -import redis.clients.jedis.util.RedisVersionRule; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; +import redis.clients.jedis.util.RedisVersionCondition; import redis.clients.jedis.util.TlsUtil; +import static org.junit.jupiter.api.Assertions.assertEquals; + /** * This test class is a copy of {@link SSLJedisTest}. *

@@ -27,12 +26,12 @@ public class SSLACLJedisTest { protected static final EndpointConfig endpointWithDefaultUser = HostAndPorts.getRedisEndpoint("standalone0-tls"); - @ClassRule - public static RedisVersionRule versionRule = new RedisVersionRule(endpoint); + @RegisterExtension + public static RedisVersionCondition versionCondition = new RedisVersionCondition(endpoint); private static final String trustStoreName = SSLACLJedisTest.class.getSimpleName(); - @BeforeClass + @BeforeAll public static void prepare() { List trustedCertLocation = Arrays.asList(endpoint.getCertificatesLocation(), endpointWithDefaultUser.getCertificatesLocation()); @@ -42,7 +41,7 @@ public static void prepare() { TlsUtil.setCustomTrustStore(trustStorePath, "changeit"); } - @AfterClass + @AfterAll public static void teardownTrustStore() { TlsUtil.restoreOriginalTrustStore(); } diff --git a/src/test/java/redis/clients/jedis/SSLJedisClusterTest.java b/src/test/java/redis/clients/jedis/SSLJedisClusterTest.java index 44807427cf..bac5b5a38b 100644 --- a/src/test/java/redis/clients/jedis/SSLJedisClusterTest.java +++ b/src/test/java/redis/clients/jedis/SSLJedisClusterTest.java @@ -1,7 +1,8 @@ package redis.clients.jedis; -import static org.junit.Assert.assertEquals; -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.fail; import static redis.clients.jedis.util.TlsUtil.*; import java.nio.file.Path; @@ -14,12 +15,11 @@ import io.redis.test.annotations.SinceRedisVersion; import io.redis.test.utils.RedisVersion; -import org.junit.AfterClass; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import redis.clients.jedis.util.RedisVersionUtil; import redis.clients.jedis.util.TlsUtil; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; import redis.clients.jedis.exceptions.JedisClusterOperationException; @@ -48,7 +48,7 @@ public class SSLJedisClusterTest extends JedisClusterTestBase { private static final String trustStoreName = SSLJedisClusterTest.class.getSimpleName(); - @BeforeClass + @BeforeAll public static void prepare() { List trustedCertLocation = Collections.singletonList(Paths.get("cluster-unbound/work/tls")); Path trustStorePath = TlsUtil.createAndSaveTestTruststore(trustStoreName, trustedCertLocation,"changeit"); @@ -56,7 +56,7 @@ public static void prepare() { TlsUtil.setCustomTrustStore(trustStorePath, "changeit"); } - @AfterClass + @AfterAll public static void teardownTrustStore() { TlsUtil.restoreOriginalTrustStore(); } @@ -142,7 +142,7 @@ public void connectToNodesFailsWithSSLParametersAndNoHostMapping() { .sslParameters(sslParameters).hostAndPortMapper(portMap).build(), DEFAULT_REDIRECTIONS, DEFAULT_POOL_CONFIG)) { jc.get("foo"); - Assert.fail("It should fail after all cluster attempts."); + fail("It should fail after all cluster attempts."); // } catch (JedisClusterMaxAttemptsException e) { } catch (JedisClusterOperationException e) { // initial connection to localhost works, but subsequent connections to nodes use 127.0.0.1 @@ -193,7 +193,7 @@ public void connectWithCustomHostNameVerifier() { .hostnameVerifier(hostnameVerifier).hostAndPortMapper(portMap).build(), DEFAULT_REDIRECTIONS, DEFAULT_POOL_CONFIG)) { jc.get("foo"); - Assert.fail("It should fail after all cluster attempts."); + fail("It should fail after all cluster attempts."); // } catch (JedisClusterMaxAttemptsException e) { } catch (JedisClusterOperationException e) { // initial connection made with 'localhost' but subsequent connections to nodes use 127.0.0.1 diff --git a/src/test/java/redis/clients/jedis/SSLJedisSentinelPoolTest.java b/src/test/java/redis/clients/jedis/SSLJedisSentinelPoolTest.java index f753394945..e9fa40cbaf 100644 --- a/src/test/java/redis/clients/jedis/SSLJedisSentinelPoolTest.java +++ b/src/test/java/redis/clients/jedis/SSLJedisSentinelPoolTest.java @@ -8,9 +8,9 @@ import java.util.Set; import org.apache.commons.pool2.impl.GenericObjectPoolConfig; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import redis.clients.jedis.util.TlsUtil; public class SSLJedisSentinelPoolTest { @@ -25,7 +25,7 @@ public class SSLJedisSentinelPoolTest { private static final GenericObjectPoolConfig POOL_CONFIG = new GenericObjectPoolConfig<>(); private static final String trustStoreName = SSLJedisSentinelPoolTest.class.getSimpleName(); - @BeforeClass + @BeforeAll public static void prepare() { List trustedCertLocation = Collections.singletonList(Paths.get("redis9-sentinel/work/tls")); Path trustStorePath = TlsUtil.createAndSaveTestTruststore(trustStoreName, trustedCertLocation,"changeit"); @@ -34,7 +34,7 @@ public static void prepare() { sentinels.add(HostAndPorts.getSentinelServers().get(4)); } - @AfterClass + @AfterAll public static void teardownTrustStore() { TlsUtil.restoreOriginalTrustStore(); } diff --git a/src/test/java/redis/clients/jedis/SSLJedisTest.java b/src/test/java/redis/clients/jedis/SSLJedisTest.java index f0abeaeb2c..7adf438a4d 100644 --- a/src/test/java/redis/clients/jedis/SSLJedisTest.java +++ b/src/test/java/redis/clients/jedis/SSLJedisTest.java @@ -1,24 +1,23 @@ package redis.clients.jedis; -import static org.junit.Assert.assertEquals; - import java.nio.file.Path; import java.util.Collections; import java.util.List; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import redis.clients.jedis.util.TlsUtil; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class SSLJedisTest { protected static final EndpointConfig endpoint = HostAndPorts.getRedisEndpoint("standalone0-tls"); private static final String trustStoreName = SSLJedisTest.class.getSimpleName(); - @BeforeClass + @BeforeAll public static void prepare() { List trustedCertLocation = Collections.singletonList(endpoint.getCertificatesLocation()); Path trustStorePath = TlsUtil.createAndSaveTestTruststore(trustStoreName, trustedCertLocation,"changeit"); @@ -26,7 +25,7 @@ public static void prepare() { TlsUtil.setCustomTrustStore(trustStorePath, "changeit"); } - @AfterClass + @AfterAll public static void teardownTrustStore() { TlsUtil.restoreOriginalTrustStore(); } diff --git a/src/test/java/redis/clients/jedis/SSLOptionsJedisClusterTest.java b/src/test/java/redis/clients/jedis/SSLOptionsJedisClusterTest.java index 1eb9b48925..94bfe4b0b6 100644 --- a/src/test/java/redis/clients/jedis/SSLOptionsJedisClusterTest.java +++ b/src/test/java/redis/clients/jedis/SSLOptionsJedisClusterTest.java @@ -1,8 +1,5 @@ package redis.clients.jedis; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - import java.nio.file.Path; import java.nio.file.Paths; import java.util.Collections; @@ -13,14 +10,17 @@ import io.redis.test.annotations.SinceRedisVersion; import io.redis.test.utils.RedisVersion; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import redis.clients.jedis.exceptions.JedisClusterOperationException; import redis.clients.jedis.util.RedisVersionUtil; import redis.clients.jedis.util.TlsUtil; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; + @SinceRedisVersion(value = "7.0.0", message = "Redis 6.2.x returns non-tls port in CLUSTER SLOTS command. Enable for 6.2.x after test is fixed.") public class SSLOptionsJedisClusterTest extends JedisClusterTestBase { @@ -47,7 +47,7 @@ public class SSLOptionsJedisClusterTest extends JedisClusterTestBase { private static final String trustStoreName = SSLOptionsJedisClusterTest.class.getSimpleName(); private static Path trustStorePath; - @BeforeClass + @BeforeAll public static void prepare() { List trustedCertLocation = Collections.singletonList(Paths.get("cluster-unbound/work/tls")); trustStorePath = TlsUtil.createAndSaveTestTruststore(trustStoreName, trustedCertLocation,"changeit"); @@ -135,7 +135,7 @@ public void connectToNodesFailsWithSSLParametersAndNoHostMapping() { .hostAndPortMapper(portMap).build(), DEFAULT_REDIRECTIONS, DEFAULT_POOL_CONFIG)) { jc.get("foo"); - Assert.fail("It should fail after all cluster attempts."); + fail("It should fail after all cluster attempts."); } catch (JedisClusterOperationException e) { // initial connection to localhost works, but subsequent connections to nodes use 127.0.0.1 // and fail hostname verification @@ -193,7 +193,7 @@ public void connectWithCustomHostNameVerifier() { .hostnameVerifier(hostnameVerifier).hostAndPortMapper(portMap).build(), DEFAULT_REDIRECTIONS, DEFAULT_POOL_CONFIG)) { jc.get("foo"); - Assert.fail("It should fail after all cluster attempts."); + fail("It should fail after all cluster attempts."); } catch (JedisClusterOperationException e) { // initial connection made with 'localhost' but subsequent connections to nodes use 127.0.0.1 // which causes custom hostname verification to fail diff --git a/src/test/java/redis/clients/jedis/SSLOptionsJedisPooledTest.java b/src/test/java/redis/clients/jedis/SSLOptionsJedisPooledTest.java index 76065f0486..5bba1c1cb0 100644 --- a/src/test/java/redis/clients/jedis/SSLOptionsJedisPooledTest.java +++ b/src/test/java/redis/clients/jedis/SSLOptionsJedisPooledTest.java @@ -1,15 +1,15 @@ package redis.clients.jedis; -import static org.junit.Assert.assertEquals; - -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import redis.clients.jedis.util.TlsUtil; import java.nio.file.Path; import java.util.Arrays; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class SSLOptionsJedisPooledTest { protected static final EndpointConfig endpoint = HostAndPorts.getRedisEndpoint("standalone0-tls"); @@ -19,7 +19,7 @@ public class SSLOptionsJedisPooledTest { private static final String trustStoreName = SSLACLJedisTest.class.getSimpleName(); private static Path trustStorePath; - @BeforeClass + @BeforeAll public static void prepare() { List trustedCertLocation = Arrays.asList(endpoint.getCertificatesLocation(), aclEndpoint.getCertificatesLocation()); diff --git a/src/test/java/redis/clients/jedis/SSLOptionsJedisSentinelPoolTest.java b/src/test/java/redis/clients/jedis/SSLOptionsJedisSentinelPoolTest.java index 4552c3fd95..0bbf267aa3 100644 --- a/src/test/java/redis/clients/jedis/SSLOptionsJedisSentinelPoolTest.java +++ b/src/test/java/redis/clients/jedis/SSLOptionsJedisSentinelPoolTest.java @@ -7,8 +7,8 @@ import java.util.List; import java.util.Set; import org.apache.commons.pool2.impl.GenericObjectPoolConfig; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import redis.clients.jedis.util.TlsUtil; public class SSLOptionsJedisSentinelPoolTest { @@ -25,7 +25,7 @@ public class SSLOptionsJedisSentinelPoolTest { private static final String trustStoreName = SSLOptionsJedisSentinelPoolTest.class.getSimpleName(); private static Path trustStorePath; - @BeforeClass + @BeforeAll public static void prepare() { List trustedCertLocation = Collections.singletonList(Paths.get("redis9-sentinel/work/tls")); trustStorePath = TlsUtil.createAndSaveTestTruststore(trustStoreName, trustedCertLocation,"changeit"); diff --git a/src/test/java/redis/clients/jedis/SSLOptionsJedisTest.java b/src/test/java/redis/clients/jedis/SSLOptionsJedisTest.java index d336b3d41d..e3aebbbc88 100644 --- a/src/test/java/redis/clients/jedis/SSLOptionsJedisTest.java +++ b/src/test/java/redis/clients/jedis/SSLOptionsJedisTest.java @@ -1,15 +1,15 @@ package redis.clients.jedis; -import static org.junit.Assert.assertEquals; - -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import redis.clients.jedis.util.TlsUtil; import java.nio.file.Path; import java.util.Arrays; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class SSLOptionsJedisTest { protected static final EndpointConfig endpoint = HostAndPorts.getRedisEndpoint("standalone0-tls"); @@ -18,7 +18,7 @@ public class SSLOptionsJedisTest { private static final String trustStoreName = SSLOptionsJedisTest.class.getSimpleName(); private static Path trustStorePath; - @BeforeClass + @BeforeAll public static void prepare() { List trustedCertLocation = Arrays.asList(endpoint.getCertificatesLocation(),aclEndpoint.getCertificatesLocation()); trustStorePath = TlsUtil.createAndSaveTestTruststore(trustStoreName, trustedCertLocation,"changeit"); diff --git a/src/test/java/redis/clients/jedis/SentineledConnectionProviderTest.java b/src/test/java/redis/clients/jedis/SentineledConnectionProviderTest.java index 746c50bc43..f15f2095e5 100644 --- a/src/test/java/redis/clients/jedis/SentineledConnectionProviderTest.java +++ b/src/test/java/redis/clients/jedis/SentineledConnectionProviderTest.java @@ -1,20 +1,21 @@ package redis.clients.jedis; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.fail; - import java.util.HashSet; import java.util.Set; import org.apache.commons.pool2.impl.GenericObjectPoolConfig; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import redis.clients.jedis.exceptions.JedisConnectionException; import redis.clients.jedis.exceptions.JedisException; import redis.clients.jedis.providers.SentineledConnectionProvider; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.fail; + /** * @see JedisSentinelPoolTest */ @@ -27,7 +28,7 @@ public class SentineledConnectionProviderTest { protected Set sentinels = new HashSet<>(); - @Before + @BeforeEach public void setUp() throws Exception { sentinels.clear(); @@ -48,23 +49,26 @@ public void repeatedSentinelPoolInitialization() { } } - @Test(expected = JedisConnectionException.class) + @Test public void initializeWithNotAvailableSentinelsShouldThrowException() { Set wrongSentinels = new HashSet<>(); wrongSentinels.add(new HostAndPort("localhost", 65432)); wrongSentinels.add(new HostAndPort("localhost", 65431)); - - try (SentineledConnectionProvider provider = new SentineledConnectionProvider(MASTER_NAME, - DefaultJedisClientConfig.builder().build(), wrongSentinels, DefaultJedisClientConfig.builder().build())) { - } + assertThrows(JedisConnectionException.class, () -> { + try (SentineledConnectionProvider provider = new SentineledConnectionProvider(MASTER_NAME, + DefaultJedisClientConfig.builder().build(), wrongSentinels, DefaultJedisClientConfig.builder().build())) { + } + }); } - @Test(expected = JedisException.class) + @Test public void initializeWithNotMonitoredMasterNameShouldThrowException() { final String wrongMasterName = "wrongMasterName"; - try (SentineledConnectionProvider provider = new SentineledConnectionProvider(wrongMasterName, - DefaultJedisClientConfig.builder().build(), sentinels, DefaultJedisClientConfig.builder().build())) { - } + assertThrows(JedisException.class, () -> { + try (SentineledConnectionProvider provider = new SentineledConnectionProvider(wrongMasterName, + DefaultJedisClientConfig.builder().build(), sentinels, DefaultJedisClientConfig.builder().build())) { + } + }); } @Test diff --git a/src/test/java/redis/clients/jedis/ShardedConnectionTest.java b/src/test/java/redis/clients/jedis/ShardedConnectionTest.java index f849315d2e..cf8d9df97d 100644 --- a/src/test/java/redis/clients/jedis/ShardedConnectionTest.java +++ b/src/test/java/redis/clients/jedis/ShardedConnectionTest.java @@ -1,16 +1,16 @@ package redis.clients.jedis; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; - import java.net.URISyntaxException; import java.util.ArrayList; import java.util.List; import org.apache.commons.pool2.impl.GenericObjectPoolConfig; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import redis.clients.jedis.exceptions.JedisDataException; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; + public class ShardedConnectionTest { /** @@ -22,7 +22,7 @@ public class ShardedConnectionTest { private List shards; private JedisClientConfig clientConfig; - @Before + @BeforeEach public void startUp() { shards = new ArrayList<>(); shards.add(redis1.getHostAndPort()); diff --git a/src/test/java/redis/clients/jedis/ShardedPipelineTest.java b/src/test/java/redis/clients/jedis/ShardedPipelineTest.java index 86349bf68c..9afe9b8d40 100644 --- a/src/test/java/redis/clients/jedis/ShardedPipelineTest.java +++ b/src/test/java/redis/clients/jedis/ShardedPipelineTest.java @@ -2,12 +2,14 @@ import java.util.Arrays; import java.util.List; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import redis.clients.jedis.providers.ShardedConnectionProvider; import redis.clients.jedis.util.Hashing; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class ShardedPipelineTest { private static final EndpointConfig redis1 = HostAndPorts.getRedisEndpoint("standalone0"); @@ -19,7 +21,7 @@ public class ShardedPipelineTest { private List shards = Arrays.asList(redis1.getHostAndPort(), redis2.getHostAndPort()); - @Before + @BeforeEach public void setUp() { for (HostAndPort shard : shards) { try (Jedis j = new Jedis(shard)) { @@ -42,12 +44,12 @@ public void shardedPipelineSync() { Response r6 = shardedPipeline.get("key3"); shardedPipeline.sync(); - Assert.assertEquals("OK", r1.get()); - Assert.assertEquals("OK", r2.get()); - Assert.assertEquals("OK", r3.get()); - Assert.assertEquals("value1", r4.get()); - Assert.assertEquals("value2", r5.get()); - Assert.assertEquals("value3", r6.get()); + assertEquals("OK", r1.get()); + assertEquals("OK", r2.get()); + assertEquals("OK", r3.get()); + assertEquals("value1", r4.get()); + assertEquals("value2", r5.get()); + assertEquals("value3", r6.get()); } } @@ -62,12 +64,12 @@ public void constructorClientConfig() { Response r6 = pipe.get("key3"); pipe.sync(); - Assert.assertEquals("OK", r1.get()); - Assert.assertEquals("OK", r2.get()); - Assert.assertEquals("OK", r3.get()); - Assert.assertEquals("value1", r4.get()); - Assert.assertEquals("value2", r5.get()); - Assert.assertEquals("value3", r6.get()); + assertEquals("OK", r1.get()); + assertEquals("OK", r2.get()); + assertEquals("OK", r3.get()); + assertEquals("value1", r4.get()); + assertEquals("value2", r5.get()); + assertEquals("value3", r6.get()); } } @@ -83,12 +85,12 @@ public void constructorPoolConfig() { Response r6 = pipe.get("key3"); pipe.sync(); - Assert.assertEquals("OK", r1.get()); - Assert.assertEquals("OK", r2.get()); - Assert.assertEquals("OK", r3.get()); - Assert.assertEquals("value1", r4.get()); - Assert.assertEquals("value2", r5.get()); - Assert.assertEquals("value3", r6.get()); + assertEquals("OK", r1.get()); + assertEquals("OK", r2.get()); + assertEquals("OK", r3.get()); + assertEquals("value1", r4.get()); + assertEquals("value2", r5.get()); + assertEquals("value3", r6.get()); } } } diff --git a/src/test/java/redis/clients/jedis/ShardingTest.java b/src/test/java/redis/clients/jedis/ShardingTest.java index a865740ee6..2083c242ee 100644 --- a/src/test/java/redis/clients/jedis/ShardingTest.java +++ b/src/test/java/redis/clients/jedis/ShardingTest.java @@ -1,15 +1,16 @@ package redis.clients.jedis; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import static redis.clients.jedis.Protocol.Command.SET; import java.util.ArrayList; import java.util.List; -import org.junit.Before; -import org.junit.Test; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import redis.clients.jedis.util.Hashing; public class ShardingTest { @@ -19,7 +20,7 @@ public class ShardingTest { private JedisClientConfig clientConfig = redis1.getClientConfigBuilder().build(); - @Before + @BeforeEach public void setUp() { try (Jedis j = new Jedis(redis1.getHostAndPort(), redis1.getClientConfigBuilder().build())) { j.flushAll(); diff --git a/src/test/java/redis/clients/jedis/TransactionV2Test.java b/src/test/java/redis/clients/jedis/TransactionV2Test.java index 88742b6ce3..943c00a8be 100644 --- a/src/test/java/redis/clients/jedis/TransactionV2Test.java +++ b/src/test/java/redis/clients/jedis/TransactionV2Test.java @@ -1,8 +1,14 @@ package redis.clients.jedis; import static org.hamcrest.Matchers.containsString; -import static org.junit.Assert.*; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import static redis.clients.jedis.Protocol.Command.INCR; import static redis.clients.jedis.Protocol.Command.GET; import static redis.clients.jedis.Protocol.Command.SET; @@ -13,9 +19,9 @@ import java.util.Set; import org.hamcrest.MatcherAssert; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import redis.clients.jedis.exceptions.JedisDataException; import redis.clients.jedis.util.SafeEncoder; @@ -34,7 +40,7 @@ public class TransactionV2Test { private Connection conn; private Jedis nj; - @Before + @BeforeEach public void setUp() throws Exception { conn = new Connection(endpoint.getHostAndPort(), endpoint.getClientConfigBuilder().timeoutMillis(500).build()); @@ -45,7 +51,7 @@ public void setUp() throws Exception { nj.flushAll(); } - @After + @AfterEach public void tearDown() throws Exception { nj.close(); conn.close(); @@ -190,13 +196,13 @@ public void transactionResponseBinary() { assertArrayEquals("foo".getBytes(), set.get()); } - @Test(expected = IllegalStateException.class) + @Test public void transactionResponseWithinPipeline() { nj.set("string", "foo"); Transaction t = new Transaction(conn); Response string = t.get("string"); - string.get(); + assertThrows(IllegalStateException.class, string::get); t.exec(); } @@ -229,8 +235,8 @@ public void transactionPropagatesErrorsBeforeExec() { t.set("foo","bar"); JedisDataException exception = assertThrows(JedisDataException.class, t::exec); Throwable[] suppressed = exception.getSuppressed(); - assertNotNull("Suppressed exceptions should not be null", suppressed); - assertTrue("There should be at least one suppressed exception", suppressed.length > 0); + assertNotNull(suppressed, "Suppressed exceptions should not be null"); + assertTrue(suppressed.length > 0, "There should be at least one suppressed exception"); MatcherAssert.assertThat(suppressed[0].getMessage(), containsString("ERR wrong number of arguments")); } diff --git a/src/test/java/redis/clients/jedis/TupleSortedSetTest.java b/src/test/java/redis/clients/jedis/TupleSortedSetTest.java index 59efcb3435..a525033778 100644 --- a/src/test/java/redis/clients/jedis/TupleSortedSetTest.java +++ b/src/test/java/redis/clients/jedis/TupleSortedSetTest.java @@ -1,18 +1,20 @@ package redis.clients.jedis; -import static org.junit.Assert.assertEquals; - import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import redis.clients.jedis.resps.Tuple; import redis.clients.jedis.commands.jedis.JedisCommandsTestBase; -@RunWith(Parameterized.class) +import static org.junit.jupiter.api.Assertions.assertEquals; + +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class TupleSortedSetTest extends JedisCommandsTestBase { final byte[] bfoo = { 0x01, 0x02, 0x03, 0x04 }; final byte[] ba = { 0x0A }; diff --git a/src/test/java/redis/clients/jedis/UdsTest.java b/src/test/java/redis/clients/jedis/UdsTest.java index a79529d990..57ae6f6503 100644 --- a/src/test/java/redis/clients/jedis/UdsTest.java +++ b/src/test/java/redis/clients/jedis/UdsTest.java @@ -4,21 +4,21 @@ import java.io.IOException; import java.net.Socket; -import org.junit.Assume; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import org.newsclub.net.unix.AFUNIXSocket; import org.newsclub.net.unix.AFUNIXSocketAddress; import redis.clients.jedis.exceptions.JedisConnectionException; import redis.clients.jedis.util.TestEnvUtil; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assumptions.assumeFalse; public class UdsTest { - @BeforeClass + @BeforeAll public static void checkDockerEnvironment() { - Assume.assumeFalse("Unix sockets tests not supported against dockerised test env yet!", TestEnvUtil.isContainerEnv()); + assumeFalse(TestEnvUtil.isContainerEnv(),"Unix sockets tests not supported against dockerised test env yet!"); } @Test diff --git a/src/test/java/redis/clients/jedis/UnavailableConnectionTest.java b/src/test/java/redis/clients/jedis/UnavailableConnectionTest.java index 79c40c7f5a..034a938337 100644 --- a/src/test/java/redis/clients/jedis/UnavailableConnectionTest.java +++ b/src/test/java/redis/clients/jedis/UnavailableConnectionTest.java @@ -1,21 +1,22 @@ package redis.clients.jedis; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - import org.apache.commons.pool2.impl.GenericObjectPoolConfig; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Timeout; import redis.clients.jedis.exceptions.JedisConnectionException; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; + public class UnavailableConnectionTest { private static final HostAndPort unavailableNode = new HostAndPort("localhost", 6400); - @BeforeClass + @BeforeAll public static void setup() { setupAvoidQuitInDestroyObject(); @@ -47,7 +48,8 @@ public void run() { threadForBrokenJedis1.start(); } - @Test(timeout = 5000) + @Test + @Timeout(5) public void testAvoidQuitInDestroyObjectForBrokenConnection() throws InterruptedException { threadForBrokenJedis1.join(); assertFalse(threadForBrokenJedis1.isAlive()); @@ -59,9 +61,6 @@ public void testAvoidQuitInDestroyObjectForBrokenConnection() throws Interrupted fail("Should not get connection from pool"); } catch (Exception ex) { assertSame(JedisConnectionException.class, ex.getClass()); - // assertSame(JedisConnectionException.class, ex.getCause().getClass()); - // assertSame(java.net.ConnectException.class, ex.getCause().getCause().getClass()); - // assertSame(java.net.ConnectException.class, ex.getCause().getClass()); } } diff --git a/src/test/java/redis/clients/jedis/UnifiedJedisCustomCommandsTest.java b/src/test/java/redis/clients/jedis/UnifiedJedisCustomCommandsTest.java index 4ffc54cc54..fa36412f78 100644 --- a/src/test/java/redis/clients/jedis/UnifiedJedisCustomCommandsTest.java +++ b/src/test/java/redis/clients/jedis/UnifiedJedisCustomCommandsTest.java @@ -8,7 +8,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import redis.clients.jedis.commands.ProtocolCommand; import redis.clients.jedis.mocked.unified.UnifiedJedisMockedTestBase; diff --git a/src/test/java/redis/clients/jedis/authentication/RedisEntraIDClusterIntegrationTests.java b/src/test/java/redis/clients/jedis/authentication/RedisEntraIDClusterIntegrationTests.java index 8830e24914..80df84a6dd 100644 --- a/src/test/java/redis/clients/jedis/authentication/RedisEntraIDClusterIntegrationTests.java +++ b/src/test/java/redis/clients/jedis/authentication/RedisEntraIDClusterIntegrationTests.java @@ -1,7 +1,8 @@ package redis.clients.jedis.authentication; import static org.hamcrest.Matchers.greaterThanOrEqualTo; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assumptions.assumeTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.atLeast; import static org.mockito.Mockito.doAnswer; @@ -19,8 +20,8 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -43,7 +44,7 @@ public class RedisEntraIDClusterIntegrationTests { private static EndpointConfig endpointConfig; private static HostAndPort hnp; - @BeforeClass + @BeforeAll public static void before() { try { testCtx = EntraIDTestContext.DEFAULT; @@ -51,7 +52,7 @@ public static void before() { hnp = endpointConfig.getHostAndPort(); } catch (IllegalArgumentException e) { log.warn("Skipping test because no Redis endpoint is configured"); - org.junit.Assume.assumeTrue(false); + assumeTrue(false, "No Redis endpoint 'standalone-entraid-acl' is configured!"); } } @@ -98,8 +99,7 @@ public void testClusterWithReAuth() throws InterruptedException, ExecutionExcept Connection connection = spy((Connection) invocation.getArgument(0)); invocation.getArguments()[0] = connection; connections.add(connection); - Object result = invocation.callRealMethod(); - return result; + return invocation.callRealMethod(); }).when(authXManager).addConnection(any(Connection.class)); JedisClientConfig config = DefaultJedisClientConfig.builder().authXManager(authXManager) @@ -113,8 +113,8 @@ public void testClusterWithReAuth() throws InterruptedException, ExecutionExcept assertEquals("OK", jc.set("foo", "bar")); } }; - Future task1 = executorService.submit(task); - Future task2 = executorService.submit(task); + Future task1 = executorService.submit(task); + Future task2 = executorService.submit(task); await().pollInterval(ONE_HUNDRED_MILLISECONDS).atMost(TWO_SECONDS) .until(connections::size, greaterThanOrEqualTo(2)); diff --git a/src/test/java/redis/clients/jedis/authentication/RedisEntraIDIntegrationTests.java b/src/test/java/redis/clients/jedis/authentication/RedisEntraIDIntegrationTests.java index ee6f40b45e..a926dcb7c4 100644 --- a/src/test/java/redis/clients/jedis/authentication/RedisEntraIDIntegrationTests.java +++ b/src/test/java/redis/clients/jedis/authentication/RedisEntraIDIntegrationTests.java @@ -4,10 +4,11 @@ import static org.awaitility.Durations.TWO_SECONDS; import static org.awaitility.Durations.FIVE_SECONDS; import static org.awaitility.Durations.ONE_HUNDRED_MILLISECONDS; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThrows; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.fail; +import static org.junit.jupiter.api.Assumptions.assumeTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.atLeast; import static org.mockito.Mockito.doAnswer; @@ -36,10 +37,10 @@ import org.awaitility.Awaitility; import org.awaitility.Durations; import org.hamcrest.MatcherAssert; -import org.junit.BeforeClass; -import org.junit.FixMethodOrder; -import org.junit.Test; -import org.junit.runners.MethodSorters; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; import org.mockito.MockedConstruction; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -68,7 +69,7 @@ import redis.clients.jedis.scenario.FaultInjectionClient; import redis.clients.jedis.scenario.FaultInjectionClient.TriggerActionResponse; -@FixMethodOrder(MethodSorters.NAME_ASCENDING) +@TestMethodOrder(MethodOrderer.MethodName.class) public class RedisEntraIDIntegrationTests { private static final Logger log = LoggerFactory.getLogger(RedisEntraIDIntegrationTests.class); @@ -78,7 +79,7 @@ public class RedisEntraIDIntegrationTests { private final FaultInjectionClient faultClient = new FaultInjectionClient(); - @BeforeClass + @BeforeAll public static void before() { try { testCtx = EntraIDTestContext.DEFAULT; @@ -86,7 +87,7 @@ public static void before() { hnp = endpointConfig.getHostAndPort(); } catch (IllegalArgumentException e) { log.warn("Skipping test because no Redis endpoint is configured"); - org.junit.Assume.assumeTrue(false); + assumeTrue(false, "No Redis endpoint 'standalone-entraid-acl' is configured!"); } } diff --git a/src/test/java/redis/clients/jedis/authentication/RedisEntraIDManagedIdentityIntegrationTests.java b/src/test/java/redis/clients/jedis/authentication/RedisEntraIDManagedIdentityIntegrationTests.java index 7e305ab766..d294997dc9 100644 --- a/src/test/java/redis/clients/jedis/authentication/RedisEntraIDManagedIdentityIntegrationTests.java +++ b/src/test/java/redis/clients/jedis/authentication/RedisEntraIDManagedIdentityIntegrationTests.java @@ -1,13 +1,11 @@ package redis.clients.jedis.authentication; -import static org.junit.Assert.assertEquals; - import java.util.Collections; import java.util.Set; import java.util.UUID; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -20,6 +18,9 @@ import redis.clients.jedis.HostAndPorts; import redis.clients.jedis.JedisPooled; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assumptions.assumeTrue; + public class RedisEntraIDManagedIdentityIntegrationTests { private static final Logger log = LoggerFactory.getLogger(RedisEntraIDIntegrationTests.class); @@ -29,7 +30,7 @@ public class RedisEntraIDManagedIdentityIntegrationTests { private static Set managedIdentityAudience = Collections .singleton("https://redis.azure.com"); - @BeforeClass + @BeforeAll public static void before() { try { testCtx = EntraIDTestContext.DEFAULT; @@ -37,7 +38,7 @@ public static void before() { hnp = endpointConfig.getHostAndPort(); } catch (IllegalArgumentException e) { log.warn("Skipping test because no Redis endpoint is configured"); - org.junit.Assume.assumeTrue(false); + assumeTrue(false,"No Redis endpoint 'standalone-entraid-acl' is configured!"); } } diff --git a/src/test/java/redis/clients/jedis/authentication/TokenBasedAuthenticationClusterIntegrationTests.java b/src/test/java/redis/clients/jedis/authentication/TokenBasedAuthenticationClusterIntegrationTests.java index e05169385c..c11df953c7 100644 --- a/src/test/java/redis/clients/jedis/authentication/TokenBasedAuthenticationClusterIntegrationTests.java +++ b/src/test/java/redis/clients/jedis/authentication/TokenBasedAuthenticationClusterIntegrationTests.java @@ -1,7 +1,8 @@ package redis.clients.jedis.authentication; import static org.hamcrest.Matchers.greaterThanOrEqualTo; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assumptions.assumeTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.atLeast; import static org.mockito.Mockito.doAnswer; @@ -19,8 +20,8 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -45,14 +46,14 @@ public class TokenBasedAuthenticationClusterIntegrationTests { private static EndpointConfig endpointConfig; private static HostAndPort hnp; - @BeforeClass + @BeforeAll public static void before() { try { endpointConfig = HostAndPorts.getRedisEndpoint("cluster"); hnp = endpointConfig.getHostAndPort(); } catch (IllegalArgumentException e) { log.warn("Skipping test because no Redis endpoint is configured"); - org.junit.Assume.assumeTrue(false); + assumeTrue(false, "No Redis endpoint 'cluster' is configured!"); } } @@ -121,8 +122,7 @@ public Token requestToken() { Connection connection = spy((Connection) invocation.getArgument(0)); invocation.getArguments()[0] = connection; connections.add(connection); - Object result = invocation.callRealMethod(); - return result; + return invocation.callRealMethod(); }).when(authXManager).addConnection(any(Connection.class)); JedisClientConfig config = DefaultJedisClientConfig.builder().authXManager(authXManager) @@ -136,8 +136,8 @@ public Token requestToken() { assertEquals("OK", jc.set("foo", "bar")); } }; - Future task1 = executorService.submit(task); - Future task2 = executorService.submit(task); + Future task1 = executorService.submit(task); + Future task2 = executorService.submit(task); await().pollInterval(ONE_HUNDRED_MILLISECONDS).atMost(TWO_SECONDS) .until(connections::size, greaterThanOrEqualTo(2)); diff --git a/src/test/java/redis/clients/jedis/authentication/TokenBasedAuthenticationIntegrationTests.java b/src/test/java/redis/clients/jedis/authentication/TokenBasedAuthenticationIntegrationTests.java index 9060f80719..628defda63 100644 --- a/src/test/java/redis/clients/jedis/authentication/TokenBasedAuthenticationIntegrationTests.java +++ b/src/test/java/redis/clients/jedis/authentication/TokenBasedAuthenticationIntegrationTests.java @@ -1,8 +1,9 @@ package redis.clients.jedis.authentication; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assumptions.assumeTrue; import static org.mockito.Mockito.when; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThrows; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.atLeast; import static org.mockito.Mockito.doAnswer; @@ -20,8 +21,9 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.atomic.AtomicBoolean; -import org.junit.BeforeClass; -import org.junit.Test; + +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -49,13 +51,13 @@ public class TokenBasedAuthenticationIntegrationTests { private static EndpointConfig endpointConfig; - @BeforeClass + @BeforeAll public static void before() { try { endpointConfig = HostAndPorts.getRedisEndpoint("standalone0"); } catch (IllegalArgumentException e) { log.warn("Skipping test because no Redis endpoint is configured"); - org.junit.Assume.assumeTrue(false); + assumeTrue(false); } } @@ -240,13 +242,12 @@ public void testJedisPubSubWithResp2() { .authXManager(new AuthXManager(tokenAuthConfig)).build(); try (JedisPooled jedis = new JedisPooled(endpointConfig.getHostAndPort(), clientConfig)) { - JedisPubSub pubSub = new JedisPubSub() { - }; + JedisPubSub pubSub = new JedisPubSub() {}; JedisException e = assertThrows(JedisException.class, - () -> jedis.subscribe(pubSub, "channel1")); + () -> jedis.subscribe(pubSub, "channel1")); assertEquals( - "Blocking pub/sub operations are not supported on token-based authentication enabled connections with RESP2 protocol!", - e.getMessage()); + "Blocking pub/sub operations are not supported on token-based authentication enabled connections with RESP2 protocol!", + e.getMessage()); } } } diff --git a/src/test/java/redis/clients/jedis/authentication/TokenBasedAuthenticationUnitTests.java b/src/test/java/redis/clients/jedis/authentication/TokenBasedAuthenticationUnitTests.java index df223a76ee..fd40ab893b 100644 --- a/src/test/java/redis/clients/jedis/authentication/TokenBasedAuthenticationUnitTests.java +++ b/src/test/java/redis/clients/jedis/authentication/TokenBasedAuthenticationUnitTests.java @@ -1,7 +1,7 @@ package redis.clients.jedis.authentication; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThrows; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import static org.awaitility.Awaitility.await; @@ -19,7 +19,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.hamcrest.Matchers; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.mockito.MockedConstruction; @@ -248,8 +248,7 @@ public void testBlockForInitialTokenWhenException() { new TokenManagerConfig(0.7F, 200, 2000, new TokenManagerConfig.RetryPolicy(5, 100))); AuthXManager manager = new AuthXManager(tokenManager); - JedisAuthenticationException e = assertThrows(JedisAuthenticationException.class, - () -> manager.start()); + JedisAuthenticationException e = assertThrows(JedisAuthenticationException.class, manager::start); assertEquals(exceptionMessage, e.getCause().getCause().getMessage()); } @@ -262,6 +261,7 @@ public void testBlockForInitialTokenWhenHangs() { try { latch.await(); } catch (InterruptedException e) { + // Ignore } return null; }; @@ -270,8 +270,7 @@ public void testBlockForInitialTokenWhenHangs() { new TokenManagerConfig(0.7F, 200, 1000, new TokenManagerConfig.RetryPolicy(2, 100))); AuthXManager manager = new AuthXManager(tokenManager); - JedisAuthenticationException e = assertThrows(JedisAuthenticationException.class, - () -> manager.start()); + JedisAuthenticationException e = assertThrows(JedisAuthenticationException.class, manager::start); latch.countDown(); assertEquals(exceptionMessage, e.getMessage()); @@ -327,6 +326,7 @@ public void testTokenManagerWithHangingTokenRequest() try { Thread.sleep(sleepDuration); } catch (InterruptedException e) { + // Ignore } return null; } diff --git a/src/test/java/redis/clients/jedis/collections/JedisByteHashMapTest.java b/src/test/java/redis/clients/jedis/collections/JedisByteHashMapTest.java index 40f493ece6..f89da29b34 100644 --- a/src/test/java/redis/clients/jedis/collections/JedisByteHashMapTest.java +++ b/src/test/java/redis/clients/jedis/collections/JedisByteHashMapTest.java @@ -10,18 +10,22 @@ import java.util.Map.Entry; import java.util.Set; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import redis.clients.jedis.util.JedisByteHashMap; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +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 JedisByteHashMapTest { private static JedisByteHashMap map = new JedisByteHashMap(); private byte[][] keys = { { 'k', 'e', 'y', '1' }, { 'k', 'e', 'y', '2' }, { 'k', 'e', 'y', '3' } }; private byte[][] vals = { { 'v', 'a', 'l', '1' }, { 'v', 'a', 'l', '2' }, { 'v', 'a', 'l', '3' } }; - @Before + @BeforeEach public void before() throws Exception { map.clear(); } @@ -63,52 +67,52 @@ private boolean entrySetSame(Set> s1, Set kvMap = new HashMap<>(); kvMap.put(keys[1], vals[1]); kvMap.put(keys[2], vals[2]); map.putAll(kvMap); - Assert.assertEquals(3, map.size()); + assertEquals(3, map.size()); // containsKey - Assert.assertTrue(map.containsKey(keys[0])); + assertTrue(map.containsKey(keys[0])); // containsValue - Assert.assertTrue(map.containsValue(vals[0])); + assertTrue(map.containsValue(vals[0])); // entrySet Set> entries = map.entrySet(); - Assert.assertEquals(3, entries.size()); + assertEquals(3, entries.size()); for (Entry entry : entries) { - Assert.assertTrue(arrayContainsKey(keys, entry.getKey())); - Assert.assertTrue(arrayContainsKey(vals, entry.getValue())); + assertTrue(arrayContainsKey(keys, entry.getKey())); + assertTrue(arrayContainsKey(vals, entry.getValue())); } // get - Assert.assertArrayEquals(vals[0], map.get(keys[0])); + assertArrayEquals(vals[0], map.get(keys[0])); // isEmpty - Assert.assertFalse(map.isEmpty()); + assertFalse(map.isEmpty()); // keySet for (byte[] key : map.keySet()) { - Assert.assertTrue(arrayContainsKey(keys, key)); + assertTrue(arrayContainsKey(keys, key)); } // values for (byte[] value : map.values()) { - Assert.assertTrue(arrayContainsKey(vals, value)); + assertTrue(arrayContainsKey(vals, value)); } // remove map.remove(keys[0]); - Assert.assertEquals(2, map.size()); + assertEquals(2, map.size()); // clear map.clear(); - Assert.assertEquals(0, map.size()); + assertEquals(0, map.size()); } @Test @@ -125,6 +129,6 @@ public void serialize() throws Exception { ObjectInputStream objIn = new ObjectInputStream(byteIn); JedisByteHashMap mapRead = (JedisByteHashMap) objIn.readObject(); - Assert.assertTrue(entrySetSame(map.entrySet(), mapRead.entrySet())); + assertTrue(entrySetSame(map.entrySet(), mapRead.entrySet())); } } diff --git a/src/test/java/redis/clients/jedis/collections/SetFromListTest.java b/src/test/java/redis/clients/jedis/collections/SetFromListTest.java index 99beec911d..216661f81c 100644 --- a/src/test/java/redis/clients/jedis/collections/SetFromListTest.java +++ b/src/test/java/redis/clients/jedis/collections/SetFromListTest.java @@ -1,8 +1,7 @@ package redis.clients.jedis.collections; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -16,16 +15,16 @@ import java.util.List; import java.util.Set; -import org.junit.BeforeClass; -import org.junit.Test; +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 SetFromListTest { private static Method method; - @BeforeClass + @BeforeAll public static void beforeClass() throws Exception { -// Class clazz = Class.forName("redis.clients.jedis.BinaryJedis$SetFromList"); Class clazz = Class.forName("redis.clients.jedis.BuilderFactory$SetFromList"); method = clazz.getDeclaredMethod("of", List.class); method.setAccessible(true); diff --git a/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsBitmapCommandsTest.java b/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsBitmapCommandsTest.java index 3c511fa823..ebb5b6425d 100644 --- a/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsBitmapCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsBitmapCommandsTest.java @@ -7,7 +7,7 @@ import java.util.List; import io.redis.test.annotations.SinceRedisVersion; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.args.BitCountOption; import redis.clients.jedis.args.BitOP; diff --git a/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsBloomFilterCommandsTest.java b/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsBloomFilterCommandsTest.java index a69bd8b68e..ba9d55cb2c 100644 --- a/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsBloomFilterCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsBloomFilterCommandsTest.java @@ -9,7 +9,7 @@ import java.util.List; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.bloom.BFInsertParams; import redis.clients.jedis.bloom.BFReserveParams; diff --git a/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsCountMinSketchCommandsTest.java b/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsCountMinSketchCommandsTest.java index c1be92acb4..22b17c53d2 100644 --- a/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsCountMinSketchCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsCountMinSketchCommandsTest.java @@ -13,7 +13,7 @@ import java.util.List; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.RedisProtocol; /** diff --git a/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsCuckooFilterCommandsTest.java b/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsCuckooFilterCommandsTest.java index 68bc9b7060..2f81dd7a6f 100644 --- a/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsCuckooFilterCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsCuckooFilterCommandsTest.java @@ -13,7 +13,7 @@ import java.util.List; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.bloom.CFInsertParams; import redis.clients.jedis.bloom.CFReserveParams; diff --git a/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsGenericCommandsTest.java b/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsGenericCommandsTest.java index d9072d9736..6ea699f040 100644 --- a/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsGenericCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsGenericCommandsTest.java @@ -20,7 +20,7 @@ import java.util.Set; import io.redis.test.annotations.SinceRedisVersion; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.Jedis; import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.args.ExpiryOption; diff --git a/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsGeospatialCommandsTest.java b/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsGeospatialCommandsTest.java index bcdcd54092..acfe251c9c 100644 --- a/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsGeospatialCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsGeospatialCommandsTest.java @@ -14,7 +14,7 @@ import java.util.Map; import java.util.stream.Collectors; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.GeoCoordinate; import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.args.GeoUnit; diff --git a/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsHashCommandsTest.java b/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsHashCommandsTest.java index 65ffac82bc..1c998a466d 100644 --- a/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsHashCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsHashCommandsTest.java @@ -26,7 +26,7 @@ import io.redis.test.annotations.SinceRedisVersion; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.args.ExpiryOption; import redis.clients.jedis.params.HGetExParams; diff --git a/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsHyperloglogCommandsTest.java b/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsHyperloglogCommandsTest.java index cdfe5aa7bd..04c75ee818 100644 --- a/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsHyperloglogCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsHyperloglogCommandsTest.java @@ -5,7 +5,7 @@ import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.greaterThanOrEqualTo; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.RedisProtocol; /** diff --git a/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsJsonCommandsTest.java b/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsJsonCommandsTest.java index 6e24cdd322..7adc5624c4 100644 --- a/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsJsonCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsJsonCommandsTest.java @@ -11,7 +11,7 @@ import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; -import static org.junit.Assume.assumeThat; +import static org.junit.jupiter.api.Assumptions.assumeTrue; import java.util.HashMap; import java.util.List; @@ -19,7 +19,7 @@ import org.json.JSONArray; import org.json.JSONObject; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.json.JsonSetParams; import redis.clients.jedis.json.Path; @@ -257,7 +257,7 @@ public void testJsonGenericObject() { @Test @Deprecated public void testJsonGetWithClass() { - assumeThat(protocol, not(equalTo(RedisProtocol.RESP3))); + assumeTrue(protocol != RedisProtocol.RESP3); String key = "user:2000"; @@ -544,7 +544,7 @@ public void testJsonType() { @Test @Deprecated public void testJsonTypeOldPath() { - assumeThat(protocol, not(equalTo(RedisProtocol.RESP3))); + assumeTrue(protocol != RedisProtocol.RESP3); String key = "jsonKey"; @@ -609,7 +609,7 @@ public void testJsonStrAppendOldPath() { @Test @Deprecated public void testJsonStrAppendRootPath() { - assumeThat(protocol, not(equalTo(RedisProtocol.RESP3))); + assumeTrue(protocol != RedisProtocol.RESP3); String key = "user:1000"; @@ -629,7 +629,7 @@ public void testJsonStrAppendRootPath() { @Test @Deprecated public void testJsonStrLenRootPath() { - assumeThat(protocol, not(equalTo(RedisProtocol.RESP3))); + assumeTrue(protocol != RedisProtocol.RESP3); String key = "user:1001"; @@ -1199,7 +1199,7 @@ public void testJsonArrTrimOldPath() { @Test @Deprecated public void testJsonArrLenRoot() { - assumeThat(protocol, not(equalTo(RedisProtocol.RESP3))); + assumeTrue(protocol != RedisProtocol.RESP3); String key = "json"; @@ -1256,7 +1256,7 @@ public void testJsonArrLenOldPath() { @Test @Deprecated public void testJsonObjLenRoot() { - assumeThat(protocol, not(equalTo(RedisProtocol.RESP3))); + assumeTrue(protocol != RedisProtocol.RESP3); String key = "json"; @@ -1307,7 +1307,7 @@ public void testJsonObjLenWithPath2() { @Test @Deprecated public void testJsonObjKeysRoot() { - assumeThat(protocol, not(equalTo(RedisProtocol.RESP3))); + assumeTrue(protocol != RedisProtocol.RESP3); String key = "json"; @@ -1358,7 +1358,7 @@ public void testJsonObjKeysWithPath() { @Test @Deprecated public void testJsonDebugMemoryRoot() { - assumeThat(protocol, not(equalTo(RedisProtocol.RESP3))); + assumeTrue(protocol != RedisProtocol.RESP3); String key = "json"; JSONObject data = new JSONObject() diff --git a/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsListCommandsTest.java b/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsListCommandsTest.java index 9ea0c1534f..61fd44e1cb 100644 --- a/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsListCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsListCommandsTest.java @@ -10,7 +10,7 @@ import java.util.List; import io.redis.test.annotations.SinceRedisVersion; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.args.ListDirection; import redis.clients.jedis.args.ListPosition; diff --git a/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsModulesTestBase.java b/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsModulesTestBase.java index 37c6500aeb..2bae712c1b 100644 --- a/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsModulesTestBase.java +++ b/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsModulesTestBase.java @@ -1,8 +1,6 @@ package redis.clients.jedis.commands.commandobjects; -import redis.clients.jedis.HostAndPort; import redis.clients.jedis.HostAndPorts; -import redis.clients.jedis.Protocol; import redis.clients.jedis.RedisProtocol; /** diff --git a/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsScriptingCommandsTest.java b/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsScriptingCommandsTest.java index e1a808e18c..bb5f7176c4 100644 --- a/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsScriptingCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsScriptingCommandsTest.java @@ -10,7 +10,7 @@ import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; -import static org.junit.Assert.assertThrows; +import static org.junit.jupiter.api.Assertions.assertThrows; import java.util.ArrayList; import java.util.Arrays; @@ -20,8 +20,8 @@ import io.redis.test.annotations.SinceRedisVersion; import io.redis.test.utils.RedisVersion; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.args.FlushMode; import redis.clients.jedis.args.FunctionRestorePolicy; @@ -39,7 +39,7 @@ public CommandObjectsScriptingCommandsTest(RedisProtocol protocol) { super(protocol); } - @Before + @BeforeEach @Override public void setUp() { super.setUp(); diff --git a/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsSearchAndQueryCommandsTest.java b/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsSearchAndQueryCommandsTest.java index 4fd7c60fc4..553a5e25d4 100644 --- a/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsSearchAndQueryCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsSearchAndQueryCommandsTest.java @@ -27,7 +27,7 @@ import java.util.stream.Collectors; import org.json.JSONObject; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.args.SortingOrder; import redis.clients.jedis.json.Path2; diff --git a/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsServerManagementCommandsTest.java b/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsServerManagementCommandsTest.java index 543f2dc6d9..607241af2c 100644 --- a/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsServerManagementCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsServerManagementCommandsTest.java @@ -6,7 +6,7 @@ import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.greaterThanOrEqualTo; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.CommandObject; import redis.clients.jedis.RedisProtocol; diff --git a/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsSetCommandsTest.java b/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsSetCommandsTest.java index 84c82ac78f..efb464c3b5 100644 --- a/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsSetCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsSetCommandsTest.java @@ -14,7 +14,7 @@ import java.util.Set; import io.redis.test.annotations.SinceRedisVersion; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.params.ScanParams; import redis.clients.jedis.resps.ScanResult; diff --git a/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsSortedSetCommandsTest.java b/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsSortedSetCommandsTest.java index 292ed25572..13094ed993 100644 --- a/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsSortedSetCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsSortedSetCommandsTest.java @@ -18,7 +18,7 @@ import java.util.Map; import io.redis.test.annotations.SinceRedisVersion; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.args.SortedSetOption; import redis.clients.jedis.params.ScanParams; diff --git a/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsStandaloneTestBase.java b/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsStandaloneTestBase.java index 707db79bb2..4bf8e742d3 100644 --- a/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsStandaloneTestBase.java +++ b/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsStandaloneTestBase.java @@ -1,8 +1,8 @@ package redis.clients.jedis.commands.commandobjects; -import redis.clients.jedis.util.EnabledOnCommandRule; -import redis.clients.jedis.util.RedisVersionRule; -import org.junit.Rule; +import org.junit.jupiter.api.extension.RegisterExtension; +import redis.clients.jedis.util.EnabledOnCommandCondition; +import redis.clients.jedis.util.RedisVersionCondition; import redis.clients.jedis.HostAndPorts; import redis.clients.jedis.RedisProtocol; @@ -11,10 +11,10 @@ */ public abstract class CommandObjectsStandaloneTestBase extends CommandObjectsTestBase { - @Rule - public RedisVersionRule versionRule = new RedisVersionRule(endpoint); - @Rule - public EnabledOnCommandRule enabledOnCommandRule = new EnabledOnCommandRule(endpoint); + @RegisterExtension + RedisVersionCondition redisVersionCondition = new RedisVersionCondition(endpoint); + @RegisterExtension + EnabledOnCommandCondition enabledOnCommandCondition = new EnabledOnCommandCondition(endpoint); public CommandObjectsStandaloneTestBase(RedisProtocol protocol) { super(protocol, HostAndPorts.getRedisEndpoint("standalone0")); diff --git a/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsStreamCommandsTest.java b/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsStreamCommandsTest.java index 8d01e4283c..30bfd654e8 100644 --- a/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsStreamCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsStreamCommandsTest.java @@ -17,7 +17,7 @@ import java.util.Map; import java.util.Optional; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.StreamEntryID; import redis.clients.jedis.params.XAddParams; diff --git a/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsStringCommandsTest.java b/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsStringCommandsTest.java index a192a462d9..a210db8787 100644 --- a/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsStringCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsStringCommandsTest.java @@ -11,7 +11,7 @@ import java.util.List; import io.redis.test.annotations.SinceRedisVersion; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.params.GetExParams; import redis.clients.jedis.params.LCSParams; diff --git a/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsTDigestCommandsTest.java b/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsTDigestCommandsTest.java index f16bc91abb..e869006315 100644 --- a/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsTDigestCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsTDigestCommandsTest.java @@ -13,7 +13,7 @@ import java.util.List; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.bloom.TDigestMergeParams; diff --git a/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsTestBase.java b/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsTestBase.java index d0501d533c..0f1430e637 100644 --- a/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsTestBase.java +++ b/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsTestBase.java @@ -5,9 +5,9 @@ import java.util.Collection; -import org.junit.Before; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import redis.clients.jedis.*; import redis.clients.jedis.commands.CommandsTestsParameters; import redis.clients.jedis.executors.CommandExecutor; @@ -24,21 +24,14 @@ * This class provides the basic setup, except the {@link HostAndPort} for connecting * to a running Redis server. That one is provided by abstract subclasses, depending * on if a Redis Stack server is needed, or a standalone suffices. + *

+ * In principle all subclasses of this class should be parameterized tests, + * to run with several versions of RESP. {@link CommandsTestsParameters#respVersions} */ -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public abstract class CommandObjectsTestBase { - /** - * Input data for parameterized tests. In principle all subclasses of this - * class should be parameterized tests, to run with several versions of RESP. - * - * @see CommandsTestsParameters#respVersions() - */ - @Parameterized.Parameters - public static Collection data() { - return CommandsTestsParameters.respVersions(); - } - /** * RESP protocol used in the tests. Injected from subclasses. */ @@ -67,7 +60,7 @@ public CommandObjectsTestBase(RedisProtocol protocol, EndpointConfig endpoint) { commandObjects.setProtocol(protocol); } - @Before + @BeforeEach public void setUp() { // Configure a default command executor. DefaultJedisClientConfig clientConfig = endpoint.getClientConfigBuilder().protocol(protocol) diff --git a/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsTimeSeriesCommandsTest.java b/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsTimeSeriesCommandsTest.java index 374ca315c2..a51efa1ccf 100644 --- a/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsTimeSeriesCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsTimeSeriesCommandsTest.java @@ -17,7 +17,7 @@ import java.util.Map; import java.util.stream.Collectors; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.timeseries.AggregationType; import redis.clients.jedis.timeseries.TSAlterParams; diff --git a/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsTopkCommandsTest.java b/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsTopkCommandsTest.java index 4091fd5280..b787ab69a9 100644 --- a/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsTopkCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/commandobjects/CommandObjectsTopkCommandsTest.java @@ -14,7 +14,7 @@ import java.util.List; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.RedisProtocol; /** diff --git a/src/test/java/redis/clients/jedis/commands/jedis/AccessControlListCommandsTest.java b/src/test/java/redis/clients/jedis/commands/jedis/AccessControlListCommandsTest.java index d0059a61a3..c26105f2da 100644 --- a/src/test/java/redis/clients/jedis/commands/jedis/AccessControlListCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/jedis/AccessControlListCommandsTest.java @@ -5,12 +5,13 @@ import static org.hamcrest.Matchers.endsWith; import static org.hamcrest.Matchers.startsWith; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; +import static org.junit.jupiter.api.Assumptions.assumeTrue; import static redis.clients.jedis.util.RedisVersionUtil.getRedisVersion; import java.util.Arrays; @@ -19,11 +20,12 @@ import io.redis.test.annotations.SinceRedisVersion; import io.redis.test.utils.RedisVersion; import org.hamcrest.Matchers; -import org.junit.After; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; + import redis.clients.jedis.CommandArguments; import redis.clients.jedis.Jedis; @@ -39,31 +41,34 @@ /** * TODO: properly define and test exceptions */ -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class AccessControlListCommandsTest extends JedisCommandsTestBase { public static final String USER_NAME = "newuser"; public static final String USER_PASSWORD = "secret"; public static final String USER_ANTIREZ = "antirez"; - @BeforeClass + @BeforeAll public static void prepare() throws Exception { // Use to check if the ACL test should be ran. ACL are available only in 6.0 and later - org.junit.Assume.assumeTrue("Not running ACL test on this version of Redis", - getRedisVersion(endpoint).isGreaterThanOrEqualTo(RedisVersion.V6_0_0)); + assumeTrue(getRedisVersion(endpoint).isGreaterThanOrEqualTo(RedisVersion.V6_0_0), + "Not running ACL test on this version of Redis"); } public AccessControlListCommandsTest(RedisProtocol protocol) { super(protocol); } - @After + @AfterEach @Override public void tearDown() throws Exception { try { jedis.aclDelUser(USER_NAME); jedis.aclDelUser(USER_ANTIREZ); - } catch (Exception e) { } + } catch (Exception e) { + // Ignore exception + } super.tearDown(); } @@ -371,7 +376,7 @@ public void aclLogTest() { jedis.auth(endpoint.getUsername(), endpoint.getPassword()); List aclEntries = jedis.aclLog(); - assertEquals("Number of log messages ", 1, aclEntries.size()); + assertEquals(1, aclEntries.size(), "Number of log messages "); assertEquals(1, aclEntries.get(0).getCount()); assertEquals(USER_ANTIREZ, aclEntries.get(0).getUsername()); assertEquals("toplevel", aclEntries.get(0).getContext()); @@ -395,7 +400,7 @@ public void aclLogTest() { // test the ACL Log jedis.auth(endpoint.getUsername(), endpoint.getPassword()); - assertEquals("Number of log messages ", 1, jedis.aclLog().size()); + assertEquals(1, jedis.aclLog().size(), "Number of log messages "); assertEquals(10, jedis.aclLog().get(0).getCount()); assertEquals("get", jedis.aclLog().get(0).getObject()); @@ -409,7 +414,7 @@ public void aclLogTest() { // test the ACL Log jedis.auth(endpoint.getUsername(), endpoint.getPassword()); - assertEquals("Number of log messages ", 2, jedis.aclLog().size()); + assertEquals( 2, jedis.aclLog().size(), "Number of log messages "); assertEquals(1, jedis.aclLog().get(0).getCount()); assertEquals("somekeynotallowed", jedis.aclLog().get(0).getObject()); assertEquals("key", jedis.aclLog().get(0).getReason()); @@ -428,7 +433,7 @@ public void aclLogTest() { t.close(); jedis.auth(endpoint.getUsername(), endpoint.getPassword()); - assertEquals("Number of log messages ", 1, jedis.aclLog().size()); + assertEquals( 1, jedis.aclLog().size(), "Number of log messages "); assertEquals(1, jedis.aclLog().get(0).getCount()); assertEquals("multi", jedis.aclLog().get(0).getContext()); assertEquals("incr", jedis.aclLog().get(0).getObject()); @@ -449,12 +454,12 @@ public void aclLogTest() { } jedis.auth(endpoint.getUsername(), endpoint.getPassword()); - assertEquals("Number of log messages ", 3, jedis.aclLog().size()); - assertEquals("Number of log messages ", 2, jedis.aclLog(2).size()); + assertEquals( 3, jedis.aclLog().size(), "Number of log messages "); + assertEquals( 2, jedis.aclLog(2).size(), "Number of log messages "); // Binary tests - assertEquals("Number of log messages ", 3, jedis.aclLogBinary().size()); - assertEquals("Number of log messages ", 2, jedis.aclLogBinary(2).size()); + assertEquals( 3, jedis.aclLogBinary().size(), "Number of log messages "); + assertEquals( 2, jedis.aclLogBinary(2).size(), "Number of log messages "); // RESET String status = jedis.aclLogReset(); @@ -473,7 +478,7 @@ public void aclLogWithEntryID() { } List aclEntries = jedis.aclLog(); - assertEquals("Number of log messages ", 1, aclEntries.size()); + assertEquals( 1, aclEntries.size(), "Number of log messages "); assertEquals(1, aclEntries.get(0).getCount()); assertEquals("wronguser", aclEntries.get(0).getUsername()); assertEquals("toplevel", aclEntries.get(0).getContext()); diff --git a/src/test/java/redis/clients/jedis/commands/jedis/AllKindOfValuesCommandsTest.java b/src/test/java/redis/clients/jedis/commands/jedis/AllKindOfValuesCommandsTest.java index be3d7e09ba..6e03b9bfda 100644 --- a/src/test/java/redis/clients/jedis/commands/jedis/AllKindOfValuesCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/jedis/AllKindOfValuesCommandsTest.java @@ -1,8 +1,15 @@ package redis.clients.jedis.commands.jedis; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import static redis.clients.jedis.Protocol.Command.BLPOP; import static redis.clients.jedis.Protocol.Command.HGETALL; import static redis.clients.jedis.Protocol.Command.GET; @@ -19,11 +26,11 @@ import io.redis.test.annotations.SinceRedisVersion; import org.hamcrest.Matchers; -import org.junit.Assume; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.Assumptions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import redis.clients.jedis.*; import redis.clients.jedis.args.ExpiryOption; @@ -37,7 +44,8 @@ import redis.clients.jedis.util.AssertUtil; import redis.clients.jedis.util.KeyValue; -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class AllKindOfValuesCommandsTest extends JedisCommandsTestBase { private static final long TIME_SKEW = Duration.ofMillis(5).toMillis(); @@ -607,7 +615,7 @@ public void dumpAndRestore() { } @Test - @Ignore(value = "TODO: Regression in 8.0-M02 discarding restore idle time.") + @Disabled(value = "TODO: Regression in 8.0-M02 discarding restore idle time.") public void restoreParams() { // take a separate instance Jedis jedis2 = new Jedis(endpoint.getHost(), endpoint.getPort(), 500); @@ -999,7 +1007,7 @@ public void encodeCompleteResponsePing() { @Test public void encodeCompleteResponseHgetall() { - Assume.assumeFalse(protocol == RedisProtocol.RESP3); + Assumptions.assumeFalse(protocol == RedisProtocol.RESP3); HashMap entries = new HashMap<>(); entries.put("foo", "bar"); @@ -1017,7 +1025,7 @@ public void encodeCompleteResponseHgetall() { @Test public void encodeCompleteResponseHgetallResp3() { - Assume.assumeTrue(protocol == RedisProtocol.RESP3); + Assumptions.assumeTrue(protocol == RedisProtocol.RESP3); HashMap entries = new HashMap<>(); entries.put("foo", "bar"); @@ -1034,7 +1042,7 @@ public void encodeCompleteResponseHgetallResp3() { @Test public void encodeCompleteResponseXinfoStream() { - Assume.assumeFalse(protocol == RedisProtocol.RESP3); + Assumptions.assumeFalse(protocol == RedisProtocol.RESP3); HashMap entry = new HashMap<>(); entry.put("foo", "bar"); @@ -1046,7 +1054,7 @@ public void encodeCompleteResponseXinfoStream() { List encodeObj = (List) SafeEncoder.encodeObject(obj); assertThat(encodeObj.size(), Matchers.greaterThanOrEqualTo(14)); - assertEquals("must have even number of elements", 0, encodeObj.size() % 2); // must be even + assertEquals( 0, encodeObj.size() % 2, "must have even number of elements"); // must be even assertEquals(1L, findValueFromMapAsList(encodeObj, "length")); assertEquals(entryID.toString(), findValueFromMapAsList(encodeObj, "last-generated-id")); @@ -1061,7 +1069,7 @@ public void encodeCompleteResponseXinfoStream() { @Test public void encodeCompleteResponseXinfoStreamResp3() { - Assume.assumeTrue(protocol == RedisProtocol.RESP3); + Assumptions.assumeTrue(protocol == RedisProtocol.RESP3); HashMap entry = new HashMap<>(); entry.put("foo", "bar"); diff --git a/src/test/java/redis/clients/jedis/commands/jedis/BinaryValuesCommandsTest.java b/src/test/java/redis/clients/jedis/commands/jedis/BinaryValuesCommandsTest.java index 3a348fecc9..03e6905d5f 100644 --- a/src/test/java/redis/clients/jedis/commands/jedis/BinaryValuesCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/jedis/BinaryValuesCommandsTest.java @@ -1,10 +1,9 @@ package redis.clients.jedis.commands.jedis; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import static redis.clients.jedis.Protocol.Command.BLPOP; import static redis.clients.jedis.Protocol.Command.GET; import static redis.clients.jedis.Protocol.Command.LRANGE; @@ -16,10 +15,11 @@ import java.util.ArrayList; import java.util.List; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import redis.clients.jedis.Protocol; import redis.clients.jedis.RedisProtocol; @@ -27,7 +27,8 @@ import redis.clients.jedis.params.GetExParams; import redis.clients.jedis.util.SafeEncoder; -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class BinaryValuesCommandsTest extends JedisCommandsTestBase { byte[] bfoo = { 0x01, 0x02, 0x03, 0x04 }; byte[] bbar = { 0x05, 0x06, 0x07, 0x08 }; @@ -43,7 +44,7 @@ public BinaryValuesCommandsTest(RedisProtocol protocol) { super(protocol); } - @Before + @BeforeEach public void startUp() { StringBuilder sb = new StringBuilder(); @@ -246,10 +247,12 @@ public void incr() { assertEquals(2, jedis.incr(bfoo)); } - @Test(expected = JedisDataException.class) + @Test public void incrWrongValue() { - jedis.set(bfoo, binaryValue); - jedis.incr(bfoo); + Assertions.assertThrows(JedisDataException.class, () -> { + jedis.set(bfoo, binaryValue); + jedis.incr(bfoo); + }); } @Test @@ -258,10 +261,12 @@ public void incrBy() { assertEquals(4, jedis.incrBy(bfoo, 2)); } - @Test(expected = JedisDataException.class) + @Test public void incrByWrongValue() { - jedis.set(bfoo, binaryValue); - jedis.incrBy(bfoo, 2); + Assertions.assertThrows(JedisDataException.class, () -> { + jedis.set(bfoo, binaryValue); + jedis.incrBy(bfoo, 2); + }); } @Test @@ -276,10 +281,12 @@ public void decr() { assertEquals(-2, jedis.decr(bfoo)); } - @Test(expected = JedisDataException.class) + @Test public void decrWrongValue() { - jedis.set(bfoo, binaryValue); - jedis.decr(bfoo); + Assertions.assertThrows(JedisDataException.class, () -> { + jedis.set(bfoo, binaryValue); + jedis.decr(bfoo); + }); } @Test @@ -288,10 +295,12 @@ public void decrBy() { assertEquals(-4, jedis.decrBy(bfoo, 2)); } - @Test(expected = JedisDataException.class) + @Test public void decrByWrongValue() { - jedis.set(bfoo, binaryValue); - jedis.decrBy(bfoo, 2); + Assertions.assertThrows(JedisDataException.class, () -> { + jedis.set(bfoo, binaryValue); + jedis.decrBy(bfoo, 2); + }); } @Test diff --git a/src/test/java/redis/clients/jedis/commands/jedis/BitCommandsTest.java b/src/test/java/redis/clients/jedis/commands/jedis/BitCommandsTest.java index d74c848081..95c88d8656 100644 --- a/src/test/java/redis/clients/jedis/commands/jedis/BitCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/jedis/BitCommandsTest.java @@ -1,17 +1,13 @@ package redis.clients.jedis.commands.jedis; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - import java.util.List; import io.redis.test.annotations.SinceRedisVersion; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; + import redis.clients.jedis.Protocol; import redis.clients.jedis.RedisProtocol; @@ -21,7 +17,14 @@ import redis.clients.jedis.params.BitPosParams; import redis.clients.jedis.util.SafeEncoder; -@RunWith(Parameterized.class) +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; + +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class BitCommandsTest extends JedisCommandsTestBase { public BitCommandsTest(RedisProtocol protocol) { @@ -254,9 +257,11 @@ public void bitOpBinary() { assertArrayEquals(new byte[]{0x79}, jedis.get(dest)); } - @Test(expected = JedisDataException.class) + @Test public void bitOpNotMultiSourceShouldFail() { - jedis.bitop(BitOP.NOT, "dest", "src1", "src2"); + Assertions.assertThrows(JedisDataException.class, () -> { + jedis.bitop(BitOP.NOT, "dest", "src1", "src2"); + }); } @Test diff --git a/src/test/java/redis/clients/jedis/commands/jedis/ClientCommandsTest.java b/src/test/java/redis/clients/jedis/commands/jedis/ClientCommandsTest.java index 181ec65da3..4d2b83dc6c 100644 --- a/src/test/java/redis/clients/jedis/commands/jedis/ClientCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/jedis/ClientCommandsTest.java @@ -1,10 +1,10 @@ package redis.clients.jedis.commands.jedis; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import static redis.clients.jedis.params.ClientKillParams.SkipMe; import java.util.concurrent.ExecutionException; @@ -16,12 +16,12 @@ import java.util.regex.Pattern; import io.redis.test.annotations.SinceRedisVersion; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import redis.clients.jedis.Jedis; import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.args.ClientAttributeOption; @@ -31,7 +31,8 @@ import redis.clients.jedis.params.ClientKillParams; import redis.clients.jedis.resps.TrackingInfo; -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class ClientCommandsTest extends JedisCommandsTestBase { private final String clientName = "fancy_jedis_name"; @@ -44,7 +45,7 @@ public ClientCommandsTest(RedisProtocol protocol) { super(protocol); } - @Before + @BeforeEach @Override public void setUp() throws Exception { super.setUp(); @@ -53,7 +54,7 @@ public void setUp() throws Exception { client.clientSetname(clientName); } - @After + @AfterEach @Override public void tearDown() throws Exception { client.close(); diff --git a/src/test/java/redis/clients/jedis/commands/jedis/ClusterBinaryValuesCommandsTest.java b/src/test/java/redis/clients/jedis/commands/jedis/ClusterBinaryValuesCommandsTest.java index bb24b6629f..f016b52f5b 100644 --- a/src/test/java/redis/clients/jedis/commands/jedis/ClusterBinaryValuesCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/jedis/ClusterBinaryValuesCommandsTest.java @@ -1,9 +1,11 @@ package redis.clients.jedis.commands.jedis; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; + import static redis.clients.jedis.Protocol.Command.*; import static redis.clients.jedis.util.AssertUtil.assertByteArrayListEquals; @@ -12,8 +14,8 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.GeoCoordinate; import redis.clients.jedis.args.GeoUnit; import redis.clients.jedis.params.GeoRadiusParam; @@ -151,8 +153,10 @@ public void testGeneralCommand() { assertEquals("2", SafeEncoder.encode((byte[]) returnObj)); } - @Test(expected = IllegalArgumentException.class) + @Test public void failKeys() { - cluster.keys("*".getBytes()); + assertThrows(IllegalArgumentException.class, () -> { + cluster.keys("*".getBytes()); + }); } } diff --git a/src/test/java/redis/clients/jedis/commands/jedis/ClusterCommandsTest.java b/src/test/java/redis/clients/jedis/commands/jedis/ClusterCommandsTest.java index adae4b9c2b..6b73c769a6 100644 --- a/src/test/java/redis/clients/jedis/commands/jedis/ClusterCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/jedis/ClusterCommandsTest.java @@ -1,10 +1,6 @@ package redis.clients.jedis.commands.jedis; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; + import java.util.List; import java.util.Map; @@ -12,8 +8,13 @@ import io.redis.test.annotations.SinceRedisVersion; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; -import org.junit.*; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; import redis.clients.jedis.DefaultJedisClientConfig; import redis.clients.jedis.HostAndPort; import redis.clients.jedis.Jedis; @@ -24,7 +25,15 @@ import redis.clients.jedis.resps.ClusterShardNodeInfo; import redis.clients.jedis.util.JedisClusterCRC16; import redis.clients.jedis.util.JedisClusterTestUtil; -import redis.clients.jedis.util.RedisVersionRule; +import redis.clients.jedis.util.RedisVersionCondition; + +import static org.junit.jupiter.api.Assertions.assertInstanceOf; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class ClusterCommandsTest { @@ -34,11 +43,11 @@ public class ClusterCommandsTest { private static HostAndPort nodeInfo1 = HostAndPorts.getClusterServers().get(0); private static HostAndPort nodeInfo2 = HostAndPorts.getClusterServers().get(1); - @Rule - public RedisVersionRule versionRule = new RedisVersionRule(nodeInfo1, + @RegisterExtension + public RedisVersionCondition versionCondition = new RedisVersionCondition(nodeInfo1, DefaultJedisClientConfig.builder().password("cluster").build()); - @Before + @BeforeEach public void setUp() throws Exception { node1 = new Jedis(nodeInfo1); node1.auth("cluster"); @@ -49,18 +58,18 @@ public void setUp() throws Exception { node2.flushAll(); } - @After + @AfterEach public void tearDown() { node1.disconnect(); node2.disconnect(); } - @BeforeClass + @BeforeAll public static void resetRedisBefore() { removeSlots(); } - @AfterClass + @AfterAll public static void resetRedisAfter() { removeSlots(); } @@ -195,12 +204,12 @@ public void clusterSlots() { List slotInfo = (List) slotInfoObj; assertTrue(slotInfo.size() >= 2); - assertTrue(slotInfo.get(0) instanceof Long); - assertTrue(slotInfo.get(1) instanceof Long); + assertInstanceOf(Long.class, slotInfo.get(0)); + assertInstanceOf(Long.class, slotInfo.get(1)); if (slotInfo.size() > 2) { // assigned slots - assertTrue(slotInfo.get(2) instanceof List); + assertInstanceOf(List.class, slotInfo.get(2)); } } node1.clusterDelSlots(3000, 3001, 3002); diff --git a/src/test/java/redis/clients/jedis/commands/jedis/ClusterJedisCommandsTestBase.java b/src/test/java/redis/clients/jedis/commands/jedis/ClusterJedisCommandsTestBase.java index 9db81d5651..a320693dad 100644 --- a/src/test/java/redis/clients/jedis/commands/jedis/ClusterJedisCommandsTestBase.java +++ b/src/test/java/redis/clients/jedis/commands/jedis/ClusterJedisCommandsTestBase.java @@ -5,19 +5,18 @@ import java.util.HashSet; import java.util.Set; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.Rule; - +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.extension.RegisterExtension; import redis.clients.jedis.DefaultJedisClientConfig; import redis.clients.jedis.HostAndPort; import redis.clients.jedis.Jedis; import redis.clients.jedis.HostAndPorts; import redis.clients.jedis.JedisCluster; -import redis.clients.jedis.util.EnabledOnCommandRule; +import redis.clients.jedis.util.EnabledOnCommandCondition; import redis.clients.jedis.util.JedisClusterCRC16; -import redis.clients.jedis.util.RedisVersionRule; +import redis.clients.jedis.util.RedisVersionCondition; public abstract class ClusterJedisCommandsTestBase { @@ -31,12 +30,12 @@ public abstract class ClusterJedisCommandsTestBase { private final Set jedisClusterNode = new HashSet<>(); JedisCluster cluster; - @Rule - public RedisVersionRule versionRule = new RedisVersionRule(nodeInfo1, DefaultJedisClientConfig.builder().password("cluster").build()); - @Rule - public EnabledOnCommandRule enabledOnCommandRule = new EnabledOnCommandRule(nodeInfo1, DefaultJedisClientConfig.builder().password("cluster").build()); + @RegisterExtension + public RedisVersionCondition versionCondition = new RedisVersionCondition(nodeInfo1, DefaultJedisClientConfig.builder().password("cluster").build()); + @RegisterExtension + public EnabledOnCommandCondition enabledOnCommandCondition = new EnabledOnCommandCondition(nodeInfo1, DefaultJedisClientConfig.builder().password("cluster").build()); - @Before + @BeforeEach public void setUp() throws InterruptedException { node1 = new Jedis(nodeInfo1); node1.auth("cluster"); @@ -82,7 +81,7 @@ public void setUp() throws InterruptedException { cluster = new JedisCluster(jedisClusterNode, null, "cluster"); } - @AfterClass + @AfterAll public static void cleanUp() { int slotTest = JedisClusterCRC16.getSlot("test"); int slot51 = JedisClusterCRC16.getSlot("51"); @@ -94,7 +93,7 @@ public static void cleanUp() { } } - @After + @AfterEach public void tearDown() { // clear all slots int[] slotsToDelete = new int[CLUSTER_HASHSLOTS]; diff --git a/src/test/java/redis/clients/jedis/commands/jedis/ClusterScriptingCommandsTest.java b/src/test/java/redis/clients/jedis/commands/jedis/ClusterScriptingCommandsTest.java index bb5e4c4688..53039469d8 100644 --- a/src/test/java/redis/clients/jedis/commands/jedis/ClusterScriptingCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/jedis/ClusterScriptingCommandsTest.java @@ -1,10 +1,5 @@ package redis.clients.jedis.commands.jedis; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertThrows; -import static org.junit.Assert.assertTrue; - import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -12,17 +7,23 @@ import java.util.Map; import io.redis.test.annotations.SinceRedisVersion; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.HostAndPort; import redis.clients.jedis.args.FlushMode; import redis.clients.jedis.exceptions.JedisBroadcastException; import redis.clients.jedis.exceptions.JedisClusterOperationException; import redis.clients.jedis.exceptions.JedisDataException; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + + public class ClusterScriptingCommandsTest extends ClusterJedisCommandsTestBase { - @Test(expected = JedisClusterOperationException.class) + @Test public void testJedisClusterException() { String script = "return {KEYS[1],KEYS[2],ARGV[1],ARGV[2],ARGV[3]}"; List keys = new ArrayList<>(); @@ -32,7 +33,10 @@ public void testJedisClusterException() { args.add("first"); args.add("second"); args.add("third"); - cluster.eval(script, keys, args); + + assertThrows(JedisClusterOperationException.class, () -> { + cluster.eval(script, keys, args); + }); } @Test @@ -57,7 +61,7 @@ public void testEvalsha() { assertEquals("10", o.toString()); } - @Test(expected = JedisClusterOperationException.class) + @Test public void testJedisClusterException2() { byte[] script = "return {KEYS[1],KEYS[2],ARGV[1],ARGV[2],ARGV[3]}".getBytes(); List keys = new ArrayList(); @@ -67,7 +71,9 @@ public void testJedisClusterException2() { args.add("first".getBytes()); args.add("second".getBytes()); args.add("third".getBytes()); - cluster.eval(script, keys, args); + + assertThrows( JedisClusterOperationException.class, ()-> cluster.eval(script, keys, args)); + } @Test @@ -86,10 +92,10 @@ public void testBinaryScriptFlush() { assertEquals("OK", cluster.scriptFlush(byteKey, FlushMode.SYNC)); } - @Test(expected = JedisDataException.class) + @Test public void testBinaryScriptKill() { byte[] byteKey = "key1".getBytes(); - cluster.scriptKill(byteKey); + assertThrows(JedisDataException.class, ()-> cluster.scriptKill(byteKey)); } @Test diff --git a/src/test/java/redis/clients/jedis/commands/jedis/ClusterShardedPublishSubscribeCommandsTest.java b/src/test/java/redis/clients/jedis/commands/jedis/ClusterShardedPublishSubscribeCommandsTest.java index 4eba70413c..eadd3cb941 100644 --- a/src/test/java/redis/clients/jedis/commands/jedis/ClusterShardedPublishSubscribeCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/jedis/ClusterShardedPublishSubscribeCommandsTest.java @@ -2,15 +2,15 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasItems; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.HashMap; import java.util.Map; import io.redis.test.annotations.SinceRedisVersion; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.BinaryJedisShardedPubSub; import redis.clients.jedis.Connection; import redis.clients.jedis.Jedis; diff --git a/src/test/java/redis/clients/jedis/commands/jedis/ClusterValuesCommandsTest.java b/src/test/java/redis/clients/jedis/commands/jedis/ClusterValuesCommandsTest.java index 743baa324c..99f83521d0 100644 --- a/src/test/java/redis/clients/jedis/commands/jedis/ClusterValuesCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/jedis/ClusterValuesCommandsTest.java @@ -2,9 +2,9 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.notNullValue; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.fail; import java.util.ArrayList; import java.util.HashMap; @@ -12,8 +12,8 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.BuilderFactory; import redis.clients.jedis.CommandArguments; import redis.clients.jedis.CommandObject; diff --git a/src/test/java/redis/clients/jedis/commands/jedis/ControlCommandsTest.java b/src/test/java/redis/clients/jedis/commands/jedis/ControlCommandsTest.java index a90699f19d..7cf154aaf3 100644 --- a/src/test/java/redis/clients/jedis/commands/jedis/ControlCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/jedis/ControlCommandsTest.java @@ -2,13 +2,14 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.greaterThan; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertThrows; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.HashSet; import java.util.List; @@ -24,9 +25,9 @@ import io.redis.test.annotations.SinceRedisVersion; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import redis.clients.jedis.*; import redis.clients.jedis.args.ClientPauseMode; @@ -42,7 +43,8 @@ import redis.clients.jedis.util.KeyValue; import redis.clients.jedis.util.SafeEncoder; -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class ControlCommandsTest extends JedisCommandsTestBase { public ControlCommandsTest(RedisProtocol redisProtocol) { @@ -132,14 +134,14 @@ public void roleMaster() { List role = master.role(); assertEquals("master", role.get(0)); - assertTrue(role.get(1) instanceof Long); - assertTrue(role.get(2) instanceof List); + assertInstanceOf(Long.class, role.get(1)); + assertInstanceOf(List.class, role.get(2)); // binary List brole = master.roleBinary(); assertArrayEquals("master".getBytes(), (byte[]) brole.get(0)); - assertTrue(brole.get(1) instanceof Long); - assertTrue(brole.get(2) instanceof List); + assertInstanceOf(Long.class, brole.get(1)); + assertInstanceOf(List.class, brole.get(2)); } } @@ -156,14 +158,14 @@ public void roleSlave() { assertEquals("slave", role.get(0)); assertEquals((long) primaryEndpoint.getPort(), role.get(2)); assertEquals("connected", role.get(3)); - assertTrue(role.get(4) instanceof Long); + assertInstanceOf(Long.class, role.get(4)); // binary List brole = slave.roleBinary(); assertArrayEquals("slave".getBytes(), (byte[]) brole.get(0)); assertEquals((long) primaryEndpoint.getPort(), brole.get(2)); assertArrayEquals("connected".getBytes(), (byte[]) brole.get(3)); - assertTrue(brole.get(4) instanceof Long); + assertInstanceOf(Long.class, brole.get(4)); } } @@ -173,13 +175,13 @@ public void roleSentinel() { List role = sentinel.role(); assertEquals("sentinel", role.get(0)); - assertTrue(role.get(1) instanceof List); + assertInstanceOf(List.class, role.get(1)); AssertUtil.assertCollectionContains((List) role.get(1), "mymaster"); // binary List brole = sentinel.roleBinary(); assertArrayEquals("sentinel".getBytes(), (byte[]) brole.get(0)); - assertTrue(brole.get(1) instanceof List); + assertInstanceOf(List.class, brole.get(1)); AssertUtil.assertByteArrayCollectionContains((List) brole.get(1), "mymaster".getBytes()); } } @@ -194,12 +196,13 @@ public void run() { Thread.sleep(100); } catch (InterruptedException e) { } - Jedis j = new Jedis(endpoint.getHostAndPort()); - j.auth(endpoint.getPassword()); - for (int i = 0; i < 5; i++) { - j.incr("foobared"); + try (Jedis j = new Jedis(endpoint.getHostAndPort())) { + j.auth(endpoint.getPassword()); + for (int i = 0; i < 5; i++) { + j.incr("foobared"); + } + j.disconnect(); } - j.disconnect(); } }).start(); diff --git a/src/test/java/redis/clients/jedis/commands/jedis/FailoverCommandsTest.java b/src/test/java/redis/clients/jedis/commands/jedis/FailoverCommandsTest.java index cd5bd5b025..f079bbec9a 100644 --- a/src/test/java/redis/clients/jedis/commands/jedis/FailoverCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/jedis/FailoverCommandsTest.java @@ -1,11 +1,7 @@ package redis.clients.jedis.commands.jedis; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; - -import org.junit.Before; -import org.junit.Test; - +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import redis.clients.jedis.EndpointConfig; import redis.clients.jedis.HostAndPort; import redis.clients.jedis.Jedis; @@ -13,6 +9,10 @@ import redis.clients.jedis.params.FailoverParams; import redis.clients.jedis.HostAndPorts; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.fail; + public class FailoverCommandsTest { private static final int INVALID_PORT = 6000; @@ -23,7 +23,7 @@ public class FailoverCommandsTest { private HostAndPort masterAddress; private HostAndPort replicaAddress; - @Before + @BeforeEach public void prepare() { String role1, role2; try (Jedis jedis1 = new Jedis(node1.getHostAndPort(), node1.getClientConfigBuilder().build())) { @@ -69,18 +69,18 @@ public void failoverReplica() { } } - @Test(expected = IllegalArgumentException.class) + @Test public void failoverForceWithoutToFailFast() { try (Jedis master = new Jedis(masterAddress)) { - assertEquals("OK", master.failover(FailoverParams.failoverParams() + assertThrows(IllegalArgumentException.class, () -> master.failover(FailoverParams.failoverParams() .timeout(100).force())); } } - @Test(expected = IllegalArgumentException.class) + @Test public void failoverForceWithoutTimeoutFailFast() { try (Jedis master = new Jedis(masterAddress)) { - assertEquals("OK", master.failover(FailoverParams.failoverParams() + assertThrows(IllegalArgumentException.class, ()-> master.failover(FailoverParams.failoverParams() .to(new HostAndPort("127.0.0.1", INVALID_PORT)).force())); } } diff --git a/src/test/java/redis/clients/jedis/commands/jedis/GeoCommandsTest.java b/src/test/java/redis/clients/jedis/commands/jedis/GeoCommandsTest.java index 1b60c8e1ac..f0b2abebe8 100644 --- a/src/test/java/redis/clients/jedis/commands/jedis/GeoCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/jedis/GeoCommandsTest.java @@ -1,16 +1,21 @@ package redis.clients.jedis.commands.jedis; -import static org.junit.Assert.*; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import static redis.clients.jedis.util.AssertUtil.assertByteArrayListEquals; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import redis.clients.jedis.GeoCoordinate; import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.args.GeoUnit; @@ -22,7 +27,8 @@ import redis.clients.jedis.util.GeoCoordinateMatcher; import redis.clients.jedis.util.SafeEncoder; -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class GeoCommandsTest extends JedisCommandsTestBase { final byte[] bfoo = { 0x01, 0x02, 0x03, 0x04 }; final byte[] bA = { 0x0A }; diff --git a/src/test/java/redis/clients/jedis/commands/jedis/HashesCommandsTest.java b/src/test/java/redis/clients/jedis/commands/jedis/HashesCommandsTest.java index ed14b27b6b..493a6857c0 100644 --- a/src/test/java/redis/clients/jedis/commands/jedis/HashesCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/jedis/HashesCommandsTest.java @@ -11,12 +11,11 @@ import static org.hamcrest.Matchers.greaterThanOrEqualTo; import static org.hamcrest.Matchers.lessThanOrEqualTo; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertNull; - +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import static redis.clients.jedis.params.ScanParams.SCAN_POINTER_START; import static redis.clients.jedis.params.ScanParams.SCAN_POINTER_START_BINARY; import static redis.clients.jedis.util.AssertUtil.assertByteArrayListEquals; @@ -33,10 +32,11 @@ import java.util.stream.Collectors; import io.redis.test.annotations.SinceRedisVersion; -import org.junit.Rule; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; + import redis.clients.jedis.Pipeline; import redis.clients.jedis.RedisProtocol; @@ -47,17 +47,18 @@ import redis.clients.jedis.params.ScanParams; import redis.clients.jedis.resps.ScanResult; import redis.clients.jedis.util.AssertUtil; +import redis.clients.jedis.util.EnabledOnCommandCondition; import redis.clients.jedis.util.JedisByteHashMap; -import redis.clients.jedis.util.EnabledOnCommandRule; -import redis.clients.jedis.util.RedisVersionRule; +import redis.clients.jedis.util.RedisVersionCondition; -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class HashesCommandsTest extends JedisCommandsTestBase { - @Rule - public RedisVersionRule versionRule = new RedisVersionRule(endpoint); - @Rule - public EnabledOnCommandRule enabledOnCommandRule = new EnabledOnCommandRule(endpoint); + @RegisterExtension + public RedisVersionCondition versionCondition = new RedisVersionCondition(endpoint); + @RegisterExtension + public EnabledOnCommandCondition enabledOnCommandCondition = new EnabledOnCommandCondition(endpoint); final byte[] bfoo = { 0x01, 0x02, 0x03, 0x04 }; final byte[] bbar = { 0x05, 0x06, 0x07, 0x08 }; @@ -137,24 +138,24 @@ public void hgetex() { public void hgetdel() { jedis.hset("foo", "bar", "car"); assertEquals(asList("car"), jedis.hgetdel("foo", "bar")); - assertEquals(null, jedis.hget("foo", "bar")); + assertNull(jedis.hget("foo", "bar")); jedis.hset("foo", "bar", "car"); jedis.hset("foo", "bare", "care"); assertEquals(asList("car", "care"), jedis.hgetdel("foo", "bar", "bare")); - assertEquals(null, jedis.hget("foo", "bar")); - assertEquals(null, jedis.hget("foo", "bare")); + assertNull(jedis.hget("foo", "bar")); + assertNull(jedis.hget("foo", "bare")); // Binary jedis.hset(bfoo, bbar, bcar); assertByteArrayListEquals(asList(bcar), jedis.hgetdel(bfoo, bbar)); - assertEquals(null, jedis.hget(bfoo, bbar)); + assertNull(jedis.hget(bfoo, bbar)); jedis.hset(bfoo, bbar, bcar); jedis.hset(bfoo, bbare, bcare); assertByteArrayListEquals(asList(bcar, bcare), jedis.hgetdel(bfoo, bbar, bbare)); - assertEquals(null, jedis.hget(bfoo, bbar)); - assertEquals(null, jedis.hget(bfoo, bbare)); + assertNull(jedis.hget(bfoo, bbar)); + assertNull(jedis.hget(bfoo, bbare)); } @Test @@ -708,8 +709,8 @@ public void hscanNoValuesCount() { @Test public void testHstrLen_EmptyHash() { - Long response = jedis.hstrlen("myhash", "k1"); - assertEquals(0l, response.longValue()); + long response = jedis.hstrlen("myhash", "k1"); + assertEquals(0L, response); } @Test @@ -717,8 +718,8 @@ public void testHstrLen() { Map values = new HashMap<>(); values.put("key", "value"); jedis.hmset("myhash", values); - Long response = jedis.hstrlen("myhash", "key"); - assertEquals(5l, response.longValue()); + long response = jedis.hstrlen("myhash", "key"); + assertEquals(5L, response); } @@ -727,8 +728,8 @@ public void testBinaryHstrLen() { Map values = new HashMap<>(); values.put(bbar, bcar); jedis.hmset(bfoo, values); - Long response = jedis.hstrlen(bfoo, bbar); - assertEquals(4l, response.longValue()); + long response = jedis.hstrlen(bfoo, bbar); + assertEquals(4L, response); } @Test diff --git a/src/test/java/redis/clients/jedis/commands/jedis/HyperLogLogCommandsTest.java b/src/test/java/redis/clients/jedis/commands/jedis/HyperLogLogCommandsTest.java index 3367070707..fee516689c 100644 --- a/src/test/java/redis/clients/jedis/commands/jedis/HyperLogLogCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/jedis/HyperLogLogCommandsTest.java @@ -1,15 +1,18 @@ package redis.clients.jedis.commands.jedis; -import static org.junit.Assert.assertEquals; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; + import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.util.SafeEncoder; -@RunWith(Parameterized.class) +import static org.junit.jupiter.api.Assertions.assertEquals; + +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class HyperLogLogCommandsTest extends JedisCommandsTestBase { public HyperLogLogCommandsTest(RedisProtocol protocol) { diff --git a/src/test/java/redis/clients/jedis/commands/jedis/JedisCommandsTestBase.java b/src/test/java/redis/clients/jedis/commands/jedis/JedisCommandsTestBase.java index 6613d6646e..e33eba1e2b 100644 --- a/src/test/java/redis/clients/jedis/commands/jedis/JedisCommandsTestBase.java +++ b/src/test/java/redis/clients/jedis/commands/jedis/JedisCommandsTestBase.java @@ -1,34 +1,19 @@ package redis.clients.jedis.commands.jedis; -import java.util.Collection; - -import org.junit.After; -import org.junit.Before; -import org.junit.Rule; -import org.junit.runners.Parameterized.Parameters; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.extension.RegisterExtension; import redis.clients.jedis.*; -import redis.clients.jedis.commands.CommandsTestsParameters; -import redis.clients.jedis.util.EnabledOnCommandRule; -import redis.clients.jedis.util.RedisVersionRule; +import redis.clients.jedis.util.EnabledOnCommandCondition; +import redis.clients.jedis.util.RedisVersionCondition; public abstract class JedisCommandsTestBase { - @Rule - public RedisVersionRule versionRule = new RedisVersionRule(endpoint); - @Rule - public EnabledOnCommandRule enabledOnCommandRule = new EnabledOnCommandRule(endpoint); - - /** - * Input data for parameterized tests. In principle all subclasses of this - * class should be parameterized tests, to run with several versions of RESP. - * - * @see CommandsTestsParameters#respVersions() - */ - @Parameters - public static Collection data() { - return CommandsTestsParameters.respVersions(); - } + @RegisterExtension + public RedisVersionCondition versionCondition = new RedisVersionCondition(endpoint); + @RegisterExtension + public EnabledOnCommandCondition enabledOnCommandCondition = new EnabledOnCommandCondition(endpoint); protected static final EndpointConfig endpoint = HostAndPorts.getRedisEndpoint("standalone0"); @@ -49,14 +34,14 @@ public JedisCommandsTestBase(RedisProtocol protocol) { this.protocol = protocol; } - @Before + @BeforeEach public void setUp() throws Exception { jedis = new Jedis(endpoint.getHostAndPort(), endpoint.getClientConfigBuilder() .protocol(protocol).timeoutMillis(500).build()); jedis.flushAll(); } - @After + @AfterEach public void tearDown() throws Exception { jedis.close(); } diff --git a/src/test/java/redis/clients/jedis/commands/jedis/ListCommandsTest.java b/src/test/java/redis/clients/jedis/commands/jedis/ListCommandsTest.java index f8f59214b4..88d734e4bb 100644 --- a/src/test/java/redis/clients/jedis/commands/jedis/ListCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/jedis/ListCommandsTest.java @@ -1,10 +1,10 @@ package redis.clients.jedis.commands.jedis; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.fail; import static redis.clients.jedis.util.AssertUtil.assertByteArrayListEquals; import java.util.ArrayList; @@ -13,9 +13,10 @@ import java.util.List; import io.redis.test.annotations.SinceRedisVersion; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Timeout; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -27,7 +28,8 @@ import redis.clients.jedis.params.LPosParams; import redis.clients.jedis.util.KeyValue; -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class ListCommandsTest extends JedisCommandsTestBase { private final Logger logger = LoggerFactory.getLogger(getClass()); @@ -495,7 +497,8 @@ public void blpopDouble() throws InterruptedException { assertArrayEquals(bbar, bresult.getValue()); } - @Test(timeout = 5000L) + @Test + @Timeout(5) public void blpopDoubleWithSleep() { KeyValue result = jedis.blpop(0.04, "foo"); assertNull(result); @@ -609,7 +612,8 @@ public void brpopDouble() throws InterruptedException { assertArrayEquals(bbar, bresult.getValue()); } - @Test(timeout = 5000L) + @Test + @Timeout(5) public void brpopDoubleWithSleep() { KeyValue result = jedis.brpop(0.04, "foo"); assertNull(result); diff --git a/src/test/java/redis/clients/jedis/commands/jedis/MigrateTest.java b/src/test/java/redis/clients/jedis/commands/jedis/MigrateTest.java index 9d44302e37..7c297ead2b 100644 --- a/src/test/java/redis/clients/jedis/commands/jedis/MigrateTest.java +++ b/src/test/java/redis/clients/jedis/commands/jedis/MigrateTest.java @@ -1,22 +1,26 @@ package redis.clients.jedis.commands.jedis; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; + + +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; + import redis.clients.jedis.*; import redis.clients.jedis.exceptions.JedisDataException; import redis.clients.jedis.params.MigrateParams; -@RunWith(Parameterized.class) +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; + +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class MigrateTest extends JedisCommandsTestBase { private static final byte[] bfoo = { 0x01, 0x02, 0x03 }; @@ -50,7 +54,7 @@ public MigrateTest(RedisProtocol protocol) { super(protocol); } - @Before + @BeforeEach @Override public void setUp() throws Exception { super.setUp(); @@ -65,7 +69,7 @@ public void setUp() throws Exception { destAuth.select(dbAuth); } - @After + @AfterEach @Override public void tearDown() throws Exception { dest.close(); diff --git a/src/test/java/redis/clients/jedis/commands/jedis/ModuleTest.java b/src/test/java/redis/clients/jedis/commands/jedis/ModuleTest.java index c9132c3e37..6fc8fc7a4d 100644 --- a/src/test/java/redis/clients/jedis/commands/jedis/ModuleTest.java +++ b/src/test/java/redis/clients/jedis/commands/jedis/ModuleTest.java @@ -1,42 +1,43 @@ package redis.clients.jedis.commands.jedis; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.hasItem; -import static org.hamcrest.Matchers.hasProperty; -import static org.hamcrest.Matchers.not; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - import java.util.List; -import org.junit.Assume; -import org.junit.BeforeClass; +import org.junit.jupiter.api.Assumptions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import redis.clients.jedis.util.TestEnvUtil; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; import redis.clients.jedis.Module; import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.commands.ProtocolCommand; import redis.clients.jedis.util.SafeEncoder; -@RunWith(Parameterized.class) +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.hasItem; +import static org.hamcrest.Matchers.hasProperty; +import static org.hamcrest.Matchers.not; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class ModuleTest extends JedisCommandsTestBase { - @BeforeClass - public static void checkDockerEnvironment() { - Assume.assumeFalse("Module tests not supported against dockerised test env yet!", TestEnvUtil.isContainerEnv()); + @BeforeEach + public void isDockerEnv() { + Assumptions.assumeFalse(TestEnvUtil.isContainerEnv(), "Module tests not supported against dockerized test env yet!"); } - static enum ModuleCommand implements ProtocolCommand { + enum ModuleCommand implements ProtocolCommand { SIMPLE("testmodule.simple"); private final byte[] raw; - private ModuleCommand(String alt) { + ModuleCommand(String alt) { raw = SafeEncoder.encode(alt); } diff --git a/src/test/java/redis/clients/jedis/commands/jedis/ObjectCommandsTest.java b/src/test/java/redis/clients/jedis/commands/jedis/ObjectCommandsTest.java index a62cbea52a..08ca9af68b 100644 --- a/src/test/java/redis/clients/jedis/commands/jedis/ObjectCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/jedis/ObjectCommandsTest.java @@ -3,21 +3,26 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.greaterThanOrEqualTo; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; import java.util.List; -import org.junit.Assert; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; + +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; + import redis.clients.jedis.*; import redis.clients.jedis.exceptions.JedisDataException; import redis.clients.jedis.util.SafeEncoder; -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class ObjectCommandsTest extends JedisCommandsTestBase { private final String key = "mylist"; @@ -29,7 +34,7 @@ public ObjectCommandsTest(RedisProtocol protocol) { super(protocol); } - @Before + @BeforeEach @Override public void setUp() throws Exception { super.setUp(); @@ -40,7 +45,7 @@ public void setUp() throws Exception { lfuJedis.flushAll(); } - @After + @AfterEach @Override public void tearDown() throws Exception { lfuJedis.disconnect(); @@ -93,11 +98,11 @@ public void objectIdletime() throws InterruptedException { public void objectHelp() { // String List helpTexts = jedis.objectHelp(); - Assert.assertNotNull(helpTexts); + assertNotNull(helpTexts); // Binary List helpBinaryTexts = jedis.objectHelpBinary(); - Assert.assertNotNull(helpBinaryTexts); + assertNotNull(helpBinaryTexts); } @Test @@ -109,9 +114,9 @@ public void objectFreq() { // Binary assertThat(lfuJedis.objectFreq(binaryKey), greaterThanOrEqualTo(1L)); - Assert.assertNull(lfuJedis.objectFreq("no_such_key")); + assertNull(lfuJedis.objectFreq("no_such_key")); jedis.set(key, "test2"); - Assert.assertThrows("Freq is only allowed with LFU policy", JedisDataException.class, () -> jedis.objectFreq(key)); + assertThrows(JedisDataException.class, () -> jedis.objectFreq(key), "Freq is only allowed with LFU policy"); } } diff --git a/src/test/java/redis/clients/jedis/commands/jedis/PublishSubscribeCommandsTest.java b/src/test/java/redis/clients/jedis/commands/jedis/PublishSubscribeCommandsTest.java index 240c198716..8d52908d27 100644 --- a/src/test/java/redis/clients/jedis/commands/jedis/PublishSubscribeCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/jedis/PublishSubscribeCommandsTest.java @@ -2,10 +2,13 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasItems; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; + +import static org.junit.jupiter.api.Assumptions.assumeTrue; import static redis.clients.jedis.Protocol.Command.CLIENT; import java.io.IOException; @@ -20,9 +23,10 @@ import java.util.function.Consumer; import org.hamcrest.Matchers; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Timeout; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import redis.clients.jedis.BinaryJedisPubSub; import redis.clients.jedis.Jedis; @@ -31,7 +35,8 @@ import redis.clients.jedis.exceptions.JedisException; import redis.clients.jedis.util.SafeEncoder; -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class PublishSubscribeCommandsTest extends JedisCommandsTestBase { public PublishSubscribeCommandsTest(RedisProtocol protocol) { @@ -41,11 +46,11 @@ public PublishSubscribeCommandsTest(RedisProtocol protocol) { private void publishOne(final String channel, final String message) { Thread t = new Thread(new Runnable() { public void run() { - try { - Jedis j = createJedis(); + try ( Jedis j = createJedis()) { j.publish(channel, message); j.disconnect(); } catch (Exception ex) { + // ignore } } }); @@ -86,8 +91,10 @@ public void onSubscribe(String channel, int subscribedChannels) { count++; // All channels are subscribed if (count == 3) { - Jedis otherJedis = createJedis(); - List activeChannels = otherJedis.pubsubChannels(); + List activeChannels; + try (Jedis otherJedis = createJedis()) { + activeChannels = otherJedis.pubsubChannels(); + } // Since we are utilizing sentinel for the tests, there is an additional // '__sentinel__:hello' channel that has subscribers and will be returned // from PUBSUB CHANNELS. @@ -108,8 +115,10 @@ public void onSubscribe(String channel, int subscribedChannels) { count++; // All channels are subscribed if (count == 3) { - Jedis otherJedis = createJedis(); - List activeChannels = otherJedis.pubsubChannels("test*"); + List activeChannels; + try (Jedis otherJedis = createJedis()) { + activeChannels = otherJedis.pubsubChannels("test*"); + } assertThat(activeChannels, hasItems("testchan1", "testchan2", "testchan3")); unsubscribe(); } @@ -192,9 +201,11 @@ public void pubSubNumPat() { public void onPSubscribe(String pattern, int subscribedChannels) { count++; if (count == 3) { - Jedis otherJedis = createJedis(); - Long numPatterns = otherJedis.pubsubNumPat(); - assertEquals(Long.valueOf(2l), numPatterns); + Long numPatterns; + try (Jedis otherJedis = createJedis()) { + numPatterns = otherJedis.pubsubNumPat(); + } + assertEquals(Long.valueOf(2L), numPatterns); punsubscribe(); } } @@ -214,8 +225,10 @@ public void pubSubNumSub() { public void onSubscribe(String channel, int subscribedChannels) { count++; if (count == 2) { - Jedis otherJedis = createJedis(); - Map numSub = otherJedis.pubsubNumSub("testchannel1", "testchannel2"); + Map numSub; + try (Jedis otherJedis = createJedis()) { + numSub = otherJedis.pubsubNumSub("testchannel1", "testchannel2"); + } assertEquals(expectedNumSub, numSub); unsubscribe(); } @@ -470,68 +483,70 @@ public void onPMessage(byte[] pattern, byte[] channel, byte[] message) { jedis.subscribe(pubsub, SafeEncoder.encode("foo")); } - @Test(expected = JedisException.class) + @Test public void unsubscribeWhenNotSusbscribed() throws InterruptedException { JedisPubSub pubsub = new JedisPubSub() { }; - pubsub.unsubscribe(); + assertThrows(JedisException.class, pubsub::unsubscribe); } - @Test(expected = JedisException.class) + @Test public void handleClientOutputBufferLimitForSubscribeTooSlow() throws InterruptedException { - final Jedis j = createJedis(); - final AtomicBoolean exit = new AtomicBoolean(false); + assertThrows(JedisException.class, () -> { + final Jedis j = createJedis(); + final AtomicBoolean exit = new AtomicBoolean(false); - final Thread t = new Thread(new Runnable() { - public void run() { - try { + final Thread t = new Thread(new Runnable() { + public void run() { + try { - // we already set jedis1 config to - // client-output-buffer-limit pubsub 256k 128k 5 - // it means if subscriber delayed to receive over 256k or - // 128k continuously 5 sec, - // redis disconnects subscriber + // we already set jedis1 config to + // client-output-buffer-limit pubsub 256k 128k 5 + // it means if subscriber delayed to receive over 256k or + // 128k continuously 5 sec, + // redis disconnects subscriber - // we publish over 100M data for making situation for exceed - // client-output-buffer-limit - String veryLargeString = makeLargeString(10485760); + // we publish over 100M data for making situation for exceed + // client-output-buffer-limit + String veryLargeString = makeLargeString(10485760); - // 10M * 10 = 100M - for (int i = 0; i < 10 && !exit.get(); i++) { - j.publish("foo", veryLargeString); - } + // 10M * 10 = 100M + for (int i = 0; i < 10 && !exit.get(); i++) { + j.publish("foo", veryLargeString); + } - j.disconnect(); - } catch (Exception ex) { + j.disconnect(); + } catch (Exception ex) { + } } - } - }); - t.start(); - try { - jedis.subscribe(new JedisPubSub() { - public void onMessage(String channel, String message) { - try { - // wait 0.5 secs to slow down subscribe and - // client-output-buffer exceed - Thread.sleep(100); - } catch (Exception e) { + }); + t.start(); + try { + jedis.subscribe(new JedisPubSub() { + public void onMessage(String channel, String message) { try { - t.join(); - } catch (InterruptedException e1) { + // wait 0.5 secs to slow down subscribe and + // client-output-buffer exceed + Thread.sleep(100); + } catch (Exception e) { + try { + t.join(); + } catch (InterruptedException e1) { + } + + fail(e.getMessage()); } - - fail(e.getMessage()); } + }, "foo"); + } finally { + // exit the publisher thread. if exception is thrown, thread might + // still keep publishing things. + exit.set(true); + if (t.isAlive()) { + t.join(); } - }, "foo"); - } finally { - // exit the publisher thread. if exception is thrown, thread might - // still keep publishing things. - exit.set(true); - if (t.isAlive()) { - t.join(); } - } + }); } private String makeLargeString(int size) { @@ -542,9 +557,11 @@ private String makeLargeString(int size) { return sb.toString(); } - @Test(timeout = 5000) + @Test + @Timeout(5) public void subscribeCacheInvalidateChannel() { - org.junit.Assume.assumeThat(protocol, Matchers.not(RedisProtocol.RESP3)); + assumeTrue(protocol != RedisProtocol.RESP3); + final String cacheInvalidate = "__redis__:invalidate"; final AtomicBoolean onMessage = new AtomicBoolean(false); @@ -570,13 +587,14 @@ public void subscribeCacheInvalidateChannel() { long clientId = subscriber.clientId(); subscriber.sendCommand(CLIENT, "TRACKING", "ON", "REDIRECT", Long.toString(clientId), "BCAST"); subscriber.subscribe(pubsub, cacheInvalidate); - assertTrue("Subscriber didn't get any message.", onMessage.get()); + assertTrue(onMessage.get(), "Subscriber didn't get any message."); } } - @Test(timeout = 5000) + @Test + @Timeout(5) public void subscribeCacheInvalidateChannelBinary() { - org.junit.Assume.assumeThat(protocol, Matchers.not(RedisProtocol.RESP3)); + assumeTrue(protocol != RedisProtocol.RESP3); final byte[] cacheInvalidate = "__redis__:invalidate".getBytes(); final AtomicBoolean onMessage = new AtomicBoolean(false); @@ -602,7 +620,7 @@ public void subscribeCacheInvalidateChannelBinary() { long clientId = subscriber.clientId(); subscriber.sendCommand(CLIENT, "TRACKING", "ON", "REDIRECT", Long.toString(clientId), "BCAST"); subscriber.subscribe(pubsub, cacheInvalidate); - assertTrue("Subscriber didn't get any message.", onMessage.get()); + assertTrue(onMessage.get(), "Subscriber didn't get any message."); } } diff --git a/src/test/java/redis/clients/jedis/commands/jedis/ScriptingCommandsTest.java b/src/test/java/redis/clients/jedis/commands/jedis/ScriptingCommandsTest.java index 410627d9bf..4642e92433 100644 --- a/src/test/java/redis/clients/jedis/commands/jedis/ScriptingCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/jedis/ScriptingCommandsTest.java @@ -1,7 +1,5 @@ package redis.clients.jedis.commands.jedis; -import static org.junit.Assert.*; - import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -12,10 +10,11 @@ import io.redis.test.utils.RedisVersion; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; + import redis.clients.jedis.Jedis; import redis.clients.jedis.RedisProtocol; @@ -31,14 +30,24 @@ import redis.clients.jedis.util.RedisVersionUtil; import redis.clients.jedis.util.SafeEncoder; -@RunWith(Parameterized.class) +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; + +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class ScriptingCommandsTest extends JedisCommandsTestBase { public ScriptingCommandsTest(RedisProtocol redisProtocol) { super(redisProtocol); } - @Before + @BeforeEach @Override public void setUp() throws Exception { super.setUp(); @@ -203,9 +212,11 @@ public void evalshaReadonlyBinary() { assertArrayEquals(SafeEncoder.encode("bar"), result); } - @Test(expected = JedisNoScriptException.class) + @Test public void evalshaShaNotFound() { - jedis.evalsha("ffffffffffffffffffffffffffffffffffffffff"); + assertThrows(JedisNoScriptException.class, () -> { + jedis.evalsha("ffffffffffffffffffffffffffffffffffffffff"); + }); } @Test diff --git a/src/test/java/redis/clients/jedis/commands/jedis/SentinelCommandsTest.java b/src/test/java/redis/clients/jedis/commands/jedis/SentinelCommandsTest.java index 48fa43e4e6..b63b21dfeb 100644 --- a/src/test/java/redis/clients/jedis/commands/jedis/SentinelCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/jedis/SentinelCommandsTest.java @@ -1,7 +1,7 @@ package redis.clients.jedis.commands.jedis; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.Arrays; import java.util.HashMap; @@ -11,8 +11,8 @@ import java.util.stream.Collectors; import org.hamcrest.Matchers; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.HostAndPort; import redis.clients.jedis.Jedis; import redis.clients.jedis.HostAndPorts; diff --git a/src/test/java/redis/clients/jedis/commands/jedis/SetCommandsTest.java b/src/test/java/redis/clients/jedis/commands/jedis/SetCommandsTest.java index 67ede2b75c..0dd02cefbe 100644 --- a/src/test/java/redis/clients/jedis/commands/jedis/SetCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/jedis/SetCommandsTest.java @@ -1,11 +1,11 @@ package redis.clients.jedis.commands.jedis; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import static redis.clients.jedis.params.ScanParams.SCAN_POINTER_START; import static redis.clients.jedis.params.ScanParams.SCAN_POINTER_START_BINARY; import static redis.clients.jedis.util.AssertUtil.assertByteArrayCollectionContainsAll; @@ -20,15 +20,17 @@ import java.util.Set; import io.redis.test.annotations.SinceRedisVersion; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; + import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.params.ScanParams; import redis.clients.jedis.resps.ScanResult; -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class SetCommandsTest extends JedisCommandsTestBase { final byte[] bfoo = { 0x01, 0x02, 0x03, 0x04 }; final byte[] bbar = { 0x05, 0x06, 0x07, 0x08 }; diff --git a/src/test/java/redis/clients/jedis/commands/jedis/SlowlogCommandsTest.java b/src/test/java/redis/clients/jedis/commands/jedis/SlowlogCommandsTest.java index 63d6b009af..b34a347056 100644 --- a/src/test/java/redis/clients/jedis/commands/jedis/SlowlogCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/jedis/SlowlogCommandsTest.java @@ -1,9 +1,9 @@ package redis.clients.jedis.commands.jedis; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.net.InetAddress; import java.net.NetworkInterface; @@ -11,18 +11,19 @@ import java.util.*; import org.hamcrest.Matchers; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import redis.clients.jedis.Protocol; import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.resps.Slowlog; import redis.clients.jedis.util.SafeEncoder; -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class SlowlogCommandsTest extends JedisCommandsTestBase { private static final String SLOWLOG_TIME_PARAM = "slowlog-log-slower-than"; @@ -34,14 +35,14 @@ public SlowlogCommandsTest(RedisProtocol protocol) { super(protocol); } - @Before + @BeforeEach @Override public void setUp() throws Exception { super.setUp(); slowlogTimeValue = jedis.configGet(SLOWLOG_TIME_PARAM).get(SLOWLOG_TIME_PARAM); } - @After + @AfterEach @Override public void tearDown() throws Exception { jedis.configSet(SLOWLOG_TIME_PARAM, slowlogTimeValue); diff --git a/src/test/java/redis/clients/jedis/commands/jedis/SortedSetCommandsTest.java b/src/test/java/redis/clients/jedis/commands/jedis/SortedSetCommandsTest.java index d98941dc5b..5569716944 100644 --- a/src/test/java/redis/clients/jedis/commands/jedis/SortedSetCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/jedis/SortedSetCommandsTest.java @@ -1,7 +1,11 @@ package redis.clients.jedis.commands.jedis; import static java.util.Collections.singletonList; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; import static redis.clients.jedis.params.ScanParams.SCAN_POINTER_START; import static redis.clients.jedis.params.ScanParams.SCAN_POINTER_START_BINARY; import static redis.clients.jedis.util.AssertUtil.assertByteArrayListEquals; @@ -9,9 +13,9 @@ import java.util.*; import io.redis.test.annotations.SinceRedisVersion; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.args.SortedSetOption; @@ -22,7 +26,8 @@ import redis.clients.jedis.util.KeyValue; import redis.clients.jedis.util.SafeEncoder; -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class SortedSetCommandsTest extends JedisCommandsTestBase { final byte[] bfoo = { 0x01, 0x02, 0x03, 0x04 }; final byte[] bbar = { 0x05, 0x06, 0x07, 0x08 }; diff --git a/src/test/java/redis/clients/jedis/commands/jedis/SortingCommandsTest.java b/src/test/java/redis/clients/jedis/commands/jedis/SortingCommandsTest.java index 91410ce344..0d4791ed39 100644 --- a/src/test/java/redis/clients/jedis/commands/jedis/SortingCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/jedis/SortingCommandsTest.java @@ -1,20 +1,21 @@ package redis.clients.jedis.commands.jedis; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static redis.clients.jedis.util.AssertUtil.assertByteArrayListEquals; import java.util.ArrayList; import java.util.List; import io.redis.test.annotations.EnabledOnCommand; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.params.SortingParams; -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class SortingCommandsTest extends JedisCommandsTestBase { final byte[] bfoo = { 0x01, 0x02, 0x03, 0x04 }; final byte[] bfoodest = { 0x01, 0x02, 0x03, 0x04, 0x05 }; @@ -89,8 +90,8 @@ public void sortBy() { assertEquals(expected, result); // Sort to dest key - Long resultCount = jedis.sort("foo", sp, "foodest"); - assertEquals(3L, resultCount.longValue()); + long resultCount = jedis.sort("foo", sp, "foodest"); + assertEquals(3L, resultCount); result = jedis.lpop("foodest", 5); assertEquals(expected, result); @@ -118,7 +119,7 @@ public void sortBy() { // Sort to dest key resultCount = jedis.sort(bfoo, sp, bfoodest); - assertEquals(3L, resultCount.longValue()); + assertEquals(3L, resultCount); bresult = jedis.lpop(bfoodest, 5); assertByteArrayListEquals(bexpected, bresult); diff --git a/src/test/java/redis/clients/jedis/commands/jedis/StreamsCommandsTest.java b/src/test/java/redis/clients/jedis/commands/jedis/StreamsCommandsTest.java index 604911ad9d..1a3763b259 100644 --- a/src/test/java/redis/clients/jedis/commands/jedis/StreamsCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/jedis/StreamsCommandsTest.java @@ -3,12 +3,12 @@ import static java.util.Collections.singleton; import static java.util.Collections.singletonMap; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import java.time.Duration; import java.util.HashMap; @@ -21,9 +21,9 @@ import io.redis.test.annotations.SinceRedisVersion; import io.redis.test.utils.RedisVersion; import org.hamcrest.Matchers; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import redis.clients.jedis.BuilderFactory; import redis.clients.jedis.Jedis; @@ -39,7 +39,8 @@ import redis.clients.jedis.util.RedisVersionUtil; import redis.clients.jedis.util.SafeEncoder; -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class StreamsCommandsTest extends JedisCommandsTestBase { public StreamsCommandsTest(RedisProtocol protocol) { diff --git a/src/test/java/redis/clients/jedis/commands/jedis/StringValuesCommandsTest.java b/src/test/java/redis/clients/jedis/commands/jedis/StringValuesCommandsTest.java index 12bcd8aebe..f4d145b6eb 100644 --- a/src/test/java/redis/clients/jedis/commands/jedis/StringValuesCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/jedis/StringValuesCommandsTest.java @@ -1,16 +1,12 @@ package redis.clients.jedis.commands.jedis; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertNull; - import java.util.ArrayList; import java.util.List; import io.redis.test.annotations.SinceRedisVersion; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.params.LCSParams; @@ -18,7 +14,13 @@ import redis.clients.jedis.exceptions.JedisDataException; import redis.clients.jedis.params.GetExParams; -@RunWith(Parameterized.class) +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class StringValuesCommandsTest extends JedisCommandsTestBase { public StringValuesCommandsTest(RedisProtocol protocol) { @@ -150,10 +152,10 @@ public void incr() { assertEquals(2, jedis.incr("foo")); } - @Test(expected = JedisDataException.class) + @Test public void incrWrongValue() { jedis.set("foo", "bar"); - jedis.incr("foo"); + assertThrows(JedisDataException.class, () -> jedis.incr("foo")); } @Test @@ -162,10 +164,10 @@ public void incrBy() { assertEquals(5, jedis.incrBy("foo", 3)); } - @Test(expected = JedisDataException.class) + @Test public void incrByWrongValue() { jedis.set("foo", "bar"); - jedis.incrBy("foo", 2); + assertThrows(JedisDataException.class, () -> jedis.incrBy("foo", 2)); } @Test @@ -174,16 +176,16 @@ public void incrByFloat() { assertEquals(10.6, jedis.incrByFloat("foo", 0.1), 0.0); } - @Test(expected = JedisDataException.class) + @Test public void incrByFloatWrongValue() { jedis.set("foo", "bar"); - jedis.incrByFloat("foo", 2d); + assertThrows(JedisDataException.class, () -> jedis.incrByFloat("foo", 2d)); } - @Test(expected = JedisDataException.class) + @Test public void decrWrongValue() { jedis.set("foo", "bar"); - jedis.decr("foo"); + assertThrows(JedisDataException.class, () -> jedis.decr("foo")); } @Test @@ -198,10 +200,10 @@ public void decrBy() { assertEquals(-4, jedis.decrBy("foo", 2)); } - @Test(expected = JedisDataException.class) + @Test public void decrByWrongValue() { jedis.set("foo", "bar"); - jedis.decrBy("foo", 2); + assertThrows(JedisDataException.class, () -> jedis.decrBy("foo", 2)); } @Test @@ -234,10 +236,10 @@ public void incrLargeNumbers() { assertEquals(1L + Integer.MAX_VALUE, jedis.incrBy("foo", Integer.MAX_VALUE)); } - @Test(expected = JedisDataException.class) + @Test public void incrReallyLargeNumbers() { jedis.set("foo", Long.toString(Long.MAX_VALUE)); - jedis.incr("foo"); // Should throw an exception + assertThrows(JedisDataException.class, () -> jedis.incr("foo")); } @Test diff --git a/src/test/java/redis/clients/jedis/commands/jedis/TransactionCommandsTest.java b/src/test/java/redis/clients/jedis/commands/jedis/TransactionCommandsTest.java index f6bedc1741..7ab7589fb7 100644 --- a/src/test/java/redis/clients/jedis/commands/jedis/TransactionCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/jedis/TransactionCommandsTest.java @@ -1,6 +1,13 @@ package redis.clients.jedis.commands.jedis; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.ArgumentMatchers.any; import static redis.clients.jedis.Protocol.Command.INCR; @@ -12,11 +19,12 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; + +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import org.mockito.MockedStatic; import org.mockito.Mockito; @@ -29,7 +37,8 @@ import redis.clients.jedis.exceptions.JedisDataException; import redis.clients.jedis.util.SafeEncoder; -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class TransactionCommandsTest extends JedisCommandsTestBase { final byte[] bfoo = { 0x01, 0x02, 0x03, 0x04 }; final byte[] bbar = { 0x05, 0x06, 0x07, 0x08 }; @@ -44,7 +53,7 @@ public TransactionCommandsTest(RedisProtocol protocol) { super(protocol); } - @Before + @BeforeEach @Override public void setUp() throws Exception { super.setUp(); @@ -53,7 +62,7 @@ public void setUp() throws Exception { endpoint.getClientConfigBuilder().timeoutMillis(500).build()); } - @After + @AfterEach @Override public void tearDown() throws Exception { nj.close(); @@ -147,10 +156,10 @@ public void unwatch() { assertEquals("OK", resp.get(0)); } - @Test(expected = IllegalStateException.class) + @Test public void validateWhenInMulti() { jedis.multi(); - jedis.ping(); + assertThrows(IllegalStateException.class, () -> jedis.ping()); } @Test @@ -246,13 +255,13 @@ public void transactionResponseBinary() { assertArrayEquals("foo".getBytes(), set.get()); } - @Test(expected = IllegalStateException.class) + @Test public void transactionResponseWithinPipeline() { jedis.set("string", "foo"); Transaction t = jedis.multi(); Response string = t.get("string"); - string.get(); + assertThrows(IllegalStateException.class, string::get); t.exec(); } diff --git a/src/test/java/redis/clients/jedis/commands/jedis/VariadicCommandsTest.java b/src/test/java/redis/clients/jedis/commands/jedis/VariadicCommandsTest.java index 337aceab7b..c33b6720ee 100644 --- a/src/test/java/redis/clients/jedis/commands/jedis/VariadicCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/jedis/VariadicCommandsTest.java @@ -1,20 +1,22 @@ package redis.clients.jedis.commands.jedis; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; import static redis.clients.jedis.util.AssertUtil.assertByteArrayListEquals; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import redis.clients.jedis.RedisProtocol; -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class VariadicCommandsTest extends JedisCommandsTestBase { final byte[] bfoo = { 0x01, 0x02, 0x03, 0x04 }; final byte[] bbar = { 0x05, 0x06, 0x07, 0x08 }; diff --git a/src/test/java/redis/clients/jedis/commands/unified/AllKindOfValuesCommandsTestBase.java b/src/test/java/redis/clients/jedis/commands/unified/AllKindOfValuesCommandsTestBase.java index 0ae434238e..ac6489e23e 100644 --- a/src/test/java/redis/clients/jedis/commands/unified/AllKindOfValuesCommandsTestBase.java +++ b/src/test/java/redis/clients/jedis/commands/unified/AllKindOfValuesCommandsTestBase.java @@ -1,14 +1,16 @@ package redis.clients.jedis.commands.unified; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; +import static org.junit.jupiter.api.Assumptions.assumeFalse; +import static org.junit.jupiter.api.Assumptions.assumeTrue; import static redis.clients.jedis.Protocol.Command.BLPOP; import static redis.clients.jedis.Protocol.Command.GET; import static redis.clients.jedis.Protocol.Command.HGETALL; @@ -32,10 +34,9 @@ import io.redis.test.annotations.SinceRedisVersion; import org.hamcrest.Matchers; -import org.junit.Assume; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.ScanIteration; import redis.clients.jedis.StreamEntryID; @@ -433,7 +434,7 @@ public void dumpAndRestore() { } @Test - @Ignore(value = "TODO: Regression in 8.0-M02 discarding restore idle time.") + @Disabled(value = "TODO: Regression in 8.0-M02 discarding restore idle time.") public void restoreParams() { jedis.set("foo", "bar"); jedis.set("from", "a"); @@ -813,7 +814,7 @@ public void encodeCompleteResponsePing() { @Test public void encodeCompleteResponseHgetall() { - Assume.assumeFalse(protocol == RedisProtocol.RESP3); + assumeFalse(protocol == RedisProtocol.RESP3); HashMap entries = new HashMap<>(); entries.put("foo", "bar"); @@ -831,7 +832,7 @@ public void encodeCompleteResponseHgetall() { @Test public void encodeCompleteResponseHgetallResp3() { - Assume.assumeTrue(protocol == RedisProtocol.RESP3); + assumeTrue(protocol == RedisProtocol.RESP3); HashMap entries = new HashMap<>(); entries.put("foo", "bar"); @@ -848,7 +849,7 @@ public void encodeCompleteResponseHgetallResp3() { @Test public void encodeCompleteResponseXinfoStream() { - Assume.assumeFalse(protocol == RedisProtocol.RESP3); + assumeFalse(protocol == RedisProtocol.RESP3); HashMap entry = new HashMap<>(); entry.put("foo", "bar"); @@ -860,7 +861,7 @@ public void encodeCompleteResponseXinfoStream() { List encodeObj = (List) SafeEncoder.encodeObject(obj); assertThat(encodeObj.size(), Matchers.greaterThanOrEqualTo(14)); - assertEquals("must have even number of elements", 0, encodeObj.size() % 2); // must be even + assertEquals( 0, encodeObj.size() % 2, "must have even number of elements"); // must be even assertEquals(1L, findValueFromMapAsList(encodeObj, "length")); assertEquals(entryID.toString(), findValueFromMapAsList(encodeObj, "last-generated-id")); @@ -875,7 +876,7 @@ public void encodeCompleteResponseXinfoStream() { @Test public void encodeCompleteResponseXinfoStreamResp3() { - Assume.assumeTrue(protocol == RedisProtocol.RESP3); + assumeTrue(protocol == RedisProtocol.RESP3); HashMap entry = new HashMap<>(); entry.put("foo", "bar"); diff --git a/src/test/java/redis/clients/jedis/commands/unified/BinaryValuesCommandsTestBase.java b/src/test/java/redis/clients/jedis/commands/unified/BinaryValuesCommandsTestBase.java index f34291d042..0dc28baeed 100644 --- a/src/test/java/redis/clients/jedis/commands/unified/BinaryValuesCommandsTestBase.java +++ b/src/test/java/redis/clients/jedis/commands/unified/BinaryValuesCommandsTestBase.java @@ -1,10 +1,10 @@ package redis.clients.jedis.commands.unified; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import static redis.clients.jedis.Protocol.Command.BLPOP; import static redis.clients.jedis.Protocol.Command.GET; import static redis.clients.jedis.Protocol.Command.LRANGE; @@ -16,9 +16,8 @@ import java.util.ArrayList; import java.util.List; -import org.junit.Before; -import org.junit.Test; - +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import redis.clients.jedis.Protocol; import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.exceptions.JedisDataException; @@ -40,7 +39,7 @@ public BinaryValuesCommandsTestBase(RedisProtocol protocol) { super(protocol); } - @Before + @BeforeEach public void startUp() { StringBuilder sb = new StringBuilder(); @@ -244,10 +243,10 @@ public void incr() { assertEquals(2, jedis.incr(bfoo)); } - @Test(expected = JedisDataException.class) + @Test public void incrWrongValue() { jedis.set(bfoo, binaryValue); - jedis.incr(bfoo); + assertThrows(JedisDataException.class, () -> jedis.incr(bfoo)); } @Test @@ -256,10 +255,10 @@ public void incrBy() { assertEquals(4, jedis.incrBy(bfoo, 2)); } - @Test(expected = JedisDataException.class) + @Test public void incrByWrongValue() { jedis.set(bfoo, binaryValue); - jedis.incrBy(bfoo, 2); + assertThrows(JedisDataException.class, ()->jedis.incrBy(bfoo, 2)); } @Test @@ -274,10 +273,10 @@ public void decr() { assertEquals(-2, jedis.decr(bfoo)); } - @Test(expected = JedisDataException.class) + @Test public void decrWrongValue() { jedis.set(bfoo, binaryValue); - jedis.decr(bfoo); + assertThrows(JedisDataException.class, ()->jedis.decr(bfoo)); } @Test @@ -286,10 +285,10 @@ public void decrBy() { assertEquals(-4, jedis.decrBy(bfoo, 2)); } - @Test(expected = JedisDataException.class) + @Test public void decrByWrongValue() { jedis.set(bfoo, binaryValue); - jedis.decrBy(bfoo, 2); + assertThrows(JedisDataException.class, ()->jedis.decrBy(bfoo, 2)); } @Test diff --git a/src/test/java/redis/clients/jedis/commands/unified/BitCommandsTestBase.java b/src/test/java/redis/clients/jedis/commands/unified/BitCommandsTestBase.java index 1465edea5b..55a2e6a646 100644 --- a/src/test/java/redis/clients/jedis/commands/unified/BitCommandsTestBase.java +++ b/src/test/java/redis/clients/jedis/commands/unified/BitCommandsTestBase.java @@ -1,16 +1,10 @@ package redis.clients.jedis.commands.unified; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - import java.util.List; import io.redis.test.annotations.SinceRedisVersion; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.Protocol; import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.args.BitCountOption; @@ -19,6 +13,13 @@ import redis.clients.jedis.params.BitPosParams; import redis.clients.jedis.util.SafeEncoder; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; + public abstract class BitCommandsTestBase extends UnifiedJedisCommandsTestBase { public BitCommandsTestBase(RedisProtocol protocol) { @@ -242,9 +243,9 @@ public void bitOpBinary() { assertArrayEquals(new byte[]{0x79}, jedis.get(dest)); } - @Test(expected = JedisDataException.class) + @Test public void bitOpNotMultiSourceShouldFail() { - jedis.bitop(BitOP.NOT, "dest", "src1", "src2"); + assertThrows(JedisDataException.class, () -> jedis.bitop(BitOP.NOT, "dest", "src1", "src2")); } @Test diff --git a/src/test/java/redis/clients/jedis/commands/unified/GeoCommandsTestBase.java b/src/test/java/redis/clients/jedis/commands/unified/GeoCommandsTestBase.java index 292d3d5ee2..51817b1d9b 100644 --- a/src/test/java/redis/clients/jedis/commands/unified/GeoCommandsTestBase.java +++ b/src/test/java/redis/clients/jedis/commands/unified/GeoCommandsTestBase.java @@ -1,13 +1,11 @@ package redis.clients.jedis.commands.unified; -import static org.junit.Assert.*; - import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.GeoCoordinate; import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.args.GeoUnit; @@ -20,6 +18,13 @@ import redis.clients.jedis.util.GeoCoordinateMatcher; import redis.clients.jedis.util.SafeEncoder; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; + public abstract class GeoCommandsTestBase extends UnifiedJedisCommandsTestBase { protected final byte[] bfoo = { 0x01, 0x02, 0x03, 0x04 }; protected final byte[] bA = { 0x0A }; diff --git a/src/test/java/redis/clients/jedis/commands/unified/HashesCommandsTestBase.java b/src/test/java/redis/clients/jedis/commands/unified/HashesCommandsTestBase.java index 7bc1c3b486..7042bf325b 100644 --- a/src/test/java/redis/clients/jedis/commands/unified/HashesCommandsTestBase.java +++ b/src/test/java/redis/clients/jedis/commands/unified/HashesCommandsTestBase.java @@ -11,12 +11,11 @@ import static org.hamcrest.Matchers.greaterThanOrEqualTo; import static org.hamcrest.Matchers.lessThanOrEqualTo; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertNull; - +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import static redis.clients.jedis.params.ScanParams.SCAN_POINTER_START; import static redis.clients.jedis.params.ScanParams.SCAN_POINTER_START_BINARY; import static redis.clients.jedis.util.AssertUtil.assertByteArrayListEquals; @@ -33,8 +32,8 @@ import java.util.stream.Collectors; import io.redis.test.annotations.SinceRedisVersion; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.args.ExpiryOption; import redis.clients.jedis.params.HGetExParams; diff --git a/src/test/java/redis/clients/jedis/commands/unified/HyperLogLogCommandsTestBase.java b/src/test/java/redis/clients/jedis/commands/unified/HyperLogLogCommandsTestBase.java index 06b6d312df..892dbca7cd 100644 --- a/src/test/java/redis/clients/jedis/commands/unified/HyperLogLogCommandsTestBase.java +++ b/src/test/java/redis/clients/jedis/commands/unified/HyperLogLogCommandsTestBase.java @@ -1,12 +1,11 @@ package redis.clients.jedis.commands.unified; -import static org.junit.Assert.assertEquals; - -import org.junit.Test; - +import org.junit.jupiter.api.Test; import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.util.SafeEncoder; +import static org.junit.jupiter.api.Assertions.assertEquals; + public abstract class HyperLogLogCommandsTestBase extends UnifiedJedisCommandsTestBase { public HyperLogLogCommandsTestBase(RedisProtocol protocol) { diff --git a/src/test/java/redis/clients/jedis/commands/unified/ListCommandsTestBase.java b/src/test/java/redis/clients/jedis/commands/unified/ListCommandsTestBase.java index 04f4d04b90..85476f2110 100644 --- a/src/test/java/redis/clients/jedis/commands/unified/ListCommandsTestBase.java +++ b/src/test/java/redis/clients/jedis/commands/unified/ListCommandsTestBase.java @@ -1,10 +1,10 @@ package redis.clients.jedis.commands.unified; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.fail; import static redis.clients.jedis.util.AssertUtil.assertByteArrayListEquals; import java.util.ArrayList; @@ -13,7 +13,8 @@ import java.util.List; import io.redis.test.annotations.SinceRedisVersion; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Timeout; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -491,7 +492,8 @@ public void blpopDouble() throws InterruptedException { assertArrayEquals(bbar, bresult.getValue()); } - @Test(timeout = 5000L) + @Test + @Timeout(5) public void blpopDoubleWithSleep() { KeyValue result = jedis.blpop(0.04, "foo"); assertNull(result); @@ -603,7 +605,8 @@ public void brpopDouble() throws InterruptedException { assertArrayEquals(bbar, bresult.getValue()); } - @Test(timeout = 5000L) + @Test + @Timeout(5) public void brpopDoubleWithSleep() { KeyValue result = jedis.brpop(0.04, "foo"); assertNull(result); diff --git a/src/test/java/redis/clients/jedis/commands/unified/SetCommandsTestBase.java b/src/test/java/redis/clients/jedis/commands/unified/SetCommandsTestBase.java index 3f21a2f9f5..25eb631145 100644 --- a/src/test/java/redis/clients/jedis/commands/unified/SetCommandsTestBase.java +++ b/src/test/java/redis/clients/jedis/commands/unified/SetCommandsTestBase.java @@ -1,11 +1,10 @@ package redis.clients.jedis.commands.unified; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import static redis.clients.jedis.params.ScanParams.SCAN_POINTER_START; import static redis.clients.jedis.params.ScanParams.SCAN_POINTER_START_BINARY; import static redis.clients.jedis.util.AssertUtil.assertByteArrayCollectionContainsAll; @@ -20,8 +19,8 @@ import java.util.Set; import io.redis.test.annotations.SinceRedisVersion; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.params.ScanParams; import redis.clients.jedis.resps.ScanResult; diff --git a/src/test/java/redis/clients/jedis/commands/unified/SortedSetCommandsTestBase.java b/src/test/java/redis/clients/jedis/commands/unified/SortedSetCommandsTestBase.java index 000a005eb6..e4f4bdfa12 100644 --- a/src/test/java/redis/clients/jedis/commands/unified/SortedSetCommandsTestBase.java +++ b/src/test/java/redis/clients/jedis/commands/unified/SortedSetCommandsTestBase.java @@ -1,7 +1,11 @@ package redis.clients.jedis.commands.unified; import static java.util.Collections.singletonList; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; import static redis.clients.jedis.params.ScanParams.SCAN_POINTER_START; import static redis.clients.jedis.params.ScanParams.SCAN_POINTER_START_BINARY; import static redis.clients.jedis.util.AssertUtil.assertByteArrayListEquals; @@ -9,8 +13,8 @@ import java.util.*; import io.redis.test.annotations.SinceRedisVersion; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.args.SortedSetOption; import redis.clients.jedis.params.*; diff --git a/src/test/java/redis/clients/jedis/commands/unified/StringValuesCommandsTestBase.java b/src/test/java/redis/clients/jedis/commands/unified/StringValuesCommandsTestBase.java index dfc6aa9b1c..491d304eea 100644 --- a/src/test/java/redis/clients/jedis/commands/unified/StringValuesCommandsTestBase.java +++ b/src/test/java/redis/clients/jedis/commands/unified/StringValuesCommandsTestBase.java @@ -1,16 +1,17 @@ package redis.clients.jedis.commands.unified; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import static redis.clients.jedis.params.SetParams.setParams; import java.util.ArrayList; import java.util.List; import io.redis.test.annotations.SinceRedisVersion; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.params.LCSParams; import redis.clients.jedis.resps.LCSMatchResult; @@ -75,7 +76,7 @@ public void getEx() { long ttl = jedis.ttl("foo"); assertTrue(ttl > 0 && ttl <= 10); - assertEquals("bar", jedis.getEx("foo", GetExParams.getExParams().px(20000l))); + assertEquals("bar", jedis.getEx("foo", GetExParams.getExParams().px(20000L))); ttl = jedis.ttl("foo"); assertTrue(ttl > 10 && ttl <= 20); @@ -83,7 +84,7 @@ public void getEx() { ttl = jedis.ttl("foo"); assertTrue(ttl > 20 && ttl <= 30); - assertEquals("bar", jedis.getEx("foo", GetExParams.getExParams().pxAt(System.currentTimeMillis() + 40000l))); + assertEquals("bar", jedis.getEx("foo", GetExParams.getExParams().pxAt(System.currentTimeMillis() + 40000L))); ttl = jedis.ttl("foo"); assertTrue(ttl > 30 && ttl <= 40); @@ -161,10 +162,10 @@ public void incr() { assertEquals(2, jedis.incr("foo")); } - @Test(expected = JedisDataException.class) + @Test public void incrWrongValue() { jedis.set("foo", "bar"); - jedis.incr("foo"); + assertThrows(JedisDataException.class, ()->jedis.incr("foo")); } @Test @@ -173,10 +174,10 @@ public void incrBy() { assertEquals(5, jedis.incrBy("foo", 3)); } - @Test(expected = JedisDataException.class) + @Test public void incrByWrongValue() { jedis.set("foo", "bar"); - jedis.incrBy("foo", 2); + assertThrows(JedisDataException.class, ()->jedis.incrBy("foo", 2)); } @Test @@ -185,16 +186,16 @@ public void incrByFloat() { assertEquals(10.6, jedis.incrByFloat("foo", 0.1), 0.0); } - @Test(expected = JedisDataException.class) + @Test public void incrByFloatWrongValue() { jedis.set("foo", "bar"); - jedis.incrByFloat("foo", 2d); + assertThrows(JedisDataException.class, ()->jedis.incrByFloat("foo", 2d)); } - @Test(expected = JedisDataException.class) + @Test public void decrWrongValue() { jedis.set("foo", "bar"); - jedis.decr("foo"); + assertThrows(JedisDataException.class, ()->jedis.decr("foo")); } @Test @@ -209,10 +210,10 @@ public void decrBy() { assertEquals(-4, jedis.decrBy("foo", 2)); } - @Test(expected = JedisDataException.class) + @Test public void decrByWrongValue() { jedis.set("foo", "bar"); - jedis.decrBy("foo", 2); + assertThrows(JedisDataException.class, ()->jedis.decrBy("foo", 2)); } @Test @@ -245,10 +246,10 @@ public void incrLargeNumbers() { assertEquals(1L + Integer.MAX_VALUE, jedis.incrBy("foo", Integer.MAX_VALUE)); } - @Test(expected = JedisDataException.class) + @Test public void incrReallyLargeNumbers() { jedis.set("foo", Long.toString(Long.MAX_VALUE)); - jedis.incr("foo"); // Should throw an exception + assertThrows(JedisDataException.class, ()->jedis.incr("foo")); // Should throw an exception } @Test diff --git a/src/test/java/redis/clients/jedis/commands/unified/UnifiedJedisCommandsTestBase.java b/src/test/java/redis/clients/jedis/commands/unified/UnifiedJedisCommandsTestBase.java index c4aabad5a3..1ae765d6e4 100644 --- a/src/test/java/redis/clients/jedis/commands/unified/UnifiedJedisCommandsTestBase.java +++ b/src/test/java/redis/clients/jedis/commands/unified/UnifiedJedisCommandsTestBase.java @@ -1,8 +1,6 @@ package redis.clients.jedis.commands.unified; -import java.util.Collection; -import org.junit.runners.Parameterized; import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.UnifiedJedis; import redis.clients.jedis.commands.CommandsTestsParameters; @@ -15,11 +13,6 @@ public abstract class UnifiedJedisCommandsTestBase { * * @see CommandsTestsParameters#respVersions() */ - @Parameterized.Parameters - public static Collection data() { - return CommandsTestsParameters.respVersions(); - } - protected final RedisProtocol protocol; protected UnifiedJedis jedis; diff --git a/src/test/java/redis/clients/jedis/commands/unified/cluster/ClusterAllKindOfValuesCommandsTest.java b/src/test/java/redis/clients/jedis/commands/unified/cluster/ClusterAllKindOfValuesCommandsTest.java index f6b575086e..350342462a 100644 --- a/src/test/java/redis/clients/jedis/commands/unified/cluster/ClusterAllKindOfValuesCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/unified/cluster/ClusterAllKindOfValuesCommandsTest.java @@ -1,40 +1,41 @@ package redis.clients.jedis.commands.unified.cluster; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import static redis.clients.jedis.params.ScanParams.SCAN_POINTER_START; import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.junit.After; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; - +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import redis.clients.jedis.DefaultJedisClientConfig; import redis.clients.jedis.HostAndPorts; import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.commands.unified.AllKindOfValuesCommandsTestBase; import redis.clients.jedis.params.ScanParams; import redis.clients.jedis.resps.ScanResult; -import redis.clients.jedis.util.EnabledOnCommandRule; -import redis.clients.jedis.util.RedisVersionRule; +import redis.clients.jedis.util.EnabledOnCommandCondition; +import redis.clients.jedis.util.RedisVersionCondition; -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class ClusterAllKindOfValuesCommandsTest extends AllKindOfValuesCommandsTestBase { - @Rule - public RedisVersionRule versionRule = new RedisVersionRule( + @RegisterExtension + public RedisVersionCondition versionCondition = new RedisVersionCondition( HostAndPorts.getStableClusterServers().get(0), DefaultJedisClientConfig.builder().password("cluster").build()); - @Rule - public EnabledOnCommandRule enabledOnCommandRule = new EnabledOnCommandRule( + @RegisterExtension + public EnabledOnCommandCondition enabledOnCommandCondition = new EnabledOnCommandCondition( HostAndPorts.getStableClusterServers().get(0), DefaultJedisClientConfig.builder().password("cluster").build()); @@ -42,12 +43,12 @@ public ClusterAllKindOfValuesCommandsTest(RedisProtocol protocol) { super(protocol); } - @Before + @BeforeEach public void setUp() { jedis = ClusterCommandsTestHelper.getCleanCluster(protocol); } - @After + @AfterEach public void tearDown() { jedis.close(); ClusterCommandsTestHelper.clearClusterData(); @@ -151,10 +152,10 @@ public void renamenx() { assertEquals(0, jedis.renamenx("foo{&}", "bar{&}")); } - @Test(expected = UnsupportedOperationException.class) + @Test @Override public void dbSize() { - super.dbSize(); + assertThrows(UnsupportedOperationException.class, super::dbSize); } @Test @@ -255,10 +256,10 @@ public void scanType() { assertEquals(Collections.singletonList("{+}f"), scanResult.getResult()); } - @Test(expected = IllegalArgumentException.class) + @Test @Override public void scanIsCompleteIteration() { - super.scanIsCompleteIteration(); + assertThrows( IllegalArgumentException.class, super::scanIsCompleteIteration); } @Test diff --git a/src/test/java/redis/clients/jedis/commands/unified/cluster/ClusterBinaryValuesCommandsTest.java b/src/test/java/redis/clients/jedis/commands/unified/cluster/ClusterBinaryValuesCommandsTest.java index 78521a7add..ca95f6c5a7 100644 --- a/src/test/java/redis/clients/jedis/commands/unified/cluster/ClusterBinaryValuesCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/unified/cluster/ClusterBinaryValuesCommandsTest.java @@ -1,42 +1,43 @@ package redis.clients.jedis.commands.unified.cluster; -import org.junit.After; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.commands.unified.BinaryValuesCommandsTestBase; -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class ClusterBinaryValuesCommandsTest extends BinaryValuesCommandsTestBase { public ClusterBinaryValuesCommandsTest(RedisProtocol protocol) { super(protocol); } - @Before + @BeforeEach public void setUp() { jedis = ClusterCommandsTestHelper.getCleanCluster(protocol); } - @After + @AfterEach public void tearDown() { jedis.close(); ClusterCommandsTestHelper.clearClusterData(); } - @Ignore + @Disabled @Override public void mget() { } - @Ignore + @Disabled @Override public void mset() { } - @Ignore + @Disabled @Override public void msetnx() { } diff --git a/src/test/java/redis/clients/jedis/commands/unified/cluster/ClusterBitCommandsTest.java b/src/test/java/redis/clients/jedis/commands/unified/cluster/ClusterBitCommandsTest.java index fa98a7d106..07a4198e38 100644 --- a/src/test/java/redis/clients/jedis/commands/unified/cluster/ClusterBitCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/unified/cluster/ClusterBitCommandsTest.java @@ -1,12 +1,14 @@ package redis.clients.jedis.commands.unified.cluster; -import static org.junit.Assert.assertEquals; - -import redis.clients.jedis.util.EnabledOnCommandRule; -import redis.clients.jedis.util.RedisVersionRule; -import org.junit.*; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; +import redis.clients.jedis.util.EnabledOnCommandCondition; +import redis.clients.jedis.util.RedisVersionCondition; import redis.clients.jedis.DefaultJedisClientConfig; import redis.clients.jedis.HostAndPorts; import redis.clients.jedis.RedisProtocol; @@ -14,15 +16,19 @@ import redis.clients.jedis.commands.unified.BitCommandsTestBase; import redis.clients.jedis.exceptions.JedisDataException; -@RunWith(Parameterized.class) +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; + +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class ClusterBitCommandsTest extends BitCommandsTestBase { - @Rule - public RedisVersionRule versionRule = new RedisVersionRule( + @RegisterExtension + public RedisVersionCondition versionCondition = new RedisVersionCondition( HostAndPorts.getStableClusterServers().get(0), DefaultJedisClientConfig.builder().password("cluster").build()); - @Rule - public EnabledOnCommandRule enabledOnCommandRule = new EnabledOnCommandRule( + @RegisterExtension + public EnabledOnCommandCondition enabledOnCommandCondition = new EnabledOnCommandCondition( HostAndPorts.getStableClusterServers().get(0), DefaultJedisClientConfig.builder().password("cluster").build()); @@ -30,12 +36,12 @@ public ClusterBitCommandsTest(RedisProtocol protocol) { super(protocol); } - @Before + @BeforeEach public void setUp() { jedis = ClusterCommandsTestHelper.getCleanCluster(protocol); } - @After + @AfterEach public void tearDown() { jedis.close(); ClusterCommandsTestHelper.clearClusterData(); @@ -71,15 +77,16 @@ public void bitOpNot() { assertEquals("\u0077", resultNot); } - @Ignore + @Disabled @Override public void bitOpBinary() { } - @Test(expected = JedisDataException.class) + @Test @Override public void bitOpNotMultiSourceShouldFail() { - jedis.bitop(BitOP.NOT, "{!}dest", "{!}src1", "{!}src2"); + assertThrows(JedisDataException.class, + () -> jedis.bitop(BitOP.NOT, "{!}dest", "{!}src1", "{!}src2")); } } diff --git a/src/test/java/redis/clients/jedis/commands/unified/cluster/ClusterGeoCommandsTest.java b/src/test/java/redis/clients/jedis/commands/unified/cluster/ClusterGeoCommandsTest.java index 11630fa589..12f163175e 100644 --- a/src/test/java/redis/clients/jedis/commands/unified/cluster/ClusterGeoCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/unified/cluster/ClusterGeoCommandsTest.java @@ -1,18 +1,16 @@ package redis.clients.jedis.commands.unified.cluster; -import static org.junit.Assert.assertEquals; - import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.junit.After; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import redis.clients.jedis.GeoCoordinate; import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.args.GeoUnit; @@ -20,19 +18,22 @@ import redis.clients.jedis.params.GeoRadiusParam; import redis.clients.jedis.params.GeoRadiusStoreParam; -@RunWith(Parameterized.class) +import static org.junit.jupiter.api.Assertions.assertEquals; + +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class ClusterGeoCommandsTest extends GeoCommandsTestBase { public ClusterGeoCommandsTest(RedisProtocol protocol) { super(protocol); } - @Before + @BeforeEach public void setUp() { jedis = ClusterCommandsTestHelper.getCleanCluster(protocol); } - @After + @AfterEach public void tearDown() { jedis.close(); ClusterCommandsTestHelper.clearClusterData(); @@ -57,7 +58,7 @@ public void georadiusStore() { assertEquals(expected, jedis.zrange("{ITA} SicilyStore", 0, -1)); } - @Ignore + @Disabled @Override public void georadiusStoreBinary() { } @@ -79,17 +80,17 @@ public void georadiusByMemberStore() { assertEquals(expected, jedis.zrange("{ITA} SicilyStore", 0, -1)); } - @Ignore + @Disabled @Override public void georadiusByMemberStoreBinary() { } - @Ignore + @Disabled @Override public void geosearchstore() { } - @Ignore + @Disabled @Override public void geosearchstoreWithdist() { } diff --git a/src/test/java/redis/clients/jedis/commands/unified/cluster/ClusterHashesCommandsTest.java b/src/test/java/redis/clients/jedis/commands/unified/cluster/ClusterHashesCommandsTest.java index bdefea6791..4d1cd38214 100644 --- a/src/test/java/redis/clients/jedis/commands/unified/cluster/ClusterHashesCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/unified/cluster/ClusterHashesCommandsTest.java @@ -1,27 +1,27 @@ package redis.clients.jedis.commands.unified.cluster; -import org.junit.After; -import org.junit.Before; -import org.junit.Rule; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; - +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.extension.RegisterExtension; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import redis.clients.jedis.DefaultJedisClientConfig; import redis.clients.jedis.HostAndPorts; import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.commands.unified.HashesCommandsTestBase; -import redis.clients.jedis.util.EnabledOnCommandRule; -import redis.clients.jedis.util.RedisVersionRule; +import redis.clients.jedis.util.EnabledOnCommandCondition; +import redis.clients.jedis.util.RedisVersionCondition; -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class ClusterHashesCommandsTest extends HashesCommandsTestBase { - @Rule - public RedisVersionRule versionRule = new RedisVersionRule( + @RegisterExtension + public RedisVersionCondition versionCondition = new RedisVersionCondition( HostAndPorts.getStableClusterServers().get(0), DefaultJedisClientConfig.builder().password("cluster") .build()); - @Rule - public EnabledOnCommandRule enabledOnCommandRule = new EnabledOnCommandRule( + @RegisterExtension + public EnabledOnCommandCondition enabledOnCommandCondition = new EnabledOnCommandCondition( HostAndPorts.getStableClusterServers().get(0), DefaultJedisClientConfig.builder().password("cluster").build()); @@ -29,12 +29,12 @@ public ClusterHashesCommandsTest(RedisProtocol protocol) { super(protocol); } - @Before + @BeforeEach public void setUp() { jedis = ClusterCommandsTestHelper.getCleanCluster(protocol); } - @After + @AfterEach public void tearDown() { jedis.close(); ClusterCommandsTestHelper.clearClusterData(); diff --git a/src/test/java/redis/clients/jedis/commands/unified/cluster/ClusterHyperLogLogCommandsTest.java b/src/test/java/redis/clients/jedis/commands/unified/cluster/ClusterHyperLogLogCommandsTest.java index 461ac873c4..62f1503c6a 100644 --- a/src/test/java/redis/clients/jedis/commands/unified/cluster/ClusterHyperLogLogCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/unified/cluster/ClusterHyperLogLogCommandsTest.java @@ -1,29 +1,30 @@ package redis.clients.jedis.commands.unified.cluster; -import static org.junit.Assert.assertEquals; - -import org.junit.After; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.commands.unified.HyperLogLogCommandsTestBase; -@RunWith(Parameterized.class) +import static org.junit.jupiter.api.Assertions.assertEquals; + +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class ClusterHyperLogLogCommandsTest extends HyperLogLogCommandsTestBase { public ClusterHyperLogLogCommandsTest(RedisProtocol protocol) { super(protocol); } - @Before + @BeforeEach public void setUp() { jedis = ClusterCommandsTestHelper.getCleanCluster(protocol); } - @After + @AfterEach public void tearDown() { jedis.close(); ClusterCommandsTestHelper.clearClusterData(); @@ -69,7 +70,7 @@ public void pfmerge() { assertEquals(6, status); } - @Ignore + @Disabled @Override public void pfmergeBinary() { } diff --git a/src/test/java/redis/clients/jedis/commands/unified/cluster/ClusterListCommandsTest.java b/src/test/java/redis/clients/jedis/commands/unified/cluster/ClusterListCommandsTest.java index 644953e335..569911ca7a 100644 --- a/src/test/java/redis/clients/jedis/commands/unified/cluster/ClusterListCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/unified/cluster/ClusterListCommandsTest.java @@ -1,22 +1,17 @@ package redis.clients.jedis.commands.unified.cluster; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; - import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; import io.redis.test.annotations.SinceRedisVersion; -import org.junit.After; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -25,21 +20,27 @@ import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.args.ListDirection; import redis.clients.jedis.commands.unified.ListCommandsTestBase; -import redis.clients.jedis.util.EnabledOnCommandRule; +import redis.clients.jedis.util.EnabledOnCommandCondition; import redis.clients.jedis.util.KeyValue; -import redis.clients.jedis.util.RedisVersionRule; +import redis.clients.jedis.util.RedisVersionCondition; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class ClusterListCommandsTest extends ListCommandsTestBase { private final Logger logger = LoggerFactory.getLogger(getClass()); - @Rule - public RedisVersionRule versionRule = new RedisVersionRule( + @RegisterExtension + public RedisVersionCondition versionCondition = new RedisVersionCondition( HostAndPorts.getStableClusterServers().get(0), DefaultJedisClientConfig.builder().password("cluster").build()); - @Rule - public EnabledOnCommandRule enabledOnCommandRule = new EnabledOnCommandRule( + @RegisterExtension + public EnabledOnCommandCondition enabledOnCommandCondition = new EnabledOnCommandCondition( HostAndPorts.getStableClusterServers().get(0), DefaultJedisClientConfig.builder().password("cluster").build()); @@ -47,12 +48,12 @@ public ClusterListCommandsTest(RedisProtocol protocol) { super(protocol); } - @Before + @BeforeEach public void setUp() { jedis = ClusterCommandsTestHelper.getCleanCluster(protocol); } - @After + @AfterEach public void tearDown() { jedis.close(); ClusterCommandsTestHelper.clearClusterData(); diff --git a/src/test/java/redis/clients/jedis/commands/unified/cluster/ClusterSetCommandsTest.java b/src/test/java/redis/clients/jedis/commands/unified/cluster/ClusterSetCommandsTest.java index 9560ef0f67..f9acf84521 100644 --- a/src/test/java/redis/clients/jedis/commands/unified/cluster/ClusterSetCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/unified/cluster/ClusterSetCommandsTest.java @@ -1,26 +1,27 @@ package redis.clients.jedis.commands.unified.cluster; -import static org.junit.Assert.assertEquals; - import java.util.HashSet; import java.util.Set; import io.redis.test.annotations.SinceRedisVersion; -import org.junit.After; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import redis.clients.jedis.DefaultJedisClientConfig; import redis.clients.jedis.HostAndPorts; import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.commands.unified.SetCommandsTestBase; -import redis.clients.jedis.util.EnabledOnCommandRule; -import redis.clients.jedis.util.RedisVersionRule; +import redis.clients.jedis.util.EnabledOnCommandCondition; +import redis.clients.jedis.util.RedisVersionCondition; + +import static org.junit.jupiter.api.Assertions.assertEquals; -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class ClusterSetCommandsTest extends SetCommandsTestBase { final byte[] bfoo = { 0x01, 0x02, 0x03, 0x04 }; @@ -33,21 +34,21 @@ public ClusterSetCommandsTest(RedisProtocol protocol) { super(protocol); } - @Rule - public RedisVersionRule versionRule = new RedisVersionRule( + @RegisterExtension + public RedisVersionCondition versionCondition = new RedisVersionCondition( HostAndPorts.getStableClusterServers().get(0), DefaultJedisClientConfig.builder().password("cluster").build()); - @Rule - public EnabledOnCommandRule enabledOnCommandRule = new EnabledOnCommandRule( + @RegisterExtension + public EnabledOnCommandCondition enabledOnCommandCondition = new EnabledOnCommandCondition( HostAndPorts.getStableClusterServers().get(0), DefaultJedisClientConfig.builder().password("cluster").build()); - @Before + @BeforeEach public void setUp() { jedis = ClusterCommandsTestHelper.getCleanCluster(protocol); } - @After + @AfterEach public void tearDown() { jedis.close(); ClusterCommandsTestHelper.clearClusterData(); diff --git a/src/test/java/redis/clients/jedis/commands/unified/cluster/ClusterSortedSetCommandsTest.java b/src/test/java/redis/clients/jedis/commands/unified/cluster/ClusterSortedSetCommandsTest.java index af2e18357d..cce518c361 100644 --- a/src/test/java/redis/clients/jedis/commands/unified/cluster/ClusterSortedSetCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/unified/cluster/ClusterSortedSetCommandsTest.java @@ -2,8 +2,8 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; import static redis.clients.jedis.util.AssertUtil.assertByteArrayListEquals; import java.util.ArrayList; @@ -11,12 +11,12 @@ import java.util.List; import io.redis.test.annotations.SinceRedisVersion; -import org.junit.After; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import redis.clients.jedis.DefaultJedisClientConfig; import redis.clients.jedis.HostAndPorts; @@ -26,11 +26,12 @@ import redis.clients.jedis.params.ZParams; import redis.clients.jedis.params.ZRangeParams; import redis.clients.jedis.resps.Tuple; +import redis.clients.jedis.util.EnabledOnCommandCondition; import redis.clients.jedis.util.KeyValue; -import redis.clients.jedis.util.EnabledOnCommandRule; -import redis.clients.jedis.util.RedisVersionRule; +import redis.clients.jedis.util.RedisVersionCondition; -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class ClusterSortedSetCommandsTest extends SortedSetCommandsTestBase { final byte[] bfoo = { 0x01, 0x02, 0x03, 0x04 }; @@ -39,12 +40,12 @@ public class ClusterSortedSetCommandsTest extends SortedSetCommandsTestBase { final byte[] bb = { 0x0B }; final byte[] bc = { 0x0C }; - @Rule - public RedisVersionRule versionRule = new RedisVersionRule( + @RegisterExtension + public RedisVersionCondition versionCondition = new RedisVersionCondition( HostAndPorts.getStableClusterServers().get(0), DefaultJedisClientConfig.builder().password("cluster").build()); - @Rule - public EnabledOnCommandRule enabledOnCommandRule = new EnabledOnCommandRule( + @RegisterExtension + public EnabledOnCommandCondition enabledOnCommandCondition = new EnabledOnCommandCondition( HostAndPorts.getStableClusterServers().get(0), DefaultJedisClientConfig.builder().password("cluster").build()); @@ -52,12 +53,12 @@ public ClusterSortedSetCommandsTest(RedisProtocol protocol) { super(protocol); } - @Before + @BeforeEach public void setUp() { jedis = ClusterCommandsTestHelper.getCleanCluster(protocol); } - @After + @AfterEach public void tearDown() { jedis.close(); ClusterCommandsTestHelper.clearClusterData(); diff --git a/src/test/java/redis/clients/jedis/commands/unified/cluster/ClusterStringValuesCommandsTest.java b/src/test/java/redis/clients/jedis/commands/unified/cluster/ClusterStringValuesCommandsTest.java index 4200887cb6..3e8b89905d 100644 --- a/src/test/java/redis/clients/jedis/commands/unified/cluster/ClusterStringValuesCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/unified/cluster/ClusterStringValuesCommandsTest.java @@ -1,17 +1,15 @@ package redis.clients.jedis.commands.unified.cluster; -import static org.junit.Assert.assertEquals; - import java.util.ArrayList; import java.util.List; import io.redis.test.annotations.SinceRedisVersion; -import org.junit.After; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import redis.clients.jedis.DefaultJedisClientConfig; import redis.clients.jedis.HostAndPorts; @@ -19,31 +17,34 @@ import redis.clients.jedis.commands.unified.StringValuesCommandsTestBase; import redis.clients.jedis.params.LCSParams; import redis.clients.jedis.resps.LCSMatchResult; -import redis.clients.jedis.util.EnabledOnCommandRule; -import redis.clients.jedis.util.RedisVersionRule; +import redis.clients.jedis.util.EnabledOnCommandCondition; +import redis.clients.jedis.util.RedisVersionCondition; + +import static org.junit.jupiter.api.Assertions.assertEquals; -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class ClusterStringValuesCommandsTest extends StringValuesCommandsTestBase { public ClusterStringValuesCommandsTest(RedisProtocol protocol) { super(protocol); } - @Rule - public RedisVersionRule versionRule = new RedisVersionRule( + @RegisterExtension + public RedisVersionCondition versionCondition = new RedisVersionCondition( HostAndPorts.getStableClusterServers().get(0), DefaultJedisClientConfig.builder().password("cluster").build()); - @Rule - public EnabledOnCommandRule enabledOnCommandRule = new EnabledOnCommandRule( + @RegisterExtension + public EnabledOnCommandCondition enabledOnCommandCondition = new EnabledOnCommandCondition( HostAndPorts.getStableClusterServers().get(0), DefaultJedisClientConfig.builder().password("cluster").build()); - @Before + @BeforeEach public void setUp() { jedis = ClusterCommandsTestHelper.getCleanCluster(protocol); } - @After + @AfterEach public void tearDown() { jedis.close(); ClusterCommandsTestHelper.clearClusterData(); diff --git a/src/test/java/redis/clients/jedis/commands/unified/pipeline/GeoPipelineCommandsTest.java b/src/test/java/redis/clients/jedis/commands/unified/pipeline/GeoPipelineCommandsTest.java index 61c686fbb0..1083e0a73f 100644 --- a/src/test/java/redis/clients/jedis/commands/unified/pipeline/GeoPipelineCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/unified/pipeline/GeoPipelineCommandsTest.java @@ -7,17 +7,17 @@ import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.nullValue; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import static redis.clients.jedis.util.GeoCoordinateMatcher.atCoordinates; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import redis.clients.jedis.GeoCoordinate; import redis.clients.jedis.RedisProtocol; @@ -30,7 +30,8 @@ import redis.clients.jedis.resps.GeoRadiusResponse; import redis.clients.jedis.util.SafeEncoder; -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class GeoPipelineCommandsTest extends PipelineCommandsTestBase { protected final byte[] bfoo = { 0x01, 0x02, 0x03, 0x04 }; @@ -795,24 +796,28 @@ public void geosearch() { contains(0L)); } - @Test(expected = IllegalArgumentException.class) + @Test public void geosearchSearchParamCombineFromMemberAndFromLonLat() { - pipe.geosearch("barcelona", new GeoSearchParam().fromMember("foobar").fromLonLat(10, 10)); + assertThrows(IllegalArgumentException.class, () -> pipe.geosearch("barcelona", + new GeoSearchParam().fromMember("foobar").fromLonLat(10, 10))); } - @Test(expected = IllegalArgumentException.class) + @Test public void geosearchSearchParamWithoutFromMemberAndFromLonLat() { - pipe.geosearch("barcelona", new GeoSearchParam().byRadius(10, GeoUnit.MI)); + assertThrows(IllegalArgumentException.class, + () -> pipe.geosearch("barcelona", new GeoSearchParam().byRadius(10, GeoUnit.MI))); } - @Test(expected = IllegalArgumentException.class) + @Test public void geosearchSearchParamCombineByRadiousAndByBox() { - pipe.geosearch("barcelona", new GeoSearchParam().byRadius(3000, GeoUnit.M).byBox(300, 300, GeoUnit.M)); + assertThrows(IllegalArgumentException.class, () -> pipe.geosearch("barcelona", + new GeoSearchParam().byRadius(3000, GeoUnit.M).byBox(300, 300, GeoUnit.M))); } - @Test(expected = IllegalArgumentException.class) + @Test public void geosearchSearchParamWithoutByRadiousAndByBox() { - pipe.geosearch("barcelona", new GeoSearchParam().fromMember("foobar")); + assertThrows(IllegalArgumentException.class, + () -> pipe.geosearch("barcelona", new GeoSearchParam().fromMember("foobar"))); } @Test diff --git a/src/test/java/redis/clients/jedis/commands/unified/pipeline/HashesPipelineCommandsTest.java b/src/test/java/redis/clients/jedis/commands/unified/pipeline/HashesPipelineCommandsTest.java index d8d9f031bd..122eef6350 100644 --- a/src/test/java/redis/clients/jedis/commands/unified/pipeline/HashesPipelineCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/unified/pipeline/HashesPipelineCommandsTest.java @@ -4,13 +4,14 @@ import java.util.*; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import redis.clients.jedis.RedisProtocol; -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class HashesPipelineCommandsTest extends PipelineCommandsTestBase { final byte[] bfoo = { 0x01, 0x02, 0x03, 0x04 }; diff --git a/src/test/java/redis/clients/jedis/commands/unified/pipeline/ListPipelineCommandsTest.java b/src/test/java/redis/clients/jedis/commands/unified/pipeline/ListPipelineCommandsTest.java index 7bb8e26464..71a93f3abf 100644 --- a/src/test/java/redis/clients/jedis/commands/unified/pipeline/ListPipelineCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/unified/pipeline/ListPipelineCommandsTest.java @@ -10,9 +10,10 @@ import java.util.List; import io.redis.test.annotations.SinceRedisVersion; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Timeout; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -24,7 +25,8 @@ import redis.clients.jedis.params.LPosParams; import redis.clients.jedis.util.KeyValue; -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class ListPipelineCommandsTest extends PipelineCommandsTestBase { private final Logger logger = LoggerFactory.getLogger(getClass()); @@ -525,7 +527,8 @@ public void blpopDouble() { assertThat(bresult3.get().getValue(), equalTo(bcar)); } - @Test(timeout = 5000L) + @Test + @Timeout(5) public void blpopDoubleWithSleep() { Response> result = pipe.blpop(0.04, "foo"); pipe.sync(); @@ -636,7 +639,8 @@ public void brpopDouble() { assertThat(bresult3.get().getValue(), equalTo(bcar)); } - @Test(timeout = 5000L) + @Test + @Timeout(5) public void brpopDoubleWithSleep() { Response> result = pipe.brpop(0.04, "foo"); pipe.sync(); @@ -747,16 +751,13 @@ public void linsert() { @Test public void brpoplpush() { - new Thread(new Runnable() { - @Override - public void run() { - try { - Thread.sleep(100); - } catch (InterruptedException e) { - logger.error("", e); - } - jedis.lpush("foo", "a"); + new Thread(() -> { + try { + Thread.sleep(100); + } catch (InterruptedException e) { + logger.error("", e); } + jedis.lpush("foo", "a"); }).start(); Response element = pipe.brpoplpush("foo", "bar", 0); @@ -771,16 +772,13 @@ public void run() { // Binary - new Thread(new Runnable() { - @Override - public void run() { - try { - Thread.sleep(100); - } catch (InterruptedException e) { - logger.error("", e); - } - jedis.lpush(bfoo, bA); + new Thread(() -> { + try { + Thread.sleep(100); + } catch (InterruptedException e) { + logger.error("", e); } + jedis.lpush(bfoo, bA); }).start(); Response belement = pipe.brpoplpush(bfoo, bbar, 0); diff --git a/src/test/java/redis/clients/jedis/commands/unified/pipeline/PipelineCommandsTestBase.java b/src/test/java/redis/clients/jedis/commands/unified/pipeline/PipelineCommandsTestBase.java index 9744244616..aaf9058848 100644 --- a/src/test/java/redis/clients/jedis/commands/unified/pipeline/PipelineCommandsTestBase.java +++ b/src/test/java/redis/clients/jedis/commands/unified/pipeline/PipelineCommandsTestBase.java @@ -1,39 +1,29 @@ package redis.clients.jedis.commands.unified.pipeline; -import java.util.Collection; - -import redis.clients.jedis.util.EnabledOnCommandRule; -import redis.clients.jedis.util.RedisVersionRule; -import org.junit.After; -import org.junit.Before; -import org.junit.Rule; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.extension.RegisterExtension; +import redis.clients.jedis.util.EnabledOnCommandCondition; +import redis.clients.jedis.util.RedisVersionCondition; import redis.clients.jedis.*; import redis.clients.jedis.commands.CommandsTestsParameters; import redis.clients.jedis.commands.unified.pooled.PooledCommandsTestHelper; public abstract class PipelineCommandsTestBase { + protected JedisPooled jedis; + protected Pipeline pipe; /** - * Input data for parameterized tests. In principle all subclasses of this - * class should be parameterized tests, to run with several versions of RESP. - * + * Input data for parameterized tests. In principle all subclasses of this class should be + * parameterized tests, to run with several versions of RESP. * @see CommandsTestsParameters#respVersions() */ - @Parameterized.Parameters - public static Collection data() { - return CommandsTestsParameters.respVersions(); - } - - protected JedisPooled jedis; - protected Pipeline pipe; - protected final RedisProtocol protocol; - @Rule - public RedisVersionRule versionRule = new RedisVersionRule(PooledCommandsTestHelper.nodeInfo); - @Rule - public EnabledOnCommandRule enabledOnCommandRule = new EnabledOnCommandRule(PooledCommandsTestHelper.nodeInfo); + @RegisterExtension + public RedisVersionCondition versionCondition = new RedisVersionCondition(PooledCommandsTestHelper.nodeInfo); + @RegisterExtension + public EnabledOnCommandCondition enabledOnCommandCondition = new EnabledOnCommandCondition(PooledCommandsTestHelper.nodeInfo); /** * The RESP protocol is to be injected by the subclasses, usually via JUnit * parameterized tests, because most of the subclassed tests are meant to be @@ -47,14 +37,14 @@ public PipelineCommandsTestBase(RedisProtocol protocol) { this.protocol = protocol; } - @Before + @BeforeEach public void setUp() { jedis = PooledCommandsTestHelper.getPooled(protocol); PooledCommandsTestHelper.clearData(); pipe = jedis.pipelined(); } - @After + @AfterEach public void tearDown() { pipe.close(); jedis.close(); diff --git a/src/test/java/redis/clients/jedis/commands/unified/pipeline/SetPipelineCommandsTest.java b/src/test/java/redis/clients/jedis/commands/unified/pipeline/SetPipelineCommandsTest.java index c311e1134c..d86f0c302b 100644 --- a/src/test/java/redis/clients/jedis/commands/unified/pipeline/SetPipelineCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/unified/pipeline/SetPipelineCommandsTest.java @@ -21,15 +21,16 @@ import java.util.Set; import io.redis.test.annotations.SinceRedisVersion; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.Response; import redis.clients.jedis.params.ScanParams; import redis.clients.jedis.resps.ScanResult; -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class SetPipelineCommandsTest extends PipelineCommandsTestBase { final byte[] bfoo = { 0x01, 0x02, 0x03, 0x04 }; diff --git a/src/test/java/redis/clients/jedis/commands/unified/pipeline/SortedSetPipelineCommandsTest.java b/src/test/java/redis/clients/jedis/commands/unified/pipeline/SortedSetPipelineCommandsTest.java index dfd46c7ae8..602f963959 100644 --- a/src/test/java/redis/clients/jedis/commands/unified/pipeline/SortedSetPipelineCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/unified/pipeline/SortedSetPipelineCommandsTest.java @@ -10,7 +10,7 @@ import static org.hamcrest.Matchers.in; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.nullValue; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static redis.clients.jedis.params.ScanParams.SCAN_POINTER_START; import static redis.clients.jedis.params.ScanParams.SCAN_POINTER_START_BINARY; @@ -21,9 +21,9 @@ import java.util.stream.Collectors; import io.redis.test.annotations.SinceRedisVersion; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.Response; import redis.clients.jedis.args.SortedSetOption; @@ -38,7 +38,8 @@ import redis.clients.jedis.util.KeyValue; import redis.clients.jedis.util.SafeEncoder; -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class SortedSetPipelineCommandsTest extends PipelineCommandsTestBase { final byte[] bfoo = { 0x01, 0x02, 0x03, 0x04 }; diff --git a/src/test/java/redis/clients/jedis/commands/unified/pipeline/StreamsPipelineCommandsTest.java b/src/test/java/redis/clients/jedis/commands/unified/pipeline/StreamsPipelineCommandsTest.java index 6d52e88b1f..5790200205 100644 --- a/src/test/java/redis/clients/jedis/commands/unified/pipeline/StreamsPipelineCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/unified/pipeline/StreamsPipelineCommandsTest.java @@ -13,10 +13,10 @@ import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.time.Duration; import java.util.HashMap; @@ -29,11 +29,11 @@ import io.redis.test.annotations.SinceRedisVersion; import io.redis.test.utils.RedisVersion; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import redis.clients.jedis.util.RedisVersionUtil; import org.hamcrest.Matchers; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; import redis.clients.jedis.BuilderFactory; import redis.clients.jedis.Pipeline; import redis.clients.jedis.RedisProtocol; @@ -58,7 +58,8 @@ import redis.clients.jedis.resps.StreamPendingEntry; import redis.clients.jedis.util.SafeEncoder; -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class StreamsPipelineCommandsTest extends PipelineCommandsTestBase { public StreamsPipelineCommandsTest(RedisProtocol protocol) { diff --git a/src/test/java/redis/clients/jedis/commands/unified/pooled/PooledAllKindOfValuesCommandsTest.java b/src/test/java/redis/clients/jedis/commands/unified/pooled/PooledAllKindOfValuesCommandsTest.java index 608034f9cc..42eb4eed02 100644 --- a/src/test/java/redis/clients/jedis/commands/unified/pooled/PooledAllKindOfValuesCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/unified/pooled/PooledAllKindOfValuesCommandsTest.java @@ -1,35 +1,36 @@ package redis.clients.jedis.commands.unified.pooled; -import org.junit.After; -import org.junit.Before; -import org.junit.Rule; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.extension.RegisterExtension; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.commands.unified.AllKindOfValuesCommandsTestBase; -import redis.clients.jedis.util.EnabledOnCommandRule; -import redis.clients.jedis.util.RedisVersionRule; +import redis.clients.jedis.util.EnabledOnCommandCondition; +import redis.clients.jedis.util.RedisVersionCondition; -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class PooledAllKindOfValuesCommandsTest extends AllKindOfValuesCommandsTestBase { - @Rule - public RedisVersionRule versionRule = new RedisVersionRule(PooledCommandsTestHelper.nodeInfo); - @Rule - public EnabledOnCommandRule enabledOnCommandRule = new EnabledOnCommandRule(PooledCommandsTestHelper.nodeInfo); + @RegisterExtension + public RedisVersionCondition versionCondition = new RedisVersionCondition(PooledCommandsTestHelper.nodeInfo); + @RegisterExtension + public EnabledOnCommandCondition enabledOnCommandCondition = new EnabledOnCommandCondition(PooledCommandsTestHelper.nodeInfo); public PooledAllKindOfValuesCommandsTest(RedisProtocol protocol) { super(protocol); } - @Before + @BeforeEach public void setUp() { jedis = PooledCommandsTestHelper.getPooled(protocol); PooledCommandsTestHelper.clearData(); } - @After + @AfterEach public void cleanUp() { jedis.close(); } diff --git a/src/test/java/redis/clients/jedis/commands/unified/pooled/PooledBinaryValuesCommandsTest.java b/src/test/java/redis/clients/jedis/commands/unified/pooled/PooledBinaryValuesCommandsTest.java index 04a5778fcc..6d5d26551a 100644 --- a/src/test/java/redis/clients/jedis/commands/unified/pooled/PooledBinaryValuesCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/unified/pooled/PooledBinaryValuesCommandsTest.java @@ -1,27 +1,28 @@ package redis.clients.jedis.commands.unified.pooled; -import org.junit.After; -import org.junit.Before; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.commands.unified.BinaryValuesCommandsTestBase; -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class PooledBinaryValuesCommandsTest extends BinaryValuesCommandsTestBase { public PooledBinaryValuesCommandsTest(RedisProtocol protocol) { super(protocol); } - @Before + @BeforeEach public void setUp() { jedis = PooledCommandsTestHelper.getPooled(protocol); PooledCommandsTestHelper.clearData(); } - @After + @AfterEach public void cleanUp() { jedis.close(); } diff --git a/src/test/java/redis/clients/jedis/commands/unified/pooled/PooledBitCommandsTest.java b/src/test/java/redis/clients/jedis/commands/unified/pooled/PooledBitCommandsTest.java index e91b0ece06..cff9ff3317 100644 --- a/src/test/java/redis/clients/jedis/commands/unified/pooled/PooledBitCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/unified/pooled/PooledBitCommandsTest.java @@ -1,35 +1,36 @@ package redis.clients.jedis.commands.unified.pooled; -import redis.clients.jedis.util.EnabledOnCommandRule; -import redis.clients.jedis.util.RedisVersionRule; -import org.junit.After; -import org.junit.Before; -import org.junit.Rule; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.extension.RegisterExtension; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; +import redis.clients.jedis.util.EnabledOnCommandCondition; +import redis.clients.jedis.util.RedisVersionCondition; import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.commands.unified.BitCommandsTestBase; -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class PooledBitCommandsTest extends BitCommandsTestBase { - @Rule - public RedisVersionRule versionRule = new RedisVersionRule(PooledCommandsTestHelper.nodeInfo); - @Rule - public EnabledOnCommandRule enabledOnCommandRule = new EnabledOnCommandRule(PooledCommandsTestHelper.nodeInfo); + @RegisterExtension + public RedisVersionCondition versionCondition = new RedisVersionCondition(PooledCommandsTestHelper.nodeInfo); + @RegisterExtension + public EnabledOnCommandCondition enabledOnCommandCondition = new EnabledOnCommandCondition(PooledCommandsTestHelper.nodeInfo); public PooledBitCommandsTest(RedisProtocol protocol) { super(protocol); } - @Before + @BeforeEach public void setUp() { jedis = PooledCommandsTestHelper.getPooled(protocol); PooledCommandsTestHelper.clearData(); } - @After + @AfterEach public void cleanUp() { jedis.close(); } diff --git a/src/test/java/redis/clients/jedis/commands/unified/pooled/PooledGeoCommandsTest.java b/src/test/java/redis/clients/jedis/commands/unified/pooled/PooledGeoCommandsTest.java index 3affb40afa..99ffb201c1 100644 --- a/src/test/java/redis/clients/jedis/commands/unified/pooled/PooledGeoCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/unified/pooled/PooledGeoCommandsTest.java @@ -1,27 +1,28 @@ package redis.clients.jedis.commands.unified.pooled; -import org.junit.After; -import org.junit.Before; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.commands.unified.GeoCommandsTestBase; -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class PooledGeoCommandsTest extends GeoCommandsTestBase { public PooledGeoCommandsTest(RedisProtocol protocol) { super(protocol); } - @Before + @BeforeEach public void setUp() { jedis = PooledCommandsTestHelper.getPooled(protocol); PooledCommandsTestHelper.clearData(); } - @After + @AfterEach public void cleanUp() { jedis.close(); } diff --git a/src/test/java/redis/clients/jedis/commands/unified/pooled/PooledHashesCommandsTest.java b/src/test/java/redis/clients/jedis/commands/unified/pooled/PooledHashesCommandsTest.java index 07d7273b58..2629301f2b 100644 --- a/src/test/java/redis/clients/jedis/commands/unified/pooled/PooledHashesCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/unified/pooled/PooledHashesCommandsTest.java @@ -1,35 +1,36 @@ package redis.clients.jedis.commands.unified.pooled; -import org.junit.After; -import org.junit.Before; -import org.junit.Rule; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.extension.RegisterExtension; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.commands.unified.HashesCommandsTestBase; -import redis.clients.jedis.util.EnabledOnCommandRule; -import redis.clients.jedis.util.RedisVersionRule; +import redis.clients.jedis.util.EnabledOnCommandCondition; +import redis.clients.jedis.util.RedisVersionCondition; -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class PooledHashesCommandsTest extends HashesCommandsTestBase { - @Rule - public RedisVersionRule versionRule = new RedisVersionRule(PooledCommandsTestHelper.nodeInfo); - @Rule - public EnabledOnCommandRule enabledOnCommandRule = new EnabledOnCommandRule(PooledCommandsTestHelper.nodeInfo); + @RegisterExtension + public RedisVersionCondition versionCondition = new RedisVersionCondition(PooledCommandsTestHelper.nodeInfo); + @RegisterExtension + public EnabledOnCommandCondition enabledOnCommandCondition = new EnabledOnCommandCondition(PooledCommandsTestHelper.nodeInfo); public PooledHashesCommandsTest(RedisProtocol protocol) { super(protocol); } - @Before + @BeforeEach public void setUp() { jedis = PooledCommandsTestHelper.getPooled(protocol); PooledCommandsTestHelper.clearData(); } - @After + @AfterEach public void cleanUp() { jedis.close(); } diff --git a/src/test/java/redis/clients/jedis/commands/unified/pooled/PooledHyperLogLogCommandsTest.java b/src/test/java/redis/clients/jedis/commands/unified/pooled/PooledHyperLogLogCommandsTest.java index 6b2b2f3dd2..bafd451fb1 100644 --- a/src/test/java/redis/clients/jedis/commands/unified/pooled/PooledHyperLogLogCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/unified/pooled/PooledHyperLogLogCommandsTest.java @@ -1,27 +1,27 @@ package redis.clients.jedis.commands.unified.pooled; -import org.junit.After; -import org.junit.Before; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; - +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.commands.unified.HyperLogLogCommandsTestBase; -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class PooledHyperLogLogCommandsTest extends HyperLogLogCommandsTestBase { public PooledHyperLogLogCommandsTest(RedisProtocol protocol) { super(protocol); } - @Before + @BeforeEach public void setUp() { jedis = PooledCommandsTestHelper.getPooled(protocol); PooledCommandsTestHelper.clearData(); } - @After + @AfterEach public void cleanUp() { jedis.close(); } diff --git a/src/test/java/redis/clients/jedis/commands/unified/pooled/PooledListCommandsTest.java b/src/test/java/redis/clients/jedis/commands/unified/pooled/PooledListCommandsTest.java index 6d053fca74..adf0e13a1b 100644 --- a/src/test/java/redis/clients/jedis/commands/unified/pooled/PooledListCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/unified/pooled/PooledListCommandsTest.java @@ -1,35 +1,36 @@ package redis.clients.jedis.commands.unified.pooled; -import org.junit.After; -import org.junit.Before; -import org.junit.Rule; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.extension.RegisterExtension; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.commands.unified.ListCommandsTestBase; -import redis.clients.jedis.util.EnabledOnCommandRule; -import redis.clients.jedis.util.RedisVersionRule; +import redis.clients.jedis.util.EnabledOnCommandCondition; +import redis.clients.jedis.util.RedisVersionCondition; -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class PooledListCommandsTest extends ListCommandsTestBase { - @Rule - public RedisVersionRule versionRule = new RedisVersionRule(PooledCommandsTestHelper.nodeInfo); - @Rule - public EnabledOnCommandRule enabledOnCommandRule = new EnabledOnCommandRule(PooledCommandsTestHelper.nodeInfo); + @RegisterExtension + public RedisVersionCondition versionCondition = new RedisVersionCondition(PooledCommandsTestHelper.nodeInfo); + @RegisterExtension + public EnabledOnCommandCondition enabledOnCommandCondition = new EnabledOnCommandCondition(PooledCommandsTestHelper.nodeInfo); public PooledListCommandsTest(RedisProtocol protocol) { super(protocol); } - @Before + @BeforeEach public void setUp() { jedis = PooledCommandsTestHelper.getPooled(protocol); PooledCommandsTestHelper.clearData(); } - @After + @AfterEach public void cleanUp() { jedis.close(); } diff --git a/src/test/java/redis/clients/jedis/commands/unified/pooled/PooledMiscellaneousTest.java b/src/test/java/redis/clients/jedis/commands/unified/pooled/PooledMiscellaneousTest.java index ba5962bded..7c2f2487e9 100644 --- a/src/test/java/redis/clients/jedis/commands/unified/pooled/PooledMiscellaneousTest.java +++ b/src/test/java/redis/clients/jedis/commands/unified/pooled/PooledMiscellaneousTest.java @@ -2,21 +2,21 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.notNullValue; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertThrows; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import io.redis.test.annotations.SinceRedisVersion; -import org.junit.After; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import redis.clients.jedis.AbstractPipeline; import redis.clients.jedis.AbstractTransaction; @@ -24,28 +24,29 @@ import redis.clients.jedis.Response; import redis.clients.jedis.commands.unified.UnifiedJedisCommandsTestBase; import redis.clients.jedis.exceptions.JedisDataException; -import redis.clients.jedis.util.EnabledOnCommandRule; -import redis.clients.jedis.util.RedisVersionRule; +import redis.clients.jedis.util.EnabledOnCommandCondition; +import redis.clients.jedis.util.RedisVersionCondition; -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class PooledMiscellaneousTest extends UnifiedJedisCommandsTestBase { - @Rule - public RedisVersionRule versionRule = new RedisVersionRule(PooledCommandsTestHelper.nodeInfo); - @Rule - public EnabledOnCommandRule enabledOnCommandRule = new EnabledOnCommandRule(PooledCommandsTestHelper.nodeInfo); + @RegisterExtension + public RedisVersionCondition versionCondition = new RedisVersionCondition(PooledCommandsTestHelper.nodeInfo); + @RegisterExtension + public EnabledOnCommandCondition enabledOnCommandCondition = new EnabledOnCommandCondition(PooledCommandsTestHelper.nodeInfo); public PooledMiscellaneousTest(RedisProtocol protocol) { super(protocol); } - @Before + @BeforeEach public void setUp() { jedis = PooledCommandsTestHelper.getPooled(protocol); PooledCommandsTestHelper.clearData(); } - @After + @AfterEach public void cleanUp() { jedis.close(); } diff --git a/src/test/java/redis/clients/jedis/commands/unified/pooled/PooledSetCommandsTest.java b/src/test/java/redis/clients/jedis/commands/unified/pooled/PooledSetCommandsTest.java index 07c8d9e983..2daf46aee3 100644 --- a/src/test/java/redis/clients/jedis/commands/unified/pooled/PooledSetCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/unified/pooled/PooledSetCommandsTest.java @@ -1,35 +1,36 @@ package redis.clients.jedis.commands.unified.pooled; -import org.junit.After; -import org.junit.Before; -import org.junit.Rule; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.extension.RegisterExtension; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.commands.unified.SetCommandsTestBase; -import redis.clients.jedis.util.EnabledOnCommandRule; -import redis.clients.jedis.util.RedisVersionRule; +import redis.clients.jedis.util.EnabledOnCommandCondition; +import redis.clients.jedis.util.RedisVersionCondition; -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class PooledSetCommandsTest extends SetCommandsTestBase { - @Rule - public RedisVersionRule versionRule = new RedisVersionRule(PooledCommandsTestHelper.nodeInfo); - @Rule - public EnabledOnCommandRule enabledOnCommandRule = new EnabledOnCommandRule(PooledCommandsTestHelper.nodeInfo); + @RegisterExtension + public RedisVersionCondition versionCondition = new RedisVersionCondition(PooledCommandsTestHelper.nodeInfo); + @RegisterExtension + public EnabledOnCommandCondition enabledOnCommandCondition = new EnabledOnCommandCondition(PooledCommandsTestHelper.nodeInfo); public PooledSetCommandsTest(RedisProtocol protocol) { super(protocol); } - @Before + @BeforeEach public void setUp() { jedis = PooledCommandsTestHelper.getPooled(protocol); PooledCommandsTestHelper.clearData(); } - @After + @AfterEach public void cleanUp() { jedis.close(); } diff --git a/src/test/java/redis/clients/jedis/commands/unified/pooled/PooledSortedSetCommandsTest.java b/src/test/java/redis/clients/jedis/commands/unified/pooled/PooledSortedSetCommandsTest.java index 7bd76c973d..e0fe2a745f 100644 --- a/src/test/java/redis/clients/jedis/commands/unified/pooled/PooledSortedSetCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/unified/pooled/PooledSortedSetCommandsTest.java @@ -1,35 +1,36 @@ package redis.clients.jedis.commands.unified.pooled; -import org.junit.After; -import org.junit.Before; -import org.junit.Rule; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.extension.RegisterExtension; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.commands.unified.SortedSetCommandsTestBase; -import redis.clients.jedis.util.EnabledOnCommandRule; -import redis.clients.jedis.util.RedisVersionRule; +import redis.clients.jedis.util.EnabledOnCommandCondition; +import redis.clients.jedis.util.RedisVersionCondition; -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class PooledSortedSetCommandsTest extends SortedSetCommandsTestBase { - @Rule - public RedisVersionRule versionRule = new RedisVersionRule(PooledCommandsTestHelper.nodeInfo); - @Rule - public EnabledOnCommandRule enabledOnCommandRule = new EnabledOnCommandRule(PooledCommandsTestHelper.nodeInfo); + @RegisterExtension + public RedisVersionCondition versionCondition = new RedisVersionCondition(PooledCommandsTestHelper.nodeInfo); + @RegisterExtension + public EnabledOnCommandCondition enabledOnCommandCondition = new EnabledOnCommandCondition(PooledCommandsTestHelper.nodeInfo); public PooledSortedSetCommandsTest(RedisProtocol protocol) { super(protocol); } - @Before + @BeforeEach public void setUp() { jedis = PooledCommandsTestHelper.getPooled(protocol); PooledCommandsTestHelper.clearData(); } - @After + @AfterEach public void cleanUp() { jedis.close(); } diff --git a/src/test/java/redis/clients/jedis/commands/unified/pooled/PooledStringValuesCommandsTest.java b/src/test/java/redis/clients/jedis/commands/unified/pooled/PooledStringValuesCommandsTest.java index c100e2a0fa..fe45958d39 100644 --- a/src/test/java/redis/clients/jedis/commands/unified/pooled/PooledStringValuesCommandsTest.java +++ b/src/test/java/redis/clients/jedis/commands/unified/pooled/PooledStringValuesCommandsTest.java @@ -1,35 +1,36 @@ package redis.clients.jedis.commands.unified.pooled; -import org.junit.After; -import org.junit.Before; -import org.junit.Rule; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.extension.RegisterExtension; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.commands.unified.StringValuesCommandsTestBase; -import redis.clients.jedis.util.EnabledOnCommandRule; -import redis.clients.jedis.util.RedisVersionRule; +import redis.clients.jedis.util.EnabledOnCommandCondition; +import redis.clients.jedis.util.RedisVersionCondition; -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class PooledStringValuesCommandsTest extends StringValuesCommandsTestBase { - @Rule - public RedisVersionRule versionRule = new RedisVersionRule(PooledCommandsTestHelper.nodeInfo); - @Rule - public EnabledOnCommandRule enabledOnCommandRule = new EnabledOnCommandRule(PooledCommandsTestHelper.nodeInfo); + @RegisterExtension + public RedisVersionCondition versionCondition = new RedisVersionCondition(PooledCommandsTestHelper.nodeInfo); + @RegisterExtension + public EnabledOnCommandCondition enabledOnCommandCondition = new EnabledOnCommandCondition(PooledCommandsTestHelper.nodeInfo); public PooledStringValuesCommandsTest(RedisProtocol protocol) { super(protocol); } - @Before + @BeforeEach public void setUp() { jedis = PooledCommandsTestHelper.getPooled(protocol); PooledCommandsTestHelper.clearData(); } - @After + @AfterEach public void cleanUp() { jedis.close(); } diff --git a/src/test/java/redis/clients/jedis/csc/AllowAndDenyListCacheableTest.java b/src/test/java/redis/clients/jedis/csc/AllowAndDenyListCacheableTest.java index a0b7d68381..50b3ffb247 100644 --- a/src/test/java/redis/clients/jedis/csc/AllowAndDenyListCacheableTest.java +++ b/src/test/java/redis/clients/jedis/csc/AllowAndDenyListCacheableTest.java @@ -1,10 +1,9 @@ package redis.clients.jedis.csc; import static java.util.Collections.singleton; -import static org.junit.Assert.assertEquals; - -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.api.Test; import redis.clients.jedis.JedisPooled; import redis.clients.jedis.Protocol; import redis.clients.jedis.csc.util.AllowAndDenyListWithStringKeys; diff --git a/src/test/java/redis/clients/jedis/csc/ClientSideCacheFunctionalityTest.java b/src/test/java/redis/clients/jedis/csc/ClientSideCacheFunctionalityTest.java index 7155a8d9ca..1836c0320f 100644 --- a/src/test/java/redis/clients/jedis/csc/ClientSideCacheFunctionalityTest.java +++ b/src/test/java/redis/clients/jedis/csc/ClientSideCacheFunctionalityTest.java @@ -4,10 +4,10 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.aMapWithSize; import static org.hamcrest.Matchers.hasSize; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.*; @@ -20,8 +20,8 @@ import java.util.stream.Collectors; import org.hamcrest.Matchers; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import redis.clients.jedis.CommandObjects; @@ -200,7 +200,7 @@ public void deleteByEntriesTest() { .collect(Collectors.toList()); List isDeleted = cache.delete(cacheKeysToDelete); assertThat(isDeleted, hasSize(delete)); - isDeleted.forEach(Assert::assertTrue); + isDeleted.forEach(Assertions::assertTrue); assertEquals(count - delete, cache.getSize()); } } @@ -244,14 +244,14 @@ public void testInvalidationWithUnifiedJedis() { // "foo" is cached client.set("foo", "bar"); client.get("foo"); // read from the server - Assert.assertEquals("bar", client.get("foo")); // cache hit + assertEquals("bar", client.get("foo")); // cache hit // Using another connection controlClient.set("foo", "bar2"); - Assert.assertEquals("bar2", controlClient.get("foo")); + assertEquals("bar2", controlClient.get("foo")); //invalidating the cache and read it back from server - Assert.assertEquals("bar2", client.get("foo")); + assertEquals("bar2", client.get("foo")); Mockito.verify(mock, Mockito.times(1)).deleteByRedisKeys(Mockito.anyList()); Mockito.verify(mock, Mockito.times(2)).set(Mockito.any(CacheKey.class), Mockito.any(CacheEntry.class)); @@ -446,9 +446,9 @@ public void testEvictionPolicy() throws InterruptedException { assertTrue(!cache.hasCacheKey(new CacheKey(new CommandObjects().get("foo" + i)))); } - /// check expected evictions are done after the touched keys + // check expected evictions are done after the touched keys for (int i = touchOffset + expectedEvictions; i < (2 * expectedEvictions); i++) { - assertTrue(!cache.hasCacheKey(new CacheKey(new CommandObjects().get("foo" + i)))); + assertFalse(cache.hasCacheKey(new CacheKey(new CommandObjects().get("foo" + i)))); } assertEquals(maxSize, cache.getSize()); diff --git a/src/test/java/redis/clients/jedis/csc/ClientSideCacheTestBase.java b/src/test/java/redis/clients/jedis/csc/ClientSideCacheTestBase.java index 5fd9c48e7a..7e13d98da3 100644 --- a/src/test/java/redis/clients/jedis/csc/ClientSideCacheTestBase.java +++ b/src/test/java/redis/clients/jedis/csc/ClientSideCacheTestBase.java @@ -4,11 +4,11 @@ import io.redis.test.annotations.SinceRedisVersion; import org.apache.commons.pool2.impl.GenericObjectPoolConfig; -import org.junit.After; -import org.junit.Before; -import org.junit.Rule; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.extension.RegisterExtension; import redis.clients.jedis.*; -import redis.clients.jedis.util.RedisVersionRule; +import redis.clients.jedis.util.RedisVersionCondition; @SinceRedisVersion(value = "7.4.0", message = "Jedis client-side caching is only supported with Redis 7.4 or later.") public abstract class ClientSideCacheTestBase { @@ -19,16 +19,16 @@ public abstract class ClientSideCacheTestBase { protected Jedis control; - @Rule - public RedisVersionRule versionRule = new RedisVersionRule(HostAndPorts.getRedisEndpoint("standalone1")); + @RegisterExtension + public RedisVersionCondition versionCondition = new RedisVersionCondition(HostAndPorts.getRedisEndpoint("standalone1")); - @Before + @BeforeEach public void setUp() throws Exception { control = new Jedis(hnp, endpoint.getClientConfigBuilder().build()); control.flushAll(); } - @After + @AfterEach public void tearDown() throws Exception { control.close(); } diff --git a/src/test/java/redis/clients/jedis/csc/JedisClusterClientSideCacheTest.java b/src/test/java/redis/clients/jedis/csc/JedisClusterClientSideCacheTest.java index 16ab32577b..0ad61e4dbb 100644 --- a/src/test/java/redis/clients/jedis/csc/JedisClusterClientSideCacheTest.java +++ b/src/test/java/redis/clients/jedis/csc/JedisClusterClientSideCacheTest.java @@ -4,9 +4,9 @@ import java.util.HashSet; import java.util.Set; import java.util.function.Supplier; -import org.junit.ClassRule; import org.apache.commons.pool2.impl.GenericObjectPoolConfig; +import org.junit.jupiter.api.extension.RegisterExtension; import redis.clients.jedis.Connection; import redis.clients.jedis.ConnectionPoolConfig; import redis.clients.jedis.DefaultJedisClientConfig; @@ -14,7 +14,7 @@ import redis.clients.jedis.HostAndPorts; import redis.clients.jedis.JedisClientConfig; import redis.clients.jedis.JedisCluster; -import redis.clients.jedis.util.RedisVersionRule; +import redis.clients.jedis.util.RedisVersionCondition; @SinceRedisVersion(value = "7.4.0", message = "Jedis client-side caching is only supported with Redis 7.4 or later.") public class JedisClusterClientSideCacheTest extends UnifiedJedisClientSideCacheTestBase { @@ -31,8 +31,8 @@ public class JedisClusterClientSideCacheTest extends UnifiedJedisClientSideCache return poolConfig; }; - @ClassRule - public static RedisVersionRule versionRule = new RedisVersionRule(hnp.iterator().next(), clientConfig.get()); + @RegisterExtension + public static RedisVersionCondition versionCondition = new RedisVersionCondition(hnp.iterator().next(), clientConfig.get()); @Override protected JedisCluster createRegularJedis() { diff --git a/src/test/java/redis/clients/jedis/csc/JedisPooledClientSideCacheTest.java b/src/test/java/redis/clients/jedis/csc/JedisPooledClientSideCacheTest.java index 9950613bfc..1bb5807a48 100644 --- a/src/test/java/redis/clients/jedis/csc/JedisPooledClientSideCacheTest.java +++ b/src/test/java/redis/clients/jedis/csc/JedisPooledClientSideCacheTest.java @@ -1,19 +1,19 @@ package redis.clients.jedis.csc; import io.redis.test.annotations.SinceRedisVersion; -import org.junit.BeforeClass; -import org.junit.ClassRule; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.extension.RegisterExtension; import redis.clients.jedis.HostAndPorts; -import redis.clients.jedis.util.RedisVersionRule; +import redis.clients.jedis.util.RedisVersionCondition; @SinceRedisVersion(value = "7.4.0", message = "Jedis client-side caching is only supported with Redis 7.4 or later.") public class JedisPooledClientSideCacheTest extends JedisPooledClientSideCacheTestBase { - @ClassRule - public static RedisVersionRule versionRule = new RedisVersionRule( + @RegisterExtension + public static RedisVersionCondition versionCondition = new RedisVersionCondition( HostAndPorts.getRedisEndpoint("standalone1")); - @BeforeClass + @BeforeAll public static void prepare() { endpoint = HostAndPorts.getRedisEndpoint("standalone1"); } diff --git a/src/test/java/redis/clients/jedis/csc/JedisPooledClientSideCacheTestBase.java b/src/test/java/redis/clients/jedis/csc/JedisPooledClientSideCacheTestBase.java index 133efcb3fc..b5c630c274 100644 --- a/src/test/java/redis/clients/jedis/csc/JedisPooledClientSideCacheTestBase.java +++ b/src/test/java/redis/clients/jedis/csc/JedisPooledClientSideCacheTestBase.java @@ -1,9 +1,6 @@ package redis.clients.jedis.csc; -import static org.junit.Assert.assertEquals; - -import org.junit.Test; - +import org.junit.jupiter.api.Test; import redis.clients.jedis.EndpointConfig; import redis.clients.jedis.Jedis; import redis.clients.jedis.JedisPooled; @@ -11,6 +8,8 @@ import redis.clients.jedis.exceptions.JedisConnectionException; import redis.clients.jedis.params.ClientKillParams; +import static org.junit.jupiter.api.Assertions.assertEquals; + public abstract class JedisPooledClientSideCacheTestBase extends UnifiedJedisClientSideCacheTestBase { protected static EndpointConfig endpoint; diff --git a/src/test/java/redis/clients/jedis/csc/JedisSentineledClientSideCacheTest.java b/src/test/java/redis/clients/jedis/csc/JedisSentineledClientSideCacheTest.java index e2d2f3c853..f765b5981d 100644 --- a/src/test/java/redis/clients/jedis/csc/JedisSentineledClientSideCacheTest.java +++ b/src/test/java/redis/clients/jedis/csc/JedisSentineledClientSideCacheTest.java @@ -4,9 +4,8 @@ import java.util.Arrays; import java.util.HashSet; import java.util.Set; -import org.junit.Assume; -import org.junit.BeforeClass; +import org.junit.jupiter.api.BeforeAll; import redis.clients.jedis.DefaultJedisClientConfig; import redis.clients.jedis.HostAndPort; import redis.clients.jedis.HostAndPorts; @@ -15,6 +14,8 @@ import redis.clients.jedis.JedisSentineled; import redis.clients.jedis.util.RedisVersionUtil; +import static org.junit.jupiter.api.Assumptions.assumeTrue; + public class JedisSentineledClientSideCacheTest extends UnifiedJedisClientSideCacheTestBase { private static final String MASTER_NAME = "mymaster"; @@ -38,12 +39,12 @@ protected JedisSentineled createCachedJedis(CacheConfig cacheConfig) { return new JedisSentineled(MASTER_NAME, masterClientConfig, cacheConfig, sentinels, sentinelClientConfig); } - @BeforeClass + @BeforeAll public static void prepare() { try (JedisSentineled sentinelClient = new JedisSentineled(MASTER_NAME, masterClientConfig, sentinels, sentinelClientConfig); Jedis master = new Jedis(sentinelClient.getCurrentMaster(),masterClientConfig)) { - Assume.assumeTrue("Jedis Client side caching is only supported with 'Redis 7.4' or later.", - RedisVersionUtil.getRedisVersion(master).isGreaterThanOrEqualTo(RedisVersion.V7_4)); + assumeTrue(RedisVersionUtil.getRedisVersion(master).isGreaterThanOrEqualTo(RedisVersion.V7_4), + "Jedis Client side caching is only supported with 'Redis 7.4' or later."); } } } diff --git a/src/test/java/redis/clients/jedis/csc/SSLJedisPooledClientSideCacheTest.java b/src/test/java/redis/clients/jedis/csc/SSLJedisPooledClientSideCacheTest.java index d04b19bc1f..34af795aac 100644 --- a/src/test/java/redis/clients/jedis/csc/SSLJedisPooledClientSideCacheTest.java +++ b/src/test/java/redis/clients/jedis/csc/SSLJedisPooledClientSideCacheTest.java @@ -5,20 +5,20 @@ import java.util.Collections; import java.util.List; -import org.junit.AfterClass; -import org.junit.Assume; -import org.junit.BeforeClass; - +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; import redis.clients.jedis.HostAndPorts; import redis.clients.jedis.Jedis; import redis.clients.jedis.util.RedisVersionUtil; import redis.clients.jedis.util.TlsUtil; +import static org.junit.jupiter.api.Assumptions.assumeTrue; + public class SSLJedisPooledClientSideCacheTest extends JedisPooledClientSideCacheTestBase { private static final String trustStoreName = SSLJedisPooledClientSideCacheTest.class.getSimpleName(); - @BeforeClass + @BeforeAll public static void prepare() { endpoint = HostAndPorts.getRedisEndpoint("standalone0-tls"); @@ -27,13 +27,14 @@ public static void prepare() { Path trustStorePath = TlsUtil.createAndSaveTestTruststore(trustStoreName, trustedCertLocation,"changeit"); TlsUtil.setCustomTrustStore(trustStorePath, "changeit"); - try (Jedis jedis = new Jedis(endpoint.getHostAndPort(), endpoint.getClientConfigBuilder().build())) { - Assume.assumeTrue("Jedis Client side caching is only supported with 'Redis 7.4' or later.", - RedisVersionUtil.getRedisVersion(jedis).isGreaterThanOrEqualTo(RedisVersion.V7_4)); + try (Jedis jedis = new Jedis(endpoint.getHostAndPort(), + endpoint.getClientConfigBuilder().build())) { + assumeTrue(RedisVersionUtil.getRedisVersion(jedis).isGreaterThanOrEqualTo(RedisVersion.V7_4), + "Jedis Client side caching is only supported with 'Redis 7.4' or later."); } } - @AfterClass + @AfterAll public static void teardownTrustStore() { TlsUtil.restoreOriginalTrustStore(); } diff --git a/src/test/java/redis/clients/jedis/csc/UnifiedJedisClientSideCacheTestBase.java b/src/test/java/redis/clients/jedis/csc/UnifiedJedisClientSideCacheTestBase.java index eb09a620c9..fa4043799e 100644 --- a/src/test/java/redis/clients/jedis/csc/UnifiedJedisClientSideCacheTestBase.java +++ b/src/test/java/redis/clients/jedis/csc/UnifiedJedisClientSideCacheTestBase.java @@ -1,10 +1,10 @@ package redis.clients.jedis.csc; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; import static org.awaitility.Awaitility.await; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.ArrayList; import java.util.Arrays; @@ -13,10 +13,9 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import redis.clients.jedis.JedisPubSub; import redis.clients.jedis.UnifiedJedis; @@ -28,13 +27,13 @@ public abstract class UnifiedJedisClientSideCacheTestBase { protected abstract UnifiedJedis createCachedJedis(CacheConfig cacheConfig); - @Before + @BeforeEach public void setUp() throws Exception { control = createRegularJedis(); control.flushAll(); } - @After + @AfterEach public void tearDown() throws Exception { control.close(); } diff --git a/src/test/java/redis/clients/jedis/csc/VersionTest.java b/src/test/java/redis/clients/jedis/csc/VersionTest.java index b154e88a05..1219d566ab 100644 --- a/src/test/java/redis/clients/jedis/csc/VersionTest.java +++ b/src/test/java/redis/clients/jedis/csc/VersionTest.java @@ -1,8 +1,9 @@ package redis.clients.jedis.csc; -import static org.junit.Assert.assertEquals; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; public class VersionTest { diff --git a/src/test/java/redis/clients/jedis/examples/GeoShapeFieldsUsageInRediSearch.java b/src/test/java/redis/clients/jedis/examples/GeoShapeFieldsUsageInRediSearch.java index ea0570265d..b5c0153a2c 100644 --- a/src/test/java/redis/clients/jedis/examples/GeoShapeFieldsUsageInRediSearch.java +++ b/src/test/java/redis/clients/jedis/examples/GeoShapeFieldsUsageInRediSearch.java @@ -1,7 +1,5 @@ package redis.clients.jedis.examples; -import org.junit.Assert; - import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.Geometry; import org.locationtech.jts.geom.GeometryFactory; @@ -16,6 +14,8 @@ import redis.clients.jedis.search.SearchResult; import redis.clients.jedis.search.schemafields.GeoShapeField; +import static org.junit.jupiter.api.Assertions.assertEquals; + /** * As of RediSearch 2.8.4, advanced GEO querying with GEOSHAPE fields is supported. *

@@ -95,14 +95,14 @@ public static void main(String[] args) { .addParam("poly", within) .dialect(3) // DIALECT '3' is required for this query ); - Assert.assertEquals(1, res.getTotalResults()); - Assert.assertEquals(1, res.getDocuments().size()); + assertEquals(1, res.getTotalResults()); + assertEquals(1, res.getDocuments().size()); // We can parse geometry objects with WKTReader try { final WKTReader reader = new WKTReader(); Geometry object = reader.read(res.getDocuments().get(0).getString("geometry")); - Assert.assertEquals(small, object); + assertEquals(small, object); } catch (ParseException ex) { // WKTReader#read throws ParseException ex.printStackTrace(System.err); } diff --git a/src/test/java/redis/clients/jedis/exceptions/ExceptionsTest.java b/src/test/java/redis/clients/jedis/exceptions/ExceptionsTest.java index 4b1bef38fe..eb3b0c2feb 100644 --- a/src/test/java/redis/clients/jedis/exceptions/ExceptionsTest.java +++ b/src/test/java/redis/clients/jedis/exceptions/ExceptionsTest.java @@ -1,19 +1,19 @@ package redis.clients.jedis.exceptions; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; - -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import redis.clients.jedis.HostAndPort; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; + public class ExceptionsTest { private static String MESSAGE; private static Throwable CAUSE; - @BeforeClass + @BeforeAll public static void prepare() { MESSAGE = "This is a test message."; CAUSE = new Throwable("This is a test cause."); diff --git a/src/test/java/redis/clients/jedis/misc/AutomaticFailoverTest.java b/src/test/java/redis/clients/jedis/misc/AutomaticFailoverTest.java index 46c40fae6a..cd87689b6c 100644 --- a/src/test/java/redis/clients/jedis/misc/AutomaticFailoverTest.java +++ b/src/test/java/redis/clients/jedis/misc/AutomaticFailoverTest.java @@ -1,18 +1,14 @@ package redis.clients.jedis.misc; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.function.Consumer; import java.util.stream.Collectors; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -22,6 +18,10 @@ import redis.clients.jedis.providers.MultiClusterPooledConnectionProvider; import redis.clients.jedis.util.IOUtils; +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 AutomaticFailoverTest { private static final Logger log = LoggerFactory.getLogger(AutomaticFailoverTest.class); @@ -41,14 +41,14 @@ private List getClusterConfigs( .collect(Collectors.toList()); } - @Before + @BeforeEach public void setUp() { jedis2 = new Jedis(workingEndpoint.getHostAndPort(), workingEndpoint.getClientConfigBuilder().build()); jedis2.flushAll(); } - @After + @AfterEach public void cleanUp() { IOUtils.closeQuietly(jedis2); } @@ -80,7 +80,7 @@ public void transactionWithSwitch() { tx.set("tstr", "foobar"); tx.hset("thash", "foo", "bar"); provider.incrementActiveMultiClusterIndex(); - assertEquals(Arrays.asList("OK", Long.valueOf(1L)), tx.exec()); + assertEquals(Arrays.asList("OK", 1L), tx.exec()); } assertEquals("foobar", jedis2.get("tstr")); @@ -134,7 +134,7 @@ public void pipelineFailover() { getClusterConfigs(clientConfig, hostPortWithFailure, workingEndpoint.getHostAndPort())) .circuitBreakerSlidingWindowMinCalls(slidingWindowMinCalls) .circuitBreakerSlidingWindowSize(slidingWindowSize) - .fallbackExceptionList(Arrays.asList(JedisConnectionException.class)); + .fallbackExceptionList(Collections.singletonList(JedisConnectionException.class)); RedisFailoverReporter failoverReporter = new RedisFailoverReporter(); MultiClusterPooledConnectionProvider cacheProvider = new MultiClusterPooledConnectionProvider(builder.build()); @@ -167,7 +167,7 @@ public void failoverFromAuthError() { getClusterConfigs(clientConfig, endpointForAuthFailure.getHostAndPort(), workingEndpoint.getHostAndPort())) .circuitBreakerSlidingWindowMinCalls(slidingWindowMinCalls) .circuitBreakerSlidingWindowSize(slidingWindowSize) - .fallbackExceptionList(Arrays.asList(JedisAccessControlException.class)); + .fallbackExceptionList(Collections.singletonList(JedisAccessControlException.class)); RedisFailoverReporter failoverReporter = new RedisFailoverReporter(); MultiClusterPooledConnectionProvider cacheProvider = new MultiClusterPooledConnectionProvider(builder.build()); @@ -187,7 +187,7 @@ public void failoverFromAuthError() { jedis.close(); } - class RedisFailoverReporter implements Consumer { + static class RedisFailoverReporter implements Consumer { boolean failedOver = false; diff --git a/src/test/java/redis/clients/jedis/misc/ClientSetInfoConfigTest.java b/src/test/java/redis/clients/jedis/misc/ClientSetInfoConfigTest.java index 8b85f70252..2f31361eab 100644 --- a/src/test/java/redis/clients/jedis/misc/ClientSetInfoConfigTest.java +++ b/src/test/java/redis/clients/jedis/misc/ClientSetInfoConfigTest.java @@ -1,14 +1,14 @@ package redis.clients.jedis.misc; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThrows; - import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.ClientSetInfoConfig; import redis.clients.jedis.exceptions.JedisValidationException; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; + public class ClientSetInfoConfigTest { @Test diff --git a/src/test/java/redis/clients/jedis/misc/ClusterInitErrorTest.java b/src/test/java/redis/clients/jedis/misc/ClusterInitErrorTest.java index 76998dc808..b7ee96e542 100644 --- a/src/test/java/redis/clients/jedis/misc/ClusterInitErrorTest.java +++ b/src/test/java/redis/clients/jedis/misc/ClusterInitErrorTest.java @@ -1,32 +1,37 @@ package redis.clients.jedis.misc; import java.util.Collections; -import org.junit.After; -import org.junit.Assert; -import org.junit.Test; + +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; import redis.clients.jedis.EndpointConfig; import redis.clients.jedis.HostAndPorts; import redis.clients.jedis.JedisCluster; import redis.clients.jedis.exceptions.JedisClusterOperationException; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; + public class ClusterInitErrorTest { private static final String INIT_NO_ERROR_PROPERTY = "jedis.cluster.initNoError"; - @After + @AfterEach public void cleanUp() { System.getProperties().remove(INIT_NO_ERROR_PROPERTY); } - @Test(expected = JedisClusterOperationException.class) + @Test public void initError() { - Assert.assertNull(System.getProperty(INIT_NO_ERROR_PROPERTY)); + assertNull(System.getProperty(INIT_NO_ERROR_PROPERTY)); EndpointConfig endpoint = HostAndPorts.getRedisEndpoint("standalone0"); - try (JedisCluster cluster = new JedisCluster( - Collections.singleton(endpoint.getHostAndPort()), - endpoint.getClientConfigBuilder().build())) { - throw new IllegalStateException("should not reach here"); - } + assertThrows(JedisClusterOperationException.class, () -> { + try (JedisCluster cluster = new JedisCluster( + Collections.singleton(endpoint.getHostAndPort()), + endpoint.getClientConfigBuilder().build())) { + // Intentionally left empty because the exception is expected + } + }); } @Test @@ -36,7 +41,7 @@ public void initNoError() { try (JedisCluster cluster = new JedisCluster( Collections.singleton(endpoint.getHostAndPort()), endpoint.getClientConfigBuilder().build())) { - Assert.assertThrows(JedisClusterOperationException.class, () -> cluster.get("foo")); + assertThrows(JedisClusterOperationException.class, () -> cluster.get("foo")); } } } diff --git a/src/test/java/redis/clients/jedis/misc/ParamsTest.java b/src/test/java/redis/clients/jedis/misc/ParamsTest.java deleted file mode 100644 index b23e87dfd7..0000000000 --- a/src/test/java/redis/clients/jedis/misc/ParamsTest.java +++ /dev/null @@ -1,26 +0,0 @@ -//package redis.clients.jedis.misc; -// -//import static org.hamcrest.CoreMatchers.containsString; -//import static org.hamcrest.MatcherAssert.assertThat; -// -//import org.junit.Test; -//import redis.clients.jedis.args.ClientType; -//import redis.clients.jedis.params.ClientKillParams; -// -//public class ParamsTest { -// -// @Test -// public void toStringTest() { -// -// ClientKillParams clientKillParams = ClientKillParams.clientKillParams() -// .addr("127.0.0.1", 6379) -// .id("12".getBytes()) -// .type(ClientType.NORMAL); -// -// String toStringResult = clientKillParams.toString(); -// assertThat(toStringResult, containsString("ID, 12")); -// assertThat(toStringResult, containsString("TYPE, NORMAL")); -// assertThat(toStringResult, containsString("127.0.0.1:6379")); -// } -// -//} diff --git a/src/test/java/redis/clients/jedis/misc/ResponsesToStringTest.java b/src/test/java/redis/clients/jedis/misc/ResponsesToStringTest.java index b5d072e250..f455eb6751 100644 --- a/src/test/java/redis/clients/jedis/misc/ResponsesToStringTest.java +++ b/src/test/java/redis/clients/jedis/misc/ResponsesToStringTest.java @@ -1,12 +1,13 @@ package redis.clients.jedis.misc; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; - -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.GeoCoordinate; import redis.clients.jedis.resps.GeoRadiusResponse; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class ResponsesToStringTest { @Test @@ -23,7 +24,7 @@ public void GeoRadiusResponse() { response_copy.setCoordinate(new GeoCoordinate(2, 3)); response_copy.setRawScore(10); - assertEquals(response, response); + assertTrue(response.equals(response)); assertEquals(response, response_copy); assertNotEquals(response, new Object()); } diff --git a/src/test/java/redis/clients/jedis/misc/TupleTest.java b/src/test/java/redis/clients/jedis/misc/TupleTest.java index 4983b8044e..e69b996dff 100644 --- a/src/test/java/redis/clients/jedis/misc/TupleTest.java +++ b/src/test/java/redis/clients/jedis/misc/TupleTest.java @@ -1,15 +1,15 @@ package redis.clients.jedis.misc; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - import java.util.HashSet; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.resps.Tuple; +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 TupleTest { @Test diff --git a/src/test/java/redis/clients/jedis/mocked/MockedCommandObjectsTestBase.java b/src/test/java/redis/clients/jedis/mocked/MockedCommandObjectsTestBase.java index 5576a207f8..0ae91e9b77 100644 --- a/src/test/java/redis/clients/jedis/mocked/MockedCommandObjectsTestBase.java +++ b/src/test/java/redis/clients/jedis/mocked/MockedCommandObjectsTestBase.java @@ -5,9 +5,8 @@ import java.util.Set; import org.json.JSONArray; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; import redis.clients.jedis.CommandObject; import redis.clients.jedis.GeoCoordinate; import redis.clients.jedis.StreamEntryID; @@ -17,11 +16,12 @@ import redis.clients.jedis.search.aggr.AggregationResult; import redis.clients.jedis.timeseries.*; import redis.clients.jedis.util.KeyValue; +import org.mockito.junit.jupiter.MockitoExtension; /** * Provides an exhaustive list of mocked {@link redis.clients.jedis.CommandObject}s for use in unit tests. */ -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public abstract class MockedCommandObjectsTestBase { /** diff --git a/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseBitmapCommandsTest.java b/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseBitmapCommandsTest.java index a96690f19b..cbdfdd75cf 100644 --- a/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseBitmapCommandsTest.java +++ b/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseBitmapCommandsTest.java @@ -7,7 +7,7 @@ import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.Response; import redis.clients.jedis.args.BitCountOption; import redis.clients.jedis.args.BitOP; diff --git a/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseBloomFilterCommandsTest.java b/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseBloomFilterCommandsTest.java index 6525e521e1..d3c5eeb0ad 100644 --- a/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseBloomFilterCommandsTest.java +++ b/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseBloomFilterCommandsTest.java @@ -8,7 +8,7 @@ import java.util.List; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.Response; import redis.clients.jedis.bloom.BFInsertParams; import redis.clients.jedis.bloom.BFReserveParams; diff --git a/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseCountMinSketchCommandsTest.java b/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseCountMinSketchCommandsTest.java index e594ce1aad..84752592ba 100644 --- a/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseCountMinSketchCommandsTest.java +++ b/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseCountMinSketchCommandsTest.java @@ -9,7 +9,7 @@ import java.util.List; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.Response; public class PipeliningBaseCountMinSketchCommandsTest extends PipeliningBaseMockedTestBase { diff --git a/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseCuckooFilterCommandsTest.java b/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseCuckooFilterCommandsTest.java index 85a26029c7..66857648a3 100644 --- a/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseCuckooFilterCommandsTest.java +++ b/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseCuckooFilterCommandsTest.java @@ -8,7 +8,7 @@ import java.util.List; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.Response; import redis.clients.jedis.bloom.CFInsertParams; import redis.clients.jedis.bloom.CFReserveParams; diff --git a/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseGenericCommandsTest.java b/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseGenericCommandsTest.java index 1e79ec87a9..9d864c9fce 100644 --- a/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseGenericCommandsTest.java +++ b/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseGenericCommandsTest.java @@ -8,7 +8,7 @@ import java.util.List; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.Response; import redis.clients.jedis.args.ExpiryOption; import redis.clients.jedis.params.MigrateParams; diff --git a/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseGeospatialCommandsTest.java b/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseGeospatialCommandsTest.java index 114bc07dc0..e2ed40d8a2 100644 --- a/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseGeospatialCommandsTest.java +++ b/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseGeospatialCommandsTest.java @@ -9,7 +9,7 @@ import java.util.List; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.GeoCoordinate; import redis.clients.jedis.Response; import redis.clients.jedis.args.GeoUnit; diff --git a/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseHashCommandsTest.java b/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseHashCommandsTest.java index 1ea0d0b3c2..9eb59826b6 100644 --- a/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseHashCommandsTest.java +++ b/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseHashCommandsTest.java @@ -12,7 +12,7 @@ import java.util.Map; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.Response; import redis.clients.jedis.args.ExpiryOption; import redis.clients.jedis.params.ScanParams; diff --git a/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseHyperloglogCommandsTest.java b/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseHyperloglogCommandsTest.java index d5b59b99a4..b532c83b12 100644 --- a/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseHyperloglogCommandsTest.java +++ b/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseHyperloglogCommandsTest.java @@ -5,7 +5,7 @@ import static org.hamcrest.Matchers.is; import static org.mockito.Mockito.when; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.Response; public class PipeliningBaseHyperloglogCommandsTest extends PipeliningBaseMockedTestBase { diff --git a/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseJsonCommandsTest.java b/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseJsonCommandsTest.java index aabb6ca5a1..d4674a36e7 100644 --- a/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseJsonCommandsTest.java +++ b/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseJsonCommandsTest.java @@ -12,7 +12,7 @@ import com.google.gson.JsonObject; import org.json.JSONArray; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.Response; import redis.clients.jedis.json.JsonObjectMapper; import redis.clients.jedis.json.JsonSetParams; diff --git a/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseListCommandsTest.java b/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseListCommandsTest.java index a43d80a138..37af960246 100644 --- a/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseListCommandsTest.java +++ b/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseListCommandsTest.java @@ -7,7 +7,7 @@ import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.Response; import redis.clients.jedis.args.ListDirection; import redis.clients.jedis.args.ListPosition; diff --git a/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseMiscellaneousTest.java b/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseMiscellaneousTest.java index d712a5cdd4..d9b6adabec 100644 --- a/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseMiscellaneousTest.java +++ b/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseMiscellaneousTest.java @@ -10,7 +10,7 @@ import java.util.List; import java.util.stream.Collectors; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.BuilderFactory; import redis.clients.jedis.CommandArguments; import redis.clients.jedis.CommandObject; diff --git a/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseMockedTestBase.java b/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseMockedTestBase.java index 14eb47cde0..dc72ee1c64 100644 --- a/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseMockedTestBase.java +++ b/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseMockedTestBase.java @@ -3,7 +3,7 @@ import java.util.ArrayList; import java.util.List; -import org.junit.Before; +import org.junit.jupiter.api.BeforeEach; import org.mockito.Mock; import redis.clients.jedis.CommandObject; @@ -72,7 +72,7 @@ protected Response appendCommand(CommandObject commandObject) { @Mock protected Response predefinedResponse; - @Before + @BeforeEach public void setUp() { pipeliningBase = new TestPipeliningBase(commandObjects, predefinedResponse, commands); } diff --git a/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseScriptingAndFunctionsCommandsTest.java b/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseScriptingAndFunctionsCommandsTest.java index a5aa8dc7ea..ba8b228828 100644 --- a/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseScriptingAndFunctionsCommandsTest.java +++ b/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseScriptingAndFunctionsCommandsTest.java @@ -8,7 +8,7 @@ import java.util.Collections; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.Response; import redis.clients.jedis.args.FlushMode; import redis.clients.jedis.args.FunctionRestorePolicy; diff --git a/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseSearchAndQueryCommandsTest.java b/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseSearchAndQueryCommandsTest.java index 4ac820d693..edaa896793 100644 --- a/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseSearchAndQueryCommandsTest.java +++ b/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseSearchAndQueryCommandsTest.java @@ -10,7 +10,7 @@ import java.util.Map; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.Response; import redis.clients.jedis.resps.Tuple; import redis.clients.jedis.search.FTCreateParams; diff --git a/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseServerManagementCommandsTest.java b/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseServerManagementCommandsTest.java index 2a7365dace..63ebefb031 100644 --- a/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseServerManagementCommandsTest.java +++ b/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseServerManagementCommandsTest.java @@ -5,7 +5,7 @@ import static org.hamcrest.Matchers.is; import static org.mockito.Mockito.when; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.Response; public class PipeliningBaseServerManagementCommandsTest extends PipeliningBaseMockedTestBase { diff --git a/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseSetCommandsTest.java b/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseSetCommandsTest.java index 694461a5a8..a735c21754 100644 --- a/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseSetCommandsTest.java +++ b/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseSetCommandsTest.java @@ -8,7 +8,7 @@ import java.util.List; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.Response; import redis.clients.jedis.params.ScanParams; import redis.clients.jedis.resps.ScanResult; diff --git a/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseSortedSetCommandsTest.java b/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseSortedSetCommandsTest.java index 3e3958abb1..ed1d79a8e1 100644 --- a/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseSortedSetCommandsTest.java +++ b/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseSortedSetCommandsTest.java @@ -9,7 +9,7 @@ import java.util.List; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.Response; import redis.clients.jedis.args.SortedSetOption; import redis.clients.jedis.params.ScanParams; diff --git a/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseStreamCommandsTest.java b/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseStreamCommandsTest.java index ff010f6e53..79a1e3e518 100644 --- a/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseStreamCommandsTest.java +++ b/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseStreamCommandsTest.java @@ -10,7 +10,7 @@ import java.util.List; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.Response; import redis.clients.jedis.StreamEntryID; import redis.clients.jedis.params.XAddParams; diff --git a/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseStringCommandsTest.java b/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseStringCommandsTest.java index 6fdd1f10dd..8590275c90 100644 --- a/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseStringCommandsTest.java +++ b/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseStringCommandsTest.java @@ -7,7 +7,7 @@ import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.Response; import redis.clients.jedis.params.GetExParams; import redis.clients.jedis.params.LCSParams; diff --git a/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseTDigestCommandsTest.java b/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseTDigestCommandsTest.java index 1e2b29f9a1..f1fd72bb80 100644 --- a/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseTDigestCommandsTest.java +++ b/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseTDigestCommandsTest.java @@ -8,7 +8,7 @@ import java.util.List; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.Response; import redis.clients.jedis.bloom.TDigestMergeParams; diff --git a/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseTimeSeriesCommandsTest.java b/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseTimeSeriesCommandsTest.java index 671fc83ef9..ad8c73cb81 100644 --- a/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseTimeSeriesCommandsTest.java +++ b/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseTimeSeriesCommandsTest.java @@ -10,7 +10,7 @@ import java.util.List; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.Response; import redis.clients.jedis.timeseries.*; diff --git a/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseTopKCommandsTest.java b/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseTopKCommandsTest.java index b652c0df25..3f1eb1fb19 100644 --- a/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseTopKCommandsTest.java +++ b/src/test/java/redis/clients/jedis/mocked/pipeline/PipeliningBaseTopKCommandsTest.java @@ -9,7 +9,7 @@ import java.util.List; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.Response; public class PipeliningBaseTopKCommandsTest extends PipeliningBaseMockedTestBase { diff --git a/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisBitmapCommandsTest.java b/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisBitmapCommandsTest.java index 86492b49da..2366d14c87 100644 --- a/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisBitmapCommandsTest.java +++ b/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisBitmapCommandsTest.java @@ -9,7 +9,7 @@ import java.util.Collections; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.args.BitCountOption; import redis.clients.jedis.args.BitOP; import redis.clients.jedis.params.BitPosParams; diff --git a/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisBloomFilterCommandsTest.java b/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisBloomFilterCommandsTest.java index cafb2d2c83..77fc337a62 100644 --- a/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisBloomFilterCommandsTest.java +++ b/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisBloomFilterCommandsTest.java @@ -11,7 +11,7 @@ import java.util.List; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.bloom.BFInsertParams; import redis.clients.jedis.bloom.BFReserveParams; diff --git a/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisConnectionManagementCommandsTest.java b/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisConnectionManagementCommandsTest.java index dc795765ee..331c99336f 100644 --- a/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisConnectionManagementCommandsTest.java +++ b/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisConnectionManagementCommandsTest.java @@ -5,7 +5,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class UnifiedJedisConnectionManagementCommandsTest extends UnifiedJedisMockedTestBase { diff --git a/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisCountMinSketchCommandsTest.java b/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisCountMinSketchCommandsTest.java index 8397d35f59..73f77296de 100644 --- a/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisCountMinSketchCommandsTest.java +++ b/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisCountMinSketchCommandsTest.java @@ -10,7 +10,7 @@ import java.util.List; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class UnifiedJedisCountMinSketchCommandsTest extends UnifiedJedisMockedTestBase { diff --git a/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisCuckooFilterCommandsTest.java b/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisCuckooFilterCommandsTest.java index d0e463aaf2..2e1888a873 100644 --- a/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisCuckooFilterCommandsTest.java +++ b/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisCuckooFilterCommandsTest.java @@ -11,7 +11,7 @@ import java.util.List; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.bloom.CFInsertParams; import redis.clients.jedis.bloom.CFReserveParams; diff --git a/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisGenericCommandsTest.java b/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisGenericCommandsTest.java index c3c0d38442..dd27c6fdbf 100644 --- a/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisGenericCommandsTest.java +++ b/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisGenericCommandsTest.java @@ -3,8 +3,8 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.equalTo; -import static org.junit.Assert.assertEquals; -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.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -17,7 +17,7 @@ import java.util.Map; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; import redis.clients.jedis.CommandArguments; diff --git a/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisGeospatialCommandsTest.java b/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisGeospatialCommandsTest.java index a6f8b8ac83..0ed78fa6d0 100644 --- a/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisGeospatialCommandsTest.java +++ b/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisGeospatialCommandsTest.java @@ -11,7 +11,7 @@ import java.util.List; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.GeoCoordinate; import redis.clients.jedis.args.GeoUnit; import redis.clients.jedis.params.GeoAddParams; diff --git a/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisHashCommandsTest.java b/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisHashCommandsTest.java index d2dc8d8892..43ac0c15bd 100644 --- a/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisHashCommandsTest.java +++ b/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisHashCommandsTest.java @@ -16,7 +16,7 @@ import java.util.Map; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.args.ExpiryOption; import redis.clients.jedis.params.ScanParams; import redis.clients.jedis.resps.ScanResult; diff --git a/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisHyperloglogCommandsTest.java b/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisHyperloglogCommandsTest.java index f7e1cc4b3c..34c4c7c64d 100644 --- a/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisHyperloglogCommandsTest.java +++ b/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisHyperloglogCommandsTest.java @@ -5,7 +5,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class UnifiedJedisHyperloglogCommandsTest extends UnifiedJedisMockedTestBase { diff --git a/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisJsonCommandsTest.java b/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisJsonCommandsTest.java index 2ce1009dec..5377e2e996 100644 --- a/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisJsonCommandsTest.java +++ b/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisJsonCommandsTest.java @@ -1,6 +1,6 @@ package redis.clients.jedis.mocked.unified; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -11,7 +11,7 @@ import com.google.gson.JsonObject; import org.json.JSONArray; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; import redis.clients.jedis.json.JsonObjectMapper; diff --git a/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisListCommandsTest.java b/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisListCommandsTest.java index 1eec5a5896..eb87e30b60 100644 --- a/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisListCommandsTest.java +++ b/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisListCommandsTest.java @@ -8,7 +8,7 @@ import java.util.Arrays; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.args.ListDirection; import redis.clients.jedis.args.ListPosition; import redis.clients.jedis.params.LPosParams; diff --git a/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisMockedTestBase.java b/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisMockedTestBase.java index 55fb55b5cd..c5e0c7afa1 100644 --- a/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisMockedTestBase.java +++ b/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisMockedTestBase.java @@ -3,8 +3,8 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; -import org.junit.After; -import org.junit.Before; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; import org.mockito.Mock; import redis.clients.jedis.CommandObject; import redis.clients.jedis.CommandObjects; @@ -47,12 +47,12 @@ public abstract class UnifiedJedisMockedTestBase extends MockedCommandObjectsTes @Mock protected CommandObjects commandObjects; - @Before + @BeforeEach public void setUp() { jedis = new UnifiedJedis(commandExecutor, connectionProvider, commandObjects); } - @After + @AfterEach public void tearDown() { // We want to be accurate about our mocks, hence we verify no more interactions here. // This might mean that some methods need to verify their interactions in a more verbose way, diff --git a/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisPubSubCommandsTest.java b/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisPubSubCommandsTest.java index ee5db61255..2f703404de 100644 --- a/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisPubSubCommandsTest.java +++ b/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisPubSubCommandsTest.java @@ -5,7 +5,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class UnifiedJedisPubSubCommandsTest extends UnifiedJedisMockedTestBase { diff --git a/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisScriptingAndFunctionsCommandsTest.java b/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisScriptingAndFunctionsCommandsTest.java index 8ab868ad41..e136a8b230 100644 --- a/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisScriptingAndFunctionsCommandsTest.java +++ b/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisScriptingAndFunctionsCommandsTest.java @@ -12,7 +12,7 @@ import java.util.Collections; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.args.FlushMode; import redis.clients.jedis.args.FunctionRestorePolicy; import redis.clients.jedis.resps.FunctionStats; diff --git a/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisSearchAndQueryCommandsTest.java b/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisSearchAndQueryCommandsTest.java index c061c6f102..66a56001f2 100644 --- a/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisSearchAndQueryCommandsTest.java +++ b/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisSearchAndQueryCommandsTest.java @@ -15,7 +15,7 @@ import java.util.Map; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.resps.Tuple; import redis.clients.jedis.search.*; import redis.clients.jedis.search.aggr.AggregationBuilder; diff --git a/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisServerManagementCommandsTest.java b/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisServerManagementCommandsTest.java index 3dc85aa201..2330b9551c 100644 --- a/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisServerManagementCommandsTest.java +++ b/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisServerManagementCommandsTest.java @@ -5,7 +5,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class UnifiedJedisServerManagementCommandsTest extends UnifiedJedisMockedTestBase { diff --git a/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisSetCommandsTest.java b/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisSetCommandsTest.java index 3fe180baeb..36be9a262a 100644 --- a/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisSetCommandsTest.java +++ b/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisSetCommandsTest.java @@ -10,7 +10,7 @@ import java.util.List; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.params.ScanParams; import redis.clients.jedis.resps.ScanResult; diff --git a/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisSortedSetCommandsTest.java b/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisSortedSetCommandsTest.java index 2dea520ea8..b0780d661f 100644 --- a/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisSortedSetCommandsTest.java +++ b/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisSortedSetCommandsTest.java @@ -2,7 +2,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; -import static org.junit.Assert.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -12,7 +12,7 @@ import java.util.List; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.args.SortedSetOption; import redis.clients.jedis.params.ScanParams; import redis.clients.jedis.params.ZAddParams; diff --git a/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisStreamCommandsTest.java b/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisStreamCommandsTest.java index 404476788f..878d5fbfa7 100644 --- a/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisStreamCommandsTest.java +++ b/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisStreamCommandsTest.java @@ -15,7 +15,7 @@ import java.util.List; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.StreamEntryID; import redis.clients.jedis.params.XAddParams; import redis.clients.jedis.params.XAutoClaimParams; diff --git a/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisStringCommandsTest.java b/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisStringCommandsTest.java index 7d1e4f1bfd..d12e9e6224 100644 --- a/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisStringCommandsTest.java +++ b/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisStringCommandsTest.java @@ -8,7 +8,7 @@ import java.util.Arrays; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.params.GetExParams; import redis.clients.jedis.params.LCSParams; import redis.clients.jedis.params.SetParams; diff --git a/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisTDigestCommandsTest.java b/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisTDigestCommandsTest.java index 4ccec8c1c7..f8f64af2c5 100644 --- a/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisTDigestCommandsTest.java +++ b/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisTDigestCommandsTest.java @@ -11,7 +11,7 @@ import java.util.List; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.bloom.TDigestMergeParams; public class UnifiedJedisTDigestCommandsTest extends UnifiedJedisMockedTestBase { diff --git a/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisTimeSeriesCommandsTest.java b/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisTimeSeriesCommandsTest.java index bfc17620ea..da9866867a 100644 --- a/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisTimeSeriesCommandsTest.java +++ b/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisTimeSeriesCommandsTest.java @@ -2,7 +2,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.sameInstance; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -14,7 +14,7 @@ import java.util.List; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.timeseries.*; public class UnifiedJedisTimeSeriesCommandsTest extends UnifiedJedisMockedTestBase { diff --git a/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisTopKCommandsTest.java b/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisTopKCommandsTest.java index e629f80bd9..1a6eabcab2 100644 --- a/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisTopKCommandsTest.java +++ b/src/test/java/redis/clients/jedis/mocked/unified/UnifiedJedisTopKCommandsTest.java @@ -10,7 +10,7 @@ import java.util.List; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class UnifiedJedisTopKCommandsTest extends UnifiedJedisMockedTestBase { diff --git a/src/test/java/redis/clients/jedis/modules/ConsolidatedAccessControlListCommandsTest.java b/src/test/java/redis/clients/jedis/modules/ConsolidatedAccessControlListCommandsTest.java index 2ebacda539..f498b1e501 100644 --- a/src/test/java/redis/clients/jedis/modules/ConsolidatedAccessControlListCommandsTest.java +++ b/src/test/java/redis/clients/jedis/modules/ConsolidatedAccessControlListCommandsTest.java @@ -1,16 +1,17 @@ package redis.clients.jedis.modules; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertThrows; +import static org.junit.jupiter.api.Assertions.assertThrows; import io.redis.test.annotations.SinceRedisVersion; import java.util.Locale; import java.util.function.Consumer; import org.hamcrest.Matchers; -import org.junit.After; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; + import redis.clients.jedis.DefaultJedisClientConfig; import redis.clients.jedis.RedisProtocol; @@ -25,7 +26,8 @@ import redis.clients.jedis.util.SafeEncoder; @SinceRedisVersion(value = "7.9.0") -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class ConsolidatedAccessControlListCommandsTest extends RedisModuleCommandsTestBase { public static final String USER_NAME = "moduser"; @@ -35,7 +37,7 @@ public ConsolidatedAccessControlListCommandsTest(RedisProtocol protocol) { super(protocol); } - @After + @AfterEach @Override public void tearDown() throws Exception { try { @@ -142,10 +144,10 @@ private void grantModuleCommandTest(ProtocolCommand command, Consumer operation.accept(client)); - assertThat(noperm.getMessage(), - Matchers.oneOf(getNopermErrorMessage(false, command), getNopermErrorMessage(true, command))); + JedisAccessControlException noperm = assertThrows(JedisAccessControlException.class, + () -> operation.accept(client), "Should throw a NOPERM exception"); + assertThat(noperm.getMessage(), Matchers.oneOf(getNopermErrorMessage(false, command), + getNopermErrorMessage(true, command))); // permit user to commands jedis.aclSetUser(USER_NAME, "+" + SafeEncoder.encode(command.getRaw())); @@ -155,7 +157,8 @@ private void grantModuleCommandTest(ProtocolCommand command, Consumer operation) { + private void grantModuleCommandCatTest(String category, ProtocolCommand command, + Consumer operation) { // create and enable an user with permission to all keys but no commands jedis.aclSetUser(USER_NAME, ">" + USER_PASSWORD, "on", "~*"); @@ -164,10 +167,10 @@ private void grantModuleCommandCatTest(String category, ProtocolCommand command, DefaultJedisClientConfig.builder().user(USER_NAME).password(USER_PASSWORD).build())) { // user can't execute category commands - JedisAccessControlException noperm = assertThrows("Should throw a NOPERM exception", - JedisAccessControlException.class, () -> operation.accept(client)); - assertThat(noperm.getMessage(), - Matchers.oneOf(getNopermErrorMessage(false, command), getNopermErrorMessage(true, command))); + JedisAccessControlException noperm = assertThrows(JedisAccessControlException.class, + () -> operation.accept(client), "Should throw a NOPERM exception"); + assertThat(noperm.getMessage(), Matchers.oneOf(getNopermErrorMessage(false, command), + getNopermErrorMessage(true, command))); // permit user to category commands jedis.aclSetUser(USER_NAME, "+@" + category); diff --git a/src/test/java/redis/clients/jedis/modules/ConsolidatedConfigurationCommandsTest.java b/src/test/java/redis/clients/jedis/modules/ConsolidatedConfigurationCommandsTest.java index c376554bbc..e0ef5b823a 100644 --- a/src/test/java/redis/clients/jedis/modules/ConsolidatedConfigurationCommandsTest.java +++ b/src/test/java/redis/clients/jedis/modules/ConsolidatedConfigurationCommandsTest.java @@ -2,20 +2,21 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.aMapWithSize; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThrows; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import io.redis.test.annotations.SinceRedisVersion; import java.util.Collections; import org.hamcrest.Matchers; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.exceptions.JedisDataException; @SinceRedisVersion(value = "7.9.0") -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class ConsolidatedConfigurationCommandsTest extends RedisModuleCommandsTestBase { public ConsolidatedConfigurationCommandsTest(RedisProtocol redisProtocol) { diff --git a/src/test/java/redis/clients/jedis/modules/RedisModuleCommandsTestBase.java b/src/test/java/redis/clients/jedis/modules/RedisModuleCommandsTestBase.java index cfe2f7910b..87551da237 100644 --- a/src/test/java/redis/clients/jedis/modules/RedisModuleCommandsTestBase.java +++ b/src/test/java/redis/clients/jedis/modules/RedisModuleCommandsTestBase.java @@ -1,13 +1,8 @@ package redis.clients.jedis.modules; -import static org.junit.Assume.assumeTrue; - -import java.util.Collection; - -import org.junit.After; -import org.junit.Before; -import org.junit.Rule; -import org.junit.runners.Parameterized.Parameters; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.extension.RegisterExtension; import redis.clients.jedis.Connection; import redis.clients.jedis.DefaultJedisClientConfig; import redis.clients.jedis.HostAndPort; @@ -17,12 +12,17 @@ import redis.clients.jedis.UnifiedJedis; import redis.clients.jedis.commands.CommandsTestsParameters; import redis.clients.jedis.exceptions.JedisConnectionException; -import redis.clients.jedis.util.RedisVersionRule; +import redis.clients.jedis.util.RedisVersionCondition; + +import static org.junit.jupiter.api.Assumptions.assumeTrue; public abstract class RedisModuleCommandsTestBase { - @Rule - public RedisVersionRule versionRule = new RedisVersionRule(hnp, DefaultJedisClientConfig.builder().build()); + @RegisterExtension + public RedisVersionCondition versionCondition = new RedisVersionCondition(hnp, DefaultJedisClientConfig.builder().build()); + + private static final String address = System.getProperty("modulesDocker", Protocol.DEFAULT_HOST + ':' + 6479); + protected static final HostAndPort hnp = HostAndPort.from(address); /** * Input data for parameterized tests. In principle all subclasses of this @@ -30,13 +30,6 @@ public abstract class RedisModuleCommandsTestBase { * * @see CommandsTestsParameters#respVersions() */ - @Parameters - public static Collection data() { - return CommandsTestsParameters.respVersions(); - } - - private static final String address = System.getProperty("modulesDocker", Protocol.DEFAULT_HOST + ':' + 6479); - protected static final HostAndPort hnp = HostAndPort.from(address); protected final RedisProtocol protocol; protected Jedis jedis; @@ -58,20 +51,20 @@ public RedisModuleCommandsTestBase(RedisProtocol protocol) { // BeforeClass public static void prepare() { try (Connection connection = new Connection(hnp)) { - assumeTrue("No Redis running on " + hnp.getPort() + " port.", connection.ping()); + assumeTrue(connection.ping(), "No Redis running on " + hnp.getPort() + " port."); } catch (JedisConnectionException jce) { - assumeTrue("Could not connect to Redis running on " + hnp.getPort() + " port.", false); + assumeTrue(false, "Could not connect to Redis running on " + hnp.getPort() + " port."); } } - @Before + @BeforeEach public void setUp() { jedis = new Jedis(hnp, DefaultJedisClientConfig.builder().protocol(protocol).build()); jedis.flushAll(); client = new UnifiedJedis(hnp, DefaultJedisClientConfig.builder().protocol(protocol).build()); } - @After + @AfterEach public void tearDown() throws Exception { client.close(); jedis.close(); diff --git a/src/test/java/redis/clients/jedis/modules/RedisModulesPipelineTest.java b/src/test/java/redis/clients/jedis/modules/RedisModulesPipelineTest.java index 4c9ad92f85..4a880ecd53 100644 --- a/src/test/java/redis/clients/jedis/modules/RedisModulesPipelineTest.java +++ b/src/test/java/redis/clients/jedis/modules/RedisModulesPipelineTest.java @@ -1,7 +1,8 @@ package redis.clients.jedis.modules; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assumptions.assumeFalse; import static redis.clients.jedis.json.Path.ROOT_PATH; import static redis.clients.jedis.modules.json.JsonObjects.Baz; import static redis.clients.jedis.modules.json.JsonObjects.IRLObject; @@ -14,11 +15,10 @@ import java.util.Collections; import org.json.JSONArray; import org.json.JSONObject; -import org.junit.Assume; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import redis.clients.jedis.Pipeline; import redis.clients.jedis.RedisProtocol; @@ -29,12 +29,13 @@ import redis.clients.jedis.search.*; import redis.clients.jedis.search.aggr.*; -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class RedisModulesPipelineTest extends RedisModuleCommandsTestBase { private static final Gson gson = new Gson(); - @BeforeClass + @BeforeAll public static void prepare() { RedisModuleCommandsTestBase.prepare(); } @@ -99,7 +100,7 @@ public void search() { @Test public void jsonV1() { - Assume.assumeFalse(protocol == RedisProtocol.RESP3); + assumeFalse(protocol == RedisProtocol.RESP3); Map hm1 = new HashMap<>(); hm1.put("hello", "world"); diff --git a/src/test/java/redis/clients/jedis/modules/bloom/BloomTest.java b/src/test/java/redis/clients/jedis/modules/bloom/BloomTest.java index c97eabd63f..b7cb3dceca 100644 --- a/src/test/java/redis/clients/jedis/modules/bloom/BloomTest.java +++ b/src/test/java/redis/clients/jedis/modules/bloom/BloomTest.java @@ -1,36 +1,33 @@ package redis.clients.jedis.modules.bloom; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertThrows; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; import java.util.List; import java.util.Map; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Timeout; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.bloom.BFInsertParams; import redis.clients.jedis.bloom.BFReserveParams; import redis.clients.jedis.exceptions.JedisDataException; import redis.clients.jedis.modules.RedisModuleCommandsTestBase; -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class BloomTest extends RedisModuleCommandsTestBase { - @BeforeClass + @BeforeAll public static void prepare() { RedisModuleCommandsTestBase.prepare(); } -// -// @AfterClass -// public static void tearDown() { -//// RedisModuleCommandsTestBase.tearDown(); -// } public BloomTest(RedisProtocol protocol) { super(protocol); @@ -44,20 +41,20 @@ public void reserveBasic() { assertFalse(client.bfExists("myBloom", "val2")); } - @Test(expected = JedisDataException.class) + @Test public void reserveValidateZeroCapacity() { - client.bfReserve("myBloom", 0.001, 0L); + assertThrows(JedisDataException.class, () -> client.bfReserve("myBloom", 0.001, 0)); } - @Test(expected = JedisDataException.class) + @Test public void reserveValidateZeroError() { - client.bfReserve("myBloom", 0d, 100L); + assertThrows(JedisDataException.class, () -> client.bfReserve("myBloom", 0d, 100L)); } - @Test(expected = JedisDataException.class) + @Test public void reserveAlreadyExists() { client.bfReserve("myBloom", 0.1, 100); - client.bfReserve("myBloom", 0.1, 100); + assertThrows(JedisDataException.class, () -> client.bfReserve("myBloom", 0.1, 100)); } @Test @@ -143,8 +140,9 @@ public void testInsert() { assertTrue(client.bfExists("b1", "1")); // returning an error if the filter does not already exist - JedisDataException jde = assertThrows("Should error if the filter does not already exist.", - JedisDataException.class, () -> client.bfInsert("b2", new BFInsertParams().noCreate(), "1")); + JedisDataException jde = assertThrows(JedisDataException.class, + () -> client.bfInsert("b2", new BFInsertParams().noCreate(), "1"), + "Should error if the filter does not already exist."); assertEquals("ERR not found", jde.getMessage()); client.bfInsert("b3", new BFInsertParams().capacity(1L).error(0.0001), "2"); @@ -168,19 +166,19 @@ public void card() { // returning an error if the filter is not a bloom filter client.set("foo", "bar"); - assertThrows("Should error if the filter is not a bloom filter", - JedisDataException.class, () -> client.bfCard("foo")); + assertThrows(JedisDataException.class, () -> client.bfCard("foo"), + "Should error if the filter is not a bloom filter"); } @Test public void info() { client.bfInsert("test_info", new BFInsertParams().capacity(1L), "1"); Map info = client.bfInfo("test_info"); - assertEquals(Long.valueOf(1), info.get("Number of items inserted")); + assertEquals(1L, info.get("Number of items inserted")); // returning an error if the filter does not already exist - JedisDataException jde = assertThrows("Should error if the filter does not already exist.", - JedisDataException.class, () -> client.bfInfo("not_exist")); + JedisDataException jde = assertThrows(JedisDataException.class, + () -> client.bfInfo("not_exist"), "Should error if the filter does not already exist."); assertEquals("ERR not found", jde.getMessage()); } @@ -204,7 +202,8 @@ public void insertExpansion() { assertEquals(20, insert.size()); } - @Test(timeout = 2000L) + @Test + @Timeout(2) public void testScanDumpAndLoadChunk() { client.bfAdd("bloom-dump", "a"); diff --git a/src/test/java/redis/clients/jedis/modules/bloom/CMSTest.java b/src/test/java/redis/clients/jedis/modules/bloom/CMSTest.java index 2ff7fd9a0a..dd74b9f271 100644 --- a/src/test/java/redis/clients/jedis/modules/bloom/CMSTest.java +++ b/src/test/java/redis/clients/jedis/modules/bloom/CMSTest.java @@ -1,37 +1,34 @@ package redis.clients.jedis.modules.bloom; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThrows; - import java.util.Arrays; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; + +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.exceptions.JedisException; import redis.clients.jedis.modules.RedisModuleCommandsTestBase; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; + /** * Tests for the Count-Min-Sketch Implementation */ -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class CMSTest extends RedisModuleCommandsTestBase { - @BeforeClass + @BeforeAll public static void prepare() { RedisModuleCommandsTestBase.prepare(); } -// -// @AfterClass -// public static void tearDown() { -//// RedisModuleCommandsTestBase.tearDown(); -// } public CMSTest(RedisProtocol protocol) { super(protocol); diff --git a/src/test/java/redis/clients/jedis/modules/bloom/CuckooTest.java b/src/test/java/redis/clients/jedis/modules/bloom/CuckooTest.java index 8d6027acbe..08df625153 100644 --- a/src/test/java/redis/clients/jedis/modules/bloom/CuckooTest.java +++ b/src/test/java/redis/clients/jedis/modules/bloom/CuckooTest.java @@ -1,18 +1,20 @@ package redis.clients.jedis.modules.bloom; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertThrows; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import java.util.Arrays; import java.util.Collections; import java.util.Map; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; + +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Timeout; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.bloom.CFInsertParams; @@ -23,18 +25,14 @@ /** * Tests for the Cuckoo Filter Implementation */ -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class CuckooTest extends RedisModuleCommandsTestBase { - @BeforeClass + @BeforeAll public static void prepare() { RedisModuleCommandsTestBase.prepare(); } -// -// @AfterClass -// public static void tearDown() { -//// RedisModuleCommandsTestBase.tearDown(); -// } public CuckooTest(RedisProtocol protocol) { super(protocol); @@ -250,7 +248,8 @@ public void testInfoFilterDoesNotExists() { assertTrue(ex.getMessage().contains("ERR not found")); } - @Test(timeout = 2000L) + @Test + @Timeout(2) public void testScanDumpAndLoadChunk() { client.cfReserve("cuckoo24", 100L /*capacity*/, CFReserveParams.reserveParams().bucketSize(50)); client.cfAdd("cuckoo24-dump", "a"); diff --git a/src/test/java/redis/clients/jedis/modules/bloom/TDigestTest.java b/src/test/java/redis/clients/jedis/modules/bloom/TDigestTest.java index 36d85018ef..ed08d16a49 100644 --- a/src/test/java/redis/clients/jedis/modules/bloom/TDigestTest.java +++ b/src/test/java/redis/clients/jedis/modules/bloom/TDigestTest.java @@ -1,34 +1,30 @@ package redis.clients.jedis.modules.bloom; import static java.util.Collections.singletonList; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.Arrays; import java.util.Map; import java.util.Random; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.bloom.TDigestMergeParams; import redis.clients.jedis.modules.RedisModuleCommandsTestBase; -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class TDigestTest extends RedisModuleCommandsTestBase { private static final Random random = new Random(); - @BeforeClass + @BeforeAll public static void prepare() { RedisModuleCommandsTestBase.prepare(); } -// -// @AfterClass -// public static void tearDown() { -//// RedisModuleCommandsTestBase.tearDown(); -// } public TDigestTest(RedisProtocol protocol) { super(protocol); @@ -51,7 +47,7 @@ public void createSimple() { assertEquals("OK", client.tdigestCreate("td-simple")); Map info = client.tdigestInfo("td-simple"); - assertEquals(Long.valueOf(100), info.get("Compression")); + assertEquals(100L, info.get("Compression")); } @Test @@ -117,17 +113,15 @@ public void mergeMultiAndParams() { client.tdigestCreate("from1", 100); client.tdigestCreate("from2", 200); -// client.tdigestAdd("from1", KeyValue.of(1d, 1l)); -// client.tdigestAdd("from2", KeyValue.of(1d, 10l)); client.tdigestAdd("from1", 1d); client.tdigestAdd("from2", weightedValue(1d, 10)); assertEquals("OK", client.tdigestMerge("to", "from1", "from2")); - assertTotalWeight("to", 11l); + assertTotalWeight("to", 11L); assertEquals("OK", client.tdigestMerge(TDigestMergeParams.mergeParams() .compression(50).override(), "to", "from1", "from2")); - assertEquals(Long.valueOf(50), client.tdigestInfo("to").get("Compression")); + assertEquals(50L, client.tdigestInfo("to").get("Compression")); } @Test @@ -135,8 +129,6 @@ public void cdf() { client.tdigestCreate("tdcdf", 100); assertEquals(singletonList(Double.NaN), client.tdigestCDF("tdcdf", 50)); -// client.tdigestAdd("tdcdf", definedValueWeight(1, 1), definedValueWeight(1, 1), definedValueWeight(1, 1)); -// client.tdigestAdd("tdcdf", definedValueWeight(100, 1), definedValueWeight(100, 1)); client.tdigestAdd("tdcdf", 1, 1, 1); client.tdigestAdd("tdcdf", 100, 100); assertEquals(singletonList(0.6), client.tdigestCDF("tdcdf", 50)); @@ -191,19 +183,11 @@ public void rankCommands() { final String key = "ranks"; client.tdigestCreate(key); client.tdigestAdd(key, 2d, 3d, 5d); - assertEquals(Arrays.asList(0l, 2l), client.tdigestRank(key, 2d, 4d)); - assertEquals(Arrays.asList(0l, 1l), client.tdigestRevRank(key, 5d, 4d)); - assertEquals(Arrays.asList(2d, 3d), client.tdigestByRank(key, 0l, 1l)); - assertEquals(Arrays.asList(5d, 3d), client.tdigestByRevRank(key, 0l, 1l)); - } -// -// private static KeyValue randomValueWeight() { -// return new KeyValue<>(random.nextDouble() * 10000, Math.abs(random.nextInt()) + 1l); -// } -// -// private static KeyValue definedValueWeight(double value, long weight) { -// return new KeyValue<>(value, weight); -// } + assertEquals(Arrays.asList(0L, 2L), client.tdigestRank(key, 2d, 4d)); + assertEquals(Arrays.asList(0L, 1L), client.tdigestRevRank(key, 5d, 4d)); + assertEquals(Arrays.asList(2d, 3d), client.tdigestByRank(key, 0L, 1L)); + assertEquals(Arrays.asList(5d, 3d), client.tdigestByRevRank(key, 0L, 1L)); + } private static double randomValue() { return random.nextDouble() * 10000; diff --git a/src/test/java/redis/clients/jedis/modules/bloom/TopKTest.java b/src/test/java/redis/clients/jedis/modules/bloom/TopKTest.java index 29a8a5738a..fbd8f9d433 100644 --- a/src/test/java/redis/clients/jedis/modules/bloom/TopKTest.java +++ b/src/test/java/redis/clients/jedis/modules/bloom/TopKTest.java @@ -1,31 +1,28 @@ package redis.clients.jedis.modules.bloom; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Arrays; import java.util.Collections; import java.util.Map; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.modules.RedisModuleCommandsTestBase; -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class TopKTest extends RedisModuleCommandsTestBase { - @BeforeClass + @BeforeAll public static void prepare() { RedisModuleCommandsTestBase.prepare(); } -// -// @AfterClass -// public static void tearDown() { -//// RedisModuleCommandsTestBase.tearDown(); -// } public TopKTest(RedisProtocol protocol) { super(protocol); @@ -48,7 +45,7 @@ public void createTopKFilter() { assertEquals(Long.valueOf(1), count); }); - assertEquals(null, client.topkIncrBy("aaa", "ff", 5)); + assertNull(client.topkIncrBy("aaa", "ff", 5)); assertEquals(Arrays.asList("ff", "bb", "cc"), client.topkList("aaa")); assertEquals(Collections.singletonList(null), diff --git a/src/test/java/redis/clients/jedis/modules/json/Path2Test.java b/src/test/java/redis/clients/jedis/modules/json/Path2Test.java index ce27749cc6..b106bd8aba 100644 --- a/src/test/java/redis/clients/jedis/modules/json/Path2Test.java +++ b/src/test/java/redis/clients/jedis/modules/json/Path2Test.java @@ -1,21 +1,21 @@ package redis.clients.jedis.modules.json; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.json.Path2; public class Path2Test { - @Test(expected = NullPointerException.class) + @Test public void _null() { - Path2.of(null); + assertThrows(NullPointerException.class, ()->Path2.of(null)); } - @Test(expected = IllegalArgumentException.class) + @Test public void empty() { - Path2.of(""); + assertThrows(IllegalArgumentException.class,()->Path2.of("")); } @Test @@ -37,7 +37,7 @@ public void test() { @Test public void equals() { - assertTrue(new Path2("a.b").equals(Path2.of(".a.b"))); - assertTrue(Path2.of("a.b").equals(new Path2(".a.b"))); + assertEquals(new Path2("a.b"), Path2.of(".a.b")); + assertEquals(Path2.of("a.b"), new Path2(".a.b")); } } diff --git a/src/test/java/redis/clients/jedis/modules/json/PathTest.java b/src/test/java/redis/clients/jedis/modules/json/PathTest.java index 15e014f226..aa60292e1c 100644 --- a/src/test/java/redis/clients/jedis/modules/json/PathTest.java +++ b/src/test/java/redis/clients/jedis/modules/json/PathTest.java @@ -1,9 +1,9 @@ package redis.clients.jedis.modules.json; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.json.Path; public class PathTest { diff --git a/src/test/java/redis/clients/jedis/modules/json/RedisJsonV1Test.java b/src/test/java/redis/clients/jedis/modules/json/RedisJsonV1Test.java index d281b33265..442e0e8543 100644 --- a/src/test/java/redis/clients/jedis/modules/json/RedisJsonV1Test.java +++ b/src/test/java/redis/clients/jedis/modules/json/RedisJsonV1Test.java @@ -1,6 +1,14 @@ package redis.clients.jedis.modules.json; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; +import static org.junit.jupiter.api.Assertions.assertNull; import static redis.clients.jedis.json.Path.ROOT_PATH; import static redis.clients.jedis.modules.json.JsonObjects.*; @@ -14,10 +22,9 @@ import java.util.Collections; import java.util.List; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; - +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.exceptions.JedisDataException; import redis.clients.jedis.json.JsonSetParams; @@ -35,7 +42,7 @@ public class RedisJsonV1Test extends RedisModuleCommandsTestBase { private RedisJsonV1Commands jsonV1; - @BeforeClass + @BeforeAll public static void prepare() { RedisModuleCommandsTestBase.prepare(); } @@ -44,7 +51,7 @@ public RedisJsonV1Test() { super(RedisProtocol.RESP2); } - @Before + @BeforeEach @Override public void setUp() { super.setUp(); @@ -113,10 +120,10 @@ public void setNonExistingPathOnlyIfExistsShouldFail() { assertNull(jsonV1.jsonSet("obj", p, "strangle", JsonSetParams.jsonSetParams().xx())); } - @Test(expected = JedisDataException.class) + @Test public void setException() { // should error on non root path for new key - jsonV1.jsonSet("test", Path.of(".foo"), "bar"); + assertThrows(JedisDataException.class, () -> jsonV1.jsonSet("test", Path.of(".foo"), "bar")); } @Test @@ -157,10 +164,11 @@ public void toggle() { assertEquals("string", jsonV1.jsonGet("obj", String.class, pstr)); } - @Test(expected = JedisDataException.class) + @Test public void getAbsent() { jsonV1.jsonSet("test", ROOT_PATH, "foo"); - jsonV1.jsonGet("test", String.class, Path.of(".bar")); + assertThrows(JedisDataException.class, + () -> jsonV1.jsonGet("test", String.class, Path.of(".bar"))); } @Test @@ -352,18 +360,20 @@ public void arrAppendAgaintsEmptyArray() { assertArrayEquals(new String[]{"a", "b", "c"}, array); } - @Test(expected = JedisDataException.class) + @Test public void arrAppendPathIsNotArray() { String json = "{ a: 'hello', b: [1, 2, 3], c: { d: ['ello'] }}"; JsonObject jsonObject = gson.fromJson(json, JsonObject.class); jsonV1.jsonSet("test_arrappend", ROOT_PATH, jsonObject); - jsonV1.jsonArrAppend("test_arrappend", Path.of(".a"), 1); + assertThrows(JedisDataException.class, + () -> jsonV1.jsonArrAppend("test_arrappend", Path.of(".a"), 1)); } - @Test(expected = JedisDataException.class) + @Test public void arrIndexAbsentKey() { - jsonV1.jsonArrIndex("quxquux", ROOT_PATH, gson.toJson(new Object())); + assertThrows(JedisDataException.class, + () -> jsonV1.jsonArrIndex("quxquux", ROOT_PATH, gson.toJson(new Object()))); } @Test @@ -385,10 +395,11 @@ public void arrIndexWithStringsAndPath() { assertEquals(1L, jsonV1.jsonArrIndex("foobar", Path.of(".fooArr"), "b")); } - @Test(expected = JedisDataException.class) + @Test public void arrIndexNonExistentPath() { jsonV1.jsonSet("foobar", ROOT_PATH, new FooBarObject()); - assertEquals(1L, jsonV1.jsonArrIndex("foobar", Path.of(".barArr"), "x")); + assertThrows(JedisDataException.class, + () -> assertEquals(1L, jsonV1.jsonArrIndex("foobar", Path.of(".barArr"), "x"))); } @Test diff --git a/src/test/java/redis/clients/jedis/modules/json/RedisJsonV2Test.java b/src/test/java/redis/clients/jedis/modules/json/RedisJsonV2Test.java index 688e64a12e..24aebb885b 100644 --- a/src/test/java/redis/clients/jedis/modules/json/RedisJsonV2Test.java +++ b/src/test/java/redis/clients/jedis/modules/json/RedisJsonV2Test.java @@ -1,7 +1,14 @@ package redis.clients.jedis.modules.json; import static java.util.Collections.singletonList; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; +import static org.junit.jupiter.api.Assumptions.assumeFalse; +import static org.junit.jupiter.api.Assumptions.assumeTrue; import static redis.clients.jedis.json.Path2.ROOT_PATH; import static redis.clients.jedis.modules.json.JsonObjects.*; @@ -11,12 +18,12 @@ import java.util.List; import org.json.JSONArray; import org.json.JSONObject; -import org.junit.Assume; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; + import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.exceptions.JedisDataException; @@ -25,14 +32,15 @@ import redis.clients.jedis.json.commands.RedisJsonV2Commands; import redis.clients.jedis.modules.RedisModuleCommandsTestBase; -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class RedisJsonV2Test extends RedisModuleCommandsTestBase { private static final Gson gson = new Gson(); private RedisJsonV2Commands jsonV2; - @BeforeClass + @BeforeAll public static void prepare() { RedisModuleCommandsTestBase.prepare(); } @@ -41,7 +49,7 @@ public RedisJsonV2Test(RedisProtocol protocol) { super(protocol); } - @Before + @BeforeEach @Override public void setUp() { super.setUp(); @@ -62,7 +70,7 @@ public void basicSetGetShouldSucceed() { IRLObject obj = new IRLObject(); jsonV2.jsonSetWithEscape("obj", obj); Object expected = gson.fromJson(gson.toJson(obj), Object.class); - assertTrue(expected.equals(jsonV2.jsonGet("obj"))); + assertEquals(expected, jsonV2.jsonGet("obj")); // check an update Path2 p = Path2.of(".str"); @@ -109,10 +117,10 @@ public void setNonExistingPathOnlyIfExistsShouldFail() { assertNull(jsonV2.jsonSetWithEscape("obj", p, "strangle", JsonSetParams.jsonSetParams().xx())); } - @Test(expected = JedisDataException.class) + @Test public void setException() { // should error on non root path for new key - jsonV2.jsonSet("test", Path2.of(".foo"), "bar"); + assertThrows(JedisDataException.class, () -> jsonV2.jsonSet("test", Path2.of(".foo"), "bar")); } @Test @@ -365,9 +373,10 @@ public void arrAppendPathIsNotArray() { assertEquals(singletonList(null), jsonV2.jsonArrAppendWithEscape("test_arrappend", Path2.of(".a"), 1)); } - @Test(expected = JedisDataException.class) + @Test public void arrIndexAbsentKey() { - jsonV2.jsonArrIndexWithEscape("quxquux", ROOT_PATH, new JSONObject()); + assertThrows(JedisDataException.class, + () -> jsonV2.jsonArrIndexWithEscape("quxquux", ROOT_PATH, new JSONObject())); } @Test @@ -448,7 +457,7 @@ public void strLen() { @Test public void numIncrBy() { - Assume.assumeFalse(protocol == RedisProtocol.RESP3); + assumeFalse(protocol == RedisProtocol.RESP3); jsonV2.jsonSet("doc", "{\"a\":\"b\",\"b\":[{\"a\":2}, {\"a\":5}, {\"a\":\"c\"}]}"); assertJsonArrayEquals(jsonArray((Object) null), jsonV2.jsonNumIncrBy("doc", Path2.of(".a"), 1d)); assertJsonArrayEquals(jsonArray(null, 4, 7, null), jsonV2.jsonNumIncrBy("doc", Path2.of("..a"), 2d)); @@ -458,7 +467,7 @@ public void numIncrBy() { @Test public void numIncrByResp3() { - Assume.assumeTrue(protocol == RedisProtocol.RESP3); + assumeTrue(protocol == RedisProtocol.RESP3); jsonV2.jsonSet("doc", "{\"a\":\"b\",\"b\":[{\"a\":2}, {\"a\":5}, {\"a\":\"c\"}]}"); assertEquals(singletonList((Object) null), jsonV2.jsonNumIncrBy("doc", Path2.of(".a"), 1d)); assertEquals(Arrays.asList(null, 4d, 7d, null), jsonV2.jsonNumIncrBy("doc", Path2.of("..a"), 2d)); @@ -491,11 +500,11 @@ private void assertJsonArrayEquals(JSONArray a, Object _b) { fail("Actual value is not JSONArray."); } JSONArray b = (JSONArray) _b; - assertEquals("JSONArray length mismatch", a.length(), b.length()); + assertEquals(a.length(), b.length(), "JSONArray length mismatch"); int length = a.length(); for (int index = 0; index < length; index++) { if (a.isNull(index)) { - assertTrue(index + "'th element is not null", b.isNull(index)); + assertTrue(b.isNull(index), index + "'th element is not null"); continue; } Object ia = a.get(index); @@ -505,9 +514,10 @@ private void assertJsonArrayEquals(JSONArray a, Object _b) { } else if (ia instanceof JSONObject) { assertJsonObjectEquals((JSONObject) ia, ib); } else if (ia instanceof Number && ib instanceof Number) { - assertEquals(index + "'th element mismatch", ((Number) ia).doubleValue(), ((Number) ib).doubleValue(), 0d); + assertEquals(((Number) ia).doubleValue(), ((Number) ib).doubleValue(), 0d, + index + "'th element mismatch"); } else { - assertEquals(index + "'th element mismatch", ia, ib); + assertEquals(ia, ib, index + "'th element mismatch"); } } } @@ -517,11 +527,11 @@ private void assertJsonObjectEquals(JSONObject a, Object _b) { fail("Actual value is not JSONObject."); } JSONObject b = (JSONObject) _b; - assertEquals("JSONObject length mismatch", a.length(), b.length()); + assertEquals(a.length(), b.length(), "JSONObject length mismatch"); assertEquals(a.keySet(), b.keySet()); for (String key : a.keySet()) { if (a.isNull(key)) { - assertTrue(key + "'s value is not null", b.isNull(key)); + assertTrue(b.isNull(key), key + "'s value is not null"); continue; } Object oa = a.get(key); @@ -531,7 +541,7 @@ private void assertJsonObjectEquals(JSONObject a, Object _b) { } else if (oa instanceof JSONObject) { assertJsonObjectEquals((JSONObject) oa, ob); } else { - assertEquals(key + "'s value mismatch", oa, ob); + assertEquals(oa, ob, key + "'s value mismatch"); } } } diff --git a/src/test/java/redis/clients/jedis/modules/search/AggregationBuilderTest.java b/src/test/java/redis/clients/jedis/modules/search/AggregationBuilderTest.java index 396ca3365e..37d27c2a5f 100644 --- a/src/test/java/redis/clients/jedis/modules/search/AggregationBuilderTest.java +++ b/src/test/java/redis/clients/jedis/modules/search/AggregationBuilderTest.java @@ -1,13 +1,12 @@ package redis.clients.jedis.modules.search; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; - -import org.junit.Test; - +import org.junit.jupiter.api.Test; import redis.clients.jedis.search.aggr.Reducer; import redis.clients.jedis.search.aggr.Reducers; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; + public class AggregationBuilderTest { @Test diff --git a/src/test/java/redis/clients/jedis/modules/search/AggregationTest.java b/src/test/java/redis/clients/jedis/modules/search/AggregationTest.java index 5c3ad9b3cb..ba50066926 100644 --- a/src/test/java/redis/clients/jedis/modules/search/AggregationTest.java +++ b/src/test/java/redis/clients/jedis/modules/search/AggregationTest.java @@ -1,19 +1,19 @@ package redis.clients.jedis.modules.search; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.fail; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.fail; import static redis.clients.jedis.util.RedisConditions.ModuleVersion.SEARCH_MOD_VER_80M3; import io.redis.test.annotations.SinceRedisVersion; import io.redis.test.utils.RedisVersion; import org.hamcrest.Matchers; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import java.util.ArrayList; import java.util.HashMap; @@ -31,12 +31,13 @@ import redis.clients.jedis.util.RedisConditions; import redis.clients.jedis.util.RedisVersionUtil; -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class AggregationTest extends RedisModuleCommandsTestBase { private static final String index = "aggbindex"; - @BeforeClass + @BeforeAll public static void prepare() { RedisModuleCommandsTestBase.prepare(); } @@ -381,6 +382,7 @@ public void cursor() { client.ftCursorRead(index, res.getCursorId(), 1); fail(); } catch (JedisDataException e) { + // ignore } } diff --git a/src/test/java/redis/clients/jedis/modules/search/CreateTest.java b/src/test/java/redis/clients/jedis/modules/search/CreateTest.java index 64aee4d035..a4978bbf32 100644 --- a/src/test/java/redis/clients/jedis/modules/search/CreateTest.java +++ b/src/test/java/redis/clients/jedis/modules/search/CreateTest.java @@ -1,6 +1,6 @@ //package redis.clients.jedis.modules.search; // -//import static org.junit.Assert.*; +//import static org.junit.jupiter.api.Assertions.*; // //import java.util.ArrayList; //import java.util.Arrays; diff --git a/src/test/java/redis/clients/jedis/modules/search/DocumentTest.java b/src/test/java/redis/clients/jedis/modules/search/DocumentTest.java index 490837ebd4..c626858a1a 100644 --- a/src/test/java/redis/clients/jedis/modules/search/DocumentTest.java +++ b/src/test/java/redis/clients/jedis/modules/search/DocumentTest.java @@ -1,7 +1,5 @@ package redis.clients.jedis.modules.search; -import static org.junit.Assert.assertEquals; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -11,9 +9,11 @@ import java.util.Locale; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.search.Document; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class DocumentTest { @Test diff --git a/src/test/java/redis/clients/jedis/modules/search/JsonSearchTest.java b/src/test/java/redis/clients/jedis/modules/search/JsonSearchTest.java index 04c4b49854..6dc4d63b69 100644 --- a/src/test/java/redis/clients/jedis/modules/search/JsonSearchTest.java +++ b/src/test/java/redis/clients/jedis/modules/search/JsonSearchTest.java @@ -1,12 +1,10 @@ package redis.clients.jedis.modules.search; -import static org.junit.Assert.*; - import org.json.JSONObject; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import redis.clients.jedis.BuilderFactory; import redis.clients.jedis.CommandArguments; @@ -19,22 +17,21 @@ import redis.clients.jedis.search.SearchResult; import redis.clients.jedis.modules.RedisModuleCommandsTestBase; -@RunWith(Parameterized.class) +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; + +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class JsonSearchTest extends RedisModuleCommandsTestBase { public static final String JSON_ROOT = "$"; private static final String index = "json-index"; - @BeforeClass + @BeforeAll public static void prepare() { RedisModuleCommandsTestBase.prepare(); } -// -// @AfterClass -// public static void tearDown() { -//// RedisModuleCommandsTestBase.tearDown(); -// } public JsonSearchTest(RedisProtocol protocol) { super(protocol); diff --git a/src/test/java/redis/clients/jedis/modules/search/JsonSearchWithGsonTest.java b/src/test/java/redis/clients/jedis/modules/search/JsonSearchWithGsonTest.java index 5ef29679fd..213d93b28f 100644 --- a/src/test/java/redis/clients/jedis/modules/search/JsonSearchWithGsonTest.java +++ b/src/test/java/redis/clients/jedis/modules/search/JsonSearchWithGsonTest.java @@ -1,34 +1,30 @@ package redis.clients.jedis.modules.search; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; import static redis.clients.jedis.util.AssertUtil.assertOK; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.search.*; import redis.clients.jedis.modules.RedisModuleCommandsTestBase; -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class JsonSearchWithGsonTest extends RedisModuleCommandsTestBase { private static final String index = "gson-index"; - @BeforeClass + @BeforeAll public static void prepare() { RedisModuleCommandsTestBase.prepare(); } -// -// @AfterClass -// public static void tearDown() { -//// RedisModuleCommandsTestBase.tearDown(); -// } public JsonSearchWithGsonTest(RedisProtocol protocol) { super(protocol); diff --git a/src/test/java/redis/clients/jedis/modules/search/QueryBuilderTest.java b/src/test/java/redis/clients/jedis/modules/search/QueryBuilderTest.java index 7f152f8985..80d9449944 100644 --- a/src/test/java/redis/clients/jedis/modules/search/QueryBuilderTest.java +++ b/src/test/java/redis/clients/jedis/modules/search/QueryBuilderTest.java @@ -1,12 +1,13 @@ package redis.clients.jedis.modules.search; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import static redis.clients.jedis.search.querybuilder.QueryBuilders.*; import static redis.clients.jedis.search.querybuilder.Values.*; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.GeoCoordinate; import redis.clients.jedis.args.GeoUnit; import redis.clients.jedis.search.querybuilder.Node; @@ -26,9 +27,9 @@ public void testTag() { assertEquals("{foo | bar}", v.toString()); } - @Test(expected = IllegalArgumentException.class) + @Test public void testEmptyTag() { - tags(); + assertThrows(IllegalArgumentException.class, () -> tags()); } @Test diff --git a/src/test/java/redis/clients/jedis/modules/search/QueryTest.java b/src/test/java/redis/clients/jedis/modules/search/QueryTest.java index 738f2c3385..8ca77cf898 100644 --- a/src/test/java/redis/clients/jedis/modules/search/QueryTest.java +++ b/src/test/java/redis/clients/jedis/modules/search/QueryTest.java @@ -1,6 +1,6 @@ //package redis.clients.jedis.modules.search; // -//import static org.junit.Assert.*; +//import static org.junit.jupiter.api.Assertions.*; // //import java.util.ArrayList; //import org.junit.Before; diff --git a/src/test/java/redis/clients/jedis/modules/search/SchemaTest.java b/src/test/java/redis/clients/jedis/modules/search/SchemaTest.java index c0153e258e..abb0495576 100644 --- a/src/test/java/redis/clients/jedis/modules/search/SchemaTest.java +++ b/src/test/java/redis/clients/jedis/modules/search/SchemaTest.java @@ -1,11 +1,11 @@ package redis.clients.jedis.modules.search; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertThrows; +import static org.junit.jupiter.api.Assertions.assertThrows; import java.util.Collections; import org.hamcrest.Matchers; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.search.FieldName; import redis.clients.jedis.search.Schema; diff --git a/src/test/java/redis/clients/jedis/modules/search/SearchDefaultDialectTest.java b/src/test/java/redis/clients/jedis/modules/search/SearchDefaultDialectTest.java index 819880877f..eae32d441a 100644 --- a/src/test/java/redis/clients/jedis/modules/search/SearchDefaultDialectTest.java +++ b/src/test/java/redis/clients/jedis/modules/search/SearchDefaultDialectTest.java @@ -4,19 +4,20 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.emptyOrNullString; import static org.hamcrest.Matchers.not; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThrows; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertThrows; import static redis.clients.jedis.util.AssertUtil.assertEqualsByProtocol; import static redis.clients.jedis.util.AssertUtil.assertOK; import java.util.*; import io.redis.test.annotations.SinceRedisVersion; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.UnifiedJedis; @@ -31,13 +32,14 @@ import redis.clients.jedis.search.aggr.Reducers; import redis.clients.jedis.search.aggr.Row; -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class SearchDefaultDialectTest extends RedisModuleCommandsTestBase { private static final String INDEX = "dialect-INDEX"; private static final int DEFAULT_DIALECT = 2; - @BeforeClass + @BeforeAll public static void prepare() { RedisModuleCommandsTestBase.prepare(); } @@ -47,15 +49,11 @@ public SearchDefaultDialectTest(RedisProtocol protocol) { } @Override + @BeforeEach public void setUp() { super.setUp(); client.setDefaultSearchDialect(DEFAULT_DIALECT); } -// -// @AfterClass -// public static void tearDown() { -//// RedisModuleCommandsTestBase.tearDown(); -// } private void addDocument(Document doc) { String key = doc.getId(); diff --git a/src/test/java/redis/clients/jedis/modules/search/SearchTest.java b/src/test/java/redis/clients/jedis/modules/search/SearchTest.java index a5de9c63d6..50339e1162 100644 --- a/src/test/java/redis/clients/jedis/modules/search/SearchTest.java +++ b/src/test/java/redis/clients/jedis/modules/search/SearchTest.java @@ -4,18 +4,25 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.emptyOrNullString; import static org.hamcrest.Matchers.not; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; +import static org.junit.jupiter.api.Assumptions.assumeFalse; import java.util.*; import java.util.stream.Collectors; import io.redis.test.utils.RedisVersion; import org.hamcrest.Matchers; -import org.junit.Assume; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.UnifiedJedis; @@ -27,19 +34,15 @@ import redis.clients.jedis.util.RedisVersionUtil; import redis.clients.jedis.util.SafeEncoder; -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class SearchTest extends RedisModuleCommandsTestBase { private static final String index = "testindex"; - @BeforeClass + @BeforeAll public static void prepare() { RedisModuleCommandsTestBase.prepare(); } -// -// @AfterClass -// public static void tearDown() { -//// RedisModuleCommandsTestBase.tearDown(); -// } public SearchTest(RedisProtocol protocol) { super(protocol); @@ -96,7 +99,7 @@ public void create() throws Exception { } @Test - public void createNoParams() throws Exception { + public void createNoParams() { Schema sc = new Schema().addTextField("first", 1.0).addTextField("last", 1.0).addNumericField("age"); assertEquals("OK", client.ftCreate(index, IndexOptions.defaultOptions(), sc)); @@ -119,7 +122,7 @@ public void createNoParams() throws Exception { } @Test - public void createWithFieldNames() throws Exception { + public void createWithFieldNames() { Schema sc = new Schema().addField(new TextField(FieldName.of("first").as("given"))) .addField(new TextField(FieldName.of("last"))); IndexDefinition rule = new IndexDefinition() @@ -147,7 +150,7 @@ public void createWithFieldNames() throws Exception { } @Test - public void alterAdd() throws Exception { + public void alterAdd() { Schema sc = new Schema().addTextField("title", 1.0); assertEquals("OK", client.ftCreate(index, IndexOptions.defaultOptions(), sc)); @@ -268,7 +271,7 @@ public void numericFilter() throws Exception { } @Test - public void stopwords() throws Exception { + public void stopwords() { Schema sc = new Schema().addTextField("title", 1.0); assertEquals("OK", client.ftCreate(index, @@ -285,7 +288,7 @@ public void stopwords() throws Exception { } @Test - public void noStopwords() throws Exception { + public void noStopwords() { Schema sc = new Schema().addTextField("title", 1.0); assertEquals("OK", client.ftCreate(index, @@ -301,7 +304,7 @@ public void noStopwords() throws Exception { } @Test - public void geoFilter() throws Exception { + public void geoFilter() { Schema sc = new Schema().addTextField("title", 1.0).addGeoField("loc"); assertEquals("OK", client.ftCreate(index, IndexOptions.defaultOptions(), sc)); @@ -330,7 +333,7 @@ public void geoFilter() throws Exception { } @Test - public void geoFilterAndGeoCoordinateObject() throws Exception { + public void geoFilterAndGeoCoordinateObject() { Schema schema = new Schema().addTextField("title", 1.0).addGeoField("loc"); assertEquals("OK", client.ftCreate(index, IndexOptions.defaultOptions(), schema)); @@ -354,7 +357,7 @@ public void geoFilterAndGeoCoordinateObject() throws Exception { } @Test - public void testQueryFlags() throws Exception { + public void testQueryFlags() { Schema sc = new Schema().addTextField("title", 1.0); assertEquals("OK", client.ftCreate(index, IndexOptions.defaultOptions(), sc)); @@ -424,7 +427,7 @@ public void testQueryParams() { } @Test - public void testSortQueryFlags() throws Exception { + public void testSortQueryFlags() { Schema sc = new Schema().addSortableTextField("title", 1.0); assertEquals("OK", client.ftCreate(index, IndexOptions.defaultOptions(), sc)); @@ -457,7 +460,7 @@ public void testSortQueryFlags() throws Exception { } @Test - public void testNullField() throws Exception { + public void testNullField() { Schema sc = new Schema() .addTextField("title", 1.0) .addTextField("genre", 1.0) @@ -554,7 +557,7 @@ public void testJsonWithAlias() { } @Test - public void dropIndex() throws Exception { + public void dropIndex() { Schema sc = new Schema().addTextField("title", 1.0); assertEquals("OK", client.ftCreate(index, IndexOptions.defaultOptions(), sc)); @@ -580,7 +583,7 @@ public void dropIndex() throws Exception { } @Test - public void dropIndexDD() throws Exception { + public void dropIndexDD() { Schema sc = new Schema().addTextField("title", 1.0); assertEquals("OK", client.ftCreate(index, IndexOptions.defaultOptions(), sc)); @@ -601,7 +604,7 @@ public void dropIndexDD() throws Exception { } @Test - public void noStem() throws Exception { + public void noStem() { Schema sc = new Schema().addTextField("stemmed", 1.0).addField(new Schema.TextField("notStemmed", 1.0, false, true)); assertEquals("OK", client.ftCreate(index, IndexOptions.defaultOptions(), sc)); @@ -621,7 +624,7 @@ public void noStem() throws Exception { } @Test - public void phoneticMatch() throws Exception { + public void phoneticMatch() { Schema sc = new Schema() .addTextField("noPhonetic", 1.0) .addField(new Schema.TextField("withPhonetic", 1.0, false, false, false, "dm:en")); @@ -684,7 +687,7 @@ public void info() throws Exception { } @Test - public void noIndex() throws Exception { + public void noIndex() { Schema sc = new Schema() .addField(new Schema.TextField("f1", 1.0, true, false, true)) .addField(new Schema.TextField("f2", 1.0)); @@ -723,7 +726,7 @@ public void noIndex() throws Exception { } @Test - public void testExplain() throws Exception { + public void testExplain() { Schema sc = new Schema() .addTextField("f1", 1.0) .addTextField("f2", 1.0) @@ -736,7 +739,7 @@ public void testExplain() throws Exception { } @Test - public void testHighlightSummarize() throws Exception { + public void testHighlightSummarize() { Schema sc = new Schema().addTextField("text", 1.0); client.ftCreate(index, IndexOptions.defaultOptions(), sc); @@ -861,7 +864,7 @@ public void caseSensitiveTagField() { } @Test - public void testReturnFields() throws Exception { + public void testReturnFields() { Schema sc = new Schema().addTextField("field1", 1.0).addTextField("field2", 1.0); assertEquals("OK", client.ftCreate(index, IndexOptions.defaultOptions(), sc)); @@ -880,7 +883,7 @@ public void testReturnFields() throws Exception { } @Test - public void returnWithFieldNames() throws Exception { + public void returnWithFieldNames() { Schema sc = new Schema().addTextField("a", 1).addTextField("b", 1).addTextField("c", 1); assertEquals("OK", client.ftCreate(index, IndexOptions.defaultOptions(), sc)); @@ -903,7 +906,7 @@ public void returnWithFieldNames() throws Exception { } @Test - public void inKeys() throws Exception { + public void inKeys() { Schema sc = new Schema().addTextField("field1", 1.0).addTextField("field2", 1.0); assertEquals("OK", client.ftCreate(index, IndexOptions.defaultOptions(), sc)); @@ -922,12 +925,12 @@ public void inKeys() throws Exception { assertEquals(1, res.getTotalResults()); assertEquals("doc1", res.getDocuments().get(0).getId()); assertEquals("value", res.getDocuments().get(0).get("field1")); - assertEquals(null, res.getDocuments().get(0).get("value")); + assertNull(res.getDocuments().get(0).get("value")); } @Test - public void blobField() throws Exception { - Assume.assumeFalse(protocol == RedisProtocol.RESP3); // not supporting + public void blobField() { + assumeFalse(protocol == RedisProtocol.RESP3); // not supporting Schema sc = new Schema().addTextField("field1", 1.0); assertEquals("OK", client.ftCreate(index, IndexOptions.defaultOptions(), sc)); @@ -952,7 +955,7 @@ public void blobField() throws Exception { } @Test - public void alias() throws Exception { + public void alias() { Schema sc = new Schema().addTextField("field1", 1.0); assertEquals("OK", client.ftCreate(index, IndexOptions.defaultOptions(), sc)); @@ -1062,7 +1065,7 @@ public void inOrder() { } @Test - public void testDialectsWithFTExplain() throws Exception { + public void testDialectsWithFTExplain() { Map attr = new HashMap<>(); attr.put("TYPE", "FLOAT32"); attr.put("DIM", 2); @@ -1201,7 +1204,7 @@ public void testFlatVectorSimilarity() { } @Test - public void searchIteration() throws Exception { + public void searchIteration() { Schema sc = new Schema().addTextField("first", 1.0).addTextField("last", 1.0).addNumericField("age"); IndexDefinition rule = new IndexDefinition(); assertEquals("OK", client.ftCreate(index, IndexOptions.defaultOptions().setDefinition(rule), sc)); diff --git a/src/test/java/redis/clients/jedis/modules/search/SearchWithParamsTest.java b/src/test/java/redis/clients/jedis/modules/search/SearchWithParamsTest.java index 9209ee04a9..77f80b0e56 100644 --- a/src/test/java/redis/clients/jedis/modules/search/SearchWithParamsTest.java +++ b/src/test/java/redis/clients/jedis/modules/search/SearchWithParamsTest.java @@ -1,8 +1,14 @@ package redis.clients.jedis.modules.search; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.*; -import static org.junit.Assume.assumeTrue; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; +import static org.junit.jupiter.api.Assumptions.assumeTrue; import static redis.clients.jedis.util.AssertUtil.assertOK; import static redis.clients.jedis.util.RedisConditions.ModuleVersion.SEARCH_MOD_VER_80M3; @@ -12,11 +18,11 @@ import io.redis.test.annotations.SinceRedisVersion; import io.redis.test.utils.RedisVersion; import org.hamcrest.Matchers; -import org.junit.After; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.GeometryFactory; @@ -39,17 +45,18 @@ import redis.clients.jedis.util.RedisConditions; import redis.clients.jedis.util.RedisVersionUtil; -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class SearchWithParamsTest extends RedisModuleCommandsTestBase { private static final String index = "testindex"; - @BeforeClass + @BeforeAll public static void prepare() { RedisModuleCommandsTestBase.prepare(); } - @After + @AfterEach public void cleanUp() { if (client.ftList().contains(index)) { client.ftDropIndex(index); @@ -1096,7 +1103,7 @@ public void inKeys() { assertEquals(1, res.getTotalResults()); assertEquals("doc1", res.getDocuments().get(0).getId()); assertEquals("value", res.getDocuments().get(0).get("field1")); - assertEquals(null, res.getDocuments().get(0).get("value")); + assertNull(res.getDocuments().get(0).get("value")); } @Test @@ -1257,8 +1264,8 @@ public void testFlatVectorSimilarity() { @Test public void testFlatVectorSimilarityInt8() { - assumeTrue("INT8", - RedisConditions.of(client).moduleVersionIsGreaterThanOrEqual(SEARCH_MOD_VER_80M3)); + assumeTrue(RedisConditions.of(client).moduleVersionIsGreaterThanOrEqual(SEARCH_MOD_VER_80M3), + "INT8"); assertOK(client.ftCreate(index, VectorField.builder().fieldName("v").algorithm(VectorAlgorithm.FLAT) .addAttribute("TYPE", "INT8").addAttribute("DIM", 2) @@ -1321,8 +1328,8 @@ public void bfloat16StorageType() { @Test public void int8StorageType() { - assumeTrue("INT8", - RedisConditions.of(client).moduleVersionIsGreaterThanOrEqual(SEARCH_MOD_VER_80M3)); + assumeTrue(RedisConditions.of(client).moduleVersionIsGreaterThanOrEqual(SEARCH_MOD_VER_80M3), + "INT8"); assertOK(client.ftCreate(index, VectorField.builder().fieldName("v").algorithm(VectorAlgorithm.HNSW) .addAttribute("TYPE", "INT8").addAttribute("DIM", 4) @@ -1331,8 +1338,8 @@ public void int8StorageType() { @Test public void uint8StorageType() { - assumeTrue("UINT8", - RedisConditions.of(client).moduleVersionIsGreaterThanOrEqual(SEARCH_MOD_VER_80M3)); + assumeTrue(RedisConditions.of(client).moduleVersionIsGreaterThanOrEqual(SEARCH_MOD_VER_80M3), + "UINT8"); assertOK(client.ftCreate(index, VectorField.builder().fieldName("v").algorithm(VectorAlgorithm.HNSW) .addAttribute("TYPE", "UINT8").addAttribute("DIM", 4) diff --git a/src/test/java/redis/clients/jedis/modules/search/SpellCheckTest.java b/src/test/java/redis/clients/jedis/modules/search/SpellCheckTest.java index bd7e529c55..46b8af9f19 100644 --- a/src/test/java/redis/clients/jedis/modules/search/SpellCheckTest.java +++ b/src/test/java/redis/clients/jedis/modules/search/SpellCheckTest.java @@ -1,7 +1,5 @@ package redis.clients.jedis.modules.search; -import static org.junit.Assert.assertEquals; - import java.util.Arrays; import java.util.Collections; import java.util.HashMap; @@ -10,11 +8,10 @@ import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.exceptions.JedisDataException; @@ -22,20 +19,19 @@ import redis.clients.jedis.search.FTSpellCheckParams; import redis.clients.jedis.search.schemafields.TextField; -@RunWith(Parameterized.class) +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; + +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class SpellCheckTest extends RedisModuleCommandsTestBase { private static final String index = "spellcheck"; - @BeforeClass + @BeforeAll public static void prepare() { RedisModuleCommandsTestBase.prepare(); } -// -// @AfterClass -// public static void tearDown() { -//// RedisModuleCommandsTestBase.tearDown(); -// } public SpellCheckTest(RedisProtocol protocol) { super(protocol); @@ -92,14 +88,14 @@ public void crossTermDictionary() { @Test public void distanceBound() { client.ftCreate(index, TextField.of("name"), TextField.of("body")); - Assert.assertThrows(JedisDataException.class, () -> client.ftSpellCheck(index, "name", + assertThrows(JedisDataException.class, () -> client.ftSpellCheck(index, "name", FTSpellCheckParams.spellCheckParams().distance(0))); } @Test public void dialectBound() { client.ftCreate(index, TextField.of("t")); - JedisDataException error = Assert.assertThrows(JedisDataException.class, + JedisDataException error = assertThrows(JedisDataException.class, () -> client.ftSpellCheck(index, "Tooni toque kerfuffle", FTSpellCheckParams.spellCheckParams().dialect(0))); MatcherAssert.assertThat(error.getMessage(), diff --git a/src/test/java/redis/clients/jedis/modules/search/SuggestionTest.java b/src/test/java/redis/clients/jedis/modules/search/SuggestionTest.java index 2341b835cd..2d76b3e02e 100644 --- a/src/test/java/redis/clients/jedis/modules/search/SuggestionTest.java +++ b/src/test/java/redis/clients/jedis/modules/search/SuggestionTest.java @@ -1,35 +1,30 @@ package redis.clients.jedis.modules.search; import static java.util.Collections.emptyList; -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.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.List; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; - +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.modules.RedisModuleCommandsTestBase; import redis.clients.jedis.resps.Tuple; -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class SuggestionTest extends RedisModuleCommandsTestBase { private static final String key = "suggest"; - @BeforeClass + @BeforeAll public static void prepare() { RedisModuleCommandsTestBase.prepare(); } -// -// @AfterClass -// public static void tearDown() { -//// RedisModuleCommandsTestBase.tearDown(); -// } public SuggestionTest(RedisProtocol protocol) { super(protocol); @@ -40,20 +35,21 @@ public void addSuggestionAndGetSuggestion() { String suggestion = "ANOTHER_WORD"; String noMatch = "_WORD MISSED"; - assertTrue(suggestion + " should of inserted at least 1", client.ftSugAdd(key, suggestion, 1d) > 0); - assertTrue(noMatch + " should of inserted at least 1", client.ftSugAdd(key, noMatch, 1d) > 0); + assertTrue(client.ftSugAdd(key, suggestion, 1d) > 0, + suggestion + " should of inserted at least 1"); + assertTrue(client.ftSugAdd(key, noMatch, 1d) > 0, noMatch + " should of inserted at least 1"); // test that with a partial part of that string will have the entire word returned - assertEquals(suggestion + " did not get a match with 3 characters", - 1, client.ftSugGet(key, suggestion.substring(0, 3), true, 5).size()); + assertEquals(1, client.ftSugGet(key, suggestion.substring(0, 3), true, 5).size(), + suggestion + " did not get a match with 3 characters"); // turn off fuzzy start at second word no hit - assertEquals(noMatch + " no fuzzy and starting at 1, should not match", - 0, client.ftSugGet(key, noMatch.substring(1, 6), false, 5).size()); + assertEquals(0, client.ftSugGet(key, noMatch.substring(1, 6), false, 5).size(), + noMatch + " no fuzzy and starting at 1, should not match"); // my attempt to trigger the fuzzy by 1 character - assertEquals(noMatch + " fuzzy is on starting at 1 position should match", - 1, client.ftSugGet(key, noMatch.substring(1, 6), true, 5).size()); + assertEquals(1, client.ftSugGet(key, noMatch.substring(1, 6), true, 5).size(), + noMatch + " fuzzy is on starting at 1 position should match"); } @Test @@ -61,7 +57,8 @@ public void addSuggestionIncrAndGetSuggestionFuzzy() { String suggestion = "TOPIC OF WORDS"; // test can add a suggestion string - assertTrue(suggestion + " insert should of returned at least 1", client.ftSugAddIncr(key, suggestion, 1d) > 0); + assertTrue(client.ftSugAddIncr(key, suggestion, 1d) > 0, + suggestion + " insert should of returned at least 1"); // test that the partial part of that string will be returned using fuzzy assertEquals(suggestion, client.ftSugGet(key, suggestion.substring(0, 3)).get(0)); @@ -74,11 +71,13 @@ public void getSuggestionScores() { client.ftSugAdd(key, "COUNT_ANOTHER", 1); String noScoreOrPayload = "COUNT NO PAYLOAD OR COUNT"; - assertTrue("Count single added should return more than 1", client.ftSugAddIncr(key, noScoreOrPayload, 1) > 1); + assertTrue(client.ftSugAddIncr(key, noScoreOrPayload, 1) > 1, + "Count single added should return more than 1"); List result = client.ftSugGetWithScores(key, "COU"); assertEquals(4, result.size()); - result.forEach(tuple -> assertTrue("Assert that a suggestion has a score not default 1 ", tuple.getScore() < .999)); + result.forEach(tuple -> assertTrue(tuple.getScore() < .999, + "Assert that a suggestion has a score not default 1 ")); } @Test @@ -88,7 +87,7 @@ public void getSuggestionMax() { client.ftSugAdd(key, "COUNTNO PAYLOAD OR COUNT", 1); // test that with a partial part of that string will have the entire word returned - assertEquals("3 suggestions", 3, client.ftSugGetWithScores(key, "COU", true, 10).size()); + assertEquals( 3, client.ftSugGetWithScores(key, "COU", true, 10).size(),"3 suggestions"); assertEquals(2, client.ftSugGetWithScores(key, "COU", true, 2).size()); } @@ -106,13 +105,14 @@ public void getSuggestionLengthAndDeleteSuggestion() { client.ftSugAddIncr(key, "ANOTHER ENTRY", 1); assertEquals(2L, client.ftSugLen(key)); - assertTrue("Delete suggestion should succeed.", client.ftSugDel(key, "ANOTHER ENTRY")); + assertTrue(client.ftSugDel(key, "ANOTHER ENTRY"), "Delete suggestion should succeed."); assertEquals(1L, client.ftSugLen(key)); - assertFalse("Delete suggestion should succeed.", client.ftSugDel(key, "ANOTHER ENTRY")); + assertFalse(client.ftSugDel(key, "ANOTHER ENTRY"), "Delete suggestion should succeed."); assertEquals(1L, client.ftSugLen(key)); - assertFalse("Delete suggestion should succeed.", client.ftSugDel(key, "ANOTHER ENTRY THAT IS NOT PRESENT")); + assertFalse(client.ftSugDel(key, "ANOTHER ENTRY THAT IS NOT PRESENT"), + "Delete suggestion should succeed."); assertEquals(1L, client.ftSugLen(key)); client.ftSugAdd(key, "LAST ENTRY", 1); diff --git a/src/test/java/redis/clients/jedis/modules/search/UtilTest.java b/src/test/java/redis/clients/jedis/modules/search/UtilTest.java index 830b52565a..9b0313f75b 100644 --- a/src/test/java/redis/clients/jedis/modules/search/UtilTest.java +++ b/src/test/java/redis/clients/jedis/modules/search/UtilTest.java @@ -1,10 +1,9 @@ package redis.clients.jedis.modules.search; -import static org.junit.Assert.assertEquals; - -import org.junit.Assert; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.api.Test; import redis.clients.jedis.search.RediSearchUtil; import redis.clients.jedis.search.schemafields.NumericField; @@ -14,10 +13,10 @@ public class UtilTest { @Test public void floatArrayToByteArray() { - float[] floats = new float[]{0.2f}; + float[] floats = new float[] { 0.2f }; byte[] bytes = RediSearchUtil.toByteArray(floats); - byte[] expected = new byte[]{-51, -52, 76, 62}; - Assert.assertArrayEquals(expected, bytes); + byte[] expected = new byte[] { -51, -52, 76, 62 }; + assertArrayEquals(expected, bytes); } @Test @@ -29,4 +28,5 @@ public void getSchemaFieldName() { assertEquals("$.num", field.getName()); } + } diff --git a/src/test/java/redis/clients/jedis/modules/timeseries/TimeSeriesTest.java b/src/test/java/redis/clients/jedis/modules/timeseries/TimeSeriesTest.java index ab8d81160a..6a427707f2 100644 --- a/src/test/java/redis/clients/jedis/modules/timeseries/TimeSeriesTest.java +++ b/src/test/java/redis/clients/jedis/modules/timeseries/TimeSeriesTest.java @@ -1,18 +1,19 @@ package redis.clients.jedis.modules.timeseries; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import static redis.clients.jedis.util.AssertUtil.assertEqualsByProtocol; import java.util.*; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; + +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedClass; +import org.junit.jupiter.params.provider.MethodSource; import redis.clients.jedis.RedisProtocol; import redis.clients.jedis.exceptions.JedisDataException; @@ -20,18 +21,14 @@ import redis.clients.jedis.timeseries.*; import redis.clients.jedis.util.KeyValue; -@RunWith(Parameterized.class) +@ParameterizedClass +@MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions") public class TimeSeriesTest extends RedisModuleCommandsTestBase { - @BeforeClass + @BeforeAll public static void prepare() { RedisModuleCommandsTestBase.prepare(); } -// -// @AfterClass -// public static void tearDown() { -//// RedisModuleCommandsTestBase.tearDown(); -// } public TimeSeriesTest(RedisProtocol protocol) { super(protocol); @@ -374,7 +371,6 @@ public void testAddStar() throws InterruptedException { long startTime = System.currentTimeMillis(); Thread.sleep(2); -// long add1 = client.tsAdd("seriesAdd2", 1.1, 10000); long add1 = client.tsAdd("seriesAdd2", 1.1); assertTrue(add1 > startTime); Thread.sleep(2); diff --git a/src/test/java/redis/clients/jedis/params/BitPosParamsTest.java b/src/test/java/redis/clients/jedis/params/BitPosParamsTest.java index 4a38018c36..3b0488dcf7 100644 --- a/src/test/java/redis/clients/jedis/params/BitPosParamsTest.java +++ b/src/test/java/redis/clients/jedis/params/BitPosParamsTest.java @@ -1,8 +1,8 @@ package redis.clients.jedis.params; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class BitPosParamsTest { diff --git a/src/test/java/redis/clients/jedis/params/ClientKillParamsTest.java b/src/test/java/redis/clients/jedis/params/ClientKillParamsTest.java index 6a9a75c8d8..96a7af8264 100644 --- a/src/test/java/redis/clients/jedis/params/ClientKillParamsTest.java +++ b/src/test/java/redis/clients/jedis/params/ClientKillParamsTest.java @@ -1,9 +1,9 @@ package redis.clients.jedis.params; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.args.ClientType; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class ClientKillParamsTest { diff --git a/src/test/java/redis/clients/jedis/params/CommandListFilterByParamsTest.java b/src/test/java/redis/clients/jedis/params/CommandListFilterByParamsTest.java index dff749febc..036a478346 100644 --- a/src/test/java/redis/clients/jedis/params/CommandListFilterByParamsTest.java +++ b/src/test/java/redis/clients/jedis/params/CommandListFilterByParamsTest.java @@ -1,8 +1,8 @@ package redis.clients.jedis.params; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class CommandListFilterByParamsTest { diff --git a/src/test/java/redis/clients/jedis/params/FailoverParamsTest.java b/src/test/java/redis/clients/jedis/params/FailoverParamsTest.java index 80d9bb1137..b673a89ffa 100644 --- a/src/test/java/redis/clients/jedis/params/FailoverParamsTest.java +++ b/src/test/java/redis/clients/jedis/params/FailoverParamsTest.java @@ -1,8 +1,8 @@ package redis.clients.jedis.params; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class FailoverParamsTest { diff --git a/src/test/java/redis/clients/jedis/params/GeoAddParamsTest.java b/src/test/java/redis/clients/jedis/params/GeoAddParamsTest.java index cf3b5a3305..e877c669b7 100644 --- a/src/test/java/redis/clients/jedis/params/GeoAddParamsTest.java +++ b/src/test/java/redis/clients/jedis/params/GeoAddParamsTest.java @@ -1,8 +1,8 @@ package redis.clients.jedis.params; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class GeoAddParamsTest { diff --git a/src/test/java/redis/clients/jedis/params/GetExParamsTest.java b/src/test/java/redis/clients/jedis/params/GetExParamsTest.java index 0774bfde54..9b05c4daae 100644 --- a/src/test/java/redis/clients/jedis/params/GetExParamsTest.java +++ b/src/test/java/redis/clients/jedis/params/GetExParamsTest.java @@ -1,8 +1,8 @@ package redis.clients.jedis.params; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class GetExParamsTest { diff --git a/src/test/java/redis/clients/jedis/params/LCSParamsTest.java b/src/test/java/redis/clients/jedis/params/LCSParamsTest.java index a3f759304c..257ecd031d 100644 --- a/src/test/java/redis/clients/jedis/params/LCSParamsTest.java +++ b/src/test/java/redis/clients/jedis/params/LCSParamsTest.java @@ -1,8 +1,8 @@ package redis.clients.jedis.params; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class LCSParamsTest { diff --git a/src/test/java/redis/clients/jedis/params/LPosParamsTest.java b/src/test/java/redis/clients/jedis/params/LPosParamsTest.java index 73e23b7798..a0cbbc157d 100644 --- a/src/test/java/redis/clients/jedis/params/LPosParamsTest.java +++ b/src/test/java/redis/clients/jedis/params/LPosParamsTest.java @@ -1,8 +1,8 @@ package redis.clients.jedis.params; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class LPosParamsTest { diff --git a/src/test/java/redis/clients/jedis/params/LolwutParamsTest.java b/src/test/java/redis/clients/jedis/params/LolwutParamsTest.java index 0e49f8686c..ae71d6d213 100644 --- a/src/test/java/redis/clients/jedis/params/LolwutParamsTest.java +++ b/src/test/java/redis/clients/jedis/params/LolwutParamsTest.java @@ -1,8 +1,8 @@ package redis.clients.jedis.params; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class LolwutParamsTest { diff --git a/src/test/java/redis/clients/jedis/params/MigrateParamsTest.java b/src/test/java/redis/clients/jedis/params/MigrateParamsTest.java index eab24f6f71..6dd148a55c 100644 --- a/src/test/java/redis/clients/jedis/params/MigrateParamsTest.java +++ b/src/test/java/redis/clients/jedis/params/MigrateParamsTest.java @@ -1,8 +1,8 @@ package redis.clients.jedis.params; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class MigrateParamsTest { diff --git a/src/test/java/redis/clients/jedis/params/ModuleLoadExParamsTest.java b/src/test/java/redis/clients/jedis/params/ModuleLoadExParamsTest.java index 08f8034bd2..6d3773a69e 100644 --- a/src/test/java/redis/clients/jedis/params/ModuleLoadExParamsTest.java +++ b/src/test/java/redis/clients/jedis/params/ModuleLoadExParamsTest.java @@ -1,8 +1,8 @@ package redis.clients.jedis.params; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class ModuleLoadExParamsTest { diff --git a/src/test/java/redis/clients/jedis/params/RestoreParamsTest.java b/src/test/java/redis/clients/jedis/params/RestoreParamsTest.java index 05f328bc41..8ecf095eaa 100644 --- a/src/test/java/redis/clients/jedis/params/RestoreParamsTest.java +++ b/src/test/java/redis/clients/jedis/params/RestoreParamsTest.java @@ -1,8 +1,8 @@ package redis.clients.jedis.params; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class RestoreParamsTest { diff --git a/src/test/java/redis/clients/jedis/params/ScanParamsTest.java b/src/test/java/redis/clients/jedis/params/ScanParamsTest.java index 111f953b2f..1413960380 100644 --- a/src/test/java/redis/clients/jedis/params/ScanParamsTest.java +++ b/src/test/java/redis/clients/jedis/params/ScanParamsTest.java @@ -1,8 +1,8 @@ package redis.clients.jedis.params; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class ScanParamsTest { diff --git a/src/test/java/redis/clients/jedis/params/SetParamsTest.java b/src/test/java/redis/clients/jedis/params/SetParamsTest.java index 14b81deeb4..d625717da9 100644 --- a/src/test/java/redis/clients/jedis/params/SetParamsTest.java +++ b/src/test/java/redis/clients/jedis/params/SetParamsTest.java @@ -1,8 +1,8 @@ package redis.clients.jedis.params; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class SetParamsTest { diff --git a/src/test/java/redis/clients/jedis/params/ShutdownParamsTest.java b/src/test/java/redis/clients/jedis/params/ShutdownParamsTest.java index 625e98b295..2f45cf9d89 100644 --- a/src/test/java/redis/clients/jedis/params/ShutdownParamsTest.java +++ b/src/test/java/redis/clients/jedis/params/ShutdownParamsTest.java @@ -1,8 +1,8 @@ package redis.clients.jedis.params; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class ShutdownParamsTest { diff --git a/src/test/java/redis/clients/jedis/params/SortingParamsTest.java b/src/test/java/redis/clients/jedis/params/SortingParamsTest.java index a66669584f..9f9795bd90 100644 --- a/src/test/java/redis/clients/jedis/params/SortingParamsTest.java +++ b/src/test/java/redis/clients/jedis/params/SortingParamsTest.java @@ -1,8 +1,8 @@ package redis.clients.jedis.params; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class SortingParamsTest { diff --git a/src/test/java/redis/clients/jedis/params/XAddParamsTest.java b/src/test/java/redis/clients/jedis/params/XAddParamsTest.java index db3cac5e56..906ef6130d 100644 --- a/src/test/java/redis/clients/jedis/params/XAddParamsTest.java +++ b/src/test/java/redis/clients/jedis/params/XAddParamsTest.java @@ -1,8 +1,8 @@ package redis.clients.jedis.params; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class XAddParamsTest { diff --git a/src/test/java/redis/clients/jedis/params/XAutoClaimParamsTest.java b/src/test/java/redis/clients/jedis/params/XAutoClaimParamsTest.java index eeb9aeb38a..5380465ea5 100644 --- a/src/test/java/redis/clients/jedis/params/XAutoClaimParamsTest.java +++ b/src/test/java/redis/clients/jedis/params/XAutoClaimParamsTest.java @@ -1,8 +1,8 @@ package redis.clients.jedis.params; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class XAutoClaimParamsTest { diff --git a/src/test/java/redis/clients/jedis/params/XClaimParamsTest.java b/src/test/java/redis/clients/jedis/params/XClaimParamsTest.java index 1cef5b8dbe..543daf5857 100644 --- a/src/test/java/redis/clients/jedis/params/XClaimParamsTest.java +++ b/src/test/java/redis/clients/jedis/params/XClaimParamsTest.java @@ -1,8 +1,8 @@ package redis.clients.jedis.params; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class XClaimParamsTest { diff --git a/src/test/java/redis/clients/jedis/params/XPendingParamsTest.java b/src/test/java/redis/clients/jedis/params/XPendingParamsTest.java index c7c95da424..212902ab73 100644 --- a/src/test/java/redis/clients/jedis/params/XPendingParamsTest.java +++ b/src/test/java/redis/clients/jedis/params/XPendingParamsTest.java @@ -1,9 +1,9 @@ package redis.clients.jedis.params; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.StreamEntryID; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class XPendingParamsTest { diff --git a/src/test/java/redis/clients/jedis/params/XReadGroupParamsTest.java b/src/test/java/redis/clients/jedis/params/XReadGroupParamsTest.java index a489d50648..181c1d3186 100644 --- a/src/test/java/redis/clients/jedis/params/XReadGroupParamsTest.java +++ b/src/test/java/redis/clients/jedis/params/XReadGroupParamsTest.java @@ -1,8 +1,8 @@ package redis.clients.jedis.params; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class XReadGroupParamsTest { diff --git a/src/test/java/redis/clients/jedis/params/XReadParamsTest.java b/src/test/java/redis/clients/jedis/params/XReadParamsTest.java index d3277cd70f..9cc8b97bca 100644 --- a/src/test/java/redis/clients/jedis/params/XReadParamsTest.java +++ b/src/test/java/redis/clients/jedis/params/XReadParamsTest.java @@ -1,8 +1,8 @@ package redis.clients.jedis.params; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class XReadParamsTest { diff --git a/src/test/java/redis/clients/jedis/params/XTrimParamsTest.java b/src/test/java/redis/clients/jedis/params/XTrimParamsTest.java index dcd344816d..bab426a949 100644 --- a/src/test/java/redis/clients/jedis/params/XTrimParamsTest.java +++ b/src/test/java/redis/clients/jedis/params/XTrimParamsTest.java @@ -1,8 +1,8 @@ package redis.clients.jedis.params; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class XTrimParamsTest { diff --git a/src/test/java/redis/clients/jedis/params/ZAddParamsTest.java b/src/test/java/redis/clients/jedis/params/ZAddParamsTest.java index 5d3148e415..620e3fced1 100644 --- a/src/test/java/redis/clients/jedis/params/ZAddParamsTest.java +++ b/src/test/java/redis/clients/jedis/params/ZAddParamsTest.java @@ -1,8 +1,8 @@ package redis.clients.jedis.params; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class ZAddParamsTest { diff --git a/src/test/java/redis/clients/jedis/params/ZIncrByParamsTest.java b/src/test/java/redis/clients/jedis/params/ZIncrByParamsTest.java index 7e68e93cbe..86c6e3ee1e 100644 --- a/src/test/java/redis/clients/jedis/params/ZIncrByParamsTest.java +++ b/src/test/java/redis/clients/jedis/params/ZIncrByParamsTest.java @@ -1,8 +1,8 @@ package redis.clients.jedis.params; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class ZIncrByParamsTest { diff --git a/src/test/java/redis/clients/jedis/params/ZParamsTest.java b/src/test/java/redis/clients/jedis/params/ZParamsTest.java index 902748a054..43988b8ff9 100644 --- a/src/test/java/redis/clients/jedis/params/ZParamsTest.java +++ b/src/test/java/redis/clients/jedis/params/ZParamsTest.java @@ -1,8 +1,8 @@ package redis.clients.jedis.params; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class ZParamsTest { diff --git a/src/test/java/redis/clients/jedis/params/ZRangeParamsTest.java b/src/test/java/redis/clients/jedis/params/ZRangeParamsTest.java index a2f5e02105..d5ae071449 100644 --- a/src/test/java/redis/clients/jedis/params/ZRangeParamsTest.java +++ b/src/test/java/redis/clients/jedis/params/ZRangeParamsTest.java @@ -1,8 +1,8 @@ package redis.clients.jedis.params; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class ZRangeParamsTest { diff --git a/src/test/java/redis/clients/jedis/prefix/JedisClusterPrefixedKeysTest.java b/src/test/java/redis/clients/jedis/prefix/JedisClusterPrefixedKeysTest.java index 0c4040de30..005d8f8f27 100644 --- a/src/test/java/redis/clients/jedis/prefix/JedisClusterPrefixedKeysTest.java +++ b/src/test/java/redis/clients/jedis/prefix/JedisClusterPrefixedKeysTest.java @@ -2,7 +2,7 @@ import java.util.stream.Collectors; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.HostAndPorts; import redis.clients.jedis.DefaultJedisClientConfig; @@ -10,6 +10,8 @@ import redis.clients.jedis.JedisClientConfig; import redis.clients.jedis.JedisCluster; +import static org.junit.jupiter.api.Assertions.assertThrows; + public class JedisClusterPrefixedKeysTest extends PrefixedKeysTest { private static final JedisClientConfig CLIENT_CONFIG = DefaultJedisClientConfig.builder().password("cluster").build(); @@ -21,8 +23,8 @@ JedisCluster nonPrefixingJedis() { } @Override - @Test(expected = UnsupportedOperationException.class) + @Test public void prefixesKeysInTransaction() { - super.prefixesKeysInTransaction(); + assertThrows(UnsupportedOperationException.class, () -> super.prefixesKeysInTransaction()); } } diff --git a/src/test/java/redis/clients/jedis/prefix/PrefixedKeysTest.java b/src/test/java/redis/clients/jedis/prefix/PrefixedKeysTest.java index 66fc2fec02..68d6079296 100644 --- a/src/test/java/redis/clients/jedis/prefix/PrefixedKeysTest.java +++ b/src/test/java/redis/clients/jedis/prefix/PrefixedKeysTest.java @@ -1,10 +1,7 @@ package redis.clients.jedis.prefix; -import static org.junit.Assert.assertEquals; - -import org.junit.After; -import org.junit.Test; - +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; import redis.clients.jedis.AbstractPipeline; import redis.clients.jedis.AbstractTransaction; import redis.clients.jedis.UnifiedJedis; @@ -12,6 +9,8 @@ import redis.clients.jedis.util.PrefixedKeyArgumentPreProcessor; import redis.clients.jedis.util.SafeEncoder; +import static org.junit.jupiter.api.Assertions.assertEquals; + public abstract class PrefixedKeysTest { abstract T nonPrefixingJedis(); @@ -22,7 +21,7 @@ T prefixingJedis() { return jedis; } - @After + @AfterEach public void cleanUp() { try (UnifiedJedis jedis = prefixingJedis()) { jedis.flushAll(); diff --git a/src/test/java/redis/clients/jedis/providers/MultiClusterPooledConnectionProviderTest.java b/src/test/java/redis/clients/jedis/providers/MultiClusterPooledConnectionProviderTest.java index 1f2c7576f6..8996f0e285 100644 --- a/src/test/java/redis/clients/jedis/providers/MultiClusterPooledConnectionProviderTest.java +++ b/src/test/java/redis/clients/jedis/providers/MultiClusterPooledConnectionProviderTest.java @@ -1,8 +1,8 @@ package redis.clients.jedis.providers; import io.github.resilience4j.circuitbreaker.CircuitBreaker; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import redis.clients.jedis.*; import redis.clients.jedis.MultiClusterClientConfig.ClusterConfig; import redis.clients.jedis.exceptions.JedisConnectionException; @@ -10,7 +10,7 @@ import java.util.concurrent.atomic.AtomicBoolean; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; /** * @see MultiClusterPooledConnectionProvider @@ -22,7 +22,7 @@ public class MultiClusterPooledConnectionProviderTest { private MultiClusterPooledConnectionProvider provider; - @Before + @BeforeEach public void setUp() { ClusterConfig[] clusterConfigs = new ClusterConfig[2]; @@ -54,14 +54,15 @@ public void testIncrementActiveMultiClusterIndex() { assertEquals(2, index); } - @Test(expected = JedisConnectionException.class) + @Test public void testIncrementActiveMultiClusterIndexOutOfRange() { provider.setActiveMultiClusterIndex(1); int index = provider.incrementActiveMultiClusterIndex(); assertEquals(2, index); - provider.incrementActiveMultiClusterIndex(); // Should throw an exception + assertThrows(JedisConnectionException.class, + () -> provider.incrementActiveMultiClusterIndex()); // Should throw an exception } @Test @@ -77,7 +78,7 @@ public void testIsLastClusterCircuitBreakerForcedOpen() { provider.incrementActiveMultiClusterIndex(); } catch (Exception e) {} - assertEquals(true, provider.isLastClusterCircuitBreakerForcedOpen()); + assertTrue(provider.isLastClusterCircuitBreakerForcedOpen()); } @Test @@ -113,22 +114,25 @@ public void testRunClusterFailoverPostProcessor() { } - assertEquals(true, isValidTest.get()); + assertTrue(isValidTest.get()); } - @Test(expected = JedisValidationException.class) + @Test public void testSetActiveMultiClusterIndexEqualsZero() { - provider.setActiveMultiClusterIndex(0); // Should throw an exception + assertThrows(JedisValidationException.class, + () -> provider.setActiveMultiClusterIndex(0)); // Should throw an exception } - @Test(expected = JedisValidationException.class) + @Test public void testSetActiveMultiClusterIndexLessThanZero() { - provider.setActiveMultiClusterIndex(-1); // Should throw an exception + assertThrows(JedisValidationException.class, + () -> provider.setActiveMultiClusterIndex(-1)); // Should throw an exception } - @Test(expected = JedisValidationException.class) + @Test public void testSetActiveMultiClusterIndexOutOfRange() { - provider.setActiveMultiClusterIndex(3); // Should throw an exception + assertThrows(JedisValidationException.class, + () -> provider.setActiveMultiClusterIndex(3)); // Should throw an exception } @Test diff --git a/src/test/java/redis/clients/jedis/scenario/ActiveActiveFailoverTest.java b/src/test/java/redis/clients/jedis/scenario/ActiveActiveFailoverTest.java index 587988b447..f8427d2968 100644 --- a/src/test/java/redis/clients/jedis/scenario/ActiveActiveFailoverTest.java +++ b/src/test/java/redis/clients/jedis/scenario/ActiveActiveFailoverTest.java @@ -1,8 +1,8 @@ package redis.clients.jedis.scenario; import io.github.resilience4j.circuitbreaker.CircuitBreakerConfig; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import redis.clients.jedis.*; @@ -18,7 +18,10 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.function.Consumer; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; +import static org.junit.jupiter.api.Assumptions.assumeTrue; public class ActiveActiveFailoverTest { private static final Logger log = LoggerFactory.getLogger(ActiveActiveFailoverTest.class); @@ -27,13 +30,13 @@ public class ActiveActiveFailoverTest { private final FaultInjectionClient faultClient = new FaultInjectionClient(); - @BeforeClass + @BeforeAll public static void beforeClass() { try { ActiveActiveFailoverTest.endpoint = HostAndPorts.getRedisEndpoint("re-active-active"); } catch (IllegalArgumentException e) { log.warn("Skipping test because no Redis endpoint is configured"); - org.junit.Assume.assumeTrue(false); + assumeTrue(false); } } diff --git a/src/test/java/redis/clients/jedis/scenario/ClusterTopologyRefreshTest.java b/src/test/java/redis/clients/jedis/scenario/ClusterTopologyRefreshTest.java index e4fc9a8b0a..973a2b4921 100644 --- a/src/test/java/redis/clients/jedis/scenario/ClusterTopologyRefreshTest.java +++ b/src/test/java/redis/clients/jedis/scenario/ClusterTopologyRefreshTest.java @@ -1,7 +1,7 @@ package redis.clients.jedis.scenario; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import redis.clients.jedis.*; @@ -13,7 +13,10 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicLong; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; +import static org.junit.jupiter.api.Assumptions.assumeTrue; import static org.mockito.Mockito.*; public class ClusterTopologyRefreshTest { @@ -24,13 +27,13 @@ public class ClusterTopologyRefreshTest { private final FaultInjectionClient faultClient = new FaultInjectionClient(); - @BeforeClass + @BeforeAll public static void beforeClass() { try { ClusterTopologyRefreshTest.endpoint = HostAndPorts.getRedisEndpoint("re-single-shard-oss-cluster"); } catch (IllegalArgumentException e) { log.warn("Skipping test because no Redis endpoint is configured"); - org.junit.Assume.assumeTrue(false); + assumeTrue(false); } } @@ -49,8 +52,8 @@ public void testWithPool() { try (JedisCluster client = new JedisCluster(spyProvider, RecommendedSettings.MAX_RETRIES, RecommendedSettings.MAX_TOTAL_RETRIES_DURATION)) { - assertEquals("Was this BDB used to run this test before?", 1, - client.getClusterNodes().size()); + assertEquals(1, + client.getClusterNodes().size(),"Was this BDB used to run this test before?"); AtomicLong commandsExecuted = new AtomicLong(); diff --git a/src/test/java/redis/clients/jedis/scenario/ConnectionInterruptionTest.java b/src/test/java/redis/clients/jedis/scenario/ConnectionInterruptionTest.java index ee584931ca..22c45c3d4e 100644 --- a/src/test/java/redis/clients/jedis/scenario/ConnectionInterruptionTest.java +++ b/src/test/java/redis/clients/jedis/scenario/ConnectionInterruptionTest.java @@ -1,9 +1,8 @@ package redis.clients.jedis.scenario; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import redis.clients.jedis.*; @@ -13,13 +12,12 @@ import redis.clients.jedis.util.SafeEncoder; import java.io.IOException; -import java.util.Arrays; import java.util.HashMap; import java.util.concurrent.atomic.AtomicLong; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assumptions.assumeTrue; -@RunWith(Parameterized.class) public class ConnectionInterruptionTest { private static final Logger log = LoggerFactory.getLogger(ConnectionInterruptionTest.class); @@ -28,26 +26,20 @@ public class ConnectionInterruptionTest { private final FaultInjectionClient faultClient = new FaultInjectionClient(); - @Parameterized.Parameters - public static Iterable data() { - return Arrays.asList("dmc_restart", "network_failure"); - } - - @Parameterized.Parameter - public String triggerAction; - @BeforeClass + @BeforeAll public static void beforeClass() { try { ConnectionInterruptionTest.endpoint = HostAndPorts.getRedisEndpoint("re-standalone"); } catch (IllegalArgumentException e) { log.warn("Skipping test because no Redis endpoint is configured"); - org.junit.Assume.assumeTrue(false); + assumeTrue(false); } } - @Test - public void testWithPool() { + @ParameterizedTest + @ValueSource(strings = {"dmc_restart", "network_failure"}) + public void testWithPool(String triggerAction) { ConnectionProvider connectionProvider = new PooledConnectionProvider(endpoint.getHostAndPort(), endpoint.getClientConfigBuilder().build(), RecommendedSettings.poolConfig); @@ -98,8 +90,9 @@ public void testWithPool() { client.close(); } - @Test - public void testWithPubSub() { + @ParameterizedTest + @ValueSource(strings = {"dmc_restart", "network_failure"}) + public void testWithPubSub(String triggerAction) { ConnectionProvider connectionProvider = new PooledConnectionProvider(endpoint.getHostAndPort(), endpoint.getClientConfigBuilder().build(), RecommendedSettings.poolConfig); diff --git a/src/test/java/redis/clients/jedis/util/AssertUtil.java b/src/test/java/redis/clients/jedis/util/AssertUtil.java index 474b34e74b..fee2d1be1e 100644 --- a/src/test/java/redis/clients/jedis/util/AssertUtil.java +++ b/src/test/java/redis/clients/jedis/util/AssertUtil.java @@ -1,7 +1,7 @@ package redis.clients.jedis.util; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.Arrays; import java.util.Collection; @@ -9,7 +9,7 @@ import java.util.List; import java.util.Objects; import java.util.Set; -import org.junit.ComparisonFailure; +import org.opentest4j.AssertionFailedError; import redis.clients.jedis.RedisProtocol; public class AssertUtil { @@ -32,7 +32,7 @@ public static boolean assertCollectionContains(Collection array, T expect return true; } } - throw new ComparisonFailure("element is missing", Objects.toString(expected), array.toString()); + throw new AssertionFailedError("element is missing", Objects.toString(expected), array.toString()); } public static boolean assertByteArrayCollectionContains(Collection array, byte[] expected) { @@ -41,13 +41,13 @@ public static boolean assertByteArrayCollectionContains(Collection array return true; } } - throw new ComparisonFailure("element is missing", Arrays.toString(expected), array.toString()); + throw new AssertionFailedError("element is missing", Arrays.toString(expected), array.toString()); } public static void assertByteArrayListEquals(List expected, List actual) { assertEquals(expected.size(), actual.size()); for (int n = 0; n < expected.size(); n++) { - assertArrayEquals(n + "'th elements don't match", expected.get(n), actual.get(n)); + assertArrayEquals(expected.get(n), actual.get(n), n + "'th elements don't match"); } } @@ -64,7 +64,7 @@ public static void assertByteArraySetEquals(Set expected, Set ac } } if (!contained) { - throw new ComparisonFailure("element is missing", Arrays.toString(next), actual.toString()); + throw new AssertionFailedError("element is missing", Arrays.toString(next), actual.toString()); } } } @@ -81,7 +81,7 @@ public static void assertCollectionContainsAll(Collection all, Collection few) { } } if (!found) { - throw new ComparisonFailure("element is missing", Objects.toString(fo), all.toString()); + throw new AssertionFailedError("element is missing", Objects.toString(fo), all.toString()); } } } @@ -99,7 +99,7 @@ public static void assertByteArrayCollectionContainsAll(Collection all, } } if (!found) { - throw new ComparisonFailure("element is missing", Arrays.toString(fo), all.toString()); + throw new AssertionFailedError("element is missing", Arrays.toString(fo), all.toString()); } } } @@ -111,30 +111,30 @@ public static void assertPipelineSyncAll(List expected, List act Object actObj = actual.get(n); if (expObj instanceof List) { if (!(actObj instanceof List)) { - throw new ComparisonFailure(n + "'th element is not a list", + throw new AssertionFailedError(n + "'th element is not a list", expObj.getClass().toString(), actObj.getClass().toString()); } assertPipelineSyncAll((List) expObj, (List) actObj); } else if (expObj instanceof List) { if (!(actObj instanceof List)) { - throw new ComparisonFailure(n + "'th element is not a list", + throw new AssertionFailedError(n + "'th element is not a list", expObj.getClass().toString(), actObj.getClass().toString()); } assertPipelineSyncAll((List) expObj, (List) actObj); } else if (expObj instanceof Set) { if (!(actObj instanceof Set)) { - throw new ComparisonFailure(n + "'th element is not a set", + throw new AssertionFailedError(n + "'th element is not a set", expObj.getClass().toString(), actObj.getClass().toString()); } assertPipelineSyncAllSet((Set) expObj, (Set) actObj); } else if (expObj instanceof byte[]) { if (!(actObj instanceof byte[])) { - throw new ComparisonFailure(n + "'th element is not byte array", + throw new AssertionFailedError(n + "'th element is not byte array", expObj.getClass().toString(), actObj.getClass().toString()); } assertArrayEquals((byte[]) expObj, (byte[]) actObj); } else { - assertEquals(n + "'th element mismatched", expObj, actObj); + assertEquals(expObj, actObj, n + "'th element mismatched"); } } } diff --git a/src/test/java/redis/clients/jedis/util/ByteArrayComparatorTest.java b/src/test/java/redis/clients/jedis/util/ByteArrayComparatorTest.java index 54cd1ca62f..f780168b03 100644 --- a/src/test/java/redis/clients/jedis/util/ByteArrayComparatorTest.java +++ b/src/test/java/redis/clients/jedis/util/ByteArrayComparatorTest.java @@ -1,8 +1,8 @@ package redis.clients.jedis.util; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ByteArrayComparatorTest { diff --git a/src/test/java/redis/clients/jedis/util/EnabledOnCommandCondition.java b/src/test/java/redis/clients/jedis/util/EnabledOnCommandCondition.java new file mode 100644 index 0000000000..8b9ad9f03b --- /dev/null +++ b/src/test/java/redis/clients/jedis/util/EnabledOnCommandCondition.java @@ -0,0 +1,85 @@ +package redis.clients.jedis.util; + +import io.redis.test.annotations.EnabledOnCommand; +import org.junit.jupiter.api.extension.ConditionEvaluationResult; +import org.junit.jupiter.api.extension.ExecutionCondition; +import org.junit.jupiter.api.extension.ExtensionContext; +import org.junit.platform.commons.util.AnnotationUtils; +import redis.clients.jedis.*; +import redis.clients.jedis.resps.CommandInfo; + +import java.util.Map; +import java.util.Optional; + +public class EnabledOnCommandCondition implements ExecutionCondition { + + private final HostAndPort hostPort; + private final JedisClientConfig config; + + public EnabledOnCommandCondition(HostAndPort hostPort, JedisClientConfig config) { + this.hostPort = hostPort; + this.config = config; + } + + public EnabledOnCommandCondition(EndpointConfig endpointConfig) { + this.hostPort = endpointConfig.getHostAndPort(); + this.config = endpointConfig.getClientConfigBuilder().build(); + } + + @Override + public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) { + try (Jedis jedisClient = new Jedis(hostPort, config)) { + String[] command = getCommandFromAnnotations(context); + + if (command != null && !isCommandAvailable(jedisClient, command[0], command[1])) { + return ConditionEvaluationResult.disabled( + "Test requires Redis command '" + command[0] + " " + command[1] + + "' to be available on " + hostPort + ", but it was not found."); + } + } catch (Exception e) { + return ConditionEvaluationResult.disabled( + "Failed to check Redis command on " + hostPort + ": " + e.getMessage()); + } + return ConditionEvaluationResult.enabled("Redis command is available"); + } + + private String[] getCommandFromAnnotations(ExtensionContext context) { + Optional methodAnnotation = AnnotationUtils.findAnnotation( + context.getRequiredTestMethod(), EnabledOnCommand.class); + if (methodAnnotation.isPresent()) { + return new String[] { methodAnnotation.get().value(), methodAnnotation.get().subCommand() }; + } + + Optional classAnnotation = AnnotationUtils.findAnnotation( + context.getRequiredTestClass(), EnabledOnCommand.class); + if (classAnnotation.isPresent()) { + return new String[] { classAnnotation.get().value(), classAnnotation.get().subCommand() }; + } + + return null; + } + + private boolean isCommandAvailable(Jedis jedisClient, String command, String subCommand) { + try { + Map commandInfoMap = jedisClient.commandInfo(command); + CommandInfo commandInfo = commandInfoMap.get(command.toLowerCase()); + if (commandInfo != null) { + if (subCommand != null && !subCommand.isEmpty()) { + String replySubCommandName = command + '|' + subCommand; + for (CommandInfo supportedSubCommand : commandInfo.getSubcommands().values()) { + if (replySubCommandName.equalsIgnoreCase(supportedSubCommand.getName())) { + return true; + } + } + return false; + } + return true; + } + return false; + } catch (Exception e) { + throw new RuntimeException("Error found while EnableOnCommand for command '" + command + "'", + e); + } + } + +} \ No newline at end of file diff --git a/src/test/java/redis/clients/jedis/util/EnabledOnCommandRule.java b/src/test/java/redis/clients/jedis/util/EnabledOnCommandRule.java deleted file mode 100644 index 0e0163cd4c..0000000000 --- a/src/test/java/redis/clients/jedis/util/EnabledOnCommandRule.java +++ /dev/null @@ -1,123 +0,0 @@ -package redis.clients.jedis.util; - -import io.redis.test.annotations.EnabledOnCommand; -import java.lang.reflect.Method; -import java.util.Map; - -import org.junit.Assume; -import org.junit.rules.TestRule; -import org.junit.runner.Description; -import org.junit.runners.model.Statement; - -import redis.clients.jedis.*; -import redis.clients.jedis.resps.CommandInfo; - -public class EnabledOnCommandRule implements TestRule { - - private final HostAndPort hostPort; - private final JedisClientConfig config; - - public EnabledOnCommandRule(HostAndPort hostPort, JedisClientConfig config) { - this.hostPort = hostPort; - this.config = config; - } - - public EnabledOnCommandRule(EndpointConfig endpointConfig) { - this.hostPort = endpointConfig.getHostAndPort(); - this.config = endpointConfig.getClientConfigBuilder().build(); - } - - @Override - public Statement apply(Statement base, Description description) { - return new Statement() { - @Override - public void evaluate() throws Throwable { - try (Jedis jedisClient = new Jedis(hostPort, config)) { - String[] command = getCommandFromAnnotations(description); - - if (command != null && !isCommandAvailable(jedisClient, command[0],command[1])) { - Assume.assumeTrue("Test requires Redis command '" + command[0] + " " + command[1] + "' to be available, but it was not found.", false); - } - - base.evaluate(); - } - } - - /** - * Retrieves the command from either class-level or method-level annotations. - * - * @param description The test description containing annotations. - * @return The Redis array containing command, subcommand from the annotations, or null if not found. - */ - private String[] getCommandFromAnnotations(Description description) { - // Retrieve class-level and method-level annotations - EnabledOnCommand descriptionCommandAnnotation = description.getAnnotation(EnabledOnCommand.class); - if (descriptionCommandAnnotation != null) { - return new String[] {descriptionCommandAnnotation.value(), descriptionCommandAnnotation.subCommand()}; - } - - EnabledOnCommand methodCommand = getMethodAnnotation(description); - if (methodCommand != null) { - return new String[] {methodCommand.value(), methodCommand.subCommand()}; - } - - EnabledOnCommand classCommand = description.getTestClass().getAnnotation(EnabledOnCommand.class); - if (classCommand != null) { - return new String[] {classCommand.value(), classCommand.subCommand()}; - } - - return null; - } - - private EnabledOnCommand getMethodAnnotation(Description description) { - try { - // description.getAnnotation() does not return anootaion when used - // with parametrised tests - String methodName = description.getMethodName(); - if (methodName != null) { - Class testClass = description.getTestClass(); - if (testClass != null) { - for (Method method : testClass.getDeclaredMethods()) { - if (method.getName().equals(methodName)) { - return method.getAnnotation(EnabledOnCommand.class); - } - } - } - } - } catch (Exception e) { - // Handle any potential exceptions here - throw new RuntimeException("Could not resolve EnabledOnCommand annotation",e); - } - return null; - } - - /** - * Checks if the specified Redis command is available. - */ - private boolean isCommandAvailable(Jedis jedisClient, String command, String subCommand) { - try { - Map commandInfoMap= jedisClient.commandInfo(command); - CommandInfo commandInfo = commandInfoMap.get(command.toLowerCase()); - if (commandInfo != null) { - // If a subCommand is provided, check for the subcommand under this command - if (subCommand != null && !subCommand.isEmpty()) { - // Check if this command supports the provided subcommand - String replySubCommandName = command + '|' + subCommand; - for (CommandInfo supportedSubCommand : commandInfo.getSubcommands().values()) { - if (replySubCommandName.equalsIgnoreCase(supportedSubCommand.getName())) { - return true; - } - } - return false; // Subcommand not found - } - return true; // Command found (no subcommand required) - } - return false; // Command not found - } catch (Exception e) { - String msg = String.format("Error found while EnableOnCommand for command '%s'", command); - throw new RuntimeException(msg, e); - } - } - }; - } -} diff --git a/src/test/java/redis/clients/jedis/util/JedisClusterCRC16Test.java b/src/test/java/redis/clients/jedis/util/JedisClusterCRC16Test.java index fe5cfb9729..a903f0b7c2 100644 --- a/src/test/java/redis/clients/jedis/util/JedisClusterCRC16Test.java +++ b/src/test/java/redis/clients/jedis/util/JedisClusterCRC16Test.java @@ -1,17 +1,17 @@ package redis.clients.jedis.util; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class JedisClusterCRC16Test { @Test - public void testGetCRC16() throws Exception { + public void testGetCRC16() { Map solutions = prepareSolutionSet(); for (Entry entry : solutions.entrySet()) { diff --git a/src/test/java/redis/clients/jedis/util/JedisURIHelperTest.java b/src/test/java/redis/clients/jedis/util/JedisURIHelperTest.java index 9b424f1164..c6349f5fe5 100644 --- a/src/test/java/redis/clients/jedis/util/JedisURIHelperTest.java +++ b/src/test/java/redis/clients/jedis/util/JedisURIHelperTest.java @@ -1,11 +1,11 @@ package redis.clients.jedis.util; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static redis.clients.jedis.util.JedisURIHelper.*; import java.net.URI; import java.net.URISyntaxException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import redis.clients.jedis.RedisProtocol; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.emptyString; diff --git a/src/test/java/redis/clients/jedis/util/RedisVersionCondition.java b/src/test/java/redis/clients/jedis/util/RedisVersionCondition.java new file mode 100644 index 0000000000..9b979379b8 --- /dev/null +++ b/src/test/java/redis/clients/jedis/util/RedisVersionCondition.java @@ -0,0 +1,73 @@ +package redis.clients.jedis.util; + +import io.redis.test.annotations.SinceRedisVersion; +import io.redis.test.utils.RedisInfo; +import io.redis.test.utils.RedisVersion; +import org.junit.jupiter.api.extension.ConditionEvaluationResult; +import org.junit.jupiter.api.extension.ExecutionCondition; +import org.junit.jupiter.api.extension.ExtensionContext; +import org.junit.platform.commons.util.AnnotationUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import redis.clients.jedis.EndpointConfig; +import redis.clients.jedis.HostAndPort; +import redis.clients.jedis.Jedis; +import redis.clients.jedis.JedisClientConfig; + +import java.lang.reflect.Method; +import java.util.Optional; + +import static redis.clients.jedis.util.RedisVersionUtil.forcedVersion; + +public class RedisVersionCondition implements ExecutionCondition { + private static final Logger logger = LoggerFactory.getLogger(RedisVersionCondition.class); + + private final HostAndPort hostPort; + private final JedisClientConfig config; + + public RedisVersionCondition(EndpointConfig endpoint) { + this.hostPort = endpoint.getHostAndPort(); + this.config = endpoint.getClientConfigBuilder().build(); + } + + public RedisVersionCondition(HostAndPort hostPort, JedisClientConfig config) { + this.hostPort = hostPort; + this.config = config; + } + + @Override + public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) { + try (Jedis jedisClient = new Jedis(hostPort, config)) { + SinceRedisVersion versionAnnotation = getAnnotation(context); + if (versionAnnotation != null) { + RedisVersion currentVersion; + + if (forcedVersion != null) { + logger.info("Using forced Redis server version from environment variable: " + forcedVersion); + currentVersion = forcedVersion; + } else { + RedisInfo info = RedisInfo.parseInfoServer(jedisClient.info("server")); + currentVersion = RedisVersion.of(info.getRedisVersion()); + } + + RedisVersion minRequiredVersion = RedisVersion.of(versionAnnotation.value()); + if (currentVersion.isLessThan(minRequiredVersion)) { + return ConditionEvaluationResult.disabled("Test requires Redis version " + minRequiredVersion + " or later, but found " + currentVersion); + } + } + } catch (Exception e) { + return ConditionEvaluationResult.disabled("Failed to check Redis version: " + e.getMessage()); + } + return ConditionEvaluationResult.enabled("Redis version is sufficient"); + } + + private SinceRedisVersion getAnnotation(ExtensionContext context) { + Optional methodAnnotation = AnnotationUtils.findAnnotation(context.getTestMethod(), SinceRedisVersion.class); + if (methodAnnotation.isPresent()) { + return methodAnnotation.get(); + } + + Optional classAnnotation = AnnotationUtils.findAnnotation(context.getRequiredTestClass(), SinceRedisVersion.class); + return classAnnotation.orElse(null); + } +} \ No newline at end of file diff --git a/src/test/java/redis/clients/jedis/util/RedisVersionRule.java b/src/test/java/redis/clients/jedis/util/RedisVersionRule.java deleted file mode 100644 index 0f3c471bae..0000000000 --- a/src/test/java/redis/clients/jedis/util/RedisVersionRule.java +++ /dev/null @@ -1,104 +0,0 @@ -package redis.clients.jedis.util; - -import io.redis.test.annotations.SinceRedisVersion; -import io.redis.test.utils.RedisInfo; -import io.redis.test.utils.RedisVersion; -import org.junit.Assume; -import org.junit.rules.TestRule; -import org.junit.runner.Description; -import org.junit.runners.model.Statement; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import redis.clients.jedis.EndpointConfig; -import redis.clients.jedis.HostAndPort; -import redis.clients.jedis.Jedis; -import redis.clients.jedis.JedisClientConfig; - -import java.lang.reflect.Method; - -import static redis.clients.jedis.util.RedisVersionUtil.forcedVersion; - -public class RedisVersionRule implements TestRule { - private static final Logger logger = LoggerFactory.getLogger(RedisVersionRule.class); - - private final HostAndPort hostPort; - private final JedisClientConfig config; - - - public RedisVersionRule(EndpointConfig endpoint) { - this.hostPort = endpoint.getHostAndPort(); - this.config = endpoint.getClientConfigBuilder().build(); - } - - public RedisVersionRule(HostAndPort hostPort, JedisClientConfig config) { - this.hostPort = hostPort; - this.config = config; - } - - @Override - public Statement apply(Statement base, Description description) { - return new Statement() { - @Override - public void evaluate() throws Throwable { - try ( Jedis jedisClient = new Jedis(hostPort, config)) { - SinceRedisVersion descriptionVersionAnnotation = description.getAnnotation(SinceRedisVersion.class); - if (descriptionVersionAnnotation != null) { - checkRedisVersion(jedisClient, descriptionVersionAnnotation); - } - - SinceRedisVersion classVersionAnnotation = description.getTestClass().getAnnotation(SinceRedisVersion.class); - if (classVersionAnnotation != null) { - checkRedisVersion(jedisClient, classVersionAnnotation); - } - - SinceRedisVersion methodVersionAnnotation = getMethodAnnotation(description); - if (methodVersionAnnotation != null) { - checkRedisVersion(jedisClient, methodVersionAnnotation); - } - - // Return the base statement to execute the test - base.evaluate(); - } - } - private void checkRedisVersion(Jedis jedisClient, SinceRedisVersion versionAnnotation) { - - // Check if the environment variable is set - RedisVersion currentVersion; - - if (forcedVersion != null) { - logger.info("Using forced Redis server version from environment variable: " + forcedVersion); - currentVersion = forcedVersion; - } else { - RedisInfo info = RedisInfo.parseInfoServer(jedisClient.info("server")); - currentVersion = RedisVersion.of(info.getRedisVersion()); - } - - RedisVersion minRequiredVersion = RedisVersion.of(versionAnnotation.value()); - if (currentVersion.isLessThan(minRequiredVersion)) { - Assume.assumeTrue("Test requires Redis version " + minRequiredVersion + " or later, but found " + currentVersion, false); - } - } - - private SinceRedisVersion getMethodAnnotation(Description description) { - try { - // description.getAnnotation() does not return any method level annotation when used - // with parametrised tests - String methodName = description.getMethodName(); - if (methodName != null) { - Class testClass = description.getTestClass(); - if (testClass != null) { - for (Method method : testClass.getDeclaredMethods()) { - if (method.getName().equals(methodName)) { - return method.getAnnotation(SinceRedisVersion.class); - } - } - } - } - } catch (Exception e) { - throw new RuntimeException("Could not resolve EnabledOnCommand annotation", e); - } - return null; - } - }; - } -}