Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[MSHARED-685] assert some things #16

Merged
merged 4 commits into from
Feb 24, 2020
Merged

[MSHARED-685] assert some things #16

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3d01167
assert some things
elharo Feb 23, 2020
eac2d72
assert some things
elharo Feb 23, 2020
8d00171
restore asserts
elharo Feb 23, 2020
0c8eb48
add spaces
elharo Feb 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,10 @@ private void createTestData()
{
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 );
Expand All @@ -60,7 +63,10 @@ private void createTestData()
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 );
}

Expand Down Expand Up @@ -131,11 +137,9 @@ public void checkSymlinkBehaviour()
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 );
assertEquals( 9, files.length );
}

@Test
Expand All @@ -155,7 +159,7 @@ public void followSymlinksFalse()
assertAlwaysIncluded( included );
assertEquals( 9, included.size() );
List<String> includedDirs = Arrays.asList( ds.getIncludedDirectories() );
assertTrue( includedDirs.contains( "" ) ); // w00t !
assertTrue( includedDirs.contains( "" ) );
assertTrue( includedDirs.contains( "aRegularDir" ) );
assertTrue( includedDirs.contains( "symDir" ) );
assertTrue( includedDirs.contains( "symLinkToDirOnTheOutside" ) );
Expand Down