Skip to content

Commit 8c32afc

Browse files
committed
Merge pull request ReactiveX#34 from cy6erGn0m/cleanup
Cleanup warnings and deprecations
2 parents 9c50949 + 6aeb25b commit 8c32afc

File tree

4 files changed

+5
-88
lines changed

4 files changed

+5
-88
lines changed

src/main/kotlin/rx/lang/kotlin/namespace.kt

Lines changed: 0 additions & 80 deletions
This file was deleted.

src/test/kotlin/rx/lang/kotlin/BasicKotlinTests.kt

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,9 @@ public class BasicKotlinTests : KotlinTests() {
3434

3535
@Test
3636
public fun testCreate() {
37-
38-
Observable.create(object:OnSubscribe<String> {
39-
override fun call(subscriber: Subscriber<in String>) {
40-
subscriber.onNext("Hello")
41-
subscriber.onCompleted()
42-
}
37+
Observable.create(OnSubscribe<kotlin.String> { subscriber ->
38+
subscriber.onNext("Hello")
39+
subscriber.onCompleted()
4340
}).subscribe { result ->
4441
a.received(result)
4542
}

src/test/kotlin/rx/lang/kotlin/ExtensionTests.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ public class ExtensionTests : KotlinTests() {
116116
@Test
117117
public fun testScriptWithMerge() {
118118
val factory = TestFactory()
119-
(factory.observable mergeWith factory.observable).subscribe((received()))
119+
(factory.observable.mergeWith(factory.observable)).subscribe((received()))
120120
verify(a, times(1)).received("hello_1")
121121
verify(a, times(1)).received("hello_2")
122122
}

src/test/kotlin/rx/lang/kotlin/ObservablesTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public class ObservablesTest {
5858
assertEquals((1..10).toList(), (1..10).toObservable().toList().toBlocking().first())
5959
}
6060

61-
@test fun intProgressionDownto() {
61+
@test fun intProgressionDownTo() {
6262
assertEquals((1 downTo 10).toList(), (1 downTo 10).toObservable().toList().toBlocking().first())
6363
}
6464

0 commit comments

Comments
 (0)