From a9932c66ff1bf86bda99f93673f219fa99ea9eb6 Mon Sep 17 00:00:00 2001
From: Evie Lau <evie@us.ibm.com>
Date: Thu, 29 Jun 2023 11:20:09 -0500
Subject: [PATCH] Refactor and cleanup, add unit test for log colors

---
 .../openliberty/tools/ant/AbstractTask.java   | 60 +++++++++----------
 .../java/net/wasdev/wlp/ant/LogColorTest.java | 29 +++++++++
 2 files changed, 56 insertions(+), 33 deletions(-)
 create mode 100644 src/test/java/net/wasdev/wlp/ant/LogColorTest.java

diff --git a/src/main/java/io/openliberty/tools/ant/AbstractTask.java b/src/main/java/io/openliberty/tools/ant/AbstractTask.java
index b0d4cf9..a77a438 100644
--- a/src/main/java/io/openliberty/tools/ant/AbstractTask.java
+++ b/src/main/java/io/openliberty/tools/ant/AbstractTask.java
@@ -39,14 +39,8 @@
 public abstract class AbstractTask extends Task {
 
     public static final String ANSI_RESET = "\u001B[0m";
-    public static final String ANSI_BLACK = "\u001B[30m";
     public static final String ANSI_RED = "\u001B[31m";
-    public static final String ANSI_GREEN = "\u001B[32m";
     public static final String ANSI_YELLOW = "\u001B[33m";
-    public static final String ANSI_BLUE = "\u001B[34m";
-    public static final String ANSI_PURPLE = "\u001B[35m";
-    public static final String ANSI_CYAN = "\u001B[36m";
-    public static final String ANSI_WHITE = "\u001B[37m";
 
     protected File installDir;
     protected File userDir;
@@ -62,7 +56,7 @@ public abstract class AbstractTask extends Task {
 
     protected ProcessBuilder processBuilder;
 
-    private static final String LIBERTY_MESSAGE_TYPE_REGEX = ".*\\[.*\\] [\\S]*?(\\S):.*";
+    private static final String LIBERTY_MESSAGE_TYPE_REGEX = ".*\\[.*\\]\\s*[\\S]*?(\\S):.*";
     private static final Pattern LIBERTY_MESSAGE_TYPE_PATTERN = Pattern.compile(LIBERTY_MESSAGE_TYPE_REGEX);
 
     protected static final String DEFAULT_SERVER = "defaultServer";
@@ -263,6 +257,31 @@ public void sendErrorInvokeCommand(String commandLine, int returnCode, int... ex
                 Arrays.toString(expectedExitCodes)));
     }
 
+    /**
+     * Check the last letter of Liberty server message code to determine severity, and log with appropriate color
+     * @param line - Liberty server message
+     */
+    public static String addColor(String line) {
+        Matcher m = LIBERTY_MESSAGE_TYPE_PATTERN.matcher(line);
+        // Group 1 - liberty log identifier code
+        String color = null;
+        if (m.find()) {
+            String identifier = m.group(1);
+            switch (identifier) {
+                case "E":
+                    color = ANSI_RED;
+                    break;
+                case "W":
+                    color = ANSI_YELLOW;
+                    break;
+            }
+        }
+        if (color != null) {
+            line = color + line + ANSI_RESET;
+        }
+        return line;
+    }
+
     private class StreamCopier extends Thread {
         private final BufferedReader reader;
         private boolean joined;
@@ -287,7 +306,7 @@ public void run() {
                             break;
                         }
                         sb.append(line);
-                        logWithColor(line);
+                        log(addColor(line));
                     }
                 }
             } catch (IOException ex) {
@@ -307,31 +326,6 @@ public void run() {
             }
         }
 
-        /**
-         * Check the last letter of Liberty server message code to determine severity, and log with appropriate color
-         * @param line - Liberty server message
-         */
-        private void logWithColor(String line) {
-            Matcher m = LIBERTY_MESSAGE_TYPE_PATTERN.matcher(line);
-            // Group 1 - liberty log identifier code
-            if (m.find()) {
-                String identifier = m.group(1);
-                switch (identifier) {
-                    case "E":
-                        log(ANSI_RED + line + ANSI_RESET);
-                        break;
-                    case "W":
-                        log(ANSI_YELLOW + line + ANSI_RESET);
-                        break;
-                    default:
-                        log(line);
-                        break;
-                }
-            } else { // could not find Liberty server message identifier
-                log(line);
-            }
-        }
-
         public String getOutput() {
             if (sb != null) {
                 return sb.toString();
diff --git a/src/test/java/net/wasdev/wlp/ant/LogColorTest.java b/src/test/java/net/wasdev/wlp/ant/LogColorTest.java
new file mode 100644
index 0000000..bc63a2f
--- /dev/null
+++ b/src/test/java/net/wasdev/wlp/ant/LogColorTest.java
@@ -0,0 +1,29 @@
+package net.wasdev.wlp.ant;
+
+import org.junit.Assert;
+import org.junit.Test;
+import io.openliberty.tools.ant.AbstractTask;
+
+public class LogColorTest {
+    @Test
+    public void testWarningColor() {
+        String logMessage = "[WARNING ] CWWKS3103W: There are no users defined for the BasicRegistry configuration of ID com.ibm.ws.security.registry.basic.config[basic].";
+        String line = AbstractTask.addColor(logMessage);
+        Assert.assertTrue(line.contains(AbstractTask.ANSI_YELLOW));
+        Assert.assertTrue(line.contains(AbstractTask.ANSI_RESET));
+    }
+
+    @Test
+    public void testErrorColor() {
+        String logMessage = "[ERROR   ] SRVE9990E: The class mvn.demo.rest.RestApplication has a @WebServlet annotation but does not implement the jakarta.servlet.http.HttpServlet interface.";
+        String line = AbstractTask.addColor(logMessage);
+        Assert.assertTrue(line.contains(AbstractTask.ANSI_RED));
+        Assert.assertTrue(line.contains(AbstractTask.ANSI_RESET));
+    }
+
+    @Test
+    public void testInfoColor() {
+        String logMessage = "[AUDIT   ] CWWKT0016I: Web application available (default_host): http://localhost:9080/openapi/";
+        String line = AbstractTask.addColor(logMessage);
+        Assert.assertEquals(logMessage, line); // should not have any ANSI colors
+    }}