removing commented code from tests (#5467)

Author: Piotr Wittchen

src/test/java/io/reactivex/flowable/FlowableTests.java

@@ -1026,17 +1026,6 @@ public void testAmbWith() {
         Flowable.just(1).ambWith(Flowable.just(2)).subscribe(ts);
         ts.assertValue(1);
     }
-// FIXME Subscribers can't throw
-//    @Test(expected = OnErrorNotImplementedException.class)
-//    public void testSubscribeWithoutOnError() {
-//        Observable<String> o = Observable.just("a", "b").flatMap(new Func1<String, Observable<String>>() {
-//            @Override
-//            public Observable<String> call(String s) {
-//                return Observable.error(new Exception("test"));
-//            }
-//        });
-//        o.subscribe();
-//    }
 
     @Test
     public void testTakeWhileToList() {
@@ -1113,28 +1102,6 @@ public void testEmptyIsEmpty() {
         verify(w, never()).onError(any(Throwable.class));
     }
 
-// FIXME this test doesn't make sense
-//    @Test // cf. https://github.com/ReactiveX/RxJava/issues/2599
-//    public void testSubscribingSubscriberAsObserverMaintainsSubscriptionChain() {
-//        TestSubscriber<Object> subscriber = new TestSubscriber<T>();
-//        Subscription subscription = Observable.just("event").subscribe((Observer<Object>) subscriber);
-//        subscription.unsubscribe();
-//
-//        subscriber.assertUnsubscribed();
-//    }
-
-// FIXME subscribers can't throw
-//    @Test(expected=OnErrorNotImplementedException.class)
-//    public void testForEachWithError() {
-//        Observable.error(new Exception("boo"))
-//        //
-//        .forEach(new Action1<Object>() {
-//            @Override
-//            public void call(Object t) {
-//                //do nothing
-//            }});
-//    }
-
     @Test(expected = NullPointerException.class)
     public void testForEachWithNull() {
         Flowable.error(new Exception("boo"))

src/test/java/io/reactivex/internal/operators/flowable/FlowableCacheTest.java

@@ -151,7 +151,6 @@ public void testTake() {
         ts.assertNoErrors();
         ts.assertComplete();
         ts.assertValues(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
-//        ts.assertUnsubscribed(); // FIXME no longer valid
         assertFalse(cached.hasSubscribers());
     }
 

src/test/java/io/reactivex/internal/operators/flowable/FlowableDoOnUnsubscribeTest.java

@@ -80,8 +80,6 @@ public void run() {
         for (int i = 0; i < subCount; ++i) {
             subscriptions.get(i).dispose();
             // Test that unsubscribe() method is not affected in any way
-            // FIXME no longer valid
-//            subscribers.get(i).assertUnsubscribed();
         }
 
         upperLatch.await();
@@ -143,8 +141,6 @@ public void run() {
         for (int i = 0; i < subCount; ++i) {
             subscriptions.get(i).dispose();
             // Test that unsubscribe() method is not affected in any way
-            // FIXME no longer valid
-//            subscribers.get(i).assertUnsubscribed();
         }
 
         upperLatch.await();

src/test/java/io/reactivex/internal/operators/flowable/FlowableIgnoreElementsTest.java

@@ -65,8 +65,6 @@ public void testCompletedOkFlowable() {
         ts.assertNoErrors();
         ts.assertNoValues();
         ts.assertTerminated();
-        // FIXME no longer testable
-//        ts.assertUnsubscribed();
     }
 
     @Test
@@ -76,8 +74,6 @@ public void testErrorReceivedFlowable() {
         Flowable.error(ex).ignoreElements().toFlowable().subscribe(ts);
         ts.assertNoValues();
         ts.assertTerminated();
-        // FIXME no longer testable
-//        ts.assertUnsubscribed();
         ts.assertError(TestException.class);
         ts.assertErrorMessage("boo");
     }
@@ -183,8 +179,6 @@ public void testCompletedOk() {
         ts.assertNoErrors();
         ts.assertNoValues();
         ts.assertTerminated();
-        // FIXME no longer testable
-//        ts.assertUnsubscribed();
     }
 
     @Test
@@ -194,8 +188,6 @@ public void testErrorReceived() {
         Flowable.error(ex).ignoreElements().subscribe(ts);
         ts.assertNoValues();
         ts.assertTerminated();
-        // FIXME no longer testable
-//        ts.assertUnsubscribed();
         ts.assertError(TestException.class);
         ts.assertErrorMessage("boo");
     }

src/test/java/io/reactivex/internal/operators/flowable/FlowableMapTest.java

@@ -256,59 +256,6 @@ public Integer apply(Integer i) {
         }).blockingGet();
     }
 
-    // FIXME RS subscribers can't throw
-//    @Test(expected = OnErrorNotImplementedException.class)
-//    public void verifyExceptionIsThrownIfThereIsNoExceptionHandler() {
-//
-//        Publisher<Object> creator = new Publisher<Object>() {
-//
-//            @Override
-//            public void subscribe(Subscriber<? super Object> observer) {
-//                observer.onSubscribe(EmptySubscription.INSTANCE);
-//                observer.onNext("a");
-//                observer.onNext("b");
-//                observer.onNext("c");
-//                observer.onComplete();
-//            }
-//        };
-//
-//        Function<Object, Flowable<Object>> manyMapper = new Function<Object, Flowable<Object>>() {
-//
-//            @Override
-//            public Flowable<Object> apply(Object object) {
-//                return Flowable.just(object);
-//            }
-//        };
-//
-//        Function<Object, Object> mapper = new Function<Object, Object>() {
-//            private int count = 0;
-//
-//            @Override
-//            public Object apply(Object object) {
-//                ++count;
-//                if (count > 2) {
-//                    throw new RuntimeException();
-//                }
-//                return object;
-//            }
-//        };
-//
-//        Consumer<Object> onNext = new Consumer<Object>() {
-//
-//            @Override
-//            public void accept(Object object) {
-//                System.out.println(object.toString());
-//            }
-//        };
-//
-//        try {
-//            Flowable.create(creator).flatMap(manyMapper).map(mapper).subscribe(onNext);
-//        } catch (RuntimeException e) {
-//            e.printStackTrace();
-//            throw e;
-//        }
-//    }
-
     private static Map<String, String> getMap(String prefix) {
         Map<String, String> m = new HashMap<String, String>();
         m.put("firstName", prefix + "First");

src/test/java/io/reactivex/internal/operators/flowable/FlowableMaterializeTest.java

@@ -197,8 +197,6 @@ public void testUnsubscribeJustBeforeCompletionNotificationShouldPreventThatNoti
         ts.dispose();
         ts.request(1);
         ts.assertNoValues();
-        // FIXME no longer assertable
-//        ts.assertUnsubscribed();
     }
 
     private static class TestNotificationSubscriber extends DefaultSubscriber<Notification<String>> {

src/test/java/io/reactivex/internal/operators/flowable/FlowableMergeTest.java

@@ -506,8 +506,6 @@ public void testEarlyUnsubscribe() {
             assertTrue(os2.get());
 
             ts.assertValues(0L, 1L, 2L, 0L, 1L);
-            // FIXME not happening anymore
-//            ts.assertUnsubscribed();
         }
     }
 

src/test/java/io/reactivex/internal/operators/flowable/FlowableOnBackpressureBufferTest.java

@@ -144,8 +144,6 @@ public void run() {
         int size = ts.values().size();
         assertTrue(size <= 150);  // will get up to 50 more
         assertTrue(ts.values().get(size - 1) == size - 1);
-        // FIXME no longer assertable
-//        assertTrue(s.isUnsubscribed());
     }
 
     static final Flowable<Long> infinite = Flowable.unsafeCreate(new Publisher<Long>() {

src/test/java/io/reactivex/internal/operators/flowable/FlowableReplayTest.java

@@ -601,8 +601,6 @@ public void testIssue2191_SchedulerUnsubscribe() throws Exception {
         verifyObserverMock(mockObserverBeforeConnect, 2, 6);
         verifyObserverMock(mockObserverAfterConnect, 2, 6);
 
-        // FIXME not supported
-//        verify(spiedWorker, times(1)).isUnsubscribed();
         // FIXME publish calls cancel too
         verify(spiedWorker, times(1)).dispose();
         verify(sourceUnsubscribed, never()).run();
@@ -667,8 +665,6 @@ public void testIssue2191_SchedulerUnsubscribeOnError() throws Exception {
         verifyObserver(mockObserverBeforeConnect, 2, 2, illegalArgumentException);
         verifyObserver(mockObserverAfterConnect, 2, 2, illegalArgumentException);
 
-        // FIXME no longer supported
-//        verify(spiedWorker, times(1)).isUnsubscribed();
         // FIXME publish also calls cancel
         verify(spiedWorker, times(1)).dispose();
         verify(sourceUnsubscribed, never()).run();
@@ -973,8 +969,6 @@ public void testTake() {
         ts.assertNoErrors();
         ts.assertTerminated();
         ts.assertValues(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
-        // FIXME no longer assertable
-//        ts.assertUnsubscribed();
     }
 
     @Test

src/test/java/io/reactivex/observable/ObservableTest.java

@@ -1044,17 +1044,6 @@ public void testAmbWith() {
         Observable.just(1).ambWith(Observable.just(2)).subscribe(ts);
         ts.assertValue(1);
     }
-// FIXME Subscribers can't throw
-//    @Test(expected = OnErrorNotImplementedException.class)
-//    public void testSubscribeWithoutOnError() {
-//        Observable<String> o = Observable.just("a", "b").flatMap(new Func1<String, Observable<String>>() {
-//            @Override
-//            public Observable<String> call(String s) {
-//                return Observable.error(new Exception("test"));
-//            }
-//        });
-//        o.subscribe();
-//    }
 
     @Test
     public void testTakeWhileToList() {