Improve controller tests

lighty-core/lighty-controller-guice-di/src/test/java/io/lighty/core/controller/guice/tests/GuiceDITest.java

@@ -50,7 +50,7 @@ public void init() throws ExecutionException, InterruptedException, Configuratio
     public void shutdown() {
         try {
             if (lightyController != null) {
-                lightyController.shutdown();
+                lightyController.shutdown().get();
             }
         } catch (Exception e) {
             LOG.error("Shutdown of LightyController failed", e);

lighty-core/lighty-controller-spring-di/src/test/java/io/lighty/core/controller/spring/LightyCoreSpringConfigurationTest.java

@@ -198,7 +198,7 @@ public LightyController initLightyController() throws LightyLaunchException, Int
         public void shutdownLightyController(LightyController lightyController) throws LightyLaunchException {
             try {
                 LOG.info("Shutting down LightyController ...");
-                lightyController.shutdown();
+                lightyController.shutdown().get();
             } catch (Exception e) {
                 throw new LightyLaunchException("Could not shutdown LightyController", e);
             }

lighty-core/lighty-controller/src/test/java/io/lighty/core/controller/api/LightyModuleTest.java

@@ -24,9 +24,10 @@
 import org.testng.annotations.Test;
 
 public class LightyModuleTest {
-    private static long MAX_INIT_TIMEOUT = 15000L;
-    private static long MAX_SHUTDOWN_TIMEOUT = 15000L;
-    private static long SLEEP_AFTER_SHUTDOWN_TIMEOUT = 800L;
+    private static final long MAX_INIT_TIMEOUT = 15000L;
+    private static final long MAX_SHUTDOWN_TIMEOUT = 15000L;
+    private static final long SLEEP_AFTER_SHUTDOWN_TIMEOUT = 800L;
+
     private ExecutorService executorService;
     private LightyModule moduleUnderTest;
 
@@ -55,7 +56,7 @@ public void shutdownExecutor() {
     @Test
     public void testStartShutdown() throws Exception {
         this.moduleUnderTest = getModuleUnderTest(getExecutorService());
-        startLightyModuleAndFailIfTimedOut();
+        this.moduleUnderTest.start().get(MAX_INIT_TIMEOUT, TimeUnit.MILLISECONDS);
         Mockito.verify(executorService, Mockito.times(1)).execute(Mockito.any());
         this.moduleUnderTest.shutdown(MAX_SHUTDOWN_TIMEOUT, TimeUnit.MILLISECONDS);
         Mockito.verify(executorService, Mockito.times(2)).execute(Mockito.any());
@@ -71,18 +72,16 @@ public void testStartStop_whenAlreadyStartedStopped() throws Exception {
             Assert.fail("Init timed out.", e);
         }
         Mockito.verify(executorService, Mockito.times(1)).execute(Mockito.any());
-        this.moduleUnderTest.shutdown();
+        this.moduleUnderTest.shutdown(MAX_SHUTDOWN_TIMEOUT, TimeUnit.MILLISECONDS);
         Mockito.verify(executorService, Mockito.times(2)).execute(Mockito.any());
-        Thread.sleep(SLEEP_AFTER_SHUTDOWN_TIMEOUT);
-        this.moduleUnderTest.shutdown();
+        this.moduleUnderTest.shutdown(MAX_SHUTDOWN_TIMEOUT, TimeUnit.MILLISECONDS);
         Mockito.verify(executorService, Mockito.times(2)).execute(Mockito.any());
     }
 
     @Test
     public void testShutdown_before_start() throws Exception {
         this.moduleUnderTest = getModuleUnderTest(getExecutorService());
         this.moduleUnderTest.shutdown(MAX_SHUTDOWN_TIMEOUT, TimeUnit.MILLISECONDS);
-
         Mockito.verify(executorService, Mockito.times(0)).execute(Mockito.any());
     }
 
@@ -143,12 +142,4 @@ private Future<Boolean> startBlockingOnLightyModuleInterface() throws Interrupte
         Thread.sleep(MAX_INIT_TIMEOUT);
         return startFuture;
     }
-
-    private void startLightyModuleAndFailIfTimedOut() throws ExecutionException, InterruptedException {
-        try {
-            this.moduleUnderTest.start().get(MAX_INIT_TIMEOUT, TimeUnit.MILLISECONDS);
-        } catch (TimeoutException e) {
-            Assert.fail("Init timed out.", e);
-        }
-    }
 }

lighty-core/lighty-controller/src/test/java/io/lighty/core/controller/impl/tests/LightyControllerMountPointTetst.java → lighty-core/lighty-controller/src/test/java/io/lighty/core/controller/impl/tests/LightyControllerMountPointTest.java

@@ -17,7 +17,7 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-public class LightyControllerMountPointTetst extends LightyControllerTestBase {
+public class LightyControllerMountPointTest extends LightyControllerTestBase {
 
     @Test
     public void domMountPointServiceTest() throws Exception {

lighty-modules/lighty-restconf-nb-community/src/test/java/io/lighty/modules/northbound/restconf/community/impl/tests/CommunityRestConfTestBase.java

@@ -60,7 +60,7 @@ public void startControllerAndRestConf() throws Exception {
         communityRestConf = builder.build();
 
         LOG.info("Starting CommunityRestConf (waiting 10s after start)");
-        communityRestConf.start();
+        communityRestConf.start().get(10_000, TimeUnit.MILLISECONDS);
         LOG.info("CommunityRestConf started");
     }