1
1
/*
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.
3
3
*/
4
4
5
5
package kotlinx.coroutines.channels
@@ -17,7 +17,6 @@ class ChannelReceiveOrClosedTest : TestBase() {
17
17
}
18
18
19
19
val element = channel.receiveOrClosed()
20
- assertTrue(element.isValue)
21
20
assertTrue(element.value is TestException1 )
22
21
assertTrue(element.valueOrNull is TestException1 )
23
22
@@ -42,15 +41,13 @@ class ChannelReceiveOrClosedTest : TestBase() {
42
41
43
42
expect(1 )
44
43
val element = channel.receiveOrClosed()
45
- assertTrue(element.isValue)
46
44
assertEquals(1 , element.value)
47
45
assertEquals(1 , element.valueOrNull)
48
46
assertEquals(" Value(1)" , element.toString())
49
47
assertTrue(ValueOrClosed .value(1 ) == element) // Don't box
50
48
51
49
expect(4 )
52
50
val nullElement = channel.receiveOrClosed()
53
- assertTrue(nullElement.isValue)
54
51
assertNull(nullElement.value)
55
52
assertNull(nullElement.valueOrNull)
56
53
assertEquals(" Value(null)" , nullElement.toString())
@@ -62,7 +59,7 @@ class ChannelReceiveOrClosedTest : TestBase() {
62
59
63
60
val closed2 = channel.receiveOrClosed()
64
61
assertTrue(closed2.isClosed)
65
- assertTrue (closed2.closeCause is ClosedReceiveChannelException )
62
+ assertNull (closed2.closeCause)
66
63
finish(7 )
67
64
}
68
65
@@ -100,7 +97,6 @@ class ChannelReceiveOrClosedTest : TestBase() {
100
97
expect(1 )
101
98
val closed = channel.receiveOrClosed()
102
99
assertTrue(closed.isClosed)
103
- assertTrue(closed.closeCause is ClosedReceiveChannelException )
104
100
finish(3 )
105
101
}
106
102
@@ -115,17 +111,14 @@ class ChannelReceiveOrClosedTest : TestBase() {
115
111
}
116
112
117
113
val intResult = channel.receiveOrClosed()
118
- assertTrue(intResult.isValue)
119
114
assertEquals(1u , intResult.value.value)
120
115
121
116
val closeCauseResult = channel.receiveOrClosed()
122
- assertTrue(closeCauseResult.isValue)
123
117
assertTrue(closeCauseResult.value.closeCause is TestException1 )
124
118
125
119
val closeCause = channel.receiveOrClosed()
126
120
assertTrue(closeCause.isClosed)
127
121
assertTrue(closeCause.closeCause is TestException2 )
128
- assertFailsWith<TestException2 > { closeCause.valueOrThrow }
129
122
}
130
123
131
124
@Test
0 commit comments