You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2008/12/19 23:30:26 UTC
svn commit: r728180 - in
/maven/core-integration-testing/trunk/core-it-suite/src/test:
java/org/apache/maven/it/MavenITmng3924XmlMarkupInterpolationTest.java
resources/mng-3924/pom.xml
Author: bentmann
Date: Fri Dec 19 14:30:26 2008
New Revision: 728180
URL: http://svn.apache.org/viewvc?rev=728180&view=rev
Log:
[MNG-3662] Model interpolation crashes if property resolves to value with ampersand
o Extended existing IT for related issue MNG-3924 to show this case is captured as well
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3924XmlMarkupInterpolationTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3924/pom.xml
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3924XmlMarkupInterpolationTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3924XmlMarkupInterpolationTest.java?rev=728180&r1=728179&r2=728180&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3924XmlMarkupInterpolationTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3924XmlMarkupInterpolationTest.java Fri Dec 19 14:30:26 2008
@@ -26,7 +26,8 @@
import java.util.Properties;
/**
- * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-3924">MNG-3924</a>.
+ * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-3924">MNG-3924</a> and
+ * <a href="http://jira.codehaus.org/browse/MNG-3662">MNG-3662</a>
*
* @author Benjamin Bentmann
* @version $Id$
@@ -56,8 +57,8 @@
verifier.resetStreams();
Properties props = verifier.loadProperties( "target/xml.properties" );
- assertEquals( "<?xml version='1.0'?>", props.getProperty( "project.properties.xmlMarkup" ) );
- assertEquals( "<?xml version='1.0'?>", props.getProperty( "project.properties.xmlTest" ) );
+ assertEquals( "<?xml version='1.0'?>Tom&Jerry", props.getProperty( "project.properties.xmlMarkup" ) );
+ assertEquals( "<?xml version='1.0'?>Tom&Jerry", props.getProperty( "project.properties.xmlTest" ) );
}
}
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3924/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3924/pom.xml?rev=728180&r1=728179&r2=728180&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3924/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3924/pom.xml Fri Dec 19 14:30:26 2008
@@ -34,7 +34,7 @@
<properties>
<!-- That's the property containing escaped XML markup -->
- <xmlMarkup><?xml version='1.0'?></xmlMarkup>
+ <xmlMarkup><?xml version='1.0'?>Tom&Jerry</xmlMarkup>
<!-- That's a property where the above property will be resolved -->
<xmlTest>${xmlMarkup}</xmlTest>
</properties>