Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MNG-2478] add "resources-filtered" filtered resource directories to super POM 

Modified MavenITmng3843PomInheritanceTest to accommodate additional resource
directories.
This commit is contained in:
Michael Osipov 2020-04-27 23:35:14 +02:00
parent 0dc01ef157
commit b60b15d8e7
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java
View File

@ -95,11 +95,25 @@ public class MavenITmng3843PomInheritanceTest
assertPathEquals( basedir, "src/main/java", props.getProperty( "project.build.sourceDirectory" ) );
assertPathEquals( basedir, "src/test/java", props.getProperty( "project.build.testSourceDirectory" ) );
assertPathEquals( basedir, "src/main/scripts", props.getProperty( "project.build.scriptSourceDirectory" ) );
if ( matchesVersionRange( "[3.7.0,)" ) )
{
assertEquals( "2", props.getProperty( "project.build.resources" ) );
assertEquals( "2", props.getProperty( "project.build.testResources" ) );
}
else
{
assertEquals( "1", props.getProperty( "project.build.resources" ) );
assertPathEquals( basedir, "src/main/resources", props.getProperty( "project.build.resources.0.directory" ) );
assertEquals( "1", props.getProperty( "project.build.testResources" ) );
}
assertPathEquals( basedir, "src/main/resources", props.getProperty( "project.build.resources.0.directory" ) );
assertPathEquals( basedir, "src/test/resources",
props.getProperty( "project.build.testResources.0.directory" ) );
if ( matchesVersionRange( "[3.7.0,)" ) )
{
assertPathEquals( basedir, "src/main/resources-filtered", props.getProperty( "project.build.resources.1.directory" ) );
assertPathEquals( basedir, "src/test/resources-filtered",
props.getProperty( "project.build.testResources.1.directory" ) );
}
assertPathEquals( basedir, "target", props.getProperty( "project.build.directory" ) );
assertPathEquals( basedir, "target/classes", props.getProperty( "project.build.outputDirectory" ) );
assertPathEquals( basedir, "target/test-classes", props.getProperty( "project.build.testOutputDirectory" ) );