You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by el...@apache.org on 2020/03/11 20:29:08 UTC
[maven-shared-utils] 01/01: system independent file separator
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch windows
in repository https://gitbox.apache.org/repos/asf/maven-shared-utils.git
commit 7d4ea36ee5b4541586d6fba395fcccc906d67053
Author: Elliotte Rusty Harold <el...@ibiblio.org>
AuthorDate: Wed Mar 11 16:28:35 2020 -0400
system independent file separator
---
.gitignore | 2 ++
.../org/apache/maven/shared/utils/io/DirectoryScannerTest.java | 8 +++++---
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/.gitignore b/.gitignore
index f79c928..e1b7e45 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,5 @@ out/
/bootstrap
/dependencies.xml
.java-version
+.checkstyle
+
diff --git a/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java b/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java
index a6149a3..2155338 100644
--- a/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java
@@ -135,10 +135,12 @@ public class DirectoryScannerTest
ds.setBasedir( new File( "src/test/resources/symlinks/src" ) );
ds.setFollowSymlinks( false );
ds.scan();
+
String[] includedDirectories = ds.getIncludedDirectories();
+ assertEquals( 5, includedDirectories.length );
+
String[] files = ds.getIncludedFiles();
assertAlwaysIncluded( Arrays.asList( files ) );
- assertEquals( 5, includedDirectories.length );
assertEquals( 9, files.length );
}
@@ -169,8 +171,8 @@ public class DirectoryScannerTest
private void assertAlwaysIncluded( List<String> included )
{
- assertTrue( included.contains( "aRegularDir/aRegularFile.txt" ) );
- assertTrue( included.contains( "targetDir/targetFile.txt" ) );
+ assertTrue( included.contains( "aRegularDir" + File.separator + "aRegularFile.txt" ) );
+ assertTrue( included.contains( "targetDir" + File.separator + "targetFile.txt" ) );
assertTrue( included.contains( "fileR.txt" ) );
assertTrue( included.contains( "fileW.txt" ) );
assertTrue( included.contains( "fileX.txt" ) );