Cleanup controller tests

Ensure that we wait until lighty.io controller is started
or stopped.

JIRA: LIGHTY-299
Signed-off-by: Ivan Hrasko <ivan.hrasko@pantheon.tech>
(cherry picked from commit f82ca5f)

Author: ihrasko

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

@@ -214,7 +214,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;
 

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

@@ -53,7 +53,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");
     }