maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bentm...@apache.org
Subject svn commit: r712573 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/MavenIT0104Test.java resources/it0104/pom.xml
Date Sun, 09 Nov 2008 22:16:10 GMT
Author: bentmann
Date: Sun Nov  9 14:16:10 2008
New Revision: 712573

URL: http://svn.apache.org/viewvc?rev=712573&view=rev
Log:
o Extended it0104 to actually check the corresponding issue MNG-2201, thereby proving this
being unresolved until 2.0.9+

Modified:
    maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0104Test.java
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0104/pom.xml

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0104Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0104Test.java?rev=712573&r1=712572&r2=712573&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0104Test.java
(original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0104Test.java
Sun Nov  9 14:16:10 2008
@@ -25,12 +25,17 @@
 import java.io.File;
 import java.util.Properties;
 
+/**
+ * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-2201">MNG-2201</a>.
+ * 
+ * @version $Id$
+ */
 public class MavenIT0104Test
     extends AbstractMavenIntegrationTestCase
 {
 
     /**
-     * Verify that plugin configurations are resolved correctly.
+     * Verify that plugin configurations are correctly interpolated
      */
     public void testit0104()
         throws Exception
@@ -45,6 +50,8 @@
 
         Properties props = verifier.loadProperties( "target/config.properties" );
         assertEquals( new File( testDir, "target" ), new File( props.getProperty( "stringParam"
) ) );
+        assertEquals( new File( testDir, "target" ), new File( props.getProperty( "propertiesParam.buildDir"
) ) );
+        assertEquals( new File( testDir, "target" ), new File( props.getProperty( "mapParam.buildDir"
) ) );
         assertEquals( "4.0.0", props.getProperty( "domParam.children.modelVersion.0.value"
) );
         assertEquals( "org.apache.maven.its.it0104", props.getProperty( "domParam.children.groupId.0.value"
) );
         assertEquals( "1.0-SNAPSHOT", props.getProperty( "domParam.children.version.0.value"
) );

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0104/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0104/pom.xml?rev=712573&r1=712572&r2=712573&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0104/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0104/pom.xml Sun
Nov  9 14:16:10 2008
@@ -47,6 +47,15 @@
           <configuration>
             <propertiesFile>${project.build.directory}/config.properties</propertiesFile>
             <stringParam>${project.build.directory}</stringParam>
+            <mapParam>
+              <buildDir>${project.build.directory}</buildDir>
+            </mapParam>
+            <propertiesParam>
+              <property>
+                <name>buildDir</name>
+                <value>${project.build.directory}</value>
+              </property>
+            </propertiesParam>
             <domParam>
               <basedir>${basedir}</basedir>
               <modelVersion>${project.modelVersion}</modelVersion>



Mime
View raw message