Skip to content

Commit 2cefdc8

Browse files
mp911demp911de
committed
#63 - Polishing.
Convert spaces to tabs. Replace version strings with managed dependencies. Javadoc. Original pull request: #63.
1 parent 66b84d2 commit 2cefdc8

File tree

3 files changed

+154
-117
lines changed

3 files changed

+154
-117
lines changed

‎pom.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
<r2dbc-releasetrain.version>Arabba-M7</r2dbc-releasetrain.version>
3636
<reactive-streams.version>1.0.1</reactive-streams.version>
3737
<testcontainers.version>1.10.1</testcontainers.version>
38-
<coroutines.version>1.1.1</coroutines.version>
3938

4039
</properties>
4140

@@ -131,25 +130,26 @@
131130
<dependency>
132131
<groupId>org.jetbrains.kotlin</groupId>
133132
<artifactId>kotlin-stdlib</artifactId>
134-
<version>${kotlin}</version>
135133
<optional>true</optional>
136134
</dependency>
135+
137136
<dependency>
138137
<groupId>org.jetbrains.kotlin</groupId>
139138
<artifactId>kotlin-reflect</artifactId>
140-
<version>${kotlin}</version>
141139
<optional>true</optional>
142140
</dependency>
141+
143142
<dependency>
144143
<groupId>org.jetbrains.kotlinx</groupId>
145144
<artifactId>kotlinx-coroutines-core</artifactId>
146-
<version>${coroutines.version}</version>
145+
<version>${kotlin-coroutines}</version>
147146
<optional>true</optional>
148147
</dependency>
148+
149149
<dependency>
150150
<groupId>org.jetbrains.kotlinx</groupId>
151151
<artifactId>kotlinx-coroutines-reactor</artifactId>
152-
<version>${coroutines.version}</version>
152+
<version>${kotlin-coroutines}</version>
153153
<optional>true</optional>
154154
</dependency>
155155

@@ -228,7 +228,7 @@
228228
<dependency>
229229
<groupId>io.mockk</groupId>
230230
<artifactId>mockk</artifactId>
231-
<version>1.9.1</version>
231+
<version>${mockk}</version>
232232
<scope>test</scope>
233233
</dependency>
234234

‎src/test/kotlin/org/springframework/data/r2dbc/function/DatabaseClientExtensionsTests.kt

+113-87
Original file line numberDiff line numberDiff line change
@@ -19,96 +19,122 @@ import io.mockk.every
1919
import io.mockk.mockk
2020
import io.mockk.verify
2121
import kotlinx.coroutines.runBlocking
22-
import org.junit.Assert.assertEquals
22+
import org.assertj.core.api.Assertions.assertThat
2323
import org.junit.Test
2424
import reactor.core.publisher.Mono
2525

26+
/**
27+
* Unit tests for [DatabaseClient] extensions.
28+
*
29+
* @author Sebastien Deleuze
30+
*/
2631
class DatabaseClientExtensionsTests {
2732

28-
@Test
29-
fun genericExecuteSpecAwait() {
30-
val spec = mockk<DatabaseClient.GenericExecuteSpec>()
31-
every { spec.then() } returns Mono.empty()
32-
runBlocking {
33-
spec.await()
34-
}
35-
verify {
36-
spec.then()
37-
}
38-
}
39-
40-
@Test
41-
fun genericExecuteSpecAsType() {
42-
val genericSpec = mockk<DatabaseClient.GenericExecuteSpec>()
43-
val typedSpec: DatabaseClient.TypedExecuteSpec<String> = mockk()
44-
every { genericSpec.`as`(String::class.java) } returns typedSpec
45-
runBlocking {
46-
assertEquals(typedSpec, genericSpec.asType<String>())
47-
}
48-
verify {
49-
genericSpec.`as`(String::class.java)
50-
}
51-
}
52-
53-
@Test
54-
fun genericSelectSpecAsType() {
55-
val genericSpec = mockk<DatabaseClient.GenericSelectSpec>()
56-
val typedSpec: DatabaseClient.TypedSelectSpec<String> = mockk()
57-
every { genericSpec.`as`(String::class.java) } returns typedSpec
58-
runBlocking {
59-
assertEquals(typedSpec, genericSpec.asType<String>())
60-
}
61-
verify {
62-
genericSpec.`as`(String::class.java)
63-
}
64-
}
65-
66-
@Test
67-
fun typedExecuteSpecAwait() {
68-
val spec = mockk<DatabaseClient.TypedExecuteSpec<String>>()
69-
every { spec.then() } returns Mono.empty()
70-
runBlocking {
71-
spec.await()
72-
}
73-
verify {
74-
spec.then()
75-
}
76-
}
77-
78-
@Test
79-
fun typedExecuteSpecAsType() {
80-
val spec: DatabaseClient.TypedExecuteSpec<String> = mockk()
81-
every { spec.`as`(String::class.java) } returns spec
82-
runBlocking {
83-
assertEquals(spec, spec.asType())
84-
}
85-
verify {
86-
spec.`as`(String::class.java)
87-
}
88-
}
89-
90-
@Test
91-
fun insertSpecAwait() {
92-
val spec = mockk<DatabaseClient.InsertSpec<String>>()
93-
every { spec.then() } returns Mono.empty()
94-
runBlocking {
95-
spec.await()
96-
}
97-
verify {
98-
spec.then()
99-
}
100-
}
101-
102-
@Test
103-
fun insertIntoSpecInto() {
104-
val spec = mockk<DatabaseClient.InsertIntoSpec>()
105-
val typedSpec: DatabaseClient.TypedInsertSpec<String> = mockk()
106-
every { spec.into(String::class.java) } returns typedSpec
107-
runBlocking {
108-
assertEquals(typedSpec, spec.into<String>())
109-
}
110-
verify {
111-
spec.into(String::class.java)
112-
}
113-
}
33+
@Test // gh-63
34+
fun genericExecuteSpecAwait() {
35+
36+
val spec = mockk<DatabaseClient.GenericExecuteSpec>()
37+
every { spec.then() } returns Mono.empty()
38+
39+
runBlocking {
40+
spec.await()
41+
}
42+
43+
verify {
44+
spec.then()
45+
}
46+
}
47+
48+
@Test // gh-63
49+
fun genericExecuteSpecAsType() {
50+
51+
val genericSpec = mockk<DatabaseClient.GenericExecuteSpec>()
52+
val typedSpec: DatabaseClient.TypedExecuteSpec<String> = mockk()
53+
every { genericSpec.`as`(String::class.java) } returns typedSpec
54+
55+
runBlocking {
56+
assertThat(genericSpec.asType<String>()).isEqualTo(typedSpec)
57+
}
58+
59+
verify {
60+
genericSpec.`as`(String::class.java)
61+
}
62+
}
63+
64+
@Test // gh-63
65+
fun genericSelectSpecAsType() {
66+
67+
val genericSpec = mockk<DatabaseClient.GenericSelectSpec>()
68+
val typedSpec: DatabaseClient.TypedSelectSpec<String> = mockk()
69+
every { genericSpec.`as`(String::class.java) } returns typedSpec
70+
71+
runBlocking {
72+
assertThat(genericSpec.asType<String>()).isEqualTo(typedSpec)
73+
}
74+
75+
verify {
76+
genericSpec.`as`(String::class.java)
77+
}
78+
}
79+
80+
@Test // gh-63
81+
fun typedExecuteSpecAwait() {
82+
83+
val spec = mockk<DatabaseClient.TypedExecuteSpec<String>>()
84+
every { spec.then() } returns Mono.empty()
85+
86+
runBlocking {
87+
spec.await()
88+
}
89+
90+
verify {
91+
spec.then()
92+
}
93+
}
94+
95+
@Test // gh-63
96+
fun typedExecuteSpecAsType() {
97+
98+
val spec: DatabaseClient.TypedExecuteSpec<String> = mockk()
99+
every { spec.`as`(String::class.java) } returns spec
100+
101+
runBlocking {
102+
assertThat(spec.asType()).isEqualTo(spec)
103+
}
104+
105+
verify {
106+
spec.`as`(String::class.java)
107+
}
108+
}
109+
110+
@Test // gh-63
111+
fun insertSpecAwait() {
112+
113+
val spec = mockk<DatabaseClient.InsertSpec<String>>()
114+
every { spec.then() } returns Mono.empty()
115+
116+
runBlocking {
117+
spec.await()
118+
}
119+
120+
verify {
121+
spec.then()
122+
}
123+
}
124+
125+
@Test // gh-63
126+
fun insertIntoSpecInto() {
127+
128+
val spec = mockk<DatabaseClient.InsertIntoSpec>()
129+
val typedSpec: DatabaseClient.TypedInsertSpec<String> = mockk()
130+
every { spec.into(String::class.java) } returns typedSpec
131+
132+
runBlocking {
133+
assertThat(spec.into<String>()).isEqualTo(typedSpec)
134+
}
135+
136+
verify {
137+
spec.into(String::class.java)
138+
}
139+
}
114140
}

‎src/test/kotlin/org/springframework/data/r2dbc/function/RowsFetchSpecExtensionsTests.kt

+35-24
Original file line numberDiff line numberDiff line change
@@ -19,33 +19,44 @@ import io.mockk.every
1919
import io.mockk.mockk
2020
import io.mockk.verify
2121
import kotlinx.coroutines.runBlocking
22-
import org.junit.Assert.assertEquals
22+
import org.assertj.core.api.Assertions.assertThat
2323
import org.junit.Test
2424
import reactor.core.publisher.Mono
2525

26+
/**
27+
* Unit tests for [RowsFetchSpec] extensions.
28+
*
29+
* @author Sebastien Deleuze
30+
*/
2631
class RowsFetchSpecExtensionsTests {
2732

28-
@Test
29-
fun awaitOne() {
30-
val spec = mockk<RowsFetchSpec<String>>()
31-
every { spec.one() } returns Mono.just("foo")
32-
runBlocking {
33-
assertEquals("foo", spec.awaitOne())
34-
}
35-
verify {
36-
spec.one()
37-
}
38-
}
39-
40-
@Test
41-
fun awaitFirst() {
42-
val spec = mockk<RowsFetchSpec<String>>()
43-
every { spec.first() } returns Mono.just("foo")
44-
runBlocking {
45-
assertEquals("foo", spec.awaitFirst())
46-
}
47-
verify {
48-
spec.first()
49-
}
50-
}
33+
@Test // gh-63
34+
fun awaitOne() {
35+
36+
val spec = mockk<RowsFetchSpec<String>>()
37+
every { spec.one() } returns Mono.just("foo")
38+
39+
runBlocking {
40+
assertThat(spec.awaitOne()).isEqualTo("foo")
41+
}
42+
43+
verify {
44+
spec.one()
45+
}
46+
}
47+
48+
@Test // gh-63
49+
fun awaitFirst() {
50+
51+
val spec = mockk<RowsFetchSpec<String>>()
52+
every { spec.first() } returns Mono.just("foo")
53+
54+
runBlocking {
55+
assertThat(spec.awaitFirst()).isEqualTo("foo")
56+
}
57+
58+
verify {
59+
spec.first()
60+
}
61+
}
5162
}

0 commit comments

Comments
 (0)