1 files changed, 14 insertions, 12 deletions

diff --git a/reactive/kotlinx-coroutines-rx2/test/ObservableSubscriptionSelectTest.kt b/reactive/kotlinx-coroutines-rx2/test/ObservableSubscriptionSelectTest.kt
index 3cd3bbff..2c22cbf0 100644
--- a/reactive/kotlinx-coroutines-rx2/test/ObservableSubscriptionSelectTest.kt
+++ b/reactive/kotlinx-coroutines-rx2/test/ObservableSubscriptionSelectTest.kt
@@ -1,12 +1,14 @@
 /*
- * Copyright 2016-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright 2016-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
  */
 
 package kotlinx.coroutines.rx2
 
 import kotlinx.coroutines.*
+import kotlinx.coroutines.channels.*
 import kotlinx.coroutines.selects.*
 import org.junit.Test
+import kotlin.onSuccess
 import kotlin.test.*
 
 class ObservableSubscriptionSelectTest : TestBase() {
@@ -18,27 +20,27 @@ class ObservableSubscriptionSelectTest : TestBase() {
         var a = 0
         var b = 0
         // open two subs
-        val channelA = source.openSubscription()
-        val channelB = source.openSubscription()
+        val channelA = source.toChannel()
+        val channelB = source.toChannel()
         loop@ while (true) {
             val done: Int = select {
-                channelA.onReceiveOrNull {
-                    if (it != null) assertEquals(a++, it)
-                    if (it == null) 0 else 1
+                channelA.onReceiveCatching { result ->
+                    result.onSuccess { assertEquals(a++, it) }
+                    if (result.isSuccess) 1 else 0
                 }
-                channelB.onReceiveOrNull {
-                    if (it != null) assertEquals(b++, it)
-                    if (it == null) 0 else 2
+                channelB.onReceiveCatching { result ->
+                    result.onSuccess { assertEquals(b++, it) }
+                    if (result.isSuccess) 2 else 0
                 }
             }
             when (done) {
                 0 -> break@loop
                 1 -> {
-                    val r = channelB.receiveOrNull()
+                    val r = channelB.receiveCatching().getOrNull()
                     if (r != null) assertEquals(b++, r)
                 }
                 2 -> {
-                    val r = channelA.receiveOrNull()
+                    val r = channelA.receiveCatching().getOrNull()
                     if (r != null) assertEquals(a++, r)
                 }
             }
@@ -48,4 +50,4 @@ class ObservableSubscriptionSelectTest : TestBase() {
         // should receive one of them fully
         assertTrue(a == n || b == n)
     }
-}
\ No newline at end of file
+}