Skip to content

Commit 201f053

Browse files
committed
Basic Kotlin tests completed
1 parent 7123ac5 commit 201f053

File tree

2 files changed

+429
-14
lines changed

2 files changed

+429
-14
lines changed

language-adaptors/rxjava-kotlin/src/main/kotlin/rx/lang/kotlin/namespace.kt

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@ import rx.Observer
55
import rx.Observable
66

77
public fun<T> Function1<Observer<in T>, Subscription>.asObservable(): Observable<T> {
8-
return Observable.create{ this(it!!) }!!
8+
return Observable.create { this(it!!) }!!
9+
}
10+
11+
public fun<T> Function0<Observable<out T>>.defer(): Observable<T> {
12+
return Observable.defer(this)!!
913
}
1014

1115
public fun<T> Iterable<T>.asObservable(): Observable<T> {
@@ -15,3 +19,31 @@ public fun<T> Iterable<T>.asObservable(): Observable<T> {
1519
public fun<T> T.asObservable(): Observable<T> {
1620
return Observable.from(this)!!
1721
}
22+
23+
public fun<T> Throwable.asObservable(): Observable<T> {
24+
return Observable.error(this)!!
25+
}
26+
27+
public fun<T> Pair<T, T>.asObservable(): Observable<T> {
28+
return Observable.from(this.component1(), this.component2())!!
29+
}
30+
31+
public fun<T> Triple<T, T, T>.asObservable(): Observable<T> {
32+
return Observable.from(this.component1(), this.component2(), this.component3())!!
33+
}
34+
35+
public fun<T> Pair<Observable<T>, Observable<T>>.merge(): Observable<T> {
36+
return Observable.merge(this.component1(), this.component2())!!
37+
}
38+
39+
public fun<T> Triple<Observable<T>, Observable<T>, Observable<T>>.merge(): Observable<T> {
40+
return Observable.merge(this.component1(), this.component2(), this.component3())!!
41+
}
42+
43+
public fun<T> Pair<Observable<T>, Observable<T>>.mergeDelayError(): Observable<T> {
44+
return Observable.mergeDelayError(this.component1(), this.component2())!!
45+
}
46+
47+
public fun<T> Triple<Observable<T>, Observable<T>, Observable<T>>.mergeDelayError(): Observable<T> {
48+
return Observable.mergeDelayError(this.component1(), this.component2(), this.component3())!!
49+
}

0 commit comments

Comments
 (0)