You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2011/08/21 14:43:02 UTC
svn commit: r1159975 -
/maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/IntegrationTestMojo.java
Author: hboutemy
Date: Sun Aug 21 12:43:01 2011
New Revision: 1159975
URL: http://svn.apache.org/viewvc?rev=1159975&view=rev
Log:
[ARCHETYPE-289] added empty directory support for IT comparison against reference
Modified:
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/IntegrationTestMojo.java
Modified: maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/IntegrationTestMojo.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/IntegrationTestMojo.java?rev=1159975&r1=1159974&r2=1159975&view=diff
==============================================================================
--- maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/IntegrationTestMojo.java (original)
+++ maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/IntegrationTestMojo.java Sun Aug 21 12:43:01 2011
@@ -149,10 +149,11 @@ public class IntegrationTestMojo
throws IntegrationTestFailure, IOException
{
@SuppressWarnings( "unchecked" )
- List<String> referenceFiles = FileUtils.getFileNames( reference, "**", null, false );
+ List<String> referenceFiles = FileUtils.getFileAndDirectoryNames( reference, "**", null, false, true, true, true );
getLog().debug( "reference content: " + referenceFiles );
+
@SuppressWarnings( "unchecked" )
- List<String> actualFiles = FileUtils.getFileNames( actual, "**", null, false );
+ List<String> actualFiles = FileUtils.getFileAndDirectoryNames( actual, "**", null, false, true, true, true );
getLog().debug( "actual content: " + referenceFiles );
boolean fileNamesEquals = CollectionUtils.isEqualCollection( referenceFiles, actualFiles );
@@ -187,15 +188,21 @@ public class IntegrationTestMojo
File referenceFile = new File( reference, file );
File actualFile = new File( actual, file );
- if ( referenceFile.isDirectory() && actualFile.isFile() )
+ if ( referenceFile.isDirectory() )
{
- getLog().warn( "File " + file + " is a directory in the reference but a file in actual" );
- contentEquals = false;
+ if ( actualFile.isFile() )
+ {
+ getLog().warn( "File " + file + " is a directory in the reference but a file in actual" );
+ contentEquals = false;
+ }
}
- else if ( referenceFile.isFile() && actualFile.isDirectory() )
+ else if ( actualFile.isDirectory() )
{
- getLog().warn( "File " + file + " is a file in the reference but a directory in actual" );
- contentEquals = false;
+ if ( referenceFile.isFile() )
+ {
+ getLog().warn( "File " + file + " is a file in the reference but a directory in actual" );
+ contentEquals = false;
+ }
}
else if ( !FileUtils.contentEquals( referenceFile, actualFile ) )
{