maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bentm...@apache.org
Subject svn commit: r1070241 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/MavenITmng4318ProjectExecutionRootTest.java resources/mng-4318/pom.xml
Date Sun, 13 Feb 2011 14:26:12 GMT
Author: bentmann
Date: Sun Feb 13 14:26:12 2011
New Revision: 1070241

URL: http://svn.apache.org/viewvc?rev=1070241&view=rev
Log:
[MNG-5014] [regression] MavenProject.getParent().isExecutionRoot() not properly set

o Strengthened related IT

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

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4318ProjectExecutionRootTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4318ProjectExecutionRootTest.java?rev=1070241&r1=1070240&r2=1070241&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4318ProjectExecutionRootTest.java
(original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4318ProjectExecutionRootTest.java
Sun Feb 13 14:26:12 2011
@@ -26,7 +26,8 @@ import java.io.File;
 import java.util.Properties;
 
 /**
- * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-4318">MNG-4318</a>.
+ * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-4318">MNG-4318</a>
and
+ * <a href="http://jira.codehaus.org/browse/MNG-5014">MNG-5014</a>.
  * 
  * @author Benjamin Bentmann
  */
@@ -36,7 +37,7 @@ public class MavenITmng4318ProjectExecut
 
     public MavenITmng4318ProjectExecutionRootTest()
     {
-        super( ALL_MAVEN_VERSIONS );
+        super( "[2.0.4,3.0-alpha-1),[3.0.3,)" );
     }
 
     /**
@@ -64,12 +65,16 @@ public class MavenITmng4318ProjectExecut
 
         props = verifier.loadProperties( "sub-1/target/project.properties" );
         assertEquals( "false", props.getProperty( "project.executionRoot" ) );
+        assertEquals( "true", props.getProperty( "project.parent.executionRoot" ) );
 
         props = verifier.loadProperties( "sub-2/target/project.properties" );
         assertEquals( "false", props.getProperty( "project.executionRoot" ) );
+        assertEquals( "true", props.getProperty( "project.parent.executionRoot" ) );
 
         props = verifier.loadProperties( "sub-2/sub-3/target/project.properties" );
         assertEquals( "false", props.getProperty( "project.executionRoot" ) );
+        assertEquals( "false", props.getProperty( "project.parent.executionRoot" ) );
+        assertEquals( "true", props.getProperty( "project.parent.parent.executionRoot" )
);
     }
 
 }

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4318/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4318/pom.xml?rev=1070241&r1=1070240&r2=1070241&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4318/pom.xml
(original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4318/pom.xml
Sun Feb 13 14:26:12 2011
@@ -47,6 +47,8 @@ under the License.
           <outputFile>target/project.properties</outputFile>
           <expressions>
             <expression>project/executionRoot</expression>
+            <expression>project/parent/executionRoot</expression>
+            <expression>project/parent/parent/executionRoot</expression>
           </expressions>
         </configuration>
         <executions>



Mime
View raw message