Compiling. Unit Tests Failing.

Now that Observer is an abstract class, Mockito is having issues with it so unit tests are a mess.

Author: benjchristensen

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

@@ -16,11 +16,11 @@
 package rx.lang.groovy;
 
 import groovy.lang.Closure;
-import rx.Operator;
+import rx.Observable.OnSubscribe;
+import rx.Observer;
 import rx.Subscription;
-import rx.util.functions.Action1;
 
-public class GroovyCreateWrapper<T> implements Action1<Operator<? super T>> {
+public class GroovyCreateWrapper<T> implements OnSubscribe<T> {
 
     private final Closure<Void> closure;
 
@@ -29,7 +29,7 @@ public GroovyCreateWrapper(Closure<Void> closure) {
     }
 
     @Override
-    public void call(Operator<? super T> op) {
+    public void call(Observer<? super T> op) {
         Object o = closure.call(op);
         /*
          * If the new signature is being used, we will get NULL back.

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

@@ -21,7 +21,7 @@ package rx.lang.scala
 trait Subject[T] extends Observable[T] with Observer[T] {
   private [scala] val asJavaSubject: rx.subjects.Subject[_ >: T, _<: T]
 
-  val asJavaObservable: rx.Observable[_ <: T] = asJavaSubject
+  val asJavaObservable: rx.Observable[_ <: T] = asJavaSubject.toObservable()
 
   override val asJavaObserver: rx.Observer[_ >: T] = asJavaSubject
   override def onNext(value: T): Unit = { asJavaObserver.onNext(value)}

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

@@ -148,7 +148,7 @@ public void itForwardsOnErrorToTargetObserver() {
     public void itDropsOnNextOnCompletedSequenceIfTargetComponentIsGone() throws Throwable {
         PublishSubject<Integer> source = PublishSubject.create();
 
-        final Observable.OnSubscribeFunc<Integer> operator = newOnSubscribeFragmentInstance(source, mockFragment);
+        final Observable.OnSubscribeFunc<Integer> operator = newOnSubscribeFragmentInstance(source.toObservable(), mockFragment);
         operator.onSubscribe(mockObserver);
 
         source.onNext(1);
@@ -166,7 +166,7 @@ public void itDropsOnNextOnCompletedSequenceIfTargetComponentIsGone() throws Thr
     public void itDropsOnErrorIfTargetComponentIsGone() throws Throwable {
         PublishSubject<Integer> source = PublishSubject.create();
 
-        final Observable.OnSubscribeFunc<Integer> operator = newOnSubscribeFragmentInstance(source, mockFragment);
+        final Observable.OnSubscribeFunc<Integer> operator = newOnSubscribeFragmentInstance(source.toObservable(), mockFragment);
         operator.onSubscribe(mockObserver);
 
         source.onNext(1);
@@ -202,7 +202,7 @@ private void releaseComponentRef(Observable.OnSubscribeFunc<Integer> operator) t
     @Test
     public void itDoesNotForwardOnNextOnCompletedSequenceIfFragmentIsDetached() {
         PublishSubject<Integer> source = PublishSubject.create();
-        OperationObserveFromAndroidComponent.observeFromAndroidComponent(source, mockFragment).subscribe(mockObserver);
+        OperationObserveFromAndroidComponent.observeFromAndroidComponent(source.toObservable(), mockFragment).subscribe(mockObserver);
 
         source.onNext(1);
 
@@ -218,7 +218,7 @@ public void itDoesNotForwardOnNextOnCompletedSequenceIfFragmentIsDetached() {
     @Test
     public void itDoesNotForwardOnErrorIfFragmentIsDetached() {
         PublishSubject<Integer> source = PublishSubject.create();
-        OperationObserveFromAndroidComponent.observeFromAndroidComponent(source, mockFragment).subscribe(mockObserver);
+        OperationObserveFromAndroidComponent.observeFromAndroidComponent(source.toObservable(), mockFragment).subscribe(mockObserver);
 
         source.onNext(1);
 

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

@@ -85,7 +85,7 @@ protected void onResponseReceived(HttpResponse response) throws HttpException, I
 
             @Override
             public Subscription onSubscribe(Observer<? super byte[]> observer) {
-                parentSubscription.add(contentSubject.subscribe(observer));
+                parentSubscription.add(contentSubject.toObservable().subscribe(observer));
                 return parentSubscription;
             }
         });