Merge pull request #308 from NorthNick/master

benjchristensen · benjchristensen · commit 9ffd288439b5 · 2013-07-22T09:35:26.000-07:00
Ensure now() is always updated in TestScheduler.advanceTo/By
diff --git a/rxjava-core/src/main/java/rx/concurrency/TestScheduler.java b/rxjava-core/src/main/java/rx/concurrency/TestScheduler.java
@@ -80,14 +80,14 @@ private void triggerActions(long targetTimeInNanos) {
         while (!queue.isEmpty()) {
             TimedAction<?> current = queue.peek();
             if (current.time > targetTimeInNanos) {
-                time = targetTimeInNanos;
                 break;
             }
             time = current.time;
             queue.remove();
             // because the queue can have wildcards we have to ignore the type T for the state
             ((Func2<Scheduler, Object, Subscription>) current.action).call(current.scheduler, current.state);
         }
+        time = targetTimeInNanos;
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -80,14 +80,14 @@ private void triggerActions(long targetTimeInNanos) {`
`80`	`80`	`while (!queue.isEmpty()) {`
`81`	`81`	`TimedAction<?> current = queue.peek();`
`82`	`82`	`if (current.time > targetTimeInNanos) {`
`83`		`- time = targetTimeInNanos;`
`84`	`83`	`break;`
`85`	`84`	`}`
`86`	`85`	`time = current.time;`
`87`	`86`	`queue.remove();`
`88`	`87`	`// because the queue can have wildcards we have to ignore the type T for the state`
`89`	`88`	`((Func2<Scheduler, Object, Subscription>) current.action).call(current.scheduler, current.state);`
`90`	`89`	`}`
	`90`	`+ time = targetTimeInNanos;`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`@Override`