Refactoring: remove assertNSE and assertIAE

Kotlin · Feb 14, 2020 · 2cfd20c · 2cfd20c
1 parent dbe3e2e
commit 2cfd20c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 64 deletions.
diff --git a/reactive/kotlinx-coroutines-jdk9/test/IntegrationTest.kt b/reactive/kotlinx-coroutines-jdk9/test/IntegrationTest.kt
@@ -43,12 +43,12 @@ class IntegrationTest(
             if (delay) delay(1)
             // does not send anything
         }
-        assertNSE { pub.awaitFirst() }
+        assertFailsWith<NoSuchElementException> { pub.awaitFirst() }
         assertEquals("OK", pub.awaitFirstOrDefault("OK"))
         assertNull(pub.awaitFirstOrNull())
         assertEquals("ELSE", pub.awaitFirstOrElse { "ELSE" })
-        assertNSE { pub.awaitLast() }
-        assertNSE { pub.awaitSingle() }
+        assertFailsWith<NoSuchElementException> { pub.awaitLast() }
+        assertFailsWith<NoSuchElementException> { pub.awaitSingle() }
         var cnt = 0
         pub.collect { cnt++ }
         assertEquals(0, cnt)
@@ -88,7 +88,7 @@ class IntegrationTest(
         assertEquals(n, pub.awaitLast())
         assertEquals(1, pub.awaitFirstOrNull())
         assertEquals(1, pub.awaitFirstOrElse { 0 })
-        assertIAE { pub.awaitSingle() }
+        assertFailsWith<IllegalArgumentException> { pub.awaitSingle() }
         checkNumbers(n, pub)
         val flow = pub.asFlow()
         checkNumbers(n, flow.flowOn(ctx(coroutineContext)).asPublisher())
@@ -129,21 +129,4 @@ class IntegrationTest(
         assertEquals(n, last)
     }
 
-    private inline fun assertIAE(block: () -> Unit) {
-        try {
-            block()
-            expectUnreached()
-        } catch (e: Throwable) {
-            assertTrue(e is IllegalArgumentException)
-        }
-    }
-
-    private inline fun assertNSE(block: () -> Unit) {
-        try {
-            block()
-            expectUnreached()
-        } catch (e: Throwable) {
-            assertTrue(e is NoSuchElementException)
-        }
-    }
 }
diff --git a/reactive/kotlinx-coroutines-reactive/test/IntegrationTest.kt b/reactive/kotlinx-coroutines-reactive/test/IntegrationTest.kt
@@ -42,12 +42,12 @@ class IntegrationTest(
             if (delay) delay(1)
             // does not send anything
         }
-        assertNSE { pub.awaitFirst() }
+        assertFailsWith<NoSuchElementException> { pub.awaitFirst() }
         assertEquals("OK", pub.awaitFirstOrDefault("OK"))
         assertNull(pub.awaitFirstOrNull())
         assertEquals("ELSE", pub.awaitFirstOrElse { "ELSE" })
-        assertNSE { pub.awaitLast() }
-        assertNSE { pub.awaitSingle() }
+        assertFailsWith<NoSuchElementException> { pub.awaitLast() }
+        assertFailsWith<NoSuchElementException> { pub.awaitSingle() }
         var cnt = 0
         pub.collect { cnt++ }
         assertEquals(0, cnt)
@@ -87,7 +87,7 @@ class IntegrationTest(
         assertEquals(n, pub.awaitLast())
         assertEquals(1, pub.awaitFirstOrNull())
         assertEquals(1, pub.awaitFirstOrElse { 0 })
-        assertIAE { pub.awaitSingle() }
+        assertFailsWith<IllegalArgumentException> { pub.awaitSingle() }
         checkNumbers(n, pub)
         val channel = pub.openSubscription()
         checkNumbers(n, channel.asPublisher(ctx(coroutineContext)))
@@ -129,21 +129,4 @@ class IntegrationTest(
         assertEquals(n, last)
     }
 
-    private inline fun assertIAE(block: () -> Unit) {
-        try {
-            block()
-            expectUnreached()
-        } catch (e: Throwable) {
-            assertTrue(e is IllegalArgumentException)
-        }
-    }
-
-    private inline fun assertNSE(block: () -> Unit) {
-        try {
-            block()
-            expectUnreached()
-        } catch (e: Throwable) {
-            assertTrue(e is NoSuchElementException)
-        }
-    }
 }
diff --git a/reactive/kotlinx-coroutines-rx2/test/IntegrationTest.kt b/reactive/kotlinx-coroutines-rx2/test/IntegrationTest.kt
@@ -42,12 +42,12 @@ class IntegrationTest(
             if (delay) delay(1)
             // does not send anything
         }
-        assertNSE { observable.awaitFirst() }
+        assertFailsWith<NoSuchElementException> { observable.awaitFirst() }
         assertEquals("OK", observable.awaitFirstOrDefault("OK"))
         assertNull(observable.awaitFirstOrNull())
         assertEquals("ELSE", observable.awaitFirstOrElse { "ELSE" })
-        assertNSE { observable.awaitLast() }
-        assertNSE { observable.awaitSingle() }
+        assertFailsWith<NoSuchElementException> { observable.awaitLast() }
+        assertFailsWith<NoSuchElementException> { observable.awaitSingle() }
         var cnt = 0
         observable.collect {
             cnt++
@@ -89,7 +89,7 @@ class IntegrationTest(
         assertEquals(1, observable.awaitFirstOrNull())
         assertEquals(1, observable.awaitFirstOrElse { 0 })
         assertEquals(n, observable.awaitLast())
-        assertIAE { observable.awaitSingle() }
+        assertFailsWith<IllegalArgumentException> { observable.awaitSingle() }
         checkNumbers(n, observable)
         val channel = observable.openSubscription()
         checkNumbers(n, channel.asObservable(ctx(coroutineContext)))
@@ -131,22 +131,4 @@ class IntegrationTest(
         assertEquals(n, last)
     }
 
-
-    private inline fun assertIAE(block: () -> Unit) {
-        try {
-            block()
-            expectUnreached()
-        } catch (e: Throwable) {
-            assertTrue(e is IllegalArgumentException)
-        }
-    }
-
-    private inline fun assertNSE(block: () -> Unit) {
-        try {
-            block()
-            expectUnreached()
-        } catch (e: Throwable) {
-            assertTrue(e is NoSuchElementException)
-        }
-    }
 }