Skip to content

Commit 387d1dd

Browse files
dkhalanskyjbelizarov
dkhalanskyjb
authored and
elizarov
committed
Improve test style
Get rid of Hamcrest, which is uncommon in this codebase, and replace as many `assert` statements from other testing frameworks as is reasonable with little automation by calls to `kotlin.test.*`.
1 parent e153863 commit 387d1dd

File tree

60 files changed

+281
-299
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+281
-299
lines changed

‎integration/kotlinx-coroutines-guava/test/ListenableFutureTest.kt

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@ package kotlinx.coroutines.guava
66

77
import com.google.common.util.concurrent.*
88
import kotlinx.coroutines.*
9-
import org.hamcrest.core.*
109
import org.junit.*
11-
import org.junit.Assert.*
1210
import org.junit.Test
1311
import java.util.concurrent.*
1412
import java.util.concurrent.CancellationException
13+
import kotlin.test.*
1514

1615
class ListenableFutureTest : TestBase() {
1716
@Before
@@ -27,7 +26,7 @@ class ListenableFutureTest : TestBase() {
2726
"O"
2827
}).await() + "K"
2928
}
30-
assertThat(future.get(), IsEqual("OK"))
29+
assertEquals("OK", future.get())
3130
}
3231

3332
@Test
@@ -64,7 +63,7 @@ class ListenableFutureTest : TestBase() {
6463
val future = GlobalScope.future {
6564
toAwait.await() + "K"
6665
}
67-
assertThat(future.get(), IsEqual("OK"))
66+
assertEquals("OK", future.get())
6867
}
6968

7069
@Test
@@ -75,7 +74,7 @@ class ListenableFutureTest : TestBase() {
7574
}
7675
assertFalse(future.isDone)
7776
toAwait.set("O")
78-
assertThat(future.get(), IsEqual("OK"))
77+
assertEquals("OK", future.get())
7978
}
8079

8180
@Test
@@ -86,11 +85,11 @@ class ListenableFutureTest : TestBase() {
8685
try {
8786
toAwait.await()
8887
} catch (e: RuntimeException) {
89-
assertThat(e, IsInstanceOf(IllegalArgumentException::class.java))
88+
assertTrue(e is IllegalArgumentException)
9089
e.message!!
9190
} + "K"
9291
}
93-
assertThat(future.get(), IsEqual("OK"))
92+
assertEquals("OK", future.get())
9493
}
9594

9695
@Test
@@ -100,13 +99,13 @@ class ListenableFutureTest : TestBase() {
10099
try {
101100
toAwait.await()
102101
} catch (e: RuntimeException) {
103-
assertThat(e, IsInstanceOf(IllegalArgumentException::class.java))
102+
assertTrue(e is IllegalArgumentException)
104103
e.message!!
105104
} + "K"
106105
}
107106
assertFalse(future.isDone)
108107
toAwait.setException(IllegalArgumentException("O"))
109-
assertThat(future.get(), IsEqual("OK"))
108+
assertEquals("OK", future.get())
110109
}
111110

112111
@Test
@@ -122,8 +121,8 @@ class ListenableFutureTest : TestBase() {
122121
future.get()
123122
fail("'get' should've throw an exception")
124123
} catch (e: ExecutionException) {
125-
assertThat(e.cause, IsInstanceOf(IllegalStateException::class.java))
126-
assertThat(e.cause!!.message, IsEqual("OK"))
124+
assertTrue(e.cause is IllegalStateException)
125+
assertEquals("OK", e.cause!!.message)
127126
}
128127
}
129128

@@ -134,7 +133,7 @@ class ListenableFutureTest : TestBase() {
134133
GlobalScope.future(start = CoroutineStart.LAZY) {}
135134
}
136135

137-
assertThat(e.message, IsEqual("LAZY start is not supported"))
136+
assertEquals("LAZY start is not supported", e.message)
138137
finish(2)
139138
}
140139

@@ -147,7 +146,7 @@ class ListenableFutureTest : TestBase() {
147146
}
148147
expect(3)
149148
val future = deferred.asListenableFuture()
150-
assertThat(future.await(), IsEqual("OK"))
149+
assertEquals("OK", future.await())
151150
finish(4)
152151
}
153152

@@ -160,7 +159,7 @@ class ListenableFutureTest : TestBase() {
160159
}
161160
expect(2)
162161
val future = deferred.asListenableFuture()
163-
assertThat(future.await(), IsEqual("OK")) // await yields main thread to deferred coroutine
162+
assertEquals("OK", future.await()) // await yields main thread to deferred coroutine
164163
finish(4)
165164
}
166165

@@ -370,9 +369,7 @@ class ListenableFutureTest : TestBase() {
370369
assertTrue(asFutureAsDeferred.isCompleted)
371370
// By documentation, join() shouldn't throw when asDeferred is already complete.
372371
asFutureAsDeferred.join()
373-
assertThat(
374-
asFutureAsDeferred.getCompletionExceptionOrNull(),
375-
IsInstanceOf(CancellationException::class.java))
372+
assertTrue(asFutureAsDeferred.getCompletionExceptionOrNull() is CancellationException)
376373
}
377374

378375
@Test
@@ -395,9 +392,7 @@ class ListenableFutureTest : TestBase() {
395392
assertTrue(asDeferred.isCompleted)
396393
// By documentation, join() shouldn't throw when asDeferred is already complete.
397394
asDeferred.join()
398-
assertThat(
399-
asDeferred.getCompletionExceptionOrNull(),
400-
IsInstanceOf(CancellationException::class.java))
395+
assertTrue(asDeferred.getCompletionExceptionOrNull() is CancellationException)
401396
}
402397

403398
@Test

‎integration/kotlinx-coroutines-jdk8/test/future/AsFutureTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
package kotlinx.coroutines.future
66

77
import kotlinx.coroutines.*
8-
import org.junit.*
9-
import org.junit.Assert.*
8+
import org.junit.Test
109
import java.util.concurrent.*
1110
import java.util.concurrent.CancellationException
11+
import kotlin.test.*
1212

1313
class AsFutureTest : TestBase() {
1414

‎integration/kotlinx-coroutines-jdk8/test/future/FutureExceptionsTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
package kotlinx.coroutines.future
66

77
import kotlinx.coroutines.*
8-
import org.junit.*
9-
import org.junit.Assert.*
8+
import org.junit.Test
109
import java.io.*
1110
import java.util.concurrent.*
11+
import kotlin.test.*
1212

1313
class FutureExceptionsTest : TestBase() {
1414

‎integration/kotlinx-coroutines-jdk8/test/future/FutureTest.kt

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@ package kotlinx.coroutines.future
66

77
import kotlinx.coroutines.*
88
import kotlinx.coroutines.CancellationException
9-
import org.hamcrest.core.*
109
import org.junit.*
11-
import org.junit.Assert.*
10+
import org.junit.Test
1211
import java.util.concurrent.*
1312
import java.util.concurrent.atomic.*
1413
import java.util.concurrent.locks.*
1514
import java.util.function.*
1615
import kotlin.concurrent.*
1716
import kotlin.coroutines.*
1817
import kotlin.reflect.*
18+
import kotlin.test.*
1919

2020
class FutureTest : TestBase() {
2121
@Before
@@ -30,7 +30,7 @@ class FutureTest : TestBase() {
3030
"O"
3131
}.await() + "K"
3232
}
33-
assertThat(future.get(), IsEqual("OK"))
33+
assertEquals("OK", future.get())
3434
}
3535

3636
@Test
@@ -40,7 +40,7 @@ class FutureTest : TestBase() {
4040
val future = GlobalScope.future {
4141
toAwait.await() + "K"
4242
}
43-
assertThat(future.get(), IsEqual("OK"))
43+
assertEquals("OK", future.get())
4444
}
4545

4646
@Test
@@ -51,7 +51,7 @@ class FutureTest : TestBase() {
5151
val future = GlobalScope.future {
5252
toAwait.await() + "K"
5353
}
54-
assertThat(future.get(), IsEqual("OK"))
54+
assertEquals("OK", future.get())
5555
}
5656

5757
@Test
@@ -62,7 +62,7 @@ class FutureTest : TestBase() {
6262
}
6363
assertFalse(future.isDone)
6464
toAwait.complete("O")
65-
assertThat(future.get(), IsEqual("OK"))
65+
assertEquals("OK", future.get())
6666
}
6767

6868
@Test
@@ -74,7 +74,7 @@ class FutureTest : TestBase() {
7474
}
7575
assertFalse(future.isDone)
7676
completable.complete("O")
77-
assertThat(future.get(), IsEqual("OK"))
77+
assertEquals("OK", future.get())
7878
}
7979

8080
@Test
@@ -88,7 +88,7 @@ class FutureTest : TestBase() {
8888
e.message!!
8989
} + "K"
9090
}
91-
assertThat(future.get(), IsEqual("OK"))
91+
assertEquals("OK", future.get())
9292
}
9393

9494
@Test
@@ -104,7 +104,7 @@ class FutureTest : TestBase() {
104104
e.message!!
105105
} + "K"
106106
}
107-
assertThat(future.get(), IsEqual("OK"))
107+
assertEquals("OK", future.get())
108108
}
109109

110110
@Test
@@ -125,7 +125,7 @@ class FutureTest : TestBase() {
125125
assertFalse(future.isDone)
126126
toAwait.completeExceptionally(TestException("O"))
127127
yield() // to future coroutine
128-
assertThat(future.get(), IsEqual("OK"))
128+
assertEquals("OK", future.get())
129129
finish(5)
130130
}
131131

@@ -142,7 +142,7 @@ class FutureTest : TestBase() {
142142
}
143143
assertFalse(future.isDone)
144144
completable.completeExceptionally(TestException("O"))
145-
assertThat(future.get(), IsEqual("OK"))
145+
assertEquals("OK", future.get())
146146
}
147147

148148
@Test
@@ -158,7 +158,7 @@ class FutureTest : TestBase() {
158158
fail("'get' should've throw an exception")
159159
} catch (e: ExecutionException) {
160160
assertTrue(e.cause is IllegalStateException)
161-
assertThat(e.cause!!.message, IsEqual("OK"))
161+
assertEquals("OK", e.cause!!.message)
162162
}
163163
}
164164

@@ -191,22 +191,22 @@ class FutureTest : TestBase() {
191191
it()
192192
depth.andDecrement
193193
}) {
194-
assertEquals("Part before first suspension must be wrapped", 1, depth.get())
194+
assertEquals(1, depth.get(), "Part before first suspension must be wrapped")
195195
val result =
196196
CompletableFuture.supplyAsync {
197197
while (depth.get() > 0);
198-
assertEquals("Part inside suspension point should not be wrapped", 0, depth.get())
198+
assertEquals(0, depth.get(), "Part inside suspension point should not be wrapped")
199199
"OK"
200200
}.await()
201-
assertEquals("Part after first suspension should be wrapped", 1, depth.get())
201+
assertEquals(1, depth.get(), "Part after first suspension should be wrapped")
202202
CompletableFuture.supplyAsync {
203203
while (depth.get() > 0);
204-
assertEquals("Part inside suspension point should not be wrapped", 0, depth.get())
204+
assertEquals(0, depth.get(), "Part inside suspension point should not be wrapped")
205205
"ignored"
206206
}.await()
207207
result
208208
}
209-
assertThat(future.get(), IsEqual("OK"))
209+
assertEquals("OK", future.get())
210210
}
211211

212212
@Test

‎integration/kotlinx-coroutines-slf4j/test/MDCContextTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class MDCContextTest : TestBase() {
2828
MDC.put("myKey", "myValue")
2929
// Standalone launch
3030
GlobalScope.launch {
31-
assertEquals(null, MDC.get("myKey"))
31+
assertNull(MDC.get("myKey"))
3232
expect(2)
3333
}.join()
3434
finish(3)
@@ -92,7 +92,7 @@ class MDCContextTest : TestBase() {
9292
@Test
9393
fun testContextMayBeEmpty() {
9494
runBlocking(MDCContext()) {
95-
assertEquals(null, MDC.get("myKey"))
95+
assertNull(MDC.get("myKey"))
9696
}
9797
}
9898

‎kotlinx-coroutines-core/common/test/AbstractCoroutineTest.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class AbstractCoroutineTest : TestBase() {
1919
}
2020

2121
override fun onCancelling(cause: Throwable?) {
22-
assertEquals(null, cause)
22+
assertNull(cause)
2323
expect(5)
2424
}
2525

@@ -34,12 +34,12 @@ class AbstractCoroutineTest : TestBase() {
3434
}
3535

3636
coroutine.invokeOnCompletion(onCancelling = true) {
37-
assertEquals(null, it)
37+
assertNull(it)
3838
expect(7)
3939
}
4040

4141
coroutine.invokeOnCompletion {
42-
assertEquals(null, it)
42+
assertNull(it)
4343
expect(8)
4444
}
4545
expect(2)

‎kotlinx-coroutines-core/common/test/CompletableDeferredTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class CompletableDeferredTest : TestBase() {
5050
assertEquals(false, c.isCancelled)
5151
assertEquals(true, c.isCompleted)
5252
assertTrue(c.getCancellationException() is JobCancellationException)
53-
assertEquals(null, c.getCompletionExceptionOrNull())
53+
assertNull(c.getCompletionExceptionOrNull())
5454
}
5555

5656
private fun checkCancel(c: CompletableDeferred<String>) {

‎kotlinx-coroutines-core/common/test/WithTimeoutOrNullTest.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ class WithTimeoutOrNullTest : TestBase() {
7777
yield()
7878
}
7979
}
80-
assertEquals(null, result)
80+
assertNull(result)
8181
finish(2)
8282
}
8383

@@ -135,11 +135,11 @@ class WithTimeoutOrNullTest : TestBase() {
135135
yield()
136136
}
137137
}
138-
assertEquals(null, inner)
138+
assertNull(inner)
139139
counter++
140140
}
141141
}
142-
assertEquals(null, result)
142+
assertNull(result)
143143
check(counter in 1..2) {"Executed: $counter times"}
144144
}
145145

@@ -167,7 +167,7 @@ class WithTimeoutOrNullTest : TestBase() {
167167
expectUnreached()
168168
"OK"
169169
}
170-
assertEquals(null, result)
170+
assertNull(result)
171171
finish(3)
172172
}
173173

@@ -183,7 +183,7 @@ class WithTimeoutOrNullTest : TestBase() {
183183
}
184184
"OK"
185185
}
186-
assertEquals(null, result)
186+
assertNull(result)
187187
finish(4)
188188
}
189189

0 commit comments

Comments
 (0)