Tested unsubscription, too

jmhofer · jmhofer · commit 5f34896edacf · 2013-04-26T15:03:44.000+02:00
diff --git a/rxjava-core/src/main/java/rx/Scheduler.java b/rxjava-core/src/main/java/rx/Scheduler.java
@@ -107,7 +107,7 @@ public <T> Subscription schedulePeriodically(T state, final Func2<Scheduler, T,
         final Func2<Scheduler, T, Subscription> recursiveAction = new Func2<Scheduler, T, Subscription>() {
             @Override
             public Subscription call(Scheduler scheduler, T state0) {
-                if (! complete.get()) {
+                if (!complete.get()) {
                     long startedAt = now();
                     final Subscription sub1 = action.call(scheduler, state0);
                     long timeTakenByActionInNanos = TimeUnit.MILLISECONDS.toNanos(now() - startedAt);
@@ -343,7 +343,7 @@ public void testPeriodicScheduling() {
             final Func1<Long, Void> calledOp = mock(Func1.class);
             
             final TestScheduler scheduler = new TestScheduler();
-            scheduler.schedulePeriodically(new Action0() {
+            Subscription subscription = scheduler.schedulePeriodically(new Action0() {
                 @Override public void call() {
                     System.out.println(scheduler.now());
                     calledOp.call(scheduler.now());
@@ -369,6 +369,10 @@ public void testPeriodicScheduling() {
             scheduler.advanceTimeBy(5L, TimeUnit.SECONDS);
             inOrder.verify(calledOp, times(1)).call(5000L);
             inOrder.verify(calledOp, times(1)).call(7000L);
+            
+            subscription.unsubscribe();
+            scheduler.advanceTimeBy(11L, TimeUnit.SECONDS);
+            inOrder.verify(calledOp, never()).call(anyLong());
         }
     }
 }
