Skip to content

Commit 75806cc

Browse files
christophstroblchristophstrobl
committed
DATAREDIS-1033 - Polishing.
Add issue reference and fix type parameter in tests. Original Pull Request: spring-projects#477
1 parent 78b895f commit 75806cc

6 files changed

+75
-51
lines changed

‎src/test/kotlin/org/springframework/data/redis/core/ReactiveGeoOperationsExtensionsUnitTests.kt‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ import reactor.core.publisher.Mono
4141
*
4242
* @author Mark Paluch
4343
* @author Christoph Strobl
44+
* @author Sebastien Deleuze
4445
*/
4546
class ReactiveGeoOperationsExtensionsUnitTests {
4647

@@ -104,9 +105,10 @@ class ReactiveGeoOperationsExtensionsUnitTests {
104105
}
105106
}
106107

107-
@Test
108+
@Test // DATAREDIS-1033
108109
@ExperimentalCoroutinesApi
109110
fun addGeoLocationFlow() {
111+
110112
val operations = mockk<ReactiveGeoOperations<String, String>>()
111113
every { operations.add(any(), any<Publisher<List<GeoLocation<String>>>>()) } returns Flux.just(1)
112114
val flow = flow { emit(listOf(GeoLocation("bar", Point(1.0, 2.0)))) }
@@ -271,9 +273,10 @@ class ReactiveGeoOperationsExtensionsUnitTests {
271273
}
272274
}
273275

274-
@Test
276+
@Test // DATAREDIS-1033
275277
@ExperimentalCoroutinesApi
276278
fun radiusAsFlowCircle() {
279+
277280
val operations = mockk<ReactiveGeoOperations<String, String>>()
278281
val result = GeoResult(GeoLocation("bar", Point(1.0, 2.0)), Distance(1.0))
279282
val circle = Circle(1.0, 2.0, 3.0)
@@ -288,9 +291,10 @@ class ReactiveGeoOperationsExtensionsUnitTests {
288291
}
289292
}
290293

291-
@Test
294+
@Test // DATAREDIS-1033
292295
@ExperimentalCoroutinesApi
293296
fun radiusAsFlowCircleAndArgs() {
297+
294298
val operations = mockk<ReactiveGeoOperations<String, String>>()
295299
val result = GeoResult(GeoLocation("bar", Point(1.0, 2.0)), Distance(1.0))
296300
val circle = Circle(1.0, 2.0, 3.0)
@@ -306,9 +310,10 @@ class ReactiveGeoOperationsExtensionsUnitTests {
306310
}
307311
}
308312

309-
@Test
313+
@Test // DATAREDIS-1033
310314
@ExperimentalCoroutinesApi
311315
fun radiusAsFlowMemberAndRadius() {
316+
312317
val operations = mockk<ReactiveGeoOperations<String, String>>()
313318
val result = GeoResult(GeoLocation("bar", Point(1.0, 2.0)), Distance(1.0))
314319

@@ -323,9 +328,10 @@ class ReactiveGeoOperationsExtensionsUnitTests {
323328
}
324329
}
325330

326-
@Test
331+
@Test // DATAREDIS-1033
327332
@ExperimentalCoroutinesApi
328333
fun radiusAsFlowDistance() {
334+
329335
val operations = mockk<ReactiveGeoOperations<String, String>>()
330336
val result = GeoResult(GeoLocation("bar", Point(1.0, 2.0)), Distance(1.0))
331337
val distance = Distance(2.0)
@@ -341,13 +347,14 @@ class ReactiveGeoOperationsExtensionsUnitTests {
341347
}
342348
}
343349

344-
@Test
350+
@Test // DATAREDIS-1033
345351
@ExperimentalCoroutinesApi
346352
fun radiusAsFlowDistanceAndArgs() {
353+
347354
val operations = mockk<ReactiveGeoOperations<String, String>>()
348355
val result = GeoResult(GeoLocation("bar", Point(1.0, 2.0)), Distance(1.0))
349356
val distance = Distance(2.0)
350-
val args = GeoRadiusCommandArgs.newGeoRadiusArgs()
357+
val args = GeoRadiusCommandArgs.newGeoRadiusArgs().limit(1)
351358

352359
every { operations.radius(any(), any(), any(), any()) } returns Flux.just(result)
353360

‎src/test/kotlin/org/springframework/data/redis/core/ReactiveHashOperationsExtensionsUnitTests.kt‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import reactor.core.publisher.Mono
3131
*
3232
* @author Mark Paluch
3333
* @author Christoph Strobl
34+
* @author Sebastien Deleuze
3435
*/
3536
class ReactiveHashOperationsExtensionsUnitTests {
3637

@@ -109,7 +110,7 @@ class ReactiveHashOperationsExtensionsUnitTests {
109110
}
110111
}
111112

112-
@Test
113+
@Test // DATAREDIS-1033
113114
@ExperimentalCoroutinesApi
114115
fun keys() {
115116
val operations = mockk<ReactiveHashOperations<String, String, String>>()
@@ -199,7 +200,7 @@ class ReactiveHashOperationsExtensionsUnitTests {
199200
}
200201
}
201202

202-
@Test
203+
@Test // DATAREDIS-1033
203204
@ExperimentalCoroutinesApi
204205
fun values() {
205206

@@ -215,7 +216,7 @@ class ReactiveHashOperationsExtensionsUnitTests {
215216
}
216217
}
217218

218-
@Test
219+
@Test // DATAREDIS-1033
219220
@ExperimentalCoroutinesApi
220221
fun entries() {
221222

@@ -232,7 +233,7 @@ class ReactiveHashOperationsExtensionsUnitTests {
232233
}
233234
}
234235

235-
@Test
236+
@Test // DATAREDIS-1033
236237
@ExperimentalCoroutinesApi
237238
fun scan() {
238239

‎src/test/kotlin/org/springframework/data/redis/core/ReactiveListOperationsExtensionsUnitTests.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,11 @@ import java.time.Duration
3131
* Unit tests for `ReactiveListOperationsExtensions`
3232
*
3333
* @author Mark Paluch
34+
* @author Sebastien Deleuze
3435
*/
3536
class ReactiveListOperationsExtensionsUnitTests {
3637

37-
@Test
38+
@Test // DATAREDIS-1033
3839
@ExperimentalCoroutinesApi
3940
fun range() {
4041

@@ -349,5 +350,4 @@ class ReactiveListOperationsExtensionsUnitTests {
349350
operations.delete("foo")
350351
}
351352
}
352-
353353
}

‎src/test/kotlin/org/springframework/data/redis/core/ReactiveRedisOperationsExtensionsUnitTests.kt‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,11 @@ import java.time.Instant
4040
*
4141
* @author Mark Paluch
4242
* @author Christoph Strobl
43+
* @author Sebastien Deleuze
4344
*/
4445
class ReactiveRedisOperationsExtensionsUnitTests {
4546

46-
@Test
47+
@Test // DATAREDIS-1033
4748
@ExperimentalCoroutinesApi
4849
fun `execute with calllback`() {
4950

@@ -59,7 +60,7 @@ class ReactiveRedisOperationsExtensionsUnitTests {
5960
}
6061
}
6162

62-
@Test
63+
@Test // DATAREDIS-1033
6364
@ExperimentalCoroutinesApi
6465
fun `execute with script`() {
6566

@@ -76,15 +77,15 @@ class ReactiveRedisOperationsExtensionsUnitTests {
7677
}
7778
}
7879

79-
@Test
80+
@Test // DATAREDIS-1033
8081
@ExperimentalCoroutinesApi
8182
fun `execute with script, argsWriter and resultReader`() {
8283

8384
val script = RedisScript.of<String>("foo")
8485
val argsWriter = mockk<RedisElementWriter<Any>>(relaxed = true)
8586
val resultReader = mockk<RedisElementReader<String>>(relaxed = true)
8687
val operations = mockk<ReactiveRedisOperations<String, String>>()
87-
every { operations.execute(any<RedisScript<*>>(), any(), any(), any(), any()) } returns Flux.just("foo")
88+
every { operations.execute(any<RedisScript<String>>(), any(), any(), any(), any()) } returns Flux.just("foo")
8889

8990
runBlocking {
9091
assertThat(operations.executeAsFlow(script, argsWriter = argsWriter, resultReader = resultReader).toList()).contains("foo")
@@ -110,7 +111,7 @@ class ReactiveRedisOperationsExtensionsUnitTests {
110111
}
111112
}
112113

113-
@Test
114+
@Test // DATAREDIS-1033
114115
@ExperimentalCoroutinesApi
115116
fun listenToChannel() {
116117

@@ -127,7 +128,7 @@ class ReactiveRedisOperationsExtensionsUnitTests {
127128
}
128129
}
129130

130-
@Test
131+
@Test // DATAREDIS-1033
131132
@ExperimentalCoroutinesApi
132133
fun listenToPattern() {
133134

@@ -144,7 +145,7 @@ class ReactiveRedisOperationsExtensionsUnitTests {
144145
}
145146
}
146147

147-
@Test
148+
@Test // DATAREDIS-1033
148149
@ExperimentalCoroutinesApi
149150
fun listenTo() {
150151

@@ -193,7 +194,7 @@ class ReactiveRedisOperationsExtensionsUnitTests {
193194
}
194195
}
195196

196-
@Test
197+
@Test // DATAREDIS-1033
197198
@ExperimentalCoroutinesApi
198199
fun keys() {
199200

@@ -209,7 +210,7 @@ class ReactiveRedisOperationsExtensionsUnitTests {
209210
}
210211
}
211212

212-
@Test
213+
@Test // DATAREDIS-1033
213214
@ExperimentalCoroutinesApi
214215
fun scan() {
215216

@@ -225,7 +226,6 @@ class ReactiveRedisOperationsExtensionsUnitTests {
225226
}
226227
}
227228

228-
229229
@Test // DATAREDIS-937
230230
fun randomKey() {
231231

‎src/test/kotlin/org/springframework/data/redis/core/ReactiveSetOperationsExtensionsUnitTests.kt‎

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import reactor.core.publisher.Mono
3131
*
3232
* @author Mark Paluch
3333
* @author Christoph Strobl
34+
* @author Sebastien Deleuze
3435
*/
3536
class ReactiveSetOperationsExtensionsUnitTests {
3637

@@ -79,7 +80,7 @@ class ReactiveSetOperationsExtensionsUnitTests {
7980
}
8081
}
8182

82-
@Test
83+
@Test // DATAREDIS-1033
8384
@ExperimentalCoroutinesApi
8485
fun `pop as Flow`() {
8586

@@ -155,7 +156,7 @@ class ReactiveSetOperationsExtensionsUnitTests {
155156
}
156157
}
157158

158-
@Test
159+
@Test // DATAREDIS-1033
159160
@ExperimentalCoroutinesApi
160161
fun intersect() {
161162
val operations = mockk<ReactiveSetOperations<String, String>>()
@@ -170,7 +171,7 @@ class ReactiveSetOperationsExtensionsUnitTests {
170171
}
171172
}
172173

173-
@Test
174+
@Test // DATAREDIS-1033
174175
@ExperimentalCoroutinesApi
175176
fun `intersect with key and collection`() {
176177
val operations = mockk<ReactiveSetOperations<String, String>>()
@@ -185,7 +186,7 @@ class ReactiveSetOperationsExtensionsUnitTests {
185186
}
186187
}
187188

188-
@Test
189+
@Test // DATAREDIS-1033
189190
@ExperimentalCoroutinesApi
190191
fun `intersect with collection`() {
191192
val operations = mockk<ReactiveSetOperations<String, String>>()
@@ -230,9 +231,10 @@ class ReactiveSetOperationsExtensionsUnitTests {
230231
}
231232
}
232233

233-
@Test
234+
@Test // DATAREDIS-1033
234235
@ExperimentalCoroutinesApi
235236
fun union() {
237+
236238
val operations = mockk<ReactiveSetOperations<String, String>>()
237239
every { operations.union("foo", "bar") } returns Flux.just("baz")
238240

@@ -245,9 +247,10 @@ class ReactiveSetOperationsExtensionsUnitTests {
245247
}
246248
}
247249

248-
@Test
250+
@Test // DATAREDIS-1033
249251
@ExperimentalCoroutinesApi
250252
fun `union with key and collection`() {
253+
251254
val operations = mockk<ReactiveSetOperations<String, String>>()
252255
every { operations.union("foo", listOf("bar")) } returns Flux.just("baz")
253256

@@ -260,9 +263,10 @@ class ReactiveSetOperationsExtensionsUnitTests {
260263
}
261264
}
262265

263-
@Test
266+
@Test // DATAREDIS-1033
264267
@ExperimentalCoroutinesApi
265268
fun `union with collection`() {
269+
266270
val operations = mockk<ReactiveSetOperations<String, String>>()
267271
every { operations.union(listOf("bar")) } returns Flux.just("baz")
268272

@@ -305,9 +309,10 @@ class ReactiveSetOperationsExtensionsUnitTests {
305309
}
306310
}
307311

308-
@Test
312+
@Test // DATAREDIS-1033
309313
@ExperimentalCoroutinesApi
310314
fun difference() {
315+
311316
val operations = mockk<ReactiveSetOperations<String, String>>()
312317
every { operations.difference("foo", "bar") } returns Flux.just("baz")
313318

@@ -320,9 +325,10 @@ class ReactiveSetOperationsExtensionsUnitTests {
320325
}
321326
}
322327

323-
@Test
328+
@Test // DATAREDIS-1033
324329
@ExperimentalCoroutinesApi
325330
fun `difference with key and collection`() {
331+
326332
val operations = mockk<ReactiveSetOperations<String, String>>()
327333
every { operations.difference("foo", listOf("bar")) } returns Flux.just("baz")
328334

@@ -335,9 +341,10 @@ class ReactiveSetOperationsExtensionsUnitTests {
335341
}
336342
}
337343

338-
@Test
344+
@Test // DATAREDIS-1033
339345
@ExperimentalCoroutinesApi
340346
fun `difference with collection`() {
347+
341348
val operations = mockk<ReactiveSetOperations<String, String>>()
342349
every { operations.difference(listOf("bar")) } returns Flux.just("baz")
343350

@@ -380,9 +387,10 @@ class ReactiveSetOperationsExtensionsUnitTests {
380387
}
381388
}
382389

383-
@Test
390+
@Test // DATAREDIS-1033
384391
@ExperimentalCoroutinesApi
385392
fun members() {
393+
386394
val operations = mockk<ReactiveSetOperations<String, String>>()
387395
every { operations.members("foo") } returns Flux.just("baz")
388396

@@ -395,7 +403,7 @@ class ReactiveSetOperationsExtensionsUnitTests {
395403
}
396404
}
397405

398-
@Test
406+
@Test // DATAREDIS-1033
399407
@ExperimentalCoroutinesApi
400408
fun scan() {
401409

@@ -441,7 +449,7 @@ class ReactiveSetOperationsExtensionsUnitTests {
441449
}
442450
}
443451

444-
@Test
452+
@Test // DATAREDIS-1033
445453
@ExperimentalCoroutinesApi
446454
fun distinctRandomMembers() {
447455

@@ -457,7 +465,7 @@ class ReactiveSetOperationsExtensionsUnitTests {
457465
}
458466
}
459467

460-
@Test
468+
@Test // DATAREDIS-1033
461469
@ExperimentalCoroutinesApi
462470
fun randomMembers() {
463471

0 commit comments

Comments
 (0)