diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3558PropertyEscapingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3558PropertyEscapingTest.java new file mode 100644 index 000000000000..3b1aac67dfc6 --- /dev/null +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3558PropertyEscapingTest.java @@ -0,0 +1,62 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.maven.it; + +import java.io.File; +import java.util.Properties; + +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +/** + * This is a test case for MNG-3558. + * + * Verifies that property references can be properly escaped in both model properties + * and plugin configuration using backslash. + */ +class MavenITmng3558PropertyEscapingTest extends AbstractMavenIntegrationTestCase { + MavenITmng3558PropertyEscapingTest() { + super("[4.0.0-beta-5,)"); + } + + @Test + public void testPropertyEscaping() throws Exception { + File testDir = extractResources("/mng-3558-property-escaping"); + + Verifier verifier = newVerifier(testDir.getAbsolutePath()); + verifier.setAutoclean(false); + verifier.deleteDirectory("target"); + verifier.addCliArgument("validate"); + verifier.execute(); + verifier.verifyErrorFreeLog(); + + // Verify model properties + Properties modelProps = verifier.loadProperties("target/property-values.properties"); + assertEquals("${test.value}", modelProps.getProperty("project.properties.escaped.property")); + assertEquals("prefix-${test.value}-suffix", modelProps.getProperty("project.properties.escaped.with.context")); + assertEquals("interpolated-value", modelProps.getProperty("project.properties.normal.property")); + + // Verify plugin configuration + Properties configProps = verifier.loadProperties("target/config-values.properties"); + assertEquals("${test.value}", configProps.getProperty("mapParam.param")); + assertEquals("prefix-${test.value}-suffix", configProps.getProperty("mapParam.paramWithContext")); + assertEquals("interpolated-value", configProps.getProperty("mapParam.normalParam")); + } +} diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/TestSuiteOrdering.java b/its/core-it-suite/src/test/java/org/apache/maven/it/TestSuiteOrdering.java index c2f0c8fda8af..470a7a9f56f7 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/TestSuiteOrdering.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/TestSuiteOrdering.java @@ -101,6 +101,7 @@ public TestSuiteOrdering() { * the tests are to finishing. Newer tests are also more likely to fail, so this is * a fail fast technique as well. */ + suite.addTestSuite(MavenITmng3558PropertyEscapingTest.class); suite.addTestSuite(MavenITmng4559MultipleJvmArgsTest.class); suite.addTestSuite(MavenITmng4559SpacesInJvmOptsTest.class); suite.addTestSuite(MavenITmng8598JvmConfigSubstitutionTest.class); diff --git a/its/core-it-suite/src/test/resources/mng-3558-property-escaping/pom.xml b/its/core-it-suite/src/test/resources/mng-3558-property-escaping/pom.xml new file mode 100644 index 000000000000..1d90c56e5f78 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-3558-property-escaping/pom.xml @@ -0,0 +1,88 @@ + + + + 4.0.0 + + org.apache.maven.its.mng3558 + test + 1.0 + + Maven Integration Test :: MNG-3558 + Verify that property references can be escaped in both model properties and plugin configuration. + + + + interpolated-value + + + $\{test.value\} + prefix-$\{test.value\}-suffix + + + ${test.value} + + + + + + org.apache.maven.its.plugins + maven-it-plugin-expression + 2.1-SNAPSHOT + + + test + + eval + + validate + + target/property-values.properties + + project/properties + + + + + + + org.apache.maven.its.plugins + maven-it-plugin-configuration + 2.1-SNAPSHOT + + + config + + config + + validate + + target/config-values.properties + + $$\{test.value\} + prefix-$$\{test.value\}-suffix + ${test.value} + + + + + + + +