[maven-stage-plugin] branch master updated: [MSTAGE-25] use Java 7 file handling in test (#4)

[elharo]

This is an automated email from the ASF dual-hosted git repository.

elharo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-stage-plugin.git


The following commit(s) were added to refs/heads/master by this push:
     new a23c2e8  [MSTAGE-25] use Java 7 file handling in test (#4)
a23c2e8 is described below

commit a23c2e80929be9495abb05d62bd2121ed41f72c2
Author: Elliotte Rusty Harold <elh...@users.noreply.github.com>
AuthorDate: Sun Oct 4 08:42:44 2020 -0400

    [MSTAGE-25] use Java 7 file handling in test (#4)
    
    * use Java 7 file handling in test
    * use newBufferedReader
---
 .../maven/plugins/stage/RepositoryCopierTest.java  | 59 +++++++++++-----------
 1 file changed, 30 insertions(+), 29 deletions(-)

diff --git 
a/src/test/java/org/apache/maven/plugins/stage/RepositoryCopierTest.java 
b/src/test/java/org/apache/maven/plugins/stage/RepositoryCopierTest.java
index 61a4ec7..4b0ab34 100644
--- a/src/test/java/org/apache/maven/plugins/stage/RepositoryCopierTest.java
+++ b/src/test/java/org/apache/maven/plugins/stage/RepositoryCopierTest.java
@@ -20,14 +20,17 @@ package org.apache.maven.plugins.stage;
  */
 
 import org.codehaus.plexus.PlexusTestCase;
-import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 import 
org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Reader;
+import org.apache.commons.io.FileUtils;
 import org.apache.maven.artifact.repository.metadata.Metadata;
 import org.apache.maven.wagon.repository.Repository;
 
 import java.io.File;
+import java.io.IOException;
 import java.io.Reader;
-import java.io.FileReader;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 import java.util.List;
 
 /** @author Jason van Zyl */
@@ -47,9 +50,7 @@ public class RepositoryCopierTest
 
         File targetRepo = new File( getBasedir(), "target/target-repository" );
 
-        System.out.println( "Copying target stage for tests ..." );
-
-        FileUtils.copyDirectoryStructure( targetRepoSource, targetRepo );
+        FileUtils.copyDirectory( targetRepoSource, targetRepo );
 
         File stagingRepo = new File( getBasedir(), 
"src/test/staging-repository" );
 
@@ -95,7 +96,7 @@ public class RepositoryCopierTest
     }
 
     private void testMavenArtifact( File repo, String artifact )
-        throws Exception
+        throws IOException, XmlPullParserException
     {
         File basedir = new File( repo, "org/apache/maven/" + artifact );
 
@@ -103,28 +104,28 @@ public class RepositoryCopierTest
 
         assertTrue( versionDir.exists() );
 
-        Reader r = new FileReader( new File( basedir, 
RepositoryCopier.MAVEN_METADATA) );
-
-        Metadata metadata = reader.read( r );
-
-        // Make sure our new versions has been setup as the release.
-        assertEquals( version, metadata.getVersioning().getRelease() );
-
-        assertEquals( "20070327020553", 
metadata.getVersioning().getLastUpdated() );
-
-        // Make sure we didn't whack old versions.
-        List versions = metadata.getVersioning().getVersions();
-
-        assertTrue( versions.contains( "2.0.1" ) );
-
-        assertTrue( versions.contains( "2.0.2" ) );
-
-        assertTrue( versions.contains( "2.0.3" ) );
-        
-        assertTrue( versions.contains( "2.0.4" ) );
-
-        assertTrue( versions.contains( "2.0.5" ) );
-
-        r.close();
+        File file = new File( basedir, RepositoryCopier.MAVEN_METADATA );
+        try ( Reader r = Files.newBufferedReader( file.toPath(), 
StandardCharsets.UTF_8 ) )
+        {
+            Metadata metadata = reader.read( r );
+    
+            // Make sure our new version has been setup as the release.
+            assertEquals( version, metadata.getVersioning().getRelease() );
+    
+            assertEquals( "20070327020553", 
metadata.getVersioning().getLastUpdated() );
+    
+            // Make sure we didn't whack old versions.
+            List<String> versions = metadata.getVersioning().getVersions();
+    
+            assertTrue( versions.contains( "2.0.1" ) );
+    
+            assertTrue( versions.contains( "2.0.2" ) );
+    
+            assertTrue( versions.contains( "2.0.3" ) );
+            
+            assertTrue( versions.contains( "2.0.4" ) );
+    
+            assertTrue( versions.contains( "2.0.5" ) );
+        }
     }
 }