Skip to content

Commit 34c6582

Browse files
sazzad16sazzad16
authored
Use Matchers instead of CoreMatchers (#3401)
1 parent 4316877 commit 34c6582

File tree

12 files changed

+46
-60
lines changed

12 files changed

+46
-60
lines changed

‎src/test/java/redis/clients/jedis/ClusterPipeliningTest.java‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@
55

66
import java.util.*;
77

8-
import org.hamcrest.CoreMatchers;
9-
import org.hamcrest.Matcher;
108
import org.hamcrest.MatcherAssert;
9+
import org.hamcrest.Matchers;
1110
import org.junit.After;
1211
import org.junit.AfterClass;
1312
import org.junit.Before;
@@ -918,8 +917,8 @@ public void testEvalNestedLists() {
918917
p.sync();
919918

920919
List<?> results = (List<?>) result.get();
921-
MatcherAssert.assertThat((List<String>) results.get(0), listWithItem("key1"));
922-
MatcherAssert.assertThat((List<Long>) results.get(1), listWithItem(2L));
920+
MatcherAssert.assertThat((List<String>) results.get(0), Matchers.hasItem("key1"));
921+
MatcherAssert.assertThat((List<Long>) results.get(1), Matchers.hasItem(2L));
923922
}
924923
}
925924

@@ -934,8 +933,8 @@ public void testEvalNestedListsWithBinary() {
934933
p.sync();
935934

936935
List<?> results = (List<?>) result.get();
937-
MatcherAssert.assertThat((List<byte[]>) results.get(0), listWithItem(bKey));
938-
MatcherAssert.assertThat((List<Long>) results.get(1), listWithItem(2L));
936+
MatcherAssert.assertThat((List<byte[]>) results.get(0), Matchers.hasItem(bKey));
937+
MatcherAssert.assertThat((List<Long>) results.get(1), Matchers.hasItem(2L));
939938
}
940939
}
941940

@@ -1010,10 +1009,6 @@ public void testEvalshaKeyAndArgWithBinary() {
10101009
}
10111010
}
10121011

1013-
private <T> Matcher<Iterable<? super T>> listWithItem(T expected) {
1014-
return CoreMatchers.<T>hasItem(CoreMatchers.equalTo(expected));
1015-
}
1016-
10171012
@Test
10181013
public void simple() { // TODO: move into 'redis.clients.jedis.commands.unified.cluster' package
10191014
try (JedisCluster jedis = new JedisCluster(nodes, DEFAULT_CLIENT_CONFIG)) {

‎src/test/java/redis/clients/jedis/PipeliningTest.java‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@
1616
import java.util.Set;
1717
import java.util.UUID;
1818

19-
import org.hamcrest.CoreMatchers;
20-
import org.hamcrest.Matcher;
2119
import org.hamcrest.MatcherAssert;
20+
import org.hamcrest.Matchers;
2221
import org.junit.Test;
2322

2423
import redis.clients.jedis.exceptions.JedisDataException;
@@ -569,8 +568,8 @@ public void testEvalNestedLists() {
569568
p.sync();
570569

571570
List<?> results = (List<?>) result.get();
572-
MatcherAssert.assertThat((List<String>) results.get(0), listWithItem("key1"));
573-
MatcherAssert.assertThat((List<Long>) results.get(1), listWithItem(2L));
571+
MatcherAssert.assertThat((List<String>) results.get(0), Matchers.hasItem("key1"));
572+
MatcherAssert.assertThat((List<Long>) results.get(1), Matchers.hasItem(2L));
574573
}
575574

576575
@Test
@@ -583,8 +582,8 @@ public void testEvalNestedListsWithBinary() {
583582
p.sync();
584583

585584
List<?> results = (List<?>) result.get();
586-
MatcherAssert.assertThat((List<byte[]>) results.get(0), listWithItem(bKey));
587-
MatcherAssert.assertThat((List<Long>) results.get(1), listWithItem(2L));
585+
MatcherAssert.assertThat((List<byte[]>) results.get(0), Matchers.hasItem(bKey));
586+
MatcherAssert.assertThat((List<Long>) results.get(1), Matchers.hasItem(2L));
588587
}
589588

590589
@Test
@@ -855,8 +854,4 @@ public void testCloseable() throws IOException {
855854
// assertTrue(firstKey.equals(value1) || firstKey.equals(value2));
856855
// assertTrue(secondKey.equals(value1) || secondKey.equals(value2));
857856
// }
858-
859-
private <T> Matcher<Iterable<? super T>> listWithItem(T expected) {
860-
return CoreMatchers.<T> hasItem(CoreMatchers.equalTo(expected));
861-
}
862857
}

‎src/test/java/redis/clients/jedis/commands/jedis/AccessControlListCommandsTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package redis.clients.jedis.commands.jedis;
22

3-
import static org.hamcrest.CoreMatchers.containsString;
4-
import static org.hamcrest.CoreMatchers.endsWith;
5-
import static org.hamcrest.CoreMatchers.startsWith;
63
import static org.hamcrest.MatcherAssert.assertThat;
4+
import static org.hamcrest.Matchers.containsString;
5+
import static org.hamcrest.Matchers.endsWith;
6+
import static org.hamcrest.Matchers.startsWith;
77
import static org.junit.Assert.assertArrayEquals;
88
import static org.junit.Assert.assertEquals;
99
import static org.junit.Assert.assertFalse;

‎src/test/java/redis/clients/jedis/commands/jedis/AllKindOfValuesCommandsTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1094,9 +1094,9 @@ public void commandDocs() {
10941094

10951095
CommandDocument sortDoc = docs.get("sort");
10961096
assertEquals("generic", sortDoc.getGroup());
1097-
MatcherAssert.assertThat(sortDoc.getSummary(), Matchers.anyOf(
1098-
Matchers.equalTo("Sort the elements in a list, set or sorted set"),
1099-
Matchers.equalTo("Sorts the elements in a list, a set, or a sorted set, optionally storing the result.")));
1097+
MatcherAssert.assertThat(sortDoc.getSummary(), Matchers.isOneOf(
1098+
"Sort the elements in a list, set or sorted set",
1099+
"Sorts the elements in a list, a set, or a sorted set, optionally storing the result."));
11001100
assertNull(sortDoc.getHistory());
11011101

11021102
CommandDocument setDoc = docs.get("set");

‎src/test/java/redis/clients/jedis/commands/jedis/ObjectCommandsTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package redis.clients.jedis.commands.jedis;
22

3-
import static org.hamcrest.CoreMatchers.containsString;
43
import static org.hamcrest.MatcherAssert.assertThat;
4+
import static org.hamcrest.Matchers.containsString;
5+
import static org.hamcrest.Matchers.greaterThanOrEqualTo;
56
import static org.junit.Assert.assertEquals;
67

78
import java.util.List;
8-
import org.hamcrest.Matchers;
99
import org.junit.Assert;
1010
import org.junit.After;
1111
import org.junit.Before;
@@ -99,9 +99,9 @@ public void objectFreq() {
9999
lfuJedis.set(key, "test1");
100100
lfuJedis.get(key);
101101
// String
102-
assertThat(lfuJedis.objectFreq(key), Matchers.greaterThan(0L));
102+
assertThat(lfuJedis.objectFreq(key), greaterThanOrEqualTo(1L));
103103
// Binary
104-
assertThat(lfuJedis.objectFreq(binaryKey), Matchers.greaterThan(0L));
104+
assertThat(lfuJedis.objectFreq(binaryKey), greaterThanOrEqualTo(1L));
105105

106106
Assert.assertNull(lfuJedis.objectFreq("no_such_key"));
107107

‎src/test/java/redis/clients/jedis/commands/jedis/ScriptingCommandsTest.java‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@
88
import java.util.List;
99
import java.util.Map;
1010

11-
import org.hamcrest.CoreMatchers;
12-
import org.hamcrest.Matcher;
1311
import org.hamcrest.MatcherAssert;
12+
import org.hamcrest.Matchers;
1413
import org.junit.Before;
1514
import org.junit.Test;
1615

@@ -119,8 +118,8 @@ public void evalNestedLists() {
119118
String script = "return { {KEYS[1]} , {2} }";
120119
List<?> results = (List<?>) jedis.eval(script, 1, "key1");
121120

122-
MatcherAssert.assertThat((List<String>) results.get(0), listWithItem("key1"));
123-
MatcherAssert.assertThat((List<Long>) results.get(1), listWithItem(2L));
121+
MatcherAssert.assertThat((List<String>) results.get(0), Matchers.hasItem("key1"));
122+
MatcherAssert.assertThat((List<Long>) results.get(1), Matchers.hasItem(2L));
124123
}
125124

126125
@Test
@@ -506,8 +505,4 @@ public void fcallReadonly() {
506505
// Binary
507506
assertEquals(Long.valueOf(1), jedis.fcallReadonly("noop".getBytes(), Collections.emptyList(), Collections.emptyList()));
508507
}
509-
510-
private <T> Matcher<Iterable<? super T>> listWithItem(T expected) {
511-
return CoreMatchers.<T> hasItem(CoreMatchers.equalTo(expected));
512-
}
513508
}

‎src/test/java/redis/clients/jedis/modules/json/RedisJsonV1Test.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package redis.clients.jedis.modules.json;
22

3-
import static org.hamcrest.CoreMatchers.anyOf;
4-
import static org.hamcrest.CoreMatchers.is;
53
import static org.junit.Assert.*;
64
import static redis.clients.jedis.json.Path.ROOT_PATH;
75
import static redis.clients.jedis.modules.json.JsonObjects.*;
@@ -14,6 +12,9 @@
1412
import java.util.Arrays;
1513
import java.util.Collections;
1614
import java.util.List;
15+
16+
import org.hamcrest.MatcherAssert;
17+
import org.hamcrest.Matchers;
1718
import org.junit.BeforeClass;
1819
import org.junit.Test;
1920

@@ -486,15 +487,15 @@ public void resp() {
486487
assertNull(arr.get(1));
487488
assertEquals(Long.valueOf(3), arr.get(2));
488489
//assertEquals("2.5", arr.get(3));
489-
assertThat(arr.get(3), anyOf(is("2.5"), is(2.5)));
490+
MatcherAssert.assertThat(arr.get(3), Matchers.isOneOf("2.5", 2.5));
490491
assertEquals("true", arr.get(4));
491492

492493
arr = client.jsonResp("resp", Path.of(".bar"));
493494
assertEquals("[", arr.get(0));
494495
assertNull(arr.get(1));
495496
assertEquals(Long.valueOf(3), arr.get(2));
496497
//assertEquals("2.5", arr.get(3));
497-
assertThat(arr.get(3), anyOf(is("2.5"), is(2.5)));
498+
MatcherAssert.assertThat(arr.get(3), Matchers.isOneOf("2.5", 2.5));
498499
assertEquals("true", arr.get(4));
499500
}
500501

‎src/test/java/redis/clients/jedis/modules/json/RedisJsonV2Test.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
package redis.clients.jedis.modules.json;
22

3-
import static java.util.Collections.emptyList;
43
import static java.util.Collections.singletonList;
5-
import static org.hamcrest.CoreMatchers.anyOf;
6-
import static org.hamcrest.CoreMatchers.is;
74
import static org.junit.Assert.*;
85
import static redis.clients.jedis.json.Path2.ROOT_PATH;
96
import static redis.clients.jedis.modules.json.JsonObjects.*;
107

118
import com.google.gson.Gson;
129
import java.util.Arrays;
10+
import java.util.Collections;
1311
import java.util.List;
12+
import org.hamcrest.MatcherAssert;
13+
import org.hamcrest.Matchers;
1414
import org.json.JSONArray;
1515
import org.json.JSONObject;
1616
import org.junit.BeforeClass;
@@ -178,7 +178,7 @@ public void typeChecksShouldSucceed() {
178178
assertEquals(singletonList(float.class), client.jsonType("foobar", Path2.of(".fooF")));
179179
assertEquals(singletonList(List.class), client.jsonType("foobar", Path2.of(".fooArr")));
180180
assertEquals(singletonList(boolean.class), client.jsonType("foobar", Path2.of(".fooB")));
181-
assertEquals(emptyList(), client.jsonType("foobar", Path2.of(".fooErr")));
181+
assertEquals(Collections.emptyList(), client.jsonType("foobar", Path2.of(".fooErr")));
182182
}
183183

184184
@Test
@@ -326,7 +326,7 @@ public void arrIndexWithStringsAndPath() {
326326
@Test
327327
public void arrIndexNonExistentPath() {
328328
client.jsonSet("foobar", ROOT_PATH, gson.toJson(new FooBarObject()));
329-
assertEquals(emptyList(), client.jsonArrIndex("foobar", Path2.of(".barArr"), gson.toJson("x")));
329+
assertEquals(Collections.emptyList(), client.jsonArrIndex("foobar", Path2.of(".barArr"), gson.toJson("x")));
330330
}
331331

332332
@Test
@@ -401,7 +401,7 @@ public void obj() {
401401

402402
@Test
403403
public void debugMemory() {
404-
assertEquals(emptyList(), client.jsonDebugMemory("json", ROOT_PATH));
404+
assertEquals(Collections.emptyList(), client.jsonDebugMemory("json", ROOT_PATH));
405405

406406
client.jsonSet("json", new JSONObject("{ foo: 'bar', bar: { foo: 10 }}"));
407407
// it is okay as long as any 'long' is returned
@@ -433,7 +433,7 @@ public void resp() {
433433
assertNull(arr.get(1));
434434
assertEquals(Long.valueOf(3), arr.get(2));
435435
//assertEquals("2.5", arr.get(3));
436-
assertThat(arr.get(3), anyOf(is("2.5"), is(2.5)));
436+
MatcherAssert.assertThat(arr.get(3), Matchers.isOneOf("2.5", 2.5));
437437
assertEquals("true", arr.get(4));
438438
}
439439

‎src/test/java/redis/clients/jedis/modules/search/SchemaTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import static org.junit.Assert.assertThrows;
55

66
import java.util.Collections;
7-
import org.hamcrest.CoreMatchers;
7+
import org.hamcrest.Matchers;
88
import org.junit.Test;
99
import redis.clients.jedis.search.FieldName;
1010
import redis.clients.jedis.search.Schema;
@@ -31,9 +31,9 @@ public void printSchemaTest() throws Exception {
3131
.addVectorField(VECTOR, Schema.VectorField.VectorAlgo.HNSW, Collections.emptyMap());
3232

3333
String schemaPrint = sc.toString();
34-
assertThat(schemaPrint, CoreMatchers.startsWith("Schema{fields=[TextField{name='title'"));
35-
assertThat(schemaPrint, CoreMatchers.containsString("{name='release_year', type=NUMERIC, sortable=true, noindex=false}"));
36-
assertThat(schemaPrint, CoreMatchers.containsString("VectorField{name='vector', type=VECTOR, algorithm=HNSW"));
34+
assertThat(schemaPrint, Matchers.startsWith("Schema{fields=[TextField{name='title'"));
35+
assertThat(schemaPrint, Matchers.containsString("{name='release_year', type=NUMERIC, sortable=true, noindex=false}"));
36+
assertThat(schemaPrint, Matchers.containsString("VectorField{name='vector', type=VECTOR, algorithm=HNSW"));
3737
}
3838

3939
@Test

‎src/test/java/redis/clients/jedis/modules/search/SpellCheckTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
import java.util.HashSet;
99
import java.util.Map;
1010

11-
import org.hamcrest.CoreMatchers;
1211
import org.hamcrest.MatcherAssert;
12+
import org.hamcrest.Matchers;
1313
import org.junit.Assert;
1414
import org.junit.BeforeClass;
1515
import org.junit.Test;
@@ -92,6 +92,6 @@ public void dialectBound() {
9292
JedisDataException error = Assert.assertThrows(JedisDataException.class,
9393
() -> client.ftSpellCheck(index, "Tooni toque kerfuffle",
9494
FTSpellCheckParams.spellCheckParams().dialect(0)));
95-
MatcherAssert.assertThat(error.getMessage(), CoreMatchers.containsString("DIALECT requires a non negative integer"));
95+
MatcherAssert.assertThat(error.getMessage(), Matchers.containsString("DIALECT requires a non negative integer"));
9696
}
9797
}

0 commit comments

Comments
 (0)