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/11/28 23:12:52 UTC
svn commit: r721575 - in
/maven/core-integration-testing/trunk/core-it-suite/src/test:
java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java
resources/mng-3475/pom.xml
Author: bentmann
Date: Fri Nov 28 14:12:52 2008
New Revision: 721575
URL: http://svn.apache.org/viewvc?rev=721575&view=rev
Log:
o Extended test to check resource/filter paths, too
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3475/pom.xml
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java?rev=721575&r1=721574&r2=721575&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java Fri Nov 28 14:12:52 2008
@@ -83,6 +83,12 @@
assertPathEquals( testDir, "target/site", configProps.getProperty( "mapParam.reportingOutputDirectory" ) );
assertPathEquals( testDir, "target/site", modelProps.getProperty( "project.reporting.outputDirectory" ) );
}
+
+ assertPathEquals( testDir, "src/main/resources", modelProps.getProperty( "project.build.resources.0.directory" ) );
+
+ assertPathEquals( testDir, "src/test/resources", modelProps.getProperty( "project.build.testResources.0.directory" ) );
+
+ assertPathEquals( testDir, "src/main/filters/it.properties", modelProps.getProperty( "project.build.filters.0" ) );
}
private void assertPathEquals( File basedir, String subdir, String path )
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3475/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3475/pom.xml?rev=721575&r1=721574&r2=721575&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3475/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3475/pom.xml Fri Nov 28 14:12:52 2008
@@ -33,6 +33,9 @@
</description>
<build>
+ <filters>
+ <filter>src/main/filters/it.properties</filter>
+ </filters>
<plugins>
<plugin>
<!-- This checks the project directories retrieved via plugin configuration -->
@@ -75,6 +78,9 @@
<expression>project/build/sourceDirectory</expression>
<expression>project/build/testSourceDirectory</expression>
<expression>project/build/scriptSourceDirectory</expression>
+ <expression>project/build/resources/0/directory</expression>
+ <expression>project/build/testResources/0/directory</expression>
+ <expression>project/build/filters/0</expression>
<expression>project/reporting/outputDirectory</expression>
</expressions>
</configuration>