svn commit: r779831 - in /maven/plugins/trunk/maven-eclipse-plugin/src: main/java/org/apache/maven/plugin/eclipse/EclipseSourceDir.java test/java/org/apache/maven/plugin/eclipse/EclipseSourceDirTest.java

[baerrach]

Author: baerrach
Date: Fri May 29 04:00:14 2009
New Revision: 779831

URL: http://svn.apache.org/viewvc?rev=779831&view=rev
Log:
[MECLIPSE-551] regression - Resources are excluded if resource dir equals 
source dir

Added unit tests for merging of include/exclude.


Modified:
    
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseSourceDir.java
    
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipseSourceDirTest.java

Modified: 
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseSourceDir.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseSourceDir.java?rev=779831&r1=779830&r2=779831&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseSourceDir.java
 (original)
+++ 
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseSourceDir.java
 Fri May 29 04:00:14 2009
@@ -265,8 +265,8 @@
         buffer.append( path );
         buffer.append( ": " );
         buffer.append( "output=" ).append( output ).append( ", " );
-        buffer.append( "include=" ).append( include ).append( ", " );
-        buffer.append( "exclude=" ).append( exclude ).append( ", " );
+        buffer.append( "include=[" ).append( getIncludeAsString() ).append( 
"], " );
+        buffer.append( "exclude=[" ).append( getExcludeAsString() ).append( 
"], " );
         buffer.append( "test=" ).append( test ).append( ", " );
         buffer.append( "filtering=" ).append( filtering );
         return buffer.toString();        

Modified: 
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipseSourceDirTest.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipseSourceDirTest.java?rev=779831&r1=779830&r2=779831&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipseSourceDirTest.java
 (original)
+++ 
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipseSourceDirTest.java
 Fri May 29 04:00:14 2009
@@ -72,9 +72,43 @@
         
         src_main_java.merge( src_main_resources );
         assertEquals( "source /src/main/java: output=null, include=[], 
exclude=[], test=false, filtering=false", src_main_java.toString());
+    }
+    
+    public void testMerge_two_resource_directories() throws Exception {
+        EclipseSourceDir resource1 = testFixture_src_main_resources();
+        EclipseSourceDir resource2 = testFixture_src_main_resources();
+        
+        resource1.getInclude().add( "**/*.txt" );
+        resource1.getExclude().add( "**/*.svn" );
+        
+        resource2.getInclude().add( "**/*.xml" );
+        resource2.getExclude().add( "**/*.cvs" );
+        
+        resource1.merge( resource2 );
+        
+        assertEquals( "resource /src/main/resources: output=target/classes, 
include=[**/*.txt|**/*.xml], exclude=[**/*.java|**/*.svn|**/*.cvs], test=false, 
filtering=false", resource1.toString());        
+    }
+    
+    public void testMerge_two_resource_directories_with_duplicates() throws 
Exception {
+        EclipseSourceDir resource1 = testFixture_src_main_resources();
+        EclipseSourceDir resource2 = testFixture_src_main_resources();
+        
+        resource1.getInclude().add( "**/*.dup" );
+        resource1.getInclude().add( "**/*.txt" );
+        resource1.getExclude().add( "**/*.svn" );
+        resource1.getExclude().add( "**/*~" );
+        
+        resource2.getInclude().add( "**/*.xml" );
+        resource2.getInclude().add( "**/*.dup" );
+        resource2.getExclude().add( "**/*.cvs" );
+        resource2.getExclude().add( "**/*~" );
 
+        resource1.merge( resource2 );
+        
+        assertEquals( "resource /src/main/resources: output=target/classes, 
include=[**/*.dup|**/*.txt|**/*.xml], 
exclude=[**/*.java|**/*.svn|**/*~|**/*.cvs], test=false, filtering=false", 
resource1.toString());        
     }
 
+
     public void testToString_src_main_java()
     {
         EclipseSourceDir objectUnderTest = testFixture_src_main_java();