Author: bentmann Date: Wed Aug 6 15:38:56 2008 New Revision: 683435 URL: http://svn.apache.org/viewvc?rev=683435&view=rev Log: o Fixed unit test to be insensitive to contents of project base directory (where lots of other files/dirs can reside)
Added: maven/scm/trunk/maven-scm-api/src/test/resources/org/apache/maven/scm/scmfileset/exclude/ maven/scm/trunk/maven-scm-api/src/test/resources/org/apache/maven/scm/scmfileset/exclude/exclude1 maven/scm/trunk/maven-scm-api/src/test/resources/org/apache/maven/scm/scmfileset/exclude/exclude2 Modified: maven/scm/trunk/maven-scm-api/src/test/java/org/apache/maven/scm/ScmFileSetTest.java Modified: maven/scm/trunk/maven-scm-api/src/test/java/org/apache/maven/scm/ScmFileSetTest.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/test/java/org/apache/maven/scm/ScmFileSetTest.java?rev=683435&r1=683434&r2=683435&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-api/src/test/java/org/apache/maven/scm/ScmFileSetTest.java (original) +++ maven/scm/trunk/maven-scm-api/src/test/java/org/apache/maven/scm/ScmFileSetTest.java Wed Aug 6 15:38:56 2008 @@ -59,7 +59,7 @@ public void testFilesListExcludes() throws IOException { - ScmFileSet fileSet = new ScmFileSet( new File( getBasedir() ), "**/**", "**/target/**" ); + ScmFileSet fileSet = new ScmFileSet( new File( getBasedir(), "src" ), "**/**", "**/exclude/**" ); List files = fileSet.getFileList(); @@ -67,7 +67,7 @@ while ( it.hasNext() ) { File file = (File) it.next(); - if ( removeBasedir( file.getAbsolutePath() ).indexOf( "target" ) != -1 ) + if ( removeBasedir( file.getAbsolutePath() ).indexOf( "exclude" ) != -1 ) { fail( "Found excludes in file set: " + file ); } @@ -77,7 +77,7 @@ public void testFilesListExcludes2() throws IOException { - ScmFileSet fileSet = new ScmFileSet( new File( getBasedir() ), "**/scmfileset/**", "**/target/**" ); + ScmFileSet fileSet = new ScmFileSet( new File( getBasedir(), "src" ), "**/scmfileset/**", "**/exclude/**" ); assertEquals( 2, fileSet.getFileList().size() ); } @@ -85,9 +85,9 @@ public void testFilesListNoExcludes() throws IOException { - ScmFileSet fileSet = new ScmFileSet( new File( getBasedir() ), "src/**/scmfileset/**" ); + ScmFileSet fileSet = new ScmFileSet( new File( getBasedir(), "src" ), "**/scmfileset/**" ); - assertEquals( 2, fileSet.getFileList().size() ); + assertEquals( 4, fileSet.getFileList().size() ); } } Added: maven/scm/trunk/maven-scm-api/src/test/resources/org/apache/maven/scm/scmfileset/exclude/exclude1 URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/test/resources/org/apache/maven/scm/scmfileset/exclude/exclude1?rev=683435&view=auto ============================================================================== (empty) Added: maven/scm/trunk/maven-scm-api/src/test/resources/org/apache/maven/scm/scmfileset/exclude/exclude2 URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/test/resources/org/apache/maven/scm/scmfileset/exclude/exclude2?rev=683435&view=auto ============================================================================== (empty)