remove direct call to System.out.println() in tests

Author: cliserkad

pom.xml

@@ -360,13 +360,22 @@
         </dependency>
 
         <!--to avoid complaints during tests -->
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
-            <version>2.0.17</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>2.0.17</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.maven</groupId>
+			<artifactId>maven-slf4j-provider</artifactId>
+			<version>3.9.9</version>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.sisu</groupId>
+			<artifactId>org.eclipse.sisu.plexus</artifactId>
+			<version>0.3.5</version>
+		</dependency>
+	</dependencies>
 
     <distributionManagement>
         <snapshotRepository>

src/test/java/pl/project13/log/CombinedLogger.java

@@ -0,0 +1,9 @@
+package pl.project13.log;
+
+import org.apache.maven.plugin.logging.Log;
+import org.slf4j.Logger;
+import pl.project13.core.log.LogInterface;
+
+public interface CombinedLogger extends Logger, LogInterface, Log {
+
+}

src/test/java/pl/project13/log/MavenLogger.java

@@ -0,0 +1,104 @@
+package pl.project13.log;
+
+import org.apache.maven.monitor.logging.DefaultLog;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.logging.Log;
+import org.slf4j.ILoggerFactory;
+import org.slf4j.Logger;
+import org.slf4j.helpers.MessageFormatter;
+
+import org.slf4j.impl.MavenSimpleLogger;
+import org.slf4j.impl.MavenSimpleLoggerFactory;
+import org.slf4j.impl.SimpleLoggerFactory;
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+
+/**
+ * Attempts to route logging to Maven Plugin / Mojo output during Maven builds.
+ * Falls back to System.out if routing fails.
+ */
+public class MavenLogger implements ILoggerFactory, InvocationHandler {
+	private static final MavenLogger INSTANCE = new MavenLogger();
+	private static final CombinedLogger PROXY = (CombinedLogger) Proxy.newProxyInstance(ClassLoader.getSystemClassLoader(), new Class[] { CombinedLogger.class }, INSTANCE);
+
+	private Logger logger;
+	private AbstractMojo mojo;
+
+	private MavenLogger() {
+		this.mojo = null;
+		logger = new SimpleLoggerFactory().getLogger(MavenLogger.class.getName());
+	}
+
+	public static CombinedLogger bindToMojo(final AbstractMojo mojo) {
+		if(mojo == null)
+			throw new IllegalArgumentException(new NullPointerException("mojo may not be null"));
+		if(INSTANCE.mojo != mojo) {
+			mojo.getPluginContext().
+			mojo.setLog(PROXY);
+		}
+		return PROXY;
+	}
+
+	public static CombinedLogger getLogger() {
+		return PROXY;
+	}
+
+	private boolean isBound() {
+		return mojo != null;
+	}
+
+	private Object loggingObject() {
+		return mojo.getLog();
+	}
+
+	@Override
+	public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+		if(method.getName().equals("getName")) {
+			return MavenLogger.class.getName();
+		}
+
+		// reroute level checks to mojo logger
+		if(method.getName().matches("is(Trace|Debug|Info|Warn|Error)Enabled")) {
+			if(!isBound())
+				return true;
+			else {
+				final String methodName = method.getName().replace("Trace", "Debug");
+				return Logger.class.getMethod(methodName).invoke(loggingObject());
+			}
+		}
+
+		if(method.getName().matches("trace|debug|info|warn|error")) {
+			if(isBound()) {
+				final String methodName = method.getName().replace("trace", "debug");
+				Logger.class.getMethod(methodName, String.class).invoke(loggingObject(), formatIntercepted(method, args));
+				return null;
+			} else {
+				System.out.println("unbound " + formatIntercepted(method, args));
+				return null;
+			}
+		}
+
+		System.out.println("Unhandled method: " + method.getName());
+		return null;
+	}
+
+	public String formatIntercepted(Method method, Object[] args) throws NoSuchMethodException, IllegalAccessException, InvocationTargetException {
+		if(args.length == 1)
+			return args[0].toString();
+		args[0] = args[0].toString();
+		if(args.length > 1 && args[1] instanceof Object[]) {
+			return MessageFormatter.class.getMethod("arrayFormat", method.getParameterTypes()).invoke(null, args).toString();
+		} else {
+			return MessageFormatter.class.getMethod("format", method.getParameterTypes()).invoke(null, args).toString();
+		}
+	}
+
+	@Override
+	public Logger getLogger(String name) {
+		return PROXY;
+	}
+
+}

src/test/java/pl/project13/maven/git/FileSystemMavenSandbox.java

@@ -25,6 +25,7 @@
 import javax.annotation.Nullable;
 import org.apache.commons.io.FileUtils;
 import org.apache.maven.project.MavenProject;
+import pl.project13.log.MavenLogger;
 
 /**
  * Quick and dirty maven projects tree structure to create on disk during integration tests. Can
@@ -73,7 +74,9 @@ public FileSystemMavenSandbox withChildProject(String childProjectDirName, Strin
 
   @Nonnull
   public FileSystemMavenSandbox withGitRepoInParent(@Nonnull AvailableGitTestRepo repo) {
-    gitRepoSourceDir = repo.getDir();
+		MavenLogger.getLogger().info("Will prepare sandbox repository based on: [" + repo.getDir() + "]");
+		MavenLogger.getLogger().info(MavenLogger.getLogger().getClass().getName());
+		gitRepoSourceDir = repo.getDir();
     gitRepoTargetDir = parentProject.getBasedir();
     return this;
   }

src/test/java/pl/project13/maven/git/GitCommitIdMojoIntegrationTest.java

@@ -50,7 +50,7 @@ public class GitCommitIdMojoIntegrationTest extends GitIntegrationTest {
   @ParameterizedTest
   @MethodSource("useNativeGit")
   public void shouldIncludeExpectedProperties(boolean useNativeGit) throws Exception {
-    // given
+		// given
     mavenSandbox
         .withParentProject("my-jar-project", "jar")
         .withNoChildProject()

src/test/java/pl/project13/maven/git/GitIntegrationTest.java

@@ -36,13 +36,17 @@
 import javax.annotation.Nonnull;
 import org.apache.commons.io.FileUtils;
 import org.apache.maven.execution.MavenSession;
+import org.apache.maven.monitor.logging.DefaultLog;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.settings.Settings;
 import org.eclipse.jgit.api.Git;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.params.provider.Arguments;
+import org.slf4j.Logger;
+import org.slf4j.spi.SLF4JServiceProvider;
 import pl.project13.core.CommitIdPropertiesOutputFormat;
+import pl.project13.log.MavenLogger;
 
 /**
  * Base class for various Testcases to verify that the git-commit-id-plugin works properly.
@@ -83,6 +87,7 @@ public void setUp() throws Exception {
     mavenSandbox = new FileSystemMavenSandbox(currSandbox);
     mojo = spy(GitCommitIdMojo.class);
     initializeMojoWithDefaults(mojo);
+		MavenLogger.bindToMojo(mojo);
   }
 
   @AfterEach