Skip to content

Commit fd6a5bf

Browse files
committed
Moved ChannelReceiveOrClosedTest to proper dir, cleanup it
Note that "receiveOrClosed" is internal now and is implemented only partially to support flow, so this test is minimal.
1 parent a730f25 commit fd6a5bf

File tree

1 file changed

+2
-9
lines changed

1 file changed

+2
-9
lines changed

common/kotlinx-coroutines-core-common/test/channels/ChannelReceiveOrClosedTest.kt renamed to kotlinx-coroutines-core/common/test/channels/ChannelReceiveOrClosedTest.kt

+2-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
2+
* Copyright 2016-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
33
*/
44

55
package kotlinx.coroutines.channels
@@ -17,7 +17,6 @@ class ChannelReceiveOrClosedTest : TestBase() {
1717
}
1818

1919
val element = channel.receiveOrClosed()
20-
assertTrue(element.isValue)
2120
assertTrue(element.value is TestException1)
2221
assertTrue(element.valueOrNull is TestException1)
2322

@@ -42,15 +41,13 @@ class ChannelReceiveOrClosedTest : TestBase() {
4241

4342
expect(1)
4443
val element = channel.receiveOrClosed()
45-
assertTrue(element.isValue)
4644
assertEquals(1, element.value)
4745
assertEquals(1, element.valueOrNull)
4846
assertEquals("Value(1)", element.toString())
4947
assertTrue(ValueOrClosed.value(1) == element) // Don't box
5048

5149
expect(4)
5250
val nullElement = channel.receiveOrClosed()
53-
assertTrue(nullElement.isValue)
5451
assertNull(nullElement.value)
5552
assertNull(nullElement.valueOrNull)
5653
assertEquals("Value(null)", nullElement.toString())
@@ -62,7 +59,7 @@ class ChannelReceiveOrClosedTest : TestBase() {
6259

6360
val closed2 = channel.receiveOrClosed()
6461
assertTrue(closed2.isClosed)
65-
assertTrue(closed2.closeCause is ClosedReceiveChannelException)
62+
assertNull(closed2.closeCause)
6663
finish(7)
6764
}
6865

@@ -100,7 +97,6 @@ class ChannelReceiveOrClosedTest : TestBase() {
10097
expect(1)
10198
val closed = channel.receiveOrClosed()
10299
assertTrue(closed.isClosed)
103-
assertTrue(closed.closeCause is ClosedReceiveChannelException)
104100
finish(3)
105101
}
106102

@@ -115,17 +111,14 @@ class ChannelReceiveOrClosedTest : TestBase() {
115111
}
116112

117113
val intResult = channel.receiveOrClosed()
118-
assertTrue(intResult.isValue)
119114
assertEquals(1u, intResult.value.value)
120115

121116
val closeCauseResult = channel.receiveOrClosed()
122-
assertTrue(closeCauseResult.isValue)
123117
assertTrue(closeCauseResult.value.closeCause is TestException1)
124118

125119
val closeCause = channel.receiveOrClosed()
126120
assertTrue(closeCause.isClosed)
127121
assertTrue(closeCause.closeCause is TestException2)
128-
assertFailsWith<TestException2> { closeCause.valueOrThrow }
129122
}
130123

131124
@Test

0 commit comments

Comments
 (0)