Merge pull request ReactiveX#312 from ReactiveX/jw/goodbyte-mockito

JakeWharton · web-flow · commit b0d7799e4453 · 2016-08-04T23:31:19.000-04:00
Swap out mocks for simple fakes.
diff --git a/rxandroid/build.gradle b/rxandroid/build.gradle
@@ -43,7 +43,6 @@ dependencies {
     compile 'io.reactivex:rxjava:1.1.6'
 
     testCompile 'junit:junit:4.12'
-    testCompile 'org.mockito:mockito-core:1.10.19'
     testCompile 'org.robolectric:robolectric:3.0'
 }
 
diff --git a/rxandroid/src/test/java/rx/android/schedulers/AndroidSchedulersTest.java b/rxandroid/src/test/java/rx/android/schedulers/AndroidSchedulersTest.java
@@ -16,13 +16,12 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-
 import rx.Scheduler;
 import rx.android.plugins.RxAndroidPlugins;
 import rx.android.plugins.RxAndroidSchedulersHook;
+import rx.android.testutil.EmptyScheduler;
 
 import static org.junit.Assert.assertSame;
-import static org.mockito.Mockito.mock;
 
 public class AndroidSchedulersTest {
 
@@ -33,7 +32,7 @@ public void setUpAndTearDown() {
 
     @Test
     public void mainThreadCallsThroughToHook() {
-        final Scheduler scheduler = mock(Scheduler.class);
+        final Scheduler scheduler = new EmptyScheduler();
         RxAndroidPlugins.getInstance().registerSchedulersHook(new RxAndroidSchedulersHook() {
             @Override public Scheduler getMainThreadScheduler() {
                 return scheduler;
diff --git a/rxandroid/src/test/java/rx/android/schedulers/LooperSchedulerTest.java b/rxandroid/src/test/java/rx/android/schedulers/LooperSchedulerTest.java
@@ -27,6 +27,7 @@
 import rx.Subscription;
 import rx.android.plugins.RxAndroidPlugins;
 import rx.android.plugins.RxAndroidSchedulersHook;
+import rx.android.testutil.CountingAction;
 import rx.exceptions.OnErrorNotImplementedException;
 import rx.functions.Action0;
 
@@ -36,9 +37,6 @@
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
 import static org.robolectric.shadows.ShadowLooper.idleMainLooper;
 import static org.robolectric.shadows.ShadowLooper.pauseMainLooper;
 import static org.robolectric.shadows.ShadowLooper.runUiThreadTasks;
@@ -67,57 +65,57 @@ public void tearDown() {
     public void schedulePostsActionImmediately() {
         Worker worker = scheduler.createWorker();
 
-        Action0 action = mock(Action0.class);
+        CountingAction action = new CountingAction();
         worker.schedule(action);
 
         runUiThreadTasks();
-        verify(action).call();
+        assertEquals(1, action.get());
     }
 
     @Test
     public void scheduleWithDelayPostsActionWithDelay() {
         Worker worker = scheduler.createWorker();
 
-        Action0 action = mock(Action0.class);
+        CountingAction action = new CountingAction();
         worker.schedule(action, 1, MINUTES);
 
         runUiThreadTasks();
-        verify(action, never()).call();
+        assertEquals(0, action.get());
 
         idleMainLooper(MINUTES.toMillis(1));
         runUiThreadTasks();
-        verify(action).call();
+        assertEquals(1, action.get());
     }
 
     @Test
     public void unsubscribeCancelsScheduledAction() {
         Worker worker = scheduler.createWorker();
 
-        Action0 action = mock(Action0.class);
+        CountingAction action = new CountingAction();
         Subscription subscription = worker.schedule(action);
         subscription.unsubscribe();
 
         runUiThreadTasks();
-        verify(action, never()).call();
+        assertEquals(0, action.get());
     }
 
     @Test
     public void unsubscribeCancelsScheduledActionWithDelay() {
         Worker worker = scheduler.createWorker();
 
-        Action0 action = mock(Action0.class);
+        CountingAction action = new CountingAction();
         Subscription subscription = worker.schedule(action, 1, MINUTES);
         subscription.unsubscribe();
 
         runUiThreadTasksIncludingDelayedTasks();
-        verify(action, never()).call();
+        assertEquals(0, action.get());
     }
 
     @Test
     public void unsubscribeState() {
         Worker worker = scheduler.createWorker();
 
-        Action0 action = mock(Action0.class);
+        Action0 action = new CountingAction();
         Subscription subscription = worker.schedule(action);
         assertFalse(subscription.isUnsubscribed());
 
@@ -127,7 +125,7 @@ public void unsubscribeState() {
 
     @Test
     public void schedulerHookIsUsed() {
-        final Action0 newAction = mock(Action0.class);
+        final CountingAction newAction = new CountingAction();
         final AtomicReference<Action0> actionRef = new AtomicReference<>();
         RxAndroidPlugins.getInstance().registerSchedulersHook(new RxAndroidSchedulersHook() {
             @Override public Action0 onSchedule(Action0 action) {
@@ -138,28 +136,28 @@ public void schedulerHookIsUsed() {
 
         Worker worker = scheduler.createWorker();
 
-        Action0 action = mock(Action0.class);
+        CountingAction action = new CountingAction();
         worker.schedule(action);
 
         // Verify our action was passed to the schedulers hook.
         assertSame(action, actionRef.get());
 
         // Verify the scheduled action was the one returned from the hook.
         runUiThreadTasks();
-        verify(newAction).call();
-        verify(action, never()).call();
+        assertEquals(1, newAction.get());
+        assertEquals(0, action.get());
     }
 
     @Test
     public void workerUnsubscriptionPreventsScheduling() {
         Worker worker = scheduler.createWorker();
         worker.unsubscribe();
 
-        Action0 action = mock(Action0.class);
+        CountingAction action = new CountingAction();
         worker.schedule(action);
 
         runUiThreadTasks();
-        verify(action, never()).call();
+        assertEquals(0, action.get());
     }
 
     @Test
@@ -176,41 +174,41 @@ public void workerUnsubscriptionDuringSchedulingCancelsScheduledAction() {
         Scheduler.Worker worker = scheduler.createWorker();
         workerRef.set(worker);
 
-        Action0 action = mock(Action0.class);
+        CountingAction action = new CountingAction();
         worker.schedule(action);
 
         runUiThreadTasks();
-        verify(action, never()).call();
+        assertEquals(0, action.get());
     }
 
     @Test
     public void workerUnsubscriptionCancelsScheduled() {
         Worker worker = scheduler.createWorker();
 
-        Action0 action = mock(Action0.class);
+        CountingAction action = new CountingAction();
         worker.schedule(action, 1, MINUTES);
 
         worker.unsubscribe();
 
         runUiThreadTasks();
-        verify(action, never()).call();
+        assertEquals(0, action.get());
     }
 
     @Test
     public void workerUnsubscriptionDoesNotAffectOtherWorkers() {
         Scheduler.Worker workerA = scheduler.createWorker();
-        Action0 actionA = mock(Action0.class);
+        CountingAction actionA = new CountingAction();
         workerA.schedule(actionA, 1, MINUTES);
 
         Scheduler.Worker workerB = scheduler.createWorker();
-        Action0 actionB = mock(Action0.class);
+        CountingAction actionB = new CountingAction();
         workerB.schedule(actionB, 1, MINUTES);
 
         workerA.unsubscribe();
 
         runUiThreadTasksIncludingDelayedTasks();
-        verify(actionA, never()).call();
-        verify(actionB).call();
+        assertEquals(0, actionA.get());
+        assertEquals(1, actionB.get());
     }
 
     @Test
diff --git a/rxandroid/src/test/java/rx/android/testutil/CountingAction.java b/rxandroid/src/test/java/rx/android/testutil/CountingAction.java
@@ -0,0 +1,24 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package rx.android.testutil;
+
+import java.util.concurrent.atomic.AtomicInteger;
+import rx.functions.Action0;
+
+public final class CountingAction extends AtomicInteger implements Action0 {
+    @Override
+    public void call() {
+        getAndIncrement();
+    }
+}
diff --git a/rxandroid/src/test/java/rx/android/testutil/EmptyScheduler.java b/rxandroid/src/test/java/rx/android/testutil/EmptyScheduler.java
@@ -0,0 +1,23 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package rx.android.testutil;
+
+import rx.Scheduler;
+
+public final class EmptyScheduler extends Scheduler {
+    @Override
+    public Worker createWorker() {
+      throw new UnsupportedOperationException();
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,6 @@ dependencies {`
`43`	`43`	`compile 'io.reactivex:rxjava:1.1.6'`
`44`	`44`
`45`	`45`	`testCompile 'junit:junit:4.12'`
`46`		`- testCompile 'org.mockito:mockito-core:1.10.19'`
`47`	`46`	`testCompile 'org.robolectric:robolectric:3.0'`
`48`	`47`	`}`
`49`	`48`