Update tests and flip implementation logic to match naming

ReactiveX · Sep 10, 2017 · 500df33 · 500df33
1 parent bae194c
commit 500df33
Show file tree

Hide file tree

Showing 12 changed files with 29 additions and 29 deletions.
diff --git a/src/main/java/io/reactivex/internal/observers/CallbackCompletableObserver.java b/src/main/java/io/reactivex/internal/observers/CallbackCompletableObserver.java
@@ -87,6 +87,6 @@ public boolean isDisposed() {
 
     @Override
     public boolean hasCustomOnError() {
-        return onError == this;
+        return onError != this;
     }
 }
diff --git a/src/main/java/io/reactivex/internal/observers/ConsumerSingleObserver.java b/src/main/java/io/reactivex/internal/observers/ConsumerSingleObserver.java
@@ -79,6 +79,6 @@ public boolean isDisposed() {
 
     @Override
     public boolean hasCustomOnError() {
-        return onError == Functions.ON_ERROR_MISSING;
+        return onError != Functions.ON_ERROR_MISSING;
     }
 }
diff --git a/src/main/java/io/reactivex/internal/observers/EmptyCompletableObserver.java b/src/main/java/io/reactivex/internal/observers/EmptyCompletableObserver.java
@@ -58,6 +58,6 @@ public void onSubscribe(Disposable d) {
 
     @Override
     public boolean hasCustomOnError() {
-        return true;
+        return false;
     }
 }
diff --git a/src/main/java/io/reactivex/internal/observers/LambdaObserver.java b/src/main/java/io/reactivex/internal/observers/LambdaObserver.java
@@ -107,6 +107,6 @@ public boolean isDisposed() {
 
     @Override
     public boolean hasCustomOnError() {
-        return onError == Functions.ON_ERROR_MISSING;
+        return onError != Functions.ON_ERROR_MISSING;
     }
 }
diff --git a/src/main/java/io/reactivex/internal/operators/maybe/MaybeCallbackObserver.java b/src/main/java/io/reactivex/internal/operators/maybe/MaybeCallbackObserver.java
@@ -100,6 +100,6 @@ public void onComplete() {
 
     @Override
     public boolean hasCustomOnError() {
-        return onError == Functions.ON_ERROR_MISSING;
+        return onError != Functions.ON_ERROR_MISSING;
     }
 }
diff --git a/src/main/java/io/reactivex/internal/subscribers/LambdaSubscriber.java b/src/main/java/io/reactivex/internal/subscribers/LambdaSubscriber.java
@@ -121,6 +121,6 @@ public void cancel() {
 
     @Override
     public boolean hasCustomOnError() {
-        return onError == Functions.ON_ERROR_MISSING;
+        return onError != Functions.ON_ERROR_MISSING;
     }
 }
diff --git a/src/test/java/io/reactivex/internal/observers/CallbackCompletableObserverTest.java b/src/test/java/io/reactivex/internal/observers/CallbackCompletableObserverTest.java
@@ -8,18 +8,18 @@
 public final class CallbackCompletableObserverTest {
 
     @Test
-    public void hasMissingErrorConsumer() {
+    public void emptyActionShouldReportNoCustomOnError() {
         CallbackCompletableObserver o = new CallbackCompletableObserver(Functions.EMPTY_ACTION);
 
-        assertTrue(o.hasCustomOnError());
+        assertFalse(o.hasCustomOnError());
     }
 
     @Test
-    public void isNotMissingErrorConsumer() {
+    public void customOnErrorShouldReportCustomOnError() {
         CallbackCompletableObserver o = new CallbackCompletableObserver(Functions.<Throwable>emptyConsumer(),
                 Functions.EMPTY_ACTION);
 
-        assertFalse(o.hasCustomOnError());
+        assertTrue(o.hasCustomOnError());
     }
 
 }
diff --git a/src/test/java/io/reactivex/internal/observers/ConsumerSingleObserverTest.java b/src/test/java/io/reactivex/internal/observers/ConsumerSingleObserverTest.java
@@ -8,19 +8,19 @@
 public final class ConsumerSingleObserverTest {
 
     @Test
-    public void hasMissingErrorConsumer() {
+    public void onErrorMissingShouldReportNoCustomOnError() {
         ConsumerSingleObserver<Integer> o = new ConsumerSingleObserver<Integer>(Functions.<Integer>emptyConsumer(),
                 Functions.ON_ERROR_MISSING);
 
-        assertTrue(o.hasCustomOnError());
+        assertFalse(o.hasCustomOnError());
     }
 
     @Test
-    public void isNotMissingErrorConsumer() {
+    public void customOnErrorShouldReportCustomOnError() {
         ConsumerSingleObserver<Integer> o = new ConsumerSingleObserver<Integer>(Functions.<Integer>emptyConsumer(),
                 Functions.<Throwable>emptyConsumer());
 
-        assertFalse(o.hasCustomOnError());
+        assertTrue(o.hasCustomOnError());
     }
 
 }
diff --git a/src/test/java/io/reactivex/internal/observers/EmptyCompletableObserverTest.java b/src/test/java/io/reactivex/internal/observers/EmptyCompletableObserverTest.java
@@ -2,14 +2,14 @@
 
 import org.junit.Test;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
 
 public final class EmptyCompletableObserverTest {
 
     @Test
-    public void hasMissingErrorConsumer() {
+    public void defaultShouldReportNoCustomOnError() {
         EmptyCompletableObserver o = new EmptyCompletableObserver();
 
-        assertTrue(o.hasCustomOnError());
+        assertFalse(o.hasCustomOnError());
     }
 }
diff --git a/src/test/java/io/reactivex/internal/observers/LambdaObserverTest.java b/src/test/java/io/reactivex/internal/observers/LambdaObserverTest.java
@@ -345,22 +345,22 @@ public void accept(Disposable s) throws Exception {
     }
 
     @Test
-    public void hasMissingErrorConsumer() {
+    public void onErrorMissingShouldReportNoCustomOnError() {
         LambdaObserver<Integer> o = new LambdaObserver<Integer>(Functions.<Integer>emptyConsumer(),
                 Functions.ON_ERROR_MISSING,
                 Functions.EMPTY_ACTION,
                 Functions.<Disposable>emptyConsumer());
 
-        assertTrue(o.hasCustomOnError());
+        assertFalse(o.hasCustomOnError());
     }
 
     @Test
-    public void isNotMissingErrorConsumer() {
+    public void customOnErrorShouldReportCustomOnError() {
         LambdaObserver<Integer> o = new LambdaObserver<Integer>(Functions.<Integer>emptyConsumer(),
                 Functions.<Throwable>emptyConsumer(),
                 Functions.EMPTY_ACTION,
                 Functions.<Disposable>emptyConsumer());
 
-        assertFalse(o.hasCustomOnError());
+        assertTrue(o.hasCustomOnError());
     }
 }
diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeCallbackObserverTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeCallbackObserverTest.java
@@ -122,20 +122,20 @@ public void run() throws Exception {
     }
 
     @Test
-    public void hasMissingErrorConsumer() {
+    public void onErrorMissingShouldReportNoCustomOnError() {
         MaybeCallbackObserver<Integer> o = new MaybeCallbackObserver<Integer>(Functions.<Integer>emptyConsumer(),
                 Functions.ON_ERROR_MISSING,
                 Functions.EMPTY_ACTION);
 
-        assertTrue(o.hasCustomOnError());
+        assertFalse(o.hasCustomOnError());
     }
 
     @Test
-    public void isNotMissingErrorConsumer() {
+    public void customOnErrorShouldReportCustomOnError() {
         MaybeCallbackObserver<Integer> o = new MaybeCallbackObserver<Integer>(Functions.<Integer>emptyConsumer(),
                 Functions.<Throwable>emptyConsumer(),
                 Functions.EMPTY_ACTION);
 
-        assertFalse(o.hasCustomOnError());
+        assertTrue(o.hasCustomOnError());
     }
 }
diff --git a/src/test/java/io/reactivex/internal/subscribers/LambdaSubscriberTest.java b/src/test/java/io/reactivex/internal/subscribers/LambdaSubscriberTest.java
@@ -350,22 +350,22 @@ public void accept(Subscription s) throws Exception {
     }
 
     @Test
-    public void hasMissingErrorConsumer() {
+    public void onErrorMissingShouldReportNoCustomOnError() {
         LambdaSubscriber<Integer> o = new LambdaSubscriber<Integer>(Functions.<Integer>emptyConsumer(),
                 Functions.ON_ERROR_MISSING,
                 Functions.EMPTY_ACTION,
                 FlowableInternalHelper.RequestMax.INSTANCE);
 
-        assertTrue(o.hasCustomOnError());
+        assertFalse(o.hasCustomOnError());
     }
 
     @Test
-    public void isNotMissingErrorConsumer() {
+    public void customOnErrorShouldReportCustomOnError() {
         LambdaSubscriber<Integer> o = new LambdaSubscriber<Integer>(Functions.<Integer>emptyConsumer(),
                 Functions.<Throwable>emptyConsumer(),
                 Functions.EMPTY_ACTION,
                 FlowableInternalHelper.RequestMax.INSTANCE);
 
-        assertFalse(o.hasCustomOnError());
+        assertTrue(o.hasCustomOnError());
     }
 }