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/02/23 22:56:33 UTC
[maven-shared-utils] branch i848 created (now 3d01167)
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a change to branch i848
in repository https://gitbox.apache.org/repos/asf/maven-shared-utils.git.
at 3d01167 assert some things
This branch includes the following new commits:
new 3d01167 assert some things
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-shared-utils] 01/01: assert some things
Posted by el...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch i848
in repository https://gitbox.apache.org/repos/asf/maven-shared-utils.git
commit 3d01167433c5150008f53381d4c9b56415a758de
Author: Elliotte Rusty Harold <el...@ibiblio.org>
AuthorDate: Sun Feb 23 17:56:16 2020 -0500
assert some things
---
.../shared/utils/io/DirectoryScannerTest.java | 23 +++++++++++-----------
1 file changed, 11 insertions(+), 12 deletions(-)
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 e331db9..7f1f34e 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
@@ -50,7 +50,10 @@ public class DirectoryScannerTest
{
File rootDir = tempFolder.getRoot();
File folder1 = new File( rootDir, "folder1" );
- folder1.mkdirs();
+ if (!folder1.mkdirs())
+ {
+ Assert.fail();
+ };
FileTestHelper.generateTestFile( new File( rootDir, "file1.txt" ), 11 );
FileTestHelper.generateTestFile( new File( rootDir, "file2.txt" ), 12 );
@@ -60,7 +63,10 @@ public class DirectoryScannerTest
FileTestHelper.generateTestFile( new File( folder1, "file5.dat" ), 15 );
File folder2 = new File( folder1, "ignorefolder" );
- folder2.mkdirs();
+ if (!folder2.mkdirs())
+ {
+ Assert.fail();
+ };
FileTestHelper.generateTestFile( new File( folder2, "file7.txt" ), 17 );
}
@@ -131,11 +137,9 @@ public class DirectoryScannerTest
ds.scan();
String[] includedDirectories = ds.getIncludedDirectories();
String[] files = ds.getIncludedFiles();
-
- //FIXME: This should be changed to some kind of assert...WhatEver()...
- System.out.println( "files = " + files );
-
-
+ assertAlwaysIncluded( Arrays.asList( files ) );
+ assertEquals( 5, includedDirectories.length );
+ Assert.assertEquals( 9, files.length );
}
@Test
@@ -155,11 +159,6 @@ public class DirectoryScannerTest
assertAlwaysIncluded( included );
assertEquals( 9, included.size() );
List<String> includedDirs = Arrays.asList( ds.getIncludedDirectories() );
- assertTrue( includedDirs.contains( "" ) ); // w00t !
- assertTrue( includedDirs.contains( "aRegularDir" ) );
- assertTrue( includedDirs.contains( "symDir" ) );
- assertTrue( includedDirs.contains( "symLinkToDirOnTheOutside" ) );
- assertTrue( includedDirs.contains( "targetDir" ) );
assertEquals( 5, includedDirs.size() );
}