Fix bug in the TestObserver and poor tests

Author: rozza

driver-async/src/test/unit/com/mongodb/async/client/SingleResultCallbackSubscriptionSpecification.groovy

@@ -157,12 +157,31 @@ class SingleResultCallbackSubscriptionSpecification extends Specification {
     def 'should not call onComplete after unsubscribe is called'() {
         given:
         def block = getBlock()
-        def observer = new TestObserver()
+        def observer = new TestObserver(new Observer() {
+            private Subscription subscription
+
+            @Override
+            void onSubscribe(final Subscription subscription) {
+                this.subscription = subscription
+            }
+
+            @Override
+            void onNext(final Object result) {
+                subscription.unsubscribe()
+            }
+
+            @Override
+            void onError(final Throwable e) {
+            }
+
+            @Override
+            void onComplete() {
+            }
+        })
         observe(block).subscribe(observer)
 
         when:
         observer.requestMore(1)
-        observer.getSubscription().unsubscribe()
 
         then:
         observer.assertUnsubscribed()
@@ -174,12 +193,16 @@ class SingleResultCallbackSubscriptionSpecification extends Specification {
         given:
         def block = getBlock()
         def observer = new TestObserver(new Observer() {
+            private Subscription subscription
+
             @Override
             void onSubscribe(final Subscription subscription) {
+                this.subscription = subscription
             }
 
             @Override
             void onNext(final Object result) {
+                subscription.unsubscribe()
                 throw new MongoException('Failure')
             }
 
@@ -195,13 +218,11 @@ class SingleResultCallbackSubscriptionSpecification extends Specification {
 
         when:
         observer.requestMore(1)
-        observer.getSubscription().unsubscribe()
 
         then:
-        observer.assertUnsubscribed()
         observer.assertReceivedOnNext([1])
-        observer.assertErrored()
-        observer.assertTerminalEvent()
+        observer.assertUnsubscribed()
+        observer.assertNoTerminalEvent()
     }
 
 

driver-async/src/test/unit/com/mongodb/async/client/TestObserver.java

@@ -62,6 +62,7 @@ public void onError(final Throwable e) {
     @Override
     public void onSubscribe(final Subscription subscription) {
         this.subscription = subscription;
+        delegate.onSubscribe(subscription);
     }
 
     /**
@@ -209,7 +210,7 @@ public void assertTerminalEvent() {
      * @throws AssertionError if a terminal event notification was received
      */
     public void assertNoTerminalEvent() {
-        if (onCompleteEvents.size() != 0 && onErrorEvents.size() != 0) {
+        if (onCompleteEvents.size() > 0 || onErrorEvents.size() > 0) {
             throw new AssertionError("Terminal events received.");
         }
     }