Merge pull request #5 from cbeams/handle-negative-delays

Handle negative delay times

Author: benjchristensen

.travis.yml

@@ -2,3 +2,7 @@ language: java
 
 jdk:
   - oraclejdk8
+
+before_install:
+- export DISPLAY=:99.0
+- sh -e /etc/init.d/xvfb start

src/main/java/rx/schedulers/JavaFxScheduler.java

@@ -30,6 +30,8 @@
 
 import java.util.concurrent.TimeUnit;
 
+import static java.lang.Math.max;
+
 /**
  * Executes work on the JavaFx UI thread.
  * This scheduler should only be used with actions that execute quickly.
@@ -44,12 +46,6 @@ public static JavaFxScheduler getInstance() {
         return INSTANCE;
     }
 
-    private static void assertThatTheDelayIsValidForTheJavaFxTimer(long delay) {
-        if (delay < 0 || delay > Integer.MAX_VALUE) {
-            throw new IllegalArgumentException(String.format("The JavaFx timer only accepts non-negative delays up to %d milliseconds.", Integer.MAX_VALUE));
-        }
-    }
-
     @Override
     public Worker createWorker() {
         return new InnerJavaFxScheduler();
@@ -71,10 +67,9 @@ public boolean isUnsubscribed() {
 
         @Override
         public Subscription schedule(final Action0 action, long delayTime, TimeUnit unit) {
-            long delay = unit.toMillis(delayTime);
-            assertThatTheDelayIsValidForTheJavaFxTimer(delay);
             final BooleanSubscription s = BooleanSubscription.create();
 
+            final long delay = unit.toMillis(max(delayTime, 0));
             final Timeline timeline = new Timeline(new KeyFrame(Duration.millis(delay), new EventHandler<ActionEvent>() {
 
                 @Override

src/test/java/rx/schedulers/JavaFxSchedulerTest.java

@@ -73,25 +73,6 @@ public void run() {
         t.start();
     }
 
-    @Test
-    public void testInvalidDelayValues() {
-        final JavaFxScheduler scheduler = new JavaFxScheduler();
-        final Worker inner = scheduler.createWorker();
-        final Action0 action = mock(Action0.class);
-
-        exception.expect(IllegalArgumentException.class);
-        inner.schedulePeriodically(action, -1L, 100L, TimeUnit.SECONDS);
-
-        exception.expect(IllegalArgumentException.class);
-        inner.schedulePeriodically(action, 100L, -1L, TimeUnit.SECONDS);
-
-        exception.expect(IllegalArgumentException.class);
-        inner.schedulePeriodically(action, 1L + Integer.MAX_VALUE, 100L, TimeUnit.MILLISECONDS);
-
-        exception.expect(IllegalArgumentException.class);
-        inner.schedulePeriodically(action, 100L, 1L + Integer.MAX_VALUE / 1000, TimeUnit.SECONDS);
-    }
-
     @Test
     public void testPeriodicScheduling() throws Exception {
         final JavaFxScheduler scheduler = new JavaFxScheduler();
@@ -114,7 +95,7 @@ public void call() {
 
         inner.schedulePeriodically(action, 50, 200, TimeUnit.MILLISECONDS);
 
-        if (!latch.await(5000, TimeUnit.MILLISECONDS)) {
+        if (!latch.await(1, TimeUnit.SECONDS)) {
             fail("timed out waiting for tasks to execute");
         }