Remove excessive Test Resources output (#1173)

* Remove excessive Test Resources output

* Tests don't need to check for a log line since later they actually verify that the port is not bound any more

* Tests don't need to check for a log line since later they actually verify that the port is not bound any more

micronaut-maven-integration-tests/src/it/test-resources-custom-dependency/verify.groovy

@@ -2,7 +2,6 @@ File log = new File(basedir, 'build.log')
 assert log.exists()
 assert log.text.contains("BUILD SUCCESS") : "Build did not succeed"
 assert log.text.contains("Starting Micronaut Test Resources service") : "Test Resources service was not started"
-assert log.text.contains("Shutting down Micronaut Test Resources service") : "Test Resources service was not shutdown"
 assert !log.text.contains("Test Resources is configured in shared mode") : "Test Resources was configured in shared mode"
 
 String port = new File(basedir, "target/test-resources-port.txt").text

micronaut-maven-integration-tests/src/it/test-resources-failing-test/verify.groovy

@@ -2,7 +2,6 @@ File log = new File(basedir, 'build.log')
 assert log.exists()
 assert log.text.contains("BUILD FAILURE")
 assert log.text.contains("Starting Micronaut Test Resources service")
-assert log.text.contains("Shutting down Micronaut Test Resources service")
 assert !log.text.contains("Test Resources is configured in shared mode")
 
 String port = new File(basedir, "target/test-resources-port.txt").text

micronaut-maven-integration-tests/src/it/test-resources-run/verify.groovy

@@ -2,7 +2,6 @@ File log = new File(basedir, 'build.log')
 assert log.exists()
 assert log.text.contains("BUILD SUCCESS") : "Build did not succeed"
 assert log.text.contains("Starting Micronaut Test Resources service") : "Test Resources service was not started"
-assert log.text.contains("Shutting down Micronaut Test Resources service") : "Test Resources service was not shutdown"
 assert log.text.contains("Container postgres:latest started") : "postgres container was not started"
 assert log.text.contains("Startup completed in") : "Startup was not completed"
 

micronaut-maven-integration-tests/src/it/test-resources-shared-namespace/verify.groovy

@@ -3,7 +3,6 @@ assert log.exists()
 assert log.text.contains("BUILD SUCCESS") : "Build did not succeed"
 assert log.text.contains("Test Resources is configured in shared mode with the namespace: my-namespace") : "Test Resources was not configured in shared mode"
 assert log.text.contains("Starting Micronaut Test Resources service") : "Test Resources service was not started"
-assert log.text.contains("Shutting down Micronaut Test Resources service") : "Test Resources service was not shutdown"
 
 String port = new File(basedir, "target/test-resources-port.txt").text
 try (ServerSocket s = new ServerSocket(port as int)) {

micronaut-maven-integration-tests/src/it/test-resources-shared/verify.groovy

@@ -3,7 +3,6 @@ assert log.exists()
 assert log.text.contains("BUILD SUCCESS") : "Build did not succeed"
 assert log.text.contains("Test Resources is configured in shared mode") : "Test Resources was not configured in shared mode"
 assert log.text.contains("Starting Micronaut Test Resources service") : "Test Resources service was not started"
-assert log.text.contains("Shutting down Micronaut Test Resources service") : "Test Resources service was not shutdown"
 
 String port = new File(basedir, "target/test-resources-port.txt").text
 try (ServerSocket s = new ServerSocket(port as int)) {

micronaut-maven-integration-tests/src/it/test-resources-start-stop/verify.groovy

@@ -3,8 +3,6 @@ assert log.exists()
 assert log.text.contains("BUILD SUCCESS")
 
 String port = new File(basedir, "target/test-resources-port.txt").text
-assert log.text.contains("Test resources service already started on port " + port)
-assert log.text.contains("Shutting down Micronaut Test Resources service")
 
 try (ServerSocket s = new ServerSocket(port as int)) {
     assert s != null

micronaut-maven-integration-tests/src/it/test-resources/verify.groovy

@@ -2,7 +2,6 @@ File log = new File(basedir, 'build.log')
 assert log.exists()
 assert log.text.contains("BUILD SUCCESS") : "Build did not succeed"
 assert log.text.contains("Starting Micronaut Test Resources service") : "Test Resources service was not started"
-assert log.text.contains("Shutting down Micronaut Test Resources service") : "Test Resources service was not shutdown"
 assert !log.text.contains("Test Resources is configured in shared mode") : "Test Resources was configured in shared mode"
 
 String port = new File(basedir, "target/test-resources-port.txt").text

micronaut-maven-plugin/src/main/java/io/micronaut/maven/RunMojo.java

@@ -594,7 +594,7 @@ private void maybeStartTestResourcesServer() throws MojoExecutionException {
     }
 
     private void maybeStopTestResourcesServer() throws MojoExecutionException {
-        testResourcesHelper.stop();
+        testResourcesHelper.stop(false);
     }
 
     private boolean compileProject() {

micronaut-maven-plugin/src/main/java/io/micronaut/maven/testresources/StopTestResourcesServerMojo.java

@@ -58,7 +58,7 @@ public final void execute() throws MojoExecutionException {
                 dependencyResolutionService, toolchainManager, testResourcesVersion,
                 classpathInference, testResourcesDependencies, sharedServerNamespace,
                 debugServer);
-        helper.stop();
+        helper.stop(false);
     }
 
 }

micronaut-maven-plugin/src/main/java/io/micronaut/maven/testresources/TestResourcesHelper.java

@@ -15,6 +15,7 @@
  */
 package io.micronaut.maven.testresources;
 
+import io.micronaut.core.io.socket.SocketUtils;
 import io.micronaut.maven.services.DependencyResolutionService;
 import io.micronaut.testresources.buildtools.MavenDependency;
 import io.micronaut.testresources.buildtools.ServerFactory;
@@ -273,30 +274,48 @@ private List<MavenDependency> getApplicationDependencies() {
 
     /**
      * Contains the logic to stop the Test Resources Service.
+     *
+     * @param quiet Whether to perform logging or not.
      */
-    public void stop() throws MojoExecutionException {
+    public void stop(boolean quiet) throws MojoExecutionException {
         if (!enabled) {
             return;
         }
         if (isKeepAlive()) {
-            log.info("Keeping Micronaut Test Resources service alive");
+            log("Keeping Micronaut Test Resources service alive", quiet);
             return;
         }
         try {
             Optional<ServerSettings> optionalServerSettings = ServerUtils.readServerSettings(getServerSettingsDirectory());
-            if (optionalServerSettings.isPresent() && ServerUtils.isServerStarted(optionalServerSettings.get().getPort())) {
-                log.info("Shutting down Micronaut Test Resources service");
+            if (optionalServerSettings.isPresent() && isServerStarted(optionalServerSettings.get().getPort())) {
+                log("Shutting down Micronaut Test Resources service", quiet);
                 doStop();
             } else {
-                if (log.isDebugEnabled()) {
-                    log.debug("Cannot find Micronaut Test Resources service settings, server may already be shutdown.");
-                }
+                log("Cannot find Micronaut Test Resources service settings, server may already be shutdown", quiet);
             }
         } catch (Exception e) {
             throw new MojoExecutionException("Unable to stop test resources server", e);
         }
     }
 
+    private static boolean isServerStarted(int port) {
+        if (System.getProperty("test.resources.internal.server.started") != null) {
+            return Boolean.getBoolean("test.resources.internal.server.started");
+        } else {
+            return !SocketUtils.isTcpPortAvailable(port);
+        }
+    }
+
+    private void log(String message, boolean quiet) {
+        if (quiet) {
+            if (log.isDebugEnabled()) {
+                log.debug(message);
+            }
+        } else {
+            log.info(message);
+        }
+    }
+
     private void doStop() throws IOException, MojoExecutionException {
         try {
             Path settingsDirectory = getServerSettingsDirectory();

micronaut-maven-plugin/src/main/java/io/micronaut/maven/testresources/TestResourcesLifecycleExtension.java

@@ -107,7 +107,7 @@ public void afterSessionEnd(MavenSession session) {
                         helper.setSharedServerNamespace(sharedServerNamespace);
                     }
                     try {
-                        helper.stop();
+                        helper.stop(true);
                     } catch (Exception e) {
                         logger.error(e.getMessage(), e);
                     }