Skip to content

Commit 174b933

Browse files
sazzad16sazzad16
committed
Merge branch 'master' into migrate_to_clients_test_image
2 parents 49dcf4d + 180d9aa commit 174b933

File tree

4 files changed

+50
-290
lines changed

4 files changed

+50
-290
lines changed

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

+43-227
Original file line numberDiff line numberDiff line change
@@ -4,78 +4,30 @@
44

55
import org.junit.Assert;
66
import org.junit.Test;
7+
// REMOVE_END
78

89
import java.util.HashMap;
910
import java.util.Map;
11+
import java.util.List;
12+
import java.util.Collections;
1013

11-
// REMOVE_END
1214
// HIDE_START
1315
import redis.clients.jedis.UnifiedJedis;
1416
// HIDE_END
1517

18+
import static java.util.stream.Collectors.toList;
19+
1620
// HIDE_START
1721
public class CmdsHashExample {
1822
@Test
1923
public void run() {
2024
UnifiedJedis jedis = new UnifiedJedis("redis://localhost:6379");
21-
2225
//REMOVE_START
2326
// Clear any keys here before using them in tests.
2427
jedis.del("myhash");
2528
//REMOVE_END
2629
// HIDE_END
2730

28-
29-
// STEP_START hdel
30-
31-
// STEP_END
32-
33-
// Tests for 'hdel' step.
34-
// REMOVE_START
35-
36-
// REMOVE_END
37-
38-
39-
// STEP_START hexists
40-
41-
// STEP_END
42-
43-
// Tests for 'hexists' step.
44-
// REMOVE_START
45-
46-
// REMOVE_END
47-
48-
49-
// STEP_START hexpire
50-
51-
// STEP_END
52-
53-
// Tests for 'hexpire' step.
54-
// REMOVE_START
55-
56-
// REMOVE_END
57-
58-
59-
// STEP_START hexpireat
60-
61-
// STEP_END
62-
63-
// Tests for 'hexpireat' step.
64-
// REMOVE_START
65-
66-
// REMOVE_END
67-
68-
69-
// STEP_START hexpiretime
70-
71-
// STEP_END
72-
73-
// Tests for 'hexpiretime' step.
74-
// REMOVE_START
75-
76-
// REMOVE_END
77-
78-
7931
// STEP_START hget
8032
Map<String, String> hGetExampleParams = new HashMap<>();
8133
hGetExampleParams.put("field1", "foo");
@@ -89,156 +41,43 @@ public void run() {
8941
String hGetResult3 = jedis.hget("myhash", "field2");
9042
System.out.println(hGetResult3); // >>> null
9143
// STEP_END
92-
93-
// Tests for 'hget' step.
9444
// REMOVE_START
45+
// Tests for 'hget' step.
9546
Assert.assertEquals(1, hGetResult1);
9647
Assert.assertEquals("foo", hGetResult2);
9748
Assert.assertNull(hGetResult3);
9849
jedis.del("myhash");
9950
// REMOVE_END
10051

101-
10252
// STEP_START hgetall
53+
Map<String, String> hGetAllExampleParams = new HashMap<>();
54+
hGetAllExampleParams.put("field1", "Hello");
55+
hGetAllExampleParams.put("field2", "World");
10356

104-
// STEP_END
105-
106-
// Tests for 'hgetall' step.
107-
// REMOVE_START
108-
109-
// REMOVE_END
110-
111-
112-
// STEP_START hincrby
113-
114-
// STEP_END
115-
116-
// Tests for 'hincrby' step.
117-
// REMOVE_START
118-
119-
// REMOVE_END
120-
121-
122-
// STEP_START hincrbyfloat
123-
124-
// STEP_END
125-
126-
// Tests for 'hincrbyfloat' step.
127-
// REMOVE_START
128-
129-
// REMOVE_END
130-
131-
132-
// STEP_START hkeys
57+
long hGetAllResult1 = jedis.hset("myhash", hGetAllExampleParams);
58+
System.out.println(hGetAllResult1); // >>> 2
13359

60+
Map<String, String> hGetAllResult2 = jedis.hgetAll("myhash");
61+
System.out.println(
62+
hGetAllResult2.entrySet().stream()
63+
.sorted((s1, s2)-> s1.getKey().compareTo(s2.getKey()))
64+
.collect(toList())
65+
.toString()
66+
);
67+
// >>> [field1=Hello, field2=World]
13468
// STEP_END
135-
136-
// Tests for 'hkeys' step.
137-
// REMOVE_START
138-
139-
// REMOVE_END
140-
141-
142-
// STEP_START hlen
143-
144-
// STEP_END
145-
146-
// Tests for 'hlen' step.
147-
// REMOVE_START
148-
149-
// REMOVE_END
150-
151-
152-
// STEP_START hmget
153-
154-
// STEP_END
155-
156-
// Tests for 'hmget' step.
15769
// REMOVE_START
158-
159-
// REMOVE_END
160-
161-
162-
// STEP_START hmset
163-
164-
// STEP_END
165-
166-
// Tests for 'hmset' step.
167-
// REMOVE_START
168-
169-
// REMOVE_END
170-
171-
172-
// STEP_START hpersist
173-
174-
// STEP_END
175-
176-
// Tests for 'hpersist' step.
177-
// REMOVE_START
178-
179-
// REMOVE_END
180-
181-
182-
// STEP_START hpexpire
183-
184-
// STEP_END
185-
186-
// Tests for 'hpexpire' step.
187-
// REMOVE_START
188-
189-
// REMOVE_END
190-
191-
192-
// STEP_START hpexpireat
193-
194-
// STEP_END
195-
196-
// Tests for 'hpexpireat' step.
197-
// REMOVE_START
198-
199-
// REMOVE_END
200-
201-
202-
// STEP_START hpexpiretime
203-
204-
// STEP_END
205-
206-
// Tests for 'hpexpiretime' step.
207-
// REMOVE_START
208-
209-
// REMOVE_END
210-
211-
212-
// STEP_START hpttl
213-
214-
// STEP_END
215-
216-
// Tests for 'hpttl' step.
217-
// REMOVE_START
218-
219-
// REMOVE_END
220-
221-
222-
// STEP_START hrandfield
223-
224-
// STEP_END
225-
226-
// Tests for 'hrandfield' step.
227-
// REMOVE_START
228-
229-
// REMOVE_END
230-
231-
232-
// STEP_START hscan
233-
234-
// STEP_END
235-
236-
// Tests for 'hscan' step.
237-
// REMOVE_START
238-
70+
// Tests for 'hgetall' step.
71+
Assert.assertEquals(2, hGetAllResult1);
72+
Assert.assertEquals("[field1=Hello, field2=World]",
73+
hGetAllResult2.entrySet().stream()
74+
.sorted((s1, s2)-> s1.getKey().compareTo(s2.getKey()))
75+
.collect(toList())
76+
.toString()
77+
);
78+
jedis.del("myhash");
23979
// REMOVE_END
24080

241-
24281
// STEP_START hset
24382
Map<String, String> hSetExampleParams = new HashMap<>();
24483
hSetExampleParams.put("field1", "Hello");
@@ -269,9 +108,8 @@ public void run() {
269108
// >>> Key: field2, Value: Hi
270109
// >>> Key: field1, Value: Hello
271110
// STEP_END
272-
273-
// Tests for 'hset' step.
274111
// REMOVE_START
112+
// Tests for 'hset' step.
275113
Assert.assertEquals(1, hSetResult1);
276114
Assert.assertEquals("Hello", hSetResult2);
277115
Assert.assertEquals(2, hSetResult3);
@@ -284,47 +122,25 @@ public void run() {
284122
jedis.del("myhash");
285123
// REMOVE_END
286124

287-
288-
// STEP_START hsetnx
289-
290-
// STEP_END
291-
292-
// Tests for 'hsetnx' step.
293-
// REMOVE_START
294-
295-
// REMOVE_END
296-
297-
298-
// STEP_START hstrlen
299-
300-
// STEP_END
301-
302-
// Tests for 'hstrlen' step.
303-
// REMOVE_START
304-
305-
// REMOVE_END
306-
307-
308-
// STEP_START httl
309-
310-
// STEP_END
311-
312-
// Tests for 'httl' step.
313-
// REMOVE_START
314-
315-
// REMOVE_END
316-
317-
318125
// STEP_START hvals
126+
Map<String, String> hValsExampleParams = new HashMap<>();
127+
hValsExampleParams.put("field1", "Hello");
128+
hValsExampleParams.put("field2", "World");
319129

320-
// STEP_END
130+
long hValsResult1 = jedis.hset("myhash", hValsExampleParams);
131+
System.out.println(hValsResult1); // >>> 2
321132

133+
List<String> hValsResult2 = jedis.hvals("myhash");
134+
Collections.sort(hValsResult2);
135+
System.out.println(hValsResult2);
136+
// >>> [Hello, World]
137+
// STEP_END
138+
// REMOVE_START
322139
// Tests for 'hvals' step.
323-
// REMOVE_START
324-
140+
Assert.assertEquals(2, hValsResult1);
141+
Assert.assertEquals("[Hello, World]", hValsResult2.toString());
142+
jedis.del("myhash");
325143
// REMOVE_END
326-
327-
328144
// HIDE_START
329145

330146
}

0 commit comments

Comments
 (0)