Skip to content

Commit e24e853

Browse files
michael-omichael-o
committed
Disable tests which do not run on Windows by default
Some symlink tests fail on Windows because link support has to be enabled first. Disable them because it is too cumbersome to fiddle with.
1 parent c24e300 commit e24e853

File tree

2 files changed

+68
-56
lines changed

2 files changed

+68
-56
lines changed

‎src/test/java/org/codehaus/plexus/archiver/SymlinkTest.java‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -93,20 +93,23 @@ public void testSymlinkZip()
9393
public void testSymlinkDirArchiver()
9494
throws Exception
9595
{
96-
DirectoryArchiver archiver = (DirectoryArchiver) lookup( Archiver.ROLE, "dir" );
96+
if ( !Os.isFamily( Os.FAMILY_WINDOWS ) )
97+
{
98+
DirectoryArchiver archiver = (DirectoryArchiver) lookup( Archiver.ROLE, "dir" );
9799

98-
File dummyContent = getTestFile( "src/test/resources/symlinks/src" );
99-
archiver.addDirectory( dummyContent );
100-
final File archiveFile = new File( "target/output/dirarchiver-symlink" );
101-
archiveFile.mkdirs();
102-
archiver.setDestFile( archiveFile );
103-
archiver.createArchive();
100+
File dummyContent = getTestFile( "src/test/resources/symlinks/src" );
101+
archiver.addDirectory( dummyContent );
102+
final File archiveFile = new File( "target/output/dirarchiver-symlink" );
103+
archiveFile.mkdirs();
104+
archiver.setDestFile( archiveFile );
105+
archiver.createArchive();
104106

105-
File symbolicLink = new File( "target/output/dirarchiver-symlink/symR" );
106-
assertTrue( Files.isSymbolicLink( symbolicLink.toPath() ) );
107+
File symbolicLink = new File( "target/output/dirarchiver-symlink/symR" );
108+
assertTrue( Files.isSymbolicLink( symbolicLink.toPath() ) );
107109

108-
symbolicLink = new File( "target/output/dirarchiver-symlink/aDirWithALink/backOutsideToFileX" );
109-
assertTrue( Files.isSymbolicLink( symbolicLink.toPath() ) );
110+
symbolicLink = new File( "target/output/dirarchiver-symlink/aDirWithALink/backOutsideToFileX" );
111+
assertTrue( Files.isSymbolicLink( symbolicLink.toPath() ) );
112+
}
110113
}
111114

112115
}

‎src/test/java/org/codehaus/plexus/archiver/zip/ZipArchiverTest.java‎

Lines changed: 54 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -104,24 +104,27 @@ public void testImplicitPermissions()
104104
assertEquals( 0100111, pam.getUnixMode() );
105105
}
106106

107-
public void testOverddidenPermissions()
107+
public void testOveriddenPermissions()
108108
throws IOException
109109
{
110-
File zipFile = getTestFile( "target/output/zip-with-overriden-modes.zip" );
110+
if ( !Os.isFamily( Os.FAMILY_WINDOWS ) )
111+
{
112+
File zipFile = getTestFile( "target/output/zip-with-overriden-modes.zip" );
111113

112-
ZipArchiver archiver = getZipArchiver( zipFile );
113-
archiver.setDefaultDirectoryMode( 0777 );
114-
archiver.setDirectoryMode( 0641 );
115-
archiver.setFileMode( 0777 );
116-
archiver.addDirectory( new File( "src/test/resources/symlinks/src" ) );
117-
archiver.createArchive();
114+
ZipArchiver archiver = getZipArchiver( zipFile );
115+
archiver.setDefaultDirectoryMode( 0777 );
116+
archiver.setDirectoryMode( 0641 );
117+
archiver.setFileMode( 0777 );
118+
archiver.addDirectory( new File( "src/test/resources/symlinks/src" ) );
119+
archiver.createArchive();
118120

119-
assertTrue( zipFile.exists() );
120-
ZipFile zf = new ZipFile( zipFile );
121-
ZipArchiveEntry fizz = zf.getEntry( "symDir" );
122-
assertTrue( fizz.isUnixSymlink() );
123-
ZipArchiveEntry symR = zf.getEntry( "symR" );
124-
assertTrue( symR.isUnixSymlink() );
121+
assertTrue( zipFile.exists() );
122+
ZipFile zf = new ZipFile( zipFile );
123+
ZipArchiveEntry fizz = zf.getEntry( "symDir" );
124+
assertTrue( fizz.isUnixSymlink() );
125+
ZipArchiveEntry symR = zf.getEntry( "symR" );
126+
assertTrue( symR.isUnixSymlink() );
127+
}
125128
}
126129

127130
public void testCreateArchiveWithDetectedModes()
@@ -543,43 +546,49 @@ else if ( ze.isUnixSymlink() )
543546
public void testSymlinkZip()
544547
throws Exception
545548
{
546-
final File zipFile = getTestFile( "target/output/pasymlinks.zip" );
547-
final ZipArchiver zipArchiver = getZipArchiver( zipFile );
548-
PlexusIoFileResourceCollection files = new PlexusIoFileResourceCollection();
549-
files.setFollowingSymLinks( false );
550-
files.setBaseDir( new File( "src/test/resources/symlinks" ) );
551-
files.setPrefix( "plexus/" );
552-
zipArchiver.addResources( files );
553-
zipArchiver.createArchive();
554-
final File output = getTestFile( "target/output/unzipped" );
555-
output.mkdirs();
556-
final ZipUnArchiver zipUnArchiver = getZipUnArchiver( zipFile );
557-
zipUnArchiver.setDestFile( output );
558-
zipUnArchiver.extract();
559-
File symDir = new File( "target/output/unzipped/plexus/src/symDir" );
560-
PlexusIoResourceAttributes fa = FileAttributes.uncached( symDir );
561-
assertTrue( fa.isSymbolicLink() );
549+
if ( !Os.isFamily( Os.FAMILY_WINDOWS ) )
550+
{
551+
final File zipFile = getTestFile( "target/output/pasymlinks.zip" );
552+
final ZipArchiver zipArchiver = getZipArchiver( zipFile );
553+
PlexusIoFileResourceCollection files = new PlexusIoFileResourceCollection();
554+
files.setFollowingSymLinks( false );
555+
files.setBaseDir( new File( "src/test/resources/symlinks" ) );
556+
files.setPrefix( "plexus/" );
557+
zipArchiver.addResources( files );
558+
zipArchiver.createArchive();
559+
final File output = getTestFile( "target/output/unzipped" );
560+
output.mkdirs();
561+
final ZipUnArchiver zipUnArchiver = getZipUnArchiver( zipFile );
562+
zipUnArchiver.setDestFile( output );
563+
zipUnArchiver.extract();
564+
File symDir = new File( "target/output/unzipped/plexus/src/symDir" );
565+
PlexusIoResourceAttributes fa = FileAttributes.uncached( symDir );
566+
assertTrue( fa.isSymbolicLink() );
567+
}
562568
}
563569

564570
@SuppressWarnings( "ResultOfMethodCallIgnored" )
565571
public void testSymlinkFileSet()
566572
throws Exception
567573
{
568-
final File zipFile = getTestFile( "target/output/pasymlinks-fileset.zip" );
569-
final ZipArchiver zipArchiver = getZipArchiver( zipFile );
570-
final DefaultFileSet fs = new DefaultFileSet();
571-
fs.setPrefix( "bzz/" );
572-
fs.setDirectory( new File( "src/test/resources/symlinks/src" ) );
573-
zipArchiver.addFileSet( fs );
574-
zipArchiver.createArchive();
575-
final File output = getTestFile( "target/output/unzipped/symlFs" );
576-
output.mkdirs();
577-
final ZipUnArchiver zipUnArchiver = getZipUnArchiver( zipFile );
578-
zipUnArchiver.setDestFile( output );
579-
zipUnArchiver.extract();
580-
File symDir = new File( output, "bzz/symDir" );
581-
PlexusIoResourceAttributes fa = FileAttributes.uncached( symDir );
582-
assertTrue( fa.isSymbolicLink() );
574+
if ( !Os.isFamily( Os.FAMILY_WINDOWS ) )
575+
{
576+
final File zipFile = getTestFile( "target/output/pasymlinks-fileset.zip" );
577+
final ZipArchiver zipArchiver = getZipArchiver( zipFile );
578+
final DefaultFileSet fs = new DefaultFileSet();
579+
fs.setPrefix( "bzz/" );
580+
fs.setDirectory( new File( "src/test/resources/symlinks/src" ) );
581+
zipArchiver.addFileSet( fs );
582+
zipArchiver.createArchive();
583+
final File output = getTestFile( "target/output/unzipped/symlFs" );
584+
output.mkdirs();
585+
final ZipUnArchiver zipUnArchiver = getZipUnArchiver( zipFile );
586+
zipUnArchiver.setDestFile( output );
587+
zipUnArchiver.extract();
588+
File symDir = new File( output, "bzz/symDir" );
589+
PlexusIoResourceAttributes fa = FileAttributes.uncached( symDir );
590+
assertTrue( fa.isSymbolicLink() );
591+
}
583592
}
584593

585594
public void testSymlinkArchivedFileSet()

0 commit comments

Comments
 (0)