diff --git a/build.gradle b/build.gradle index a92479e11..e8804366c 100644 --- a/build.gradle +++ b/build.gradle @@ -107,7 +107,7 @@ java { } def libertyAntVersion = "1.9.18" -def libertyCommonVersion = "1.8.40" +def libertyCommonVersion = "1.8.41-SNAPSHOT" dependencies { diff --git a/src/main/groovy/io/openliberty/tools/gradle/utils/CommonLogger.groovy b/src/main/groovy/io/openliberty/tools/gradle/utils/CommonLogger.groovy index c871ff64d..a9a78b090 100644 --- a/src/main/groovy/io/openliberty/tools/gradle/utils/CommonLogger.groovy +++ b/src/main/groovy/io/openliberty/tools/gradle/utils/CommonLogger.groovy @@ -18,6 +18,7 @@ package io.openliberty.tools.gradle.utils import io.openliberty.tools.common.CommonLoggerI import org.gradle.api.Project +import org.gradle.api.logging.LogLevel public class CommonLogger implements CommonLoggerI { diff --git a/src/test/groovy/io/openliberty/tools/gradle/TestAppConfig.groovy b/src/test/groovy/io/openliberty/tools/gradle/TestAppConfig.groovy index bd9aa4538..84f9ed6e2 100644 --- a/src/test/groovy/io/openliberty/tools/gradle/TestAppConfig.groovy +++ b/src/test/groovy/io/openliberty/tools/gradle/TestAppConfig.groovy @@ -1,8 +1,10 @@ -package io.openliberty.tools.gradle; +package io.openliberty.tools.gradle +import org.gradle.testkit.runner.BuildResult; import org.junit.AfterClass import org.junit.BeforeClass import org.junit.Test +import io.openliberty.tools.common.plugins.util.OSUtil public class TestAppConfig extends AbstractIntegrationTest{ static File resourceDir = new File("build/resources/test/sample.servlet") @@ -23,10 +25,18 @@ public class TestAppConfig extends AbstractIntegrationTest{ @Test public void test_start_with_timeout_success() { try { - runTasks(buildDir, 'libertyStart') + BuildResult result = runTasksResult(buildDir, 'libertyStart') + String output = result.getOutput() + if (OSUtil.isWindows()) { + assert output.contains('Resolving Property EXP_VAR for expression !EXP_VAR!_!EXP_VAR3!. Resolved expression value is TEST'): 'Expected info about expansion variable resolution for !EXP_VAR!_!EXP_VAR3!' + assert output.contains('Resolving Property EXP_VAR3 for expression !EXP_VAR!_!EXP_VAR3!. Resolved expression value is TEST_WINDOWS'): 'Expected info about expansion variable resolution for TEST_!EXP_VAR3!' + } else { + assert output.contains('Resolving Property EXP_VAR for expression ${EXP_VAR}_${EXP_VAR2}. Resolved expression value is TEST'): 'Expected info about expansion variable resolution for ${EXP_VAR}_${EXP_VAR2}' + assert output.contains('Resolving Property EXP_VAR2 for expression ${EXP_VAR}_${EXP_VAR2}. Resolved expression value is TEST_UNIX'): 'Expected info about expansion variable resolution for TEST_${EXP_VAR2}' + } } catch (Exception e) { - throw new AssertionError ("Fail on task libertyStart.", e) + throw new AssertionError("Fail on task libertyStart.", e) } - assert new File('build/testBuilds/test-app-config/build/wlp/usr/servers/LibertyProjectServer/apps/sample.servlet-1.war').exists() : 'application not installed on server' + assert new File('build/testBuilds/test-app-config/build/wlp/usr/servers/LibertyProjectServer/apps/sample.servlet-1.war').exists(): 'application not installed on server' } } diff --git a/src/test/resources/sample.servlet/src/resources/server.env b/src/test/resources/sample.servlet/src/resources/server.env index 710baeaf4..3e0495bef 100644 --- a/src/test/resources/sample.servlet/src/resources/server.env +++ b/src/test/resources/sample.servlet/src/resources/server.env @@ -1,3 +1,9 @@ CONFIG_SERVER_ENV=TEST TEST_PROP_2=green -TEST_PROP_3=blue \ No newline at end of file +TEST_PROP_3=blue + +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! \ No newline at end of file diff --git a/src/test/resources/sample.servlet/testAppConfig.gradle b/src/test/resources/sample.servlet/testAppConfig.gradle index 94bfd037c..a9813c06f 100644 --- a/src/test/resources/sample.servlet/testAppConfig.gradle +++ b/src/test/resources/sample.servlet/testAppConfig.gradle @@ -41,6 +41,7 @@ ext { liberty { server{ + serverEnvFile = file("src/resources/server.env") name = wlpServerName looseApplication = false embedded = true