Add ability to track and verify error logs in tests. Verify invalid i…

…nclude dir error message
OpenLiberty · Oct 27, 2023 · ece394f · ece394f
1 parent e1820ae
commit ece394f
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 0 deletions.
diff --git a/src/main/java/io/openliberty/tools/common/plugins/util/InstallFeatureUtil.java b/src/main/java/io/openliberty/tools/common/plugins/util/InstallFeatureUtil.java
@@ -284,6 +284,14 @@ private Set<File> getAdditionalJsons() {
      */
     public abstract void error(String msg, Throwable e);
 
+    /**
+     * Check if any of the logged errors contain the given string.
+     * 
+     * @param msg
+     * @return
+     */
+    public abstract boolean containsErrorMessage(String msg);
+
     /**
      * Returns whether debug is enabled by the current logger
      * 

diff --git a/src/test/java/io/openliberty/tools/common/plugins/util/BaseInstallFeatureUtilTest.java b/src/test/java/io/openliberty/tools/common/plugins/util/BaseInstallFeatureUtilTest.java
@@ -41,6 +41,8 @@ public class BaseInstallFeatureUtilTest {
     public File installDir;
     public File buildDir;
     public String verify = "enforce";
+
+    private ArrayList<String> errorMessages = new ArrayList<String>();
 
     @Rule
     public TemporaryFolder temp = new TemporaryFolder();
@@ -87,13 +89,24 @@ public void info(String msg) {
         @Override
         public void error(String msg) {
             // not needed for tests
+            errorMessages.add(msg);
         }
 
         @Override
         public void error(String msg, Throwable e) {
             // not needed for tests
         }
 
+        @Override
+        public boolean containsErrorMessage(String msg) {
+            for (String error : errorMessages) {
+                if (error.contains(msg)) {
+                    return true;
+                }
+            }
+            return false;
+        }
+
         @Override
         public boolean isDebugEnabled() {
             return false;

diff --git a/...ava/io/openliberty/tools/common/plugins/util/InstallFeatureUtilGetServerFeaturesTest.java b/...ava/io/openliberty/tools/common/plugins/util/InstallFeatureUtilGetServerFeaturesTest.java
@@ -625,6 +625,7 @@ public void testInvalidIncludeDir() throws Exception {
         expected.add("orig");
 
         verifyServerFeatures(expected);
+        util.containsErrorMessage("Path specified a file, but resource exists as a directory (path=includeDir)");
     }
 
     @Test