TestSubscriber.awaitTerminalEventAndUnsubscribeOnTimeout

Author: benjchristensen

rxjava-core/src/main/java/rx/Observable.java

@@ -7057,6 +7057,7 @@ public final Subscription subscribe(Subscriber<? super T> observer, Scheduler sc
     public final Observable<T> subscribeOn(Scheduler scheduler) {
         return nest().lift(new OperatorSubscribeOn<T>(scheduler, false));
     }
+    
     /**
      * Asynchronously subscribes and unsubscribes Observers to this Observable on the specified {@link Scheduler}
      * and allows buffering some events emitted from the source in the time gap between the original and

rxjava-core/src/main/java/rx/observers/TestSubscriber.java

@@ -101,6 +101,14 @@ public void awaitTerminalEvent(long timeout, TimeUnit unit) {
         }
     }
 
+    public void awaitTerminalEventAndUnsubscribeOnTimeout(long timeout, TimeUnit unit) {
+        try {
+            awaitTerminalEvent(timeout, unit);
+        } catch (RuntimeException e) {
+            unsubscribe();
+        }
+    }
+
     public Thread getLastSeenThread() {
         return lastSeenThread;
     }