Skip to content

Commit 5478e30

Browse files
benjchristensenbenjchristensen
committed
Compiling. Unit Tests Failing.
Now that Observer is an abstract class, Mockito is having issues with it so unit tests are a mess.
1 parent 510850e commit 5478e30

File tree

125 files changed

+1149
-1147
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

125 files changed

+1149
-1147
lines changed

‎language-adaptors/rxjava-groovy/src/main/java/rx/lang/groovy/GroovyCreateWrapper.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
package rx.lang.groovy;
1717

1818
import groovy.lang.Closure;
19-
import rx.Operator;
19+
import rx.Observable.OnSubscribe;
20+
import rx.Observer;
2021
import rx.Subscription;
21-
import rx.util.functions.Action1;
2222

23-
public class GroovyCreateWrapper<T> implements Action1<Operator<? super T>> {
23+
public class GroovyCreateWrapper<T> implements OnSubscribe<T> {
2424

2525
private final Closure<Void> closure;
2626

@@ -29,7 +29,7 @@ public GroovyCreateWrapper(Closure<Void> closure) {
2929
}
3030

3131
@Override
32-
public void call(Operator<? super T> op) {
32+
public void call(Observer<? super T> op) {
3333
Object o = closure.call(op);
3434
/*
3535
* If the new signature is being used, we will get NULL back.

‎language-adaptors/rxjava-scala/src/main/scala/rx/lang/scala/Subject.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ package rx.lang.scala
2121
trait Subject[T] extends Observable[T] with Observer[T] {
2222
private [scala] val asJavaSubject: rx.subjects.Subject[_ >: T, _<: T]
2323

24-
val asJavaObservable: rx.Observable[_ <: T] = asJavaSubject
24+
val asJavaObservable: rx.Observable[_ <: T] = asJavaSubject.toObservable()
2525

2626
override val asJavaObserver: rx.Observer[_ >: T] = asJavaSubject
2727
override def onNext(value: T): Unit = { asJavaObserver.onNext(value)}

‎rxjava-contrib/rxjava-android/src/test/java/rx/android/operators/OperationObserveFromAndroidComponentTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ public void itForwardsOnErrorToTargetObserver() {
148148
public void itDropsOnNextOnCompletedSequenceIfTargetComponentIsGone() throws Throwable {
149149
PublishSubject<Integer> source = PublishSubject.create();
150150

151-
final Observable.OnSubscribeFunc<Integer> operator = newOnSubscribeFragmentInstance(source, mockFragment);
151+
final Observable.OnSubscribeFunc<Integer> operator = newOnSubscribeFragmentInstance(source.toObservable(), mockFragment);
152152
operator.onSubscribe(mockObserver);
153153

154154
source.onNext(1);
@@ -166,7 +166,7 @@ public void itDropsOnNextOnCompletedSequenceIfTargetComponentIsGone() throws Thr
166166
public void itDropsOnErrorIfTargetComponentIsGone() throws Throwable {
167167
PublishSubject<Integer> source = PublishSubject.create();
168168

169-
final Observable.OnSubscribeFunc<Integer> operator = newOnSubscribeFragmentInstance(source, mockFragment);
169+
final Observable.OnSubscribeFunc<Integer> operator = newOnSubscribeFragmentInstance(source.toObservable(), mockFragment);
170170
operator.onSubscribe(mockObserver);
171171

172172
source.onNext(1);
@@ -202,7 +202,7 @@ private void releaseComponentRef(Observable.OnSubscribeFunc<Integer> operator) t
202202
@Test
203203
public void itDoesNotForwardOnNextOnCompletedSequenceIfFragmentIsDetached() {
204204
PublishSubject<Integer> source = PublishSubject.create();
205-
OperationObserveFromAndroidComponent.observeFromAndroidComponent(source, mockFragment).subscribe(mockObserver);
205+
OperationObserveFromAndroidComponent.observeFromAndroidComponent(source.toObservable(), mockFragment).subscribe(mockObserver);
206206

207207
source.onNext(1);
208208

@@ -218,7 +218,7 @@ public void itDoesNotForwardOnNextOnCompletedSequenceIfFragmentIsDetached() {
218218
@Test
219219
public void itDoesNotForwardOnErrorIfFragmentIsDetached() {
220220
PublishSubject<Integer> source = PublishSubject.create();
221-
OperationObserveFromAndroidComponent.observeFromAndroidComponent(source, mockFragment).subscribe(mockObserver);
221+
OperationObserveFromAndroidComponent.observeFromAndroidComponent(source.toObservable(), mockFragment).subscribe(mockObserver);
222222

223223
source.onNext(1);
224224

‎rxjava-contrib/rxjava-apache-http/src/main/java/rx/apache/http/consumers/ResponseConsumerEventStream.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ protected void onResponseReceived(HttpResponse response) throws HttpException, I
8585

8686
@Override
8787
public Subscription onSubscribe(Observer<? super byte[]> observer) {
88-
parentSubscription.add(contentSubject.subscribe(observer));
88+
parentSubscription.add(contentSubject.toObservable().subscribe(observer));
8989
return parentSubscription;
9090
}
9191
});

0 commit comments

Comments
 (0)