Skip to content

Commit 9c3f59f

Browse files
committed
Remove deprecation leftovers in reactive modules
1 parent 6841fae commit 9c3f59f

File tree

3 files changed

+1
-100
lines changed

3 files changed

+1
-100
lines changed

reactive/kotlinx-coroutines-reactive/test/IntegrationTest.kt

+1-11
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,6 @@ class IntegrationTest(
5252
assertEquals("ELSE", pub.awaitFirstOrElse { "ELSE" })
5353
assertFailsWith<NoSuchElementException> { pub.awaitLast() }
5454
assertFailsWith<NoSuchElementException> { pub.awaitSingle() }
55-
assertEquals("OK", pub.awaitSingleOrDefault("OK"))
56-
assertNull(pub.awaitSingleOrNull())
57-
assertEquals("ELSE", pub.awaitSingleOrElse { "ELSE" })
5855
var cnt = 0
5956
pub.collect { cnt++ }
6057
assertEquals(0, cnt)
@@ -72,9 +69,6 @@ class IntegrationTest(
7269
assertEquals("OK", pub.awaitFirstOrElse { "ELSE" })
7370
assertEquals("OK", pub.awaitLast())
7471
assertEquals("OK", pub.awaitSingle())
75-
assertEquals("OK", pub.awaitSingleOrDefault("!"))
76-
assertEquals("OK", pub.awaitSingleOrNull())
77-
assertEquals("OK", pub.awaitSingleOrElse { "ELSE" })
7872
var cnt = 0
7973
pub.collect {
8074
assertEquals("OK", it)
@@ -189,10 +183,6 @@ class IntegrationTest(
189183
onError(dummyThrowable)
190184
onComplete()
191185
}
192-
assertDetectsBadPublisher<Int>({ awaitSingleOrDefault(2) }, "terminal state") {
193-
onComplete()
194-
onError(dummyThrowable)
195-
}
196186
assertDetectsBadPublisher<Int>({ awaitFirst() }, "terminal state") {
197187
onNext(0)
198188
onComplete()
@@ -251,4 +241,4 @@ internal suspend inline fun <reified E: Throwable> assertCallsExceptionHandlerWi
251241
it
252242
}
253243
}
254-
}
244+
}

reactive/kotlinx-coroutines-reactor/test/FluxSingleTest.kt

-66
Original file line numberDiff line numberDiff line change
@@ -68,72 +68,6 @@ class FluxSingleTest : TestBase() {
6868
}
6969
}
7070

71-
@Test
72-
fun testAwaitSingleOrDefault() {
73-
val flux = flux {
74-
send(Flux.empty<String>().awaitSingleOrDefault("O") + "K")
75-
}
76-
77-
checkSingleValue(flux) {
78-
assertEquals("OK", it)
79-
}
80-
}
81-
82-
@Test
83-
fun testAwaitSingleOrDefaultException() {
84-
val flux = flux {
85-
send(Flux.just("O", "#").awaitSingleOrDefault("!") + "K")
86-
}
87-
88-
checkErroneous(flux) {
89-
assert(it is IllegalArgumentException)
90-
}
91-
}
92-
93-
@Test
94-
fun testAwaitSingleOrNull() {
95-
val flux = flux<String?> {
96-
send(Flux.empty<String>().awaitSingleOrNull() ?: "OK")
97-
}
98-
99-
checkSingleValue(flux) {
100-
assertEquals("OK", it)
101-
}
102-
}
103-
104-
@Test
105-
fun testAwaitSingleOrNullException() {
106-
val flux = flux {
107-
send((Flux.just("O", "#").awaitSingleOrNull() ?: "!") + "K")
108-
}
109-
110-
checkErroneous(flux) {
111-
assert(it is IllegalArgumentException)
112-
}
113-
}
114-
115-
@Test
116-
fun testAwaitSingleOrElse() {
117-
val flux = flux {
118-
send(Flux.empty<String>().awaitSingleOrElse { "O" } + "K")
119-
}
120-
121-
checkSingleValue(flux) {
122-
assertEquals("OK", it)
123-
}
124-
}
125-
126-
@Test
127-
fun testAwaitSingleOrElseException() {
128-
val flux = flux {
129-
send(Flux.just("O", "#").awaitSingleOrElse { "!" } + "K")
130-
}
131-
132-
checkErroneous(flux) {
133-
assert(it is IllegalArgumentException)
134-
}
135-
}
136-
13771
@Test
13872
fun testAwaitFirst() {
13973
val flux = flux {

reactive/kotlinx-coroutines-reactor/test/MonoTest.kt

-23
Original file line numberDiff line numberDiff line change
@@ -119,29 +119,6 @@ class MonoTest : TestBase() {
119119
assertNull(Mono.empty<Int>().awaitSingleOrNull())
120120
}
121121

122-
/** Tests that the versions of the await methods specialized for Mono for deprecation behave correctly and we don't
123-
* break any code by introducing them. */
124-
@Test
125-
@Suppress("DEPRECATION")
126-
fun testDeprecatedAwaitMethods() = runBlocking {
127-
val filledMono = mono<String> { "OK" }
128-
assertEquals("OK", filledMono.awaitFirst())
129-
assertEquals("OK", filledMono.awaitFirstOrDefault("!"))
130-
assertEquals("OK", filledMono.awaitFirstOrNull())
131-
assertEquals("OK", filledMono.awaitFirstOrElse { "ELSE" })
132-
assertEquals("OK", filledMono.awaitLast())
133-
assertEquals("OK", filledMono.awaitSingleOrDefault("!"))
134-
assertEquals("OK", filledMono.awaitSingleOrElse { "ELSE" })
135-
val emptyMono = mono<String> { null }
136-
assertFailsWith<NoSuchElementException> { emptyMono.awaitFirst() }
137-
assertEquals("OK", emptyMono.awaitFirstOrDefault("OK"))
138-
assertNull(emptyMono.awaitFirstOrNull())
139-
assertEquals("ELSE", emptyMono.awaitFirstOrElse { "ELSE" })
140-
assertFailsWith<NoSuchElementException> { emptyMono.awaitLast() }
141-
assertEquals("OK", emptyMono.awaitSingleOrDefault("OK"))
142-
assertEquals("ELSE", emptyMono.awaitSingleOrElse { "ELSE" })
143-
}
144-
145122
/** Tests that calls to [awaitSingleOrNull] (and, thus, to the rest of such functions) throw [CancellationException]
146123
* and unsubscribe from the publisher when their [Job] is cancelled. */
147124
@Test

0 commit comments

Comments
 (0)