Rewrite AndroidObservableTest to test the new operator

Author: mttkay

rxjava-contrib/rxjava-android/src/main/java/rx/android/observables/AndroidObservable.java

@@ -141,6 +141,7 @@ public static <T> Observable<T> fromFragment(Object fragment, Observable<T> sour
      * @param source   the source sequence
      */
     public static <T> Observable<T> bindActivity(Activity activity, Observable<T> source) {
+        Assertions.assertUiThread();
         return source.observeOn(mainThread()).lift(new OperatorWeakBinding<T, Activity>(activity, ACTIVITY_VALIDATOR));
     }
 
@@ -155,7 +156,8 @@ public static <T> Observable<T> bindActivity(Activity activity, Observable<T> so
      * @param source   the source sequence
      */
     public static <T> Observable<T> bindFragment(Object fragment, Observable<T> cachedSequence) {
-        Observable<T> source = cachedSequence.observeOn(mainThread());
+        Assertions.assertUiThread();
+        final Observable<T> source = cachedSequence.observeOn(mainThread());
         if (USES_SUPPORT_FRAGMENTS && fragment instanceof android.support.v4.app.Fragment) {
             android.support.v4.app.Fragment f = (android.support.v4.app.Fragment) fragment;
             return source.lift(new OperatorWeakBinding<T, android.support.v4.app.Fragment>(f, FRAGMENTV4_VALIDATOR));

rxjava-contrib/rxjava-android/src/test/java/rx/android/observables/AndroidObservableTest.java

@@ -69,29 +69,29 @@ public void setup() {
 
     @Test
     public void itSupportsFragmentsFromTheSupportV4Library() {
-        AndroidObservable.fromFragment(supportFragment, Observable.just("success")).subscribe(new TestObserver<String>(observer));
+        AndroidObservable.bindFragment(supportFragment, Observable.just("success")).subscribe(new TestObserver<String>(observer));
         verify(observer).onNext("success");
         verify(observer).onCompleted();
     }
 
     @Test
     public void itSupportsNativeFragments() {
-        AndroidObservable.fromFragment(fragment, Observable.just("success")).subscribe(new TestObserver<String>(observer));
+        AndroidObservable.bindFragment(fragment, Observable.just("success")).subscribe(new TestObserver<String>(observer));
         verify(observer).onNext("success");
         verify(observer).onCompleted();
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void itThrowsIfObjectPassedIsNotAFragment() {
-        AndroidObservable.fromFragment("not a fragment", Observable.never());
+        AndroidObservable.bindFragment("not a fragment", Observable.never());
     }
 
     @Test(expected = IllegalStateException.class)
     public void itThrowsIfObserverCallsFromFragmentFromBackgroundThread() throws Throwable {
         final Future<Object> future = Executors.newSingleThreadExecutor().submit(new Callable<Object>() {
             @Override
             public Object call() throws Exception {
-                AndroidObservable.fromFragment(fragment, Observable.empty());
+                AndroidObservable.bindFragment(fragment, Observable.empty());
                 return null;
             }
         });
@@ -107,7 +107,7 @@ public void itThrowsIfObserverCallsFromActivityFromBackgroundThread() throws Thr
         final Future<Object> future = Executors.newSingleThreadExecutor().submit(new Callable<Object>() {
             @Override
             public Object call() throws Exception {
-                AndroidObservable.fromActivity(activity, Observable.empty());
+                AndroidObservable.bindActivity(activity, Observable.empty());
                 return null;
             }
         });