This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a commit to annotated tag maven-filtering-1.0-alpha-1 in repository https://gitbox.apache.org/repos/asf/maven-filtering.git
commit 0758f94a7a3b325b6bf861ef0983ae8cfc009853 Author: Oliver Lamy <[email protected]> AuthorDate: Wed Feb 27 23:34:35 2008 +0000 add units on exclude/include git-svn-id: https://svn.apache.org/repos/asf/maven/sandbox/trunk/shared/maven-filtering@631772 13f79535-47bb-0310-9956-ffa450edef68 --- .../DefaultMavenResourcesFilteringTest.java | 131 ++++++++++++++++++++- .../maven-resources-filtering/excludedir/bar.txt | 1 + .../maven-resources-filtering/excludedir/foo.txt | 1 + .../maven-resources-filtering/exludefile.txt | 0 .../includedir/include.txt | 0 .../maven-resources-filtering/includefile.txt | 0 6 files changed, 131 insertions(+), 2 deletions(-) diff --git a/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java b/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java index fe5a6a1..b1f995f 100755 --- a/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java +++ b/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java @@ -139,7 +139,7 @@ public class DefaultMavenResourcesFilteringTest private void assertFiltering( File baseDir, File initialImageFile ) throws Exception { - assertEquals( 3, outputDirectory.listFiles().length ); + assertEquals( 7, outputDirectory.listFiles().length ); Properties result = PropertyUtils.loadPropertyFile( new File( outputDirectory, "empty-maven-resources-filtering.txt" ), null ); assertTrue( result.isEmpty() ); @@ -216,6 +216,7 @@ public class DefaultMavenResourcesFilteringTest .loadPropertyFile( new File( outputDirectory, "maven-resources-filtering.txt" ), null ); assertFalse( result.isEmpty() ); assertEquals( mavenProject.getName(), result.get( "pomName" ) ); + assertFiltering( baseDir, initialImageFile ); } public void testNoFiltering() @@ -240,7 +241,7 @@ public class DefaultMavenResourcesFilteringTest mavenResourcesFiltering.filterResources( resources, outputDirectory, mavenProject, null, null, Collections.EMPTY_LIST, new StubMavenSession() ); - assertEquals( 3, outputDirectory.listFiles().length ); + assertEquals( 7, outputDirectory.listFiles().length ); Properties result = PropertyUtils.loadPropertyFile( new File( outputDirectory, "empty-maven-resources-filtering.txt" ), null ); assertTrue( result.isEmpty() ); @@ -291,4 +292,130 @@ public class DefaultMavenResourcesFilteringTest return true; } + public void testIncludeOneFile() + throws Exception + { + File baseDir = new File( "c:\\foo\\bar" ); + StubMavenProject mavenProject = new StubMavenProject( baseDir ); + mavenProject.setVersion( "1.0" ); + mavenProject.setGroupId( "org.apache" ); + mavenProject.setName( "test project" ); + + MavenResourcesFiltering mavenResourcesFiltering = (MavenResourcesFiltering) lookup( MavenResourcesFiltering.class + .getName() ); + + String unitFilesDir = getBasedir() + "/src/test/units-files/maven-resources-filtering"; + + Resource resource = new Resource(); + List resources = new ArrayList(); + resources.add( resource ); + resource.setDirectory( unitFilesDir ); + resource.setFiltering( true ); + resource.addInclude( "includ*" ); + + List filtersFile = new ArrayList(); + filtersFile.add( getBasedir() + + "/src/test/units-files/maven-resources-filtering/empty-maven-resources-filtering.txt" ); + + MavenResourcesExecution mavenResourcesExecution = new MavenResourcesExecution( resources, outputDirectory, + mavenProject, null, filtersFile, + Collections.EMPTY_LIST, + new StubMavenSession() ); + mavenResourcesFiltering.filterResources( mavenResourcesExecution ); + + File[] files = outputDirectory.listFiles(); + assertEquals( 1, files.length ); + assertEquals( "includefile.txt", files[0].getName() ); + + } + + public void testIncludeOneFileAndDirectory() + throws Exception + { + File baseDir = new File( "c:\\foo\\bar" ); + StubMavenProject mavenProject = new StubMavenProject( baseDir ); + mavenProject.setVersion( "1.0" ); + mavenProject.setGroupId( "org.apache" ); + mavenProject.setName( "test project" ); + + MavenResourcesFiltering mavenResourcesFiltering = (MavenResourcesFiltering) lookup( MavenResourcesFiltering.class + .getName() ); + + String unitFilesDir = getBasedir() + "/src/test/units-files/maven-resources-filtering"; + + Resource resource = new Resource(); + List resources = new ArrayList(); + resources.add( resource ); + resource.setDirectory( unitFilesDir ); + resource.setFiltering( true ); + resource.addInclude( "includ*" ); + resource.addInclude( "**/includ*" ); + + List filtersFile = new ArrayList(); + filtersFile.add( getBasedir() + + "/src/test/units-files/maven-resources-filtering/empty-maven-resources-filtering.txt" ); + + MavenResourcesExecution mavenResourcesExecution = new MavenResourcesExecution( resources, outputDirectory, + mavenProject, null, filtersFile, + Collections.EMPTY_LIST, + new StubMavenSession() ); + mavenResourcesFiltering.filterResources( mavenResourcesExecution ); + + File[] files = outputDirectory.listFiles(); + assertEquals( 2, files.length ); + File includeFile = new File( outputDirectory, "includefile.txt" ); + assertTrue( includeFile.exists() ); + + includeFile = new File( new File( outputDirectory, "includedir" ), "include.txt" ); + assertTrue( includeFile.exists() ); + + } + + public void testExcludeOneFile() + throws Exception + { + File baseDir = new File( "c:\\foo\\bar" ); + StubMavenProject mavenProject = new StubMavenProject( baseDir ); + mavenProject.setVersion( "1.0" ); + mavenProject.setGroupId( "org.apache" ); + mavenProject.setName( "test project" ); + + MavenResourcesFiltering mavenResourcesFiltering = (MavenResourcesFiltering) lookup( MavenResourcesFiltering.class + .getName() ); + + String unitFilesDir = getBasedir() + "/src/test/units-files/maven-resources-filtering"; + + Resource resource = new Resource(); + List resources = new ArrayList(); + resources.add( resource ); + resource.setDirectory( unitFilesDir ); + resource.setFiltering( true ); + resource.addExclude( "*.gif" ); + resource.addExclude( "**/excludedir/**" ); + + List filtersFile = new ArrayList(); + filtersFile.add( getBasedir() + + "/src/test/units-files/maven-resources-filtering/empty-maven-resources-filtering.txt" ); + + MavenResourcesExecution mavenResourcesExecution = new MavenResourcesExecution( resources, outputDirectory, + mavenProject, null, filtersFile, + Collections.EMPTY_LIST, + new StubMavenSession() ); + mavenResourcesFiltering.filterResources( mavenResourcesExecution ); + + File[] files = outputDirectory.listFiles(); + assertEquals( 5, files.length ); + File includeFile = new File( outputDirectory, "includefile.txt" ); + assertTrue( includeFile.exists() ); + + includeFile = new File( new File( outputDirectory, "includedir" ), "include.txt" ); + assertTrue( includeFile.exists() ); + + File imageFile = new File( outputDirectory, "happy_duke.gif" ); + assertFalse( imageFile.exists() ); + + File excludeDir = new File( outputDirectory, "excludedir" ); + assertFalse( excludeDir.exists() ); + } + } diff --git a/src/test/units-files/maven-resources-filtering/excludedir/bar.txt b/src/test/units-files/maven-resources-filtering/excludedir/bar.txt new file mode 100755 index 0000000..32d5c9e --- /dev/null +++ b/src/test/units-files/maven-resources-filtering/excludedir/bar.txt @@ -0,0 +1 @@ +excluded \ No newline at end of file diff --git a/src/test/units-files/maven-resources-filtering/excludedir/foo.txt b/src/test/units-files/maven-resources-filtering/excludedir/foo.txt new file mode 100755 index 0000000..32d5c9e --- /dev/null +++ b/src/test/units-files/maven-resources-filtering/excludedir/foo.txt @@ -0,0 +1 @@ +excluded \ No newline at end of file diff --git a/src/test/units-files/maven-resources-filtering/exludefile.txt b/src/test/units-files/maven-resources-filtering/exludefile.txt new file mode 100755 index 0000000..e69de29 diff --git a/src/test/units-files/maven-resources-filtering/includedir/include.txt b/src/test/units-files/maven-resources-filtering/includedir/include.txt new file mode 100755 index 0000000..e69de29 diff --git a/src/test/units-files/maven-resources-filtering/includefile.txt b/src/test/units-files/maven-resources-filtering/includefile.txt new file mode 100755 index 0000000..e69de29
