fixed tests

Author: vikas-cs07

cdap-common/src/test/java/io/cdap/cdap/common/internal/remote/RemoteTaskExecutorTest.java

@@ -16,7 +16,8 @@
 
 package io.cdap.cdap.common.internal.remote;
 
-import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.AbstractService;
+import com.google.common.util.concurrent.Service;
 import io.cdap.cdap.api.metrics.MetricsCollectionService;
 import io.cdap.cdap.api.metrics.MetricsContext;
 import io.cdap.cdap.api.service.worker.RemoteExecutionException;
@@ -39,6 +40,8 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.Executor;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 import org.apache.twill.common.Cancellable;
 import org.apache.twill.discovery.InMemoryDiscoveryService;
 import org.junit.After;
@@ -110,39 +113,69 @@ public byte[] decrypt(byte[] cipherData, byte[] associatedData) throws CipherExc
 
   private MetricsCollectionService createMockMetricsCollectionService() {
     return new MetricsCollectionService() {
+      private final AbstractService delegate = new AbstractService() {
+        @Override
+        protected void doStart() {
+          notifyStarted();
+        }
 
-      @Override
-      public ListenableFuture<State> start() {
-        return null;
-      }
+        @Override
+        protected void doStop() {
+          notifyStopped();
+        }
+      };
 
       @Override
-      public State startAndWait() {
-        return null;
+      public Service startAsync() {
+        delegate.startAsync();
+        return this;
       }
 
       @Override
       public boolean isRunning() {
-        return false;
+        return delegate.isRunning();
       }
 
       @Override
       public State state() {
-        return null;
+        return delegate.state();
       }
 
       @Override
-      public ListenableFuture<State> stop() {
-        return null;
+      public Service stopAsync() {
+        delegate.stopAsync();
+        return this;
       }
 
       @Override
-      public State stopAndWait() {
-        return null;
+      public void awaitRunning() {
+        delegate.awaitRunning();
       }
 
       @Override
-      public void addListener(final Listener listener, final Executor executor) {}
+      public void awaitRunning(long timeout, TimeUnit unit) throws TimeoutException {
+        delegate.awaitRunning(timeout, unit);
+      }
+
+      @Override
+      public void awaitTerminated() {
+        delegate.awaitTerminated();
+      }
+
+      @Override
+      public void awaitTerminated(long timeout, TimeUnit unit) throws TimeoutException {
+        delegate.awaitTerminated(timeout, unit);
+      }
+
+      @Override
+      public Throwable failureCause() {
+        return delegate.failureCause();
+      }
+
+      @Override
+      public void addListener(final Listener listener, final Executor executor) {
+        delegate.addListener(listener, executor);
+      }
 
       @Override
       public MetricsContext getContext(Map<String, String> context) {

cdap-common/src/test/java/io/cdap/cdap/common/service/CommandPortServiceTest.java

@@ -16,9 +16,6 @@
 
 package io.cdap.cdap.common.service;
 
-import com.google.common.util.concurrent.FutureCallback;
-import com.google.common.util.concurrent.Futures;
-import com.google.common.util.concurrent.MoreExecutors;
 import com.google.common.util.concurrent.Service;
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -63,20 +60,18 @@ public void testCommandPortServer() throws Exception {
                                                   .build();
 
     final CountDownLatch stopLatch = new CountDownLatch(1);
-    Futures.addCallback(server.start(), new FutureCallback<Service.State>() {
+    server.addListener(new Service.Listener() {
       @Override
-      public void onSuccess(Service.State result) {
+      public void terminated(Service.State from) {
         stopLatch.countDown();
       }
 
       @Override
-      public void onFailure(Throwable t) {
+      public void failed(Service.State from, Throwable failure) {
         stopLatch.countDown();
       }
-    },
-        MoreExecutors.directExecutor());
-    // wait a bit for service to start
-    TimeUnit.SECONDS.sleep(1);
+    }, Runnable::run);
+    server.startAsync().awaitRunning();
 
     try {
       for (int i = 0; i < 10; i++) {

cdap-common/src/test/java/io/cdap/cdap/common/service/RetryOnStartFailureServiceTest.java

@@ -27,7 +27,6 @@
 import java.util.concurrent.TimeoutException;
 import java.util.function.Supplier;
 import org.apache.twill.common.Threads;
-import com.google.common.util.concurrent.Service;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -61,7 +60,7 @@ public void failed(Service.State from, Throwable failure) {
       }
     }, Threads.SAME_THREAD_EXECUTOR);
 
-    service.start();
+    service.startAsync();
     Assert.assertTrue(failureLatch.await(1, TimeUnit.SECONDS));
     Assert.assertFalse(startLatch.await(100, TimeUnit.MILLISECONDS));
   }

cdap-common/src/test/java/io/cdap/cdap/common/service/RetryableScheduledServiceTest.java

@@ -45,7 +45,7 @@ protected long runTask() {
       }
     };
 
-    service.start();
+    service.startAsync();
     Assert.assertTrue(latch.await(5, TimeUnit.SECONDS));
     service.stopAsync().awaitTerminated();
   }
@@ -59,7 +59,7 @@ protected long runTask() throws Exception {
       }
     };
 
-    service.start();
+    service.startAsync();
     // Wait for the service to fail
     Tasks.waitFor(Service.State.FAILED, service::state, 5, TimeUnit.SECONDS, 10, TimeUnit.MILLISECONDS);
 
@@ -89,7 +89,7 @@ protected boolean shouldRetry(Exception ex) {
       }
     };
 
-    service.start();
+    service.startAsync();
     // Wait for the service to fail
     Tasks.waitFor(Service.State.FAILED, service::state, 5, TimeUnit.SECONDS, 10, TimeUnit.MILLISECONDS);
 
@@ -118,7 +118,7 @@ protected long runTask() throws Exception {
         return 1L;
       }
     };
-    service.start();
+    service.startAsync();
     Assert.assertTrue(latch.await(3, TimeUnit.SECONDS));
     service.stopAsync().awaitTerminated();
   }

cdap-common/src/test/java/io/cdap/cdap/common/utils/TimeBoundIteratorTest.java

@@ -34,7 +34,7 @@ public class TimeBoundIteratorTest {
   @Test
   public void testTimeBoundNotHit() {
     SettableTicker ticker = new SettableTicker(0);
-    Stopwatch stopwatch = new Stopwatch(ticker);
+    Stopwatch stopwatch = Stopwatch.createUnstarted(ticker);
 
     List<Integer> list = new ArrayList<>();
     list.add(0);
@@ -54,7 +54,7 @@ public void testTimeBoundNotHit() {
   @Test
   public void testTimeBoundImmediatelyHit() {
     SettableTicker ticker = new SettableTicker(0);
-    Stopwatch stopwatch = new Stopwatch(ticker);
+    Stopwatch stopwatch = Stopwatch.createUnstarted(ticker);
 
     List<Integer> list = new ArrayList<>();
     list.add(0);
@@ -70,7 +70,7 @@ public void testTimeBoundImmediatelyHit() {
   @Test
   public void testEarlyStop() {
     SettableTicker ticker = new SettableTicker(0);
-    Stopwatch stopwatch = new Stopwatch(ticker);
+    Stopwatch stopwatch = Stopwatch.createUnstarted(ticker);
 
     List<Integer> list = new ArrayList<>();
     list.add(0);

cdap-common/src/test/java/io/cdap/cdap/common/zookeeper/election/LeaderElectionInfoServiceTest.java

@@ -105,7 +105,7 @@ public void follower() {
           LOG.info("Follow: {}", participantId);
         }
       });
-      leaderElection.start();
+      leaderElection.startAsync();
       leaderElections.add(leaderElection);
     }