Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Kotlin M8 #1406

Merged
merged 1 commit into from
Jul 7, 2014
Merged

Kotlin M8 #1406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions language-adaptors/rxjava-kotlin/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ buildscript {
}

dependencies {
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:0.7.270'
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:0.8.11'
}
}

Expand All @@ -13,7 +13,7 @@ apply plugin: 'osgi'

dependencies {
compile project(':rxjava-core')
compile 'org.jetbrains.kotlin:kotlin-stdlib:0.7.270'
compile 'org.jetbrains.kotlin:kotlin-stdlib:0.8.11'
provided 'junit:junit-dep:4.10'
provided 'org.mockito:mockito-core:1.8.5'
}
Expand Down
42 changes: 19 additions & 23 deletions language-adaptors/rxjava-kotlin/src/test/kotlin/rx/lang/kotlin/BasicKotlinTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,11 @@ package rx.lang.kotlin

import rx.Observable
import org.junit.Test
import rx.subscriptions.Subscriptions
import org.mockito.Mockito.*
import org.mockito.Matchers.*
import rx.Observer
import org.junit.Assert.*
import rx.Notification
import rx.Subscription
import kotlin.concurrent.thread
import rx.Observable.OnSubscribeFunc
import rx.lang.kotlin.BasicKotlinTests.AsyncObservable
import rx.Observable.OnSubscribe
import rx.Subscriber
Expand Down Expand Up @@ -62,12 +58,12 @@ public class BasicKotlinTests : KotlinTests() {

[Test]
public fun testLast() {
assertEquals("three", Observable.from(listOf("one", "two", "three"))!!.toBlockingObservable()!!.last())
assertEquals("three", Observable.from(listOf("one", "two", "three"))!!.toBlocking()!!.last())
}

[Test]
public fun testLastWithPredicate() {
assertEquals("two", Observable.from(listOf("one", "two", "three"))!!.toBlockingObservable()!!.last { x -> x!!.length == 3 })
assertEquals("two", Observable.from(listOf("one", "two", "three"))!!.toBlocking()!!.last { x -> x!!.length == 3 })
}

[Test]
Expand Down Expand Up @@ -150,21 +146,21 @@ public class BasicKotlinTests : KotlinTests() {
[Test]
public fun testFromWithIterable() {
val list = listOf(1, 2, 3, 4, 5)
assertEquals(5, Observable.from(list)!!.count()!!.toBlockingObservable()!!.single())
assertEquals(5, Observable.from(list)!!.count()!!.toBlocking()!!.single())
}

[Test]
public fun testFromWithObjects() {
val list = listOf(1, 2, 3, 4, 5)
assertEquals(2, Observable.from(listOf(list, 6))!!.count()!!.toBlockingObservable()!!.single())
assertEquals(2, Observable.from(listOf(list, 6))!!.count()!!.toBlocking()!!.single())
}

[Test]
public fun testStartWith() {
val list = listOf(10, 11, 12, 13, 14)
val startList = listOf(1, 2, 3, 4, 5)
assertEquals(6, Observable.from(list)!!.startWith(0)!!.count()!!.toBlockingObservable()!!.single())
assertEquals(10, Observable.from(list)!!.startWith(startList)!!.count()!!.toBlockingObservable()!!.single())
assertEquals(6, Observable.from(list)!!.startWith(0)!!.count()!!.toBlocking()!!.single())
assertEquals(10, Observable.from(list)!!.startWith(startList)!!.count()!!.toBlocking()!!.single())
}

[Test]
Expand Down Expand Up @@ -227,28 +223,28 @@ public class BasicKotlinTests : KotlinTests() {

[Test]
public fun testForEach() {
Observable.create(AsyncObservable())!!.toBlockingObservable()!!.forEach(received())
Observable.create(AsyncObservable())!!.toBlocking()!!.forEach(received())
verify(a, times(1))!!.received(1)
verify(a, times(1))!!.received(2)
verify(a, times(1))!!.received(3)
}

[Test(expected = javaClass<RuntimeException>())]
public fun testForEachWithError() {
Observable.create(AsyncObservable())!!.toBlockingObservable()!!.forEach { throw RuntimeException("err") }
Observable.create(AsyncObservable())!!.toBlocking()!!.forEach { throw RuntimeException("err") }
fail("we expect an exception to be thrown")
}

[Test]
public fun testLastOrDefault() {
assertEquals("two", Observable.from(listOf("one", "two"))!!.toBlockingObservable()!!.lastOrDefault("default") { x -> x!!.length == 3 })
assertEquals("default", Observable.from(listOf("one", "two"))!!.toBlockingObservable()!!.lastOrDefault("default") { x -> x!!.length > 3 })
assertEquals("two", Observable.from(listOf("one", "two"))!!.toBlocking()!!.lastOrDefault("default") { x -> x!!.length == 3 })
assertEquals("default", Observable.from(listOf("one", "two"))!!.toBlocking()!!.lastOrDefault("default") { x -> x!!.length > 3 })
}

[Test(expected = javaClass<IllegalArgumentException>())]
public fun testSingle() {
assertEquals("one", Observable.from("one")!!.toBlockingObservable()!!.single { x -> x!!.length == 3 })
Observable.from(listOf("one", "two"))!!.toBlockingObservable()!!.single { x -> x!!.length == 3 }
assertEquals("one", Observable.from("one")!!.toBlocking()!!.single { x -> x!!.length == 3 })
Observable.from(listOf("one", "two"))!!.toBlocking()!!.single { x -> x!!.length == 3 }
fail()
}

Expand All @@ -271,7 +267,7 @@ public class BasicKotlinTests : KotlinTests() {
val o2 = Observable.from(listOf(4, 5, 6))!!
val o3 = Observable.from(listOf(7, 8, 9))!!

val values = Observable.zip(o1, o2, o3) { a, b, c -> listOf(a, b, c) }!!.toList()!!.toBlockingObservable()!!.single()!!
val values = Observable.zip(o1, o2, o3) { a, b, c -> listOf(a, b, c) }!!.toList()!!.toBlocking()!!.single()!!
assertEquals(listOf(1, 4, 7), values[0])
assertEquals(listOf(2, 5, 8), values[1])
assertEquals(listOf(3, 6, 9), values[2])
Expand All @@ -283,7 +279,7 @@ public class BasicKotlinTests : KotlinTests() {
val o2 = Observable.from(listOf(4, 5, 6))!!
val o3 = Observable.from(listOf(7, 8, 9))!!

val values = Observable.zip(listOf(o1, o2, o3)) { args -> listOf(*args) }!!.toList()!!.toBlockingObservable()!!.single()!!
val values = Observable.zip(listOf(o1, o2, o3)) { args -> listOf(*args) }!!.toList()!!.toBlocking()!!.single()!!
assertEquals(listOf(1, 4, 7), values[0])
assertEquals(listOf(2, 5, 8), values[1])
assertEquals(listOf(3, 6, 9), values[2])
Expand All @@ -296,10 +292,10 @@ public class BasicKotlinTests : KotlinTests() {
Observable.from(listOf("one", "two", "three", "four", "five", "six"))!!
.groupBy { s -> s!!.length }!!
.flatMap { groupObervable ->
groupObervable!!.map { s ->
"Value: $s Group ${groupObervable.getKey()}"
}
}!!.toBlockingObservable()!!.forEach { s ->
groupObervable!!.map { s ->
"Value: $s Group ${groupObervable.getKey()}"
}
}!!.toBlocking()!!.forEach { s ->
println(s)
count++
}
Expand Down Expand Up @@ -343,7 +339,7 @@ public class BasicKotlinTests : KotlinTests() {
}

class TestOnSubscribe(val count: Int) : OnSubscribe<String> {
override fun call(op: Subscriber<in String>?) {
override fun call(op: Subscriber<in String>?) {
op!!.onNext("hello_$count")
op.onCompleted()
}
Expand Down
20 changes: 10 additions & 10 deletions language-adaptors/rxjava-kotlin/src/test/kotlin/rx/lang/kotlin/ExtensionTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,12 @@ public class ExtensionTests : KotlinTests() {

[Test]
public fun testLast() {
assertEquals("three", listOf("one", "two", "three").asObservable().toBlockingObservable()!!.last())
assertEquals("three", listOf("one", "two", "three").asObservable().toBlocking()!!.last())
}

[Test]
public fun testLastWithPredicate() {
assertEquals("two", listOf("one", "two", "three").asObservable().toBlockingObservable()!!.last { x -> x!!.length == 3 })
assertEquals("two", listOf("one", "two", "three").asObservable().toBlocking()!!.last { x -> x!!.length == 3 })
}

[Test]
Expand Down Expand Up @@ -139,15 +139,15 @@ public class ExtensionTests : KotlinTests() {

[Test]
public fun testFromWithIterable() {
assertEquals(5, listOf(1, 2, 3, 4, 5).asObservable().count()!!.toBlockingObservable()!!.single())
assertEquals(5, listOf(1, 2, 3, 4, 5).asObservable().count()!!.toBlocking()!!.single())
}

[Test]
public fun testStartWith() {
val list = listOf(10, 11, 12, 13, 14)
val startList = listOf(1, 2, 3, 4, 5)
assertEquals(6, list.asObservable().startWith(0)!!.count()!!.toBlockingObservable()!!.single())
assertEquals(10, list.asObservable().startWith(startList)!!.count()!!.toBlockingObservable()!!.single())
assertEquals(6, list.asObservable().startWith(0)!!.count()!!.toBlocking()!!.single())
assertEquals(10, list.asObservable().startWith(startList)!!.count()!!.toBlocking()!!.single())
}

[Test]
Expand Down Expand Up @@ -210,22 +210,22 @@ public class ExtensionTests : KotlinTests() {

[Test]
public fun testForEach() {
asyncObservable.asObservable().toBlockingObservable()!!.forEach(received())
asyncObservable.asObservable().toBlocking()!!.forEach(received())
verify(a, times(1))!!.received(1)
verify(a, times(1))!!.received(2)
verify(a, times(1))!!.received(3)
}

[Test(expected = javaClass<RuntimeException>())]
public fun testForEachWithError() {
asyncObservable.asObservable().toBlockingObservable()!!.forEach { throw RuntimeException("err") }
asyncObservable.asObservable().toBlocking()!!.forEach { throw RuntimeException("err") }
fail("we expect an exception to be thrown")
}

[Test]
public fun testLastOrDefault() {
assertEquals("two", ("one" to"two").asObservable().toBlockingObservable()!!.lastOrDefault("default") { x -> x!!.length == 3 })
assertEquals("default", ("one" to"two").asObservable().toBlockingObservable()!!.lastOrDefault("default") { x -> x!!.length > 3 })
assertEquals("two", ("one" to"two").asObservable().toBlocking()!!.lastOrDefault("default") { x -> x!!.length == 3 })
assertEquals("default", ("one" to"two").asObservable().toBlocking()!!.lastOrDefault("default") { x -> x!!.length > 3 })
}

[Test]
Expand All @@ -247,7 +247,7 @@ public class ExtensionTests : KotlinTests() {
val o2 = Triple(4, 5, 6).asObservable()
val o3 = Triple(7, 8, 9).asObservable()

val values = Observable.zip(o1, o2, o3) { a, b, c -> listOf(a, b, c) }!!.toList()!!.toBlockingObservable()!!.single()!!
val values = Observable.zip(o1, o2, o3) { a, b, c -> listOf(a, b, c) }!!.toList()!!.toBlocking()!!.single()!!
assertEquals(listOf(1, 4, 7), values[0])
assertEquals(listOf(2, 5, 8), values[1])
assertEquals(listOf(3, 6, 9), values[2])
Expand Down