From 4802ba87d1b533690d5d3511c062b7050fccd043 Mon Sep 17 00:00:00 2001 From: Arun Venmany Date: Fri, 6 Feb 2026 12:08:16 +0530 Subject: [PATCH 1/2] adding tests for expansion variable for server.env Signed-off-by: Arun Venmany --- liberty-maven-plugin/pom.xml | 2 +- .../wlp/maven/test/app/ToolchainTest.java | 24 ++++++++++++------- .../src/test/resources/server2.env | 8 ++++++- 3 files changed, 23 insertions(+), 11 deletions(-) diff --git a/liberty-maven-plugin/pom.xml b/liberty-maven-plugin/pom.xml index e3f37d317..a5e47cfcf 100644 --- a/liberty-maven-plugin/pom.xml +++ b/liberty-maven-plugin/pom.xml @@ -89,7 +89,7 @@ io.openliberty.tools ci.common - 1.8.40 + 1.8.41-SNAPSHOT org.apache.commons diff --git a/liberty-maven-plugin/src/it/toolchain-java-warning-server-env-custom-file-it/src/test/java/net/wasdev/wlp/maven/test/app/ToolchainTest.java b/liberty-maven-plugin/src/it/toolchain-java-warning-server-env-custom-file-it/src/test/java/net/wasdev/wlp/maven/test/app/ToolchainTest.java index 86cd2f083..09d56ea14 100644 --- a/liberty-maven-plugin/src/it/toolchain-java-warning-server-env-custom-file-it/src/test/java/net/wasdev/wlp/maven/test/app/ToolchainTest.java +++ b/liberty-maven-plugin/src/it/toolchain-java-warning-server-env-custom-file-it/src/test/java/net/wasdev/wlp/maven/test/app/ToolchainTest.java @@ -3,21 +3,12 @@ import java.io.File; import java.io.FileNotFoundException; -import java.io.FileInputStream; - -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.xpath.XPath; -import javax.xml.xpath.XPathConstants; -import javax.xml.xpath.XPathFactory; import java.util.Scanner; import org.junit.Test; import org.junit.Assert; -import org.w3c.dom.Document; -import org.w3c.dom.NodeList; /** * @@ -57,6 +48,21 @@ public void testToolchainLogExists() throws Exception { Assert.assertTrue("Did not find project properties contain java.home message for status goal in build.log", logContainsMessage(buildLog, String.format(TOOLCHAIN_NOT_HONORED_WARNING, "status"))); } + @Test + public void verifyLogMessageForExpansionVariables() throws Exception { + File buildLog = new File("../build.log"); + Assert.assertTrue(buildLog.exists()); + String os = System.getProperty("os.name"); + if (os != null && os.toLowerCase().startsWith("windows")) { + Assert.assertTrue("Did not find variable expansion message in build.log", logContainsMessage(buildLog, "Resolving Property EXP_VAR for expression !EXP_VAR!_!EXP_VAR3!. Resolved expression value is TEST")); + Assert.assertTrue("Did not find variable expansion message in build.log", logContainsMessage(buildLog, "Resolving Property EXP_VAR2 for expression !EXP_VAR!_!EXP_VAR3!. Resolved expression value is TEST_WINDOWS")); + }else { + Assert.assertTrue("Did not find variable expansion message in build.log", logContainsMessage(buildLog, "Resolving Property EXP_VAR for expression ${EXP_VAR}_${EXP_VAR2}. Resolved expression value is TEST")); + Assert.assertTrue("Did not find variable expansion message in build.log", logContainsMessage(buildLog, "Resolving Property EXP_VAR2 for expression ${EXP_VAR}_${EXP_VAR2}. Resolved expression value is TEST_UNIX")); + } + + } + private boolean logContainsMessage( File logFile, String message) throws FileNotFoundException { Assert.assertTrue("Log file not found at location: "+ LOG_LOCATION, logFile.exists()); diff --git a/liberty-maven-plugin/src/it/toolchain-java-warning-server-env-custom-file-it/src/test/resources/server2.env b/liberty-maven-plugin/src/it/toolchain-java-warning-server-env-custom-file-it/src/test/resources/server2.env index 19e4a8b38..2ad0cd8f0 100644 --- a/liberty-maven-plugin/src/it/toolchain-java-warning-server-env-custom-file-it/src/test/resources/server2.env +++ b/liberty-maven-plugin/src/it/toolchain-java-warning-server-env-custom-file-it/src/test/resources/server2.env @@ -1 +1,7 @@ -JAVA_HOME= \ No newline at end of file +JAVA_HOME= + +EXP_VAR=TEST +EXP_VAR2=UNIX +EXP_VAR3=WINDOWS +TEST_EXP_VAR_UNIX=${EXP_VAR}_${EXP_VAR2} +TEST_EXP_VAR_WIN=!EXP_VAR!_!EXP_VAR3! From b3bde4dcd244c8e69b1127c4e611c9644d5a087e Mon Sep 17 00:00:00 2001 From: Arun Venmany Date: Fri, 6 Feb 2026 13:11:51 +0530 Subject: [PATCH 2/2] adding tests for expansion variable for server.env Signed-off-by: Arun Venmany --- .../java/net/wasdev/wlp/maven/test/app/ToolchainTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/liberty-maven-plugin/src/it/toolchain-java-warning-server-env-custom-file-it/src/test/java/net/wasdev/wlp/maven/test/app/ToolchainTest.java b/liberty-maven-plugin/src/it/toolchain-java-warning-server-env-custom-file-it/src/test/java/net/wasdev/wlp/maven/test/app/ToolchainTest.java index 09d56ea14..ff36b3da6 100644 --- a/liberty-maven-plugin/src/it/toolchain-java-warning-server-env-custom-file-it/src/test/java/net/wasdev/wlp/maven/test/app/ToolchainTest.java +++ b/liberty-maven-plugin/src/it/toolchain-java-warning-server-env-custom-file-it/src/test/java/net/wasdev/wlp/maven/test/app/ToolchainTest.java @@ -55,10 +55,10 @@ public void verifyLogMessageForExpansionVariables() throws Exception { String os = System.getProperty("os.name"); if (os != null && os.toLowerCase().startsWith("windows")) { Assert.assertTrue("Did not find variable expansion message in build.log", logContainsMessage(buildLog, "Resolving Property EXP_VAR for expression !EXP_VAR!_!EXP_VAR3!. Resolved expression value is TEST")); - Assert.assertTrue("Did not find variable expansion message in build.log", logContainsMessage(buildLog, "Resolving Property EXP_VAR2 for expression !EXP_VAR!_!EXP_VAR3!. Resolved expression value is TEST_WINDOWS")); + Assert.assertTrue("Did not find second variable expansion message in build.log", logContainsMessage(buildLog, "Resolving Property EXP_VAR3 for expression !EXP_VAR!_!EXP_VAR3!. Resolved expression value is TEST_WINDOWS")); }else { Assert.assertTrue("Did not find variable expansion message in build.log", logContainsMessage(buildLog, "Resolving Property EXP_VAR for expression ${EXP_VAR}_${EXP_VAR2}. Resolved expression value is TEST")); - Assert.assertTrue("Did not find variable expansion message in build.log", logContainsMessage(buildLog, "Resolving Property EXP_VAR2 for expression ${EXP_VAR}_${EXP_VAR2}. Resolved expression value is TEST_UNIX")); + Assert.assertTrue("Did not find second variable expansion message in build.log", logContainsMessage(buildLog, "Resolving Property EXP_VAR2 for expression ${EXP_VAR}_${EXP_VAR2}. Resolved expression value is TEST_UNIX")); } }