Deprecate flowWith with ERROR

Kotlin · Aug 5, 2019 · 55bead0 · 55bead0
1 parent 41428a3
commit 55bead0
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 386 deletions.
diff --git a/kotlinx-coroutines-core/common/src/flow/operators/Context.kt b/kotlinx-coroutines-core/common/src/flow/operators/Context.kt
@@ -238,7 +238,7 @@ public fun <T> Flow<T>.flowOn(context: CoroutineContext): Flow<T> {
  * 4) It can be confused with [flowOn] operator, though [flowWith] is much rarer.
  */
 @FlowPreview
-@Deprecated(message = "flowWith is deprecated without replacement, please refer to its KDoc for an explanation", level = DeprecationLevel.WARNING) // Error in beta release, removal in 1.4
+@Deprecated(message = "flowWith is deprecated without replacement, please refer to its KDoc for an explanation", level = DeprecationLevel.ERROR) // Error in beta release, removal in 1.4
 public fun <T, R> Flow<T>.flowWith(
     flowContext: CoroutineContext,
     bufferSize: Int = BUFFERED,

diff --git a/kotlinx-coroutines-core/common/test/flow/operators/FlowContextTest.kt b/kotlinx-coroutines-core/common/test/flow/operators/FlowContextTest.kt
diff --git a/kotlinx-coroutines-core/common/test/flow/operators/FlowOnTest.kt b/kotlinx-coroutines-core/common/test/flow/operators/FlowOnTest.kt
@@ -261,6 +261,27 @@ class FlowOnTest : TestBase() {
         finish(3)
     }
 
+    @Test
+    fun testException() = runTest {
+        val flow = flow {
+            emit(314)
+            delay(Long.MAX_VALUE)
+        }.flowOn(NamedDispatchers("upstream"))
+            .map {
+                throw TestException()
+            }
+
+        assertFailsWith<TestException> { flow.single() }
+        assertFailsWith<TestException>(flow)
+        ensureActive()
+    }
+
+    @Test
+    fun testIllegalArgumentException() {
+        val flow = emptyFlow<Int>()
+        assertFailsWith<IllegalArgumentException> { flow.flowOn(Job()) }
+    }
+
     private inner class Source(private val value: Int) {
         public var contextName: String = "unknown"