Merge FakeScheduledExecutorService with the implementation already in the master branch

davidtorres · davidtorres · commit 7c1c98ed5346 · 2016-12-06T12:59:23.000-05:00
diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/FakeScheduledExecutorService.java b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/FakeScheduledExecutorService.java
@@ -53,6 +53,40 @@ public FakeScheduledExecutorService() {
     DateTimeUtils.setCurrentMillisFixed(currentTime.getMillis());
   }
 
+  @Override
+  public ScheduledFuture<?> schedule(Runnable command, long delay, TimeUnit unit) {
+    return schedulePendingCallable(
+        new PendingCallable<>(
+            new Duration(unit.toMillis(delay)), command, PendingCallableType.NORMAL));
+  }
+
+  @Override
+  public <V> ScheduledFuture<V> schedule(Callable<V> callable, long delay, TimeUnit unit) {
+    return schedulePendingCallable(
+        new PendingCallable<>(
+            new Duration(unit.toMillis(delay)), callable, PendingCallableType.NORMAL));
+  }
+
+  @Override
+  public ScheduledFuture<?> scheduleAtFixedRate(
+      Runnable command, long initialDelay, long period, TimeUnit unit) {
+    return schedulePendingCallable(
+        new PendingCallable<>(
+            new Duration(unit.toMillis(initialDelay)), command, PendingCallableType.FIXED_RATE));
+  }
+
+  @Override
+  public ScheduledFuture<?> scheduleWithFixedDelay(
+      Runnable command, long initialDelay, long delay, TimeUnit unit) {
+    return schedulePendingCallable(
+        new PendingCallable<>(
+            new Duration(unit.toMillis(initialDelay)), command, PendingCallableType.FIXED_DELAY));
+  }
+
+  public void tick(long time, TimeUnit unit) {
+    advanceTime(Duration.millis(unit.toMillis(time)));
+  }
+
   /**
    * This will advance the reference time of the executor and execute (in the same thread) any
    * outstanding callable which execution time has passed.
@@ -134,36 +168,6 @@ public void execute(Runnable command) {
     delegate.execute(command);
   }
 
-  @Override
-  public ScheduledFuture<?> schedule(Runnable command, long delay, TimeUnit unit) {
-    return schedulePendingCallable(
-        new PendingCallable<>(
-            new Duration(unit.toMillis(delay)), command, PendingCallableType.NORMAL));
-  }
-
-  @Override
-  public <V> ScheduledFuture<V> schedule(Callable<V> callable, long delay, TimeUnit unit) {
-    return schedulePendingCallable(
-        new PendingCallable<>(
-            new Duration(unit.toMillis(delay)), callable, PendingCallableType.NORMAL));
-  }
-
-  @Override
-  public ScheduledFuture<?> scheduleAtFixedRate(
-      Runnable command, long initialDelay, long period, TimeUnit unit) {
-    return schedulePendingCallable(
-        new PendingCallable<>(
-            new Duration(unit.toMillis(initialDelay)), command, PendingCallableType.FIXED_RATE));
-  }
-
-  @Override
-  public ScheduledFuture<?> scheduleWithFixedDelay(
-      Runnable command, long initialDelay, long delay, TimeUnit unit) {
-    return schedulePendingCallable(
-        new PendingCallable<>(
-            new Duration(unit.toMillis(initialDelay)), command, PendingCallableType.FIXED_DELAY));
-  }
-
   <V> ScheduledFuture<V> schedulePendingCallable(PendingCallable<V> callable) {
     if (shutdown.get()) {
       throw new IllegalStateException("This executor has been shutdown");
diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/FlowControllerTest.java b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/FlowControllerTest.java
@@ -50,15 +50,21 @@ public void testInvalidArguments() throws Exception {
     try {
       flowController.reserve(-1, 1);
       fail("Must have thrown an illegal argument error");
-    } catch (IllegalArgumentException expected) { }
+    } catch (IllegalArgumentException expected) { 
+      // Expected
+    }
     try {
       flowController.reserve(1, -1);
       fail("Must have thrown an illegal argument error");
-    } catch (IllegalArgumentException expected) { }
+    } catch (IllegalArgumentException expected) { 
+      // Expected
+    }
     try {
       flowController.reserve(0, 1);
       fail("Must have thrown an illegal argument error");
-    } catch (IllegalArgumentException expected) { }
+    } catch (IllegalArgumentException expected) { 
+      // Expected
+    }
   }
 
   @Test
diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/SubscriberImplTest.java b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/SubscriberImplTest.java
@@ -17,7 +17,6 @@
 package com.google.cloud.pubsub;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
 
 import com.google.cloud.pubsub.FakeSubscriberServiceImpl.ModifyAckDeadline;
 import com.google.cloud.pubsub.Subscriber.Builder;
