Skip to content

Commit 460e932

Browse files
committed
DATACASS-648 - Polishing.
Rename allAsFlow() to flow(). Statically import assertThat(…) methods. Update ticket references. Original pull request: #159.
1 parent 35f6293 commit 460e932

File tree

2 files changed

+16
-14
lines changed

2 files changed

+16
-14
lines changed

spring-data-cassandra/src/main/kotlin/org/springframework/data/cassandra/core/ReactiveSelectOperationExtensions.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,5 +121,5 @@ suspend fun <T : Any> ReactiveSelectOperation.TerminatingSelect<T>.awaitExists()
121121
* @since 2.2
122122
*/
123123
@FlowPreview
124-
fun <T : Any> ReactiveSelectOperation.TerminatingSelect<T>.allAsFlow(batchSize: Int = 1): Flow<T> =
124+
fun <T : Any> ReactiveSelectOperation.TerminatingSelect<T>.flow(batchSize: Int = 1): Flow<T> =
125125
all().asFlow(batchSize)

spring-data-cassandra/src/test/kotlin/org/springframework/data/cassandra/core/ReactiveSelectOperationExtensionsUnitTests.kt

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ import io.mockk.verify
2121
import kotlinx.coroutines.FlowPreview
2222
import kotlinx.coroutines.flow.toList
2323
import kotlinx.coroutines.runBlocking
24-
import org.assertj.core.api.Assertions
24+
import org.assertj.core.api.Assertions.assertThat
25+
import org.assertj.core.api.Assertions.assertThatExceptionOfType
2526
import org.junit.Test
2627
import org.springframework.data.cassandra.domain.Person
2728
import org.springframework.data.cassandra.domain.User
@@ -32,6 +33,7 @@ import reactor.core.publisher.Mono
3233
* Unit tests for [ReactiveSelectOperationExtensions].
3334
*
3435
* @author Mark Paluch
36+
* @author Sebastien Deleuze
3537
*/
3638
class ReactiveSelectOperationExtensionsUnitTests {
3739

@@ -74,7 +76,7 @@ class ReactiveSelectOperationExtensionsUnitTests {
7476
every { find.one() } returns Mono.just("foo")
7577

7678
runBlocking {
77-
Assertions.assertThat(find.awaitOne()).isEqualTo("foo")
79+
assertThat(find.awaitOne()).isEqualTo("foo")
7880
}
7981

8082
verify {
@@ -88,7 +90,7 @@ class ReactiveSelectOperationExtensionsUnitTests {
8890
val find = mockk<ReactiveSelectOperation.TerminatingSelect<String>>()
8991
every { find.one() } returns Mono.empty()
9092

91-
Assertions.assertThatExceptionOfType(NoSuchElementException::class.java).isThrownBy {
93+
assertThatExceptionOfType(NoSuchElementException::class.java).isThrownBy {
9294
runBlocking { find.awaitOne() }
9395
}
9496

@@ -104,7 +106,7 @@ class ReactiveSelectOperationExtensionsUnitTests {
104106
every { find.one() } returns Mono.just("foo")
105107

106108
runBlocking {
107-
Assertions.assertThat(find.awaitOneOrNull()).isEqualTo("foo")
109+
assertThat(find.awaitOneOrNull()).isEqualTo("foo")
108110
}
109111

110112
verify {
@@ -119,7 +121,7 @@ class ReactiveSelectOperationExtensionsUnitTests {
119121
every { find.one() } returns Mono.empty()
120122

121123
runBlocking {
122-
Assertions.assertThat(find.awaitOneOrNull()).isNull()
124+
assertThat(find.awaitOneOrNull()).isNull()
123125
}
124126

125127
verify {
@@ -134,7 +136,7 @@ class ReactiveSelectOperationExtensionsUnitTests {
134136
every { find.first() } returns Mono.just("foo")
135137

136138
runBlocking {
137-
Assertions.assertThat(find.awaitFirst()).isEqualTo("foo")
139+
assertThat(find.awaitFirst()).isEqualTo("foo")
138140
}
139141

140142
verify {
@@ -148,7 +150,7 @@ class ReactiveSelectOperationExtensionsUnitTests {
148150
val find = mockk<ReactiveSelectOperation.TerminatingSelect<String>>()
149151
every { find.first() } returns Mono.empty()
150152

151-
Assertions.assertThatExceptionOfType(NoSuchElementException::class.java).isThrownBy {
153+
assertThatExceptionOfType(NoSuchElementException::class.java).isThrownBy {
152154
runBlocking { find.awaitFirst() }
153155
}
154156

@@ -164,7 +166,7 @@ class ReactiveSelectOperationExtensionsUnitTests {
164166
every { find.first() } returns Mono.just("foo")
165167

166168
runBlocking {
167-
Assertions.assertThat(find.awaitFirstOrNull()).isEqualTo("foo")
169+
assertThat(find.awaitFirstOrNull()).isEqualTo("foo")
168170
}
169171

170172
verify {
@@ -179,7 +181,7 @@ class ReactiveSelectOperationExtensionsUnitTests {
179181
every { find.first() } returns Mono.empty()
180182

181183
runBlocking {
182-
Assertions.assertThat(find.awaitFirstOrNull()).isNull()
184+
assertThat(find.awaitFirstOrNull()).isNull()
183185
}
184186

185187
verify {
@@ -194,7 +196,7 @@ class ReactiveSelectOperationExtensionsUnitTests {
194196
every { find.count() } returns Mono.just(1)
195197

196198
runBlocking {
197-
Assertions.assertThat(find.awaitCount()).isEqualTo(1)
199+
assertThat(find.awaitCount()).isEqualTo(1)
198200
}
199201

200202
verify {
@@ -209,23 +211,23 @@ class ReactiveSelectOperationExtensionsUnitTests {
209211
every { find.exists() } returns Mono.just(true)
210212

211213
runBlocking {
212-
Assertions.assertThat(find.awaitExists()).isTrue()
214+
assertThat(find.awaitExists()).isTrue()
213215
}
214216

215217
verify {
216218
find.exists()
217219
}
218220
}
219221

220-
@Test
222+
@Test // DATACASS-648
221223
@FlowPreview
222224
fun terminatingFindAllAsFlow() {
223225

224226
val spec = mockk<ReactiveSelectOperation.TerminatingSelect<String>>()
225227
every { spec.all() } returns Flux.just("foo", "bar", "baz")
226228

227229
runBlocking {
228-
Assertions.assertThat(spec.allAsFlow().toList()).contains("foo", "bar", "baz")
230+
assertThat(spec.flow().toList()).contains("foo", "bar", "baz")
229231
}
230232

231233
verify {

0 commit comments

Comments
 (0)