Add quiet and debug flags and also a simple debug configuration

utPLSQL · Pazus · Feb 14, 2019 · Feb 5, 2019 · Feb 6, 2019 · Feb 7, 2019
commit 8bdaf0f9edde93f269ffad73127d7e0b337fd686
diff --git a/src/main/java/org/utplsql/cli/LoggerConfiguration.java b/src/main/java/org/utplsql/cli/LoggerConfiguration.java
@@ -10,32 +10,55 @@
 import org.slf4j.LoggerFactory;
 import org.utplsql.api.TestRunner;
 
-public class LoggerConfiguration {
+class LoggerConfiguration {
 
-    static void configureDefault() {
+    static void configure(boolean silent, boolean debug) {
+        if ( silent )
+            configureSilent();
+        else if ( debug )
+            configureDebug();
+        else
+            configureDefault();
+    }
+
+    private static void configureSilent() {
         Logger root = (Logger)LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME);
-        root.setLevel(Level.INFO);
+        root.setLevel(Level.OFF);
+    }
 
-        Logger hikariLogger = (Logger) LoggerFactory.getLogger(HikariDataSource.class);
-        hikariLogger.setLevel(Level.OFF);
+    private static void configureDefault() {
+        Logger root = (Logger)LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME);
+        root.setLevel(Level.INFO);
 
+        ((Logger) LoggerFactory.getLogger(HikariDataSource.class)).setLevel(Level.OFF);
         ((Logger) LoggerFactory.getLogger(TestRunner.class)).setLevel(Level.ERROR);
 
+        setSingleConsoleAppenderWithLayout(root, "%msg%n");
+    }
+
+    private static void configureDebug() {
+        Logger root = (Logger)LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME);
+        root.setLevel(Level.DEBUG);
+
+        setSingleConsoleAppenderWithLayout(root, "%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n");
+    }
+
+    private static void setSingleConsoleAppenderWithLayout( Logger logger, String patternLayout ) {
         LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory();
 
         PatternLayoutEncoder ple = new PatternLayoutEncoder();
-        ple.setPattern("%msg%n");
+        ple.setPattern(patternLayout);
 
         ple.setContext(lc);
         ple.start();
 
-        ConsoleAppender<ILoggingEvent> consoleAppender = new ConsoleAppender<ILoggingEvent>();
+        ConsoleAppender<ILoggingEvent> consoleAppender = new ConsoleAppender<>();
         consoleAppender.setEncoder(ple);
         consoleAppender.setContext(lc);
         consoleAppender.start();
 
-        root.detachAndStopAllAppenders();
-        root.setAdditive(false);
-        root.addAppender(consoleAppender);
+        logger.detachAndStopAllAppenders();
+        logger.setAdditive(false);
+        logger.addAppender(consoleAppender);
     }
 }
diff --git a/src/main/java/org/utplsql/cli/RunCommand.java b/src/main/java/org/utplsql/cli/RunCommand.java
@@ -102,6 +102,15 @@ public class RunCommand implements ICommand {
     )
     private String excludeObjects = null;
 
+    @Parameter(
+            names = {"-q", "--quiet"},
+            description = "Does not output the informational messages normally printed to console")
+    private boolean logSilent = false;
+
+    @Parameter(
+            names = {"-d", "--debug"},
+            description = "Outputs a load of debug information to console")
+    private boolean logDebug = false;
 
     private CompatibilityProxy compatibilityProxy;
     private ReporterFactory reporterFactory;
@@ -115,10 +124,12 @@ public List<String> getTestPaths() {
         return testPaths;
     }
 
-    public int run() {
-
-        LoggerConfiguration.configureDefault();
+    public void init() {
+        LoggerConfiguration.configure(logSilent, logDebug);
+    }
 
+    public int run() {
+        init();
         outputMainInformation();
 
         try {

diff --git a/src/test/java/org/utplsql/cli/RunCommandIT.java b/src/test/java/org/utplsql/cli/RunCommandIT.java
@@ -29,6 +29,17 @@ public void run_Default() throws Exception {
         else
             assertEquals(0, result);
     }
+
+    @Test
+    public void run_Debug() throws Exception {
+
+        int result = TestHelper.runApp("run",
+                TestHelper.getConnectionString(),
+                "--debug");
+
+        assertEquals(1, result);
+    }
+
     @Test
     public void run_MultipleReporters() throws Exception {
 

diff --git a/src/test/java/org/utplsql/cli/RunCommandLogLevelTest.java b/src/test/java/org/utplsql/cli/RunCommandLogLevelTest.java
@@ -0,0 +1,39 @@
+package org.utplsql.cli;
+
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.Logger;
+import org.junit.jupiter.api.Test;
+import org.slf4j.LoggerFactory;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class RunCommandLogLevelTest {
+
+    private Logger getRootLogger() {
+        return (Logger)LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME);
+    }
+
+    @Test
+    void defaultIsInfo() {
+        TestHelper.createRunCommand(TestHelper.getConnectionString())
+                .init();
+
+        assertEquals(Level.INFO, getRootLogger().getLevel());
+    }
+
+    @Test
+    void silentModeSetsLoggerToOff() {
+        TestHelper.createRunCommand(TestHelper.getConnectionString(), "-q")
+                .init();
+
+        assertEquals(Level.OFF, getRootLogger().getLevel());
+    }
+
+    @Test
+    void debugModeSetsLoggerToDebug() {
+        TestHelper.createRunCommand(TestHelper.getConnectionString(), "-d")
+                .init();
+
+        assertEquals(Level.DEBUG, getRootLogger().getLevel());
+    }
+}