From c13a18b0a5b0fe5afdb9c133c098a138f0c408f8 Mon Sep 17 00:00:00 2001 From: rfscholte Date: Fri, 17 Apr 2020 11:43:29 +0200 Subject: [PATCH] Clean up code --- .../AbstractPlexusIoResourceCollection.java | 4 +- .../PlexusIoResourceAttributeUtilsTest.java | 66 ++++++++++--------- .../io/attributes/SymlinkUtilsTest.java | 31 +++++++-- 3 files changed, 61 insertions(+), 40 deletions(-) diff --git a/src/main/java/org/codehaus/plexus/components/io/resources/AbstractPlexusIoResourceCollection.java b/src/main/java/org/codehaus/plexus/components/io/resources/AbstractPlexusIoResourceCollection.java index 431b762e..3caf6098 100644 --- a/src/main/java/org/codehaus/plexus/components/io/resources/AbstractPlexusIoResourceCollection.java +++ b/src/main/java/org/codehaus/plexus/components/io/resources/AbstractPlexusIoResourceCollection.java @@ -297,9 +297,9 @@ public long getLastModified() throws IOException { long lastModified = PlexusIoResource.UNKNOWN_MODIFICATION_DATE; - for ( final Iterator iter = getResources(); iter.hasNext(); ) + for ( final Iterator iter = getResources(); iter.hasNext(); ) { - final PlexusIoResource res = (PlexusIoResource) iter.next(); + final PlexusIoResource res = iter.next(); long l = res.getLastModified(); if ( l == PlexusIoResource.UNKNOWN_MODIFICATION_DATE ) { diff --git a/src/test/java/org/codehaus/plexus/components/io/attributes/PlexusIoResourceAttributeUtilsTest.java b/src/test/java/org/codehaus/plexus/components/io/attributes/PlexusIoResourceAttributeUtilsTest.java index 573fb2d8..aea35e10 100644 --- a/src/test/java/org/codehaus/plexus/components/io/attributes/PlexusIoResourceAttributeUtilsTest.java +++ b/src/test/java/org/codehaus/plexus/components/io/attributes/PlexusIoResourceAttributeUtilsTest.java @@ -21,28 +21,34 @@ import org.codehaus.plexus.util.cli.CommandLineException; import org.codehaus.plexus.util.cli.CommandLineUtils; import org.codehaus.plexus.util.cli.Commandline; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; import java.io.File; import java.io.IOException; import java.net.URL; import java.util.Map; -import junit.framework.TestCase; - import static org.codehaus.plexus.components.io.attributes.PlexusIoResourceAttributeUtils.getFileAttributes; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; +import static org.junit.Assume.assumeFalse; public class PlexusIoResourceAttributeUtilsTest - extends TestCase { - + @Rule + public ExpectedException expectedException = ExpectedException.none(); + + @Test public void testGetAttributesForThisTestClass() - throws IOException + throws Exception { - if ( Os.isFamily( Os.FAMILY_WINDOWS ) ) - { - System.out.println( "WARNING: Unsupported OS, skipping test" ); - return; - } + assumeFalse( "WARNING: Unsupported OS, skipping test", Os.isFamily( Os.FAMILY_WINDOWS ) ); URL resource = Thread.currentThread().getContextClassLoader().getResource( getClass().getName().replace( '.', '/' ) + ".class" ); @@ -67,14 +73,11 @@ public void testGetAttributesForThisTestClass() assertEquals( System.getProperty( "user.name" ), fileAttrs.getUserName() ); } + @Test public void testDirectory() - throws IOException, CommandLineException + throws Exception, CommandLineException { - - if ( Os.isFamily( Os.FAMILY_WINDOWS ) ) - { - return; // Nothing to do here. - } + assumeFalse( "WARNING: Unsupported OS, skipping test", Os.isFamily( Os.FAMILY_WINDOWS ) ); URL resource = Thread.currentThread().getContextClassLoader().getResource( getClass().getName().replace( '.', '/' ) + ".class" ); @@ -112,13 +115,11 @@ public void testDirectory() assertNotNull( fileAttrs ); } + @Test public void testSrcResource() - throws IOException + throws Exception { - if ( Os.isFamily( Os.FAMILY_WINDOWS ) ) - { - return; // Nothing to do here. - } + assumeFalse( "WARNING: Unsupported OS, skipping test", Os.isFamily( Os.FAMILY_WINDOWS ) ); File dir = new File( "src/test/resources/symlinks" ); final Map fileAttributesByPathScreenScrape = @@ -134,20 +135,17 @@ public void testSrcResource() assertTrue( pr.getOctalMode() > 0 ); } - public void testNonExistingDirectory() + + @Test + public void testNonExistingDirectory() throws Exception { + expectedException.expect( IOException.class ); File dir = new File( "src/test/noSuchDirectory" ); - try - { - PlexusIoResourceAttributeUtils.getFileAttributesByPath( dir, true ); - fail( "We were supposed to get an io exceptions" ); - } - catch ( IOException ignore ) - { - ignore.printStackTrace(); - } + + PlexusIoResourceAttributeUtils.getFileAttributesByPath( dir, true ); } + @Test public void testMergeAttributesWithNullBase() { PlexusIoResourceAttributes override = @@ -162,6 +160,7 @@ public void testMergeAttributesWithNullBase() assertEquals( Integer.valueOf( 1001 ), attributes.getUserId() ); } + @Test public void testMergeAttributesWithNullOverrideGroup() { final PlexusIoResourceAttributes override = @@ -176,6 +175,7 @@ public void testMergeAttributesWithNullOverrideGroup() assertEquals( attributes.getUserId(), Integer.valueOf( 1001 ) ); } + @Test public void testMergeAttributesOverride() { final PlexusIoResourceAttributes blank = new SimpleResourceAttributes(); @@ -285,8 +285,9 @@ public void testMergeAttributesOverride() assertEquals( 0111, attributes.getOctalMode() ); } + @Test public void testFileAttributes() - throws IOException + throws Exception { PlexusIoResourceAttributes attrs = getFileAttributes( new File( "src/test/resources/symlinks/src/fileW.txt" ) ); assertFalse( attrs.isSymbolicLink() ); @@ -299,6 +300,7 @@ public void testFileAttributes() } } + @Test public void testMergeAttributesDefault() { final PlexusIoResourceAttributes blank = new SimpleResourceAttributes( null, null, null, null, 0 ); diff --git a/src/test/java/org/codehaus/plexus/components/io/attributes/SymlinkUtilsTest.java b/src/test/java/org/codehaus/plexus/components/io/attributes/SymlinkUtilsTest.java index 0d1875d7..943dbaee 100644 --- a/src/test/java/org/codehaus/plexus/components/io/attributes/SymlinkUtilsTest.java +++ b/src/test/java/org/codehaus/plexus/components/io/attributes/SymlinkUtilsTest.java @@ -16,15 +16,18 @@ package org.codehaus.plexus.components.io.attributes; -import org.apache.commons.io.FileUtils; -import org.junit.Before; -import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assume.assumeFalse; import java.io.File; import java.io.IOException; +import java.nio.file.FileSystemException; import java.nio.file.Files; -import static org.junit.Assert.*; +import org.apache.commons.io.FileUtils; +import org.codehaus.plexus.util.Os; +import org.junit.Before; +import org.junit.Test; public class SymlinkUtilsTest { @@ -53,7 +56,15 @@ public void create_read_symbolic_link_to_file() { File symlink = new File( target, "symlinkToTarget" ); File relativePath = createTargetFile( target ); - SymlinkUtils.createSymbolicLink( symlink, relativePath ); + try + { + SymlinkUtils.createSymbolicLink( symlink, relativePath ); + } + catch ( FileSystemException e ) + { + // must run as administrator in case of Windows + assumeFalse( Os.isFamily( Os.FAMILY_WINDOWS ) ); + } assertEquals( expected, FileUtils.readFileToString( symlink ) ); assertEquals( new File( "actualFile" ), SymlinkUtils.readSymbolicLink( new File( target, "symlinkToTarget" ) ) ); @@ -66,7 +77,15 @@ public void create_read_symbolic_link_to_directory() File subDir = new File( target, "aSubDir" ); createTargetFile( subDir ); File symlink = new File( target, "symlinkToDir" ); - SymlinkUtils.createSymbolicLink( symlink, new File( "aSubDir" ) ); + try + { + SymlinkUtils.createSymbolicLink( symlink, new File( "aSubDir" ) ); + } + catch ( FileSystemException e ) + { + // must run as administrator in case of Windows + assumeFalse( Os.isFamily( Os.FAMILY_WINDOWS ) ); + } assertEquals( expected, FileUtils.readFileToString( new File( symlink, "actualFile" ) ) ); assertEquals( new File( "aSubDir" ), SymlinkUtils.readSymbolicLink( new File( target, "symlinkToDir" ) ) );