Centralize FileUtils usage into ItUtils

Author: gnodet

its/core-it-suite/src/test/java/org/apache/maven/it/ItUtils.java

@@ -59,7 +59,7 @@ public static String calcHash(Path file, String algo) throws Exception {
     }
 
     public static void assertCanonicalFileEquals(Path expected, Path actual) throws IOException {
-        assertEquals(expected.toFile().getCanonicalFile(), actual.toFile().getCanonicalFile());
+        assertEquals(canonicalPath(expected), canonicalPath(actual));
     }
 
     public static void createFile(Path path) throws IOException {
@@ -77,4 +77,12 @@ public static void lastModified(Path path, long millis) throws IOException {
     public static void deleteDirectory(Path path) throws IOException {
         FileUtils.deleteDirectory(path.toFile());
     }
+
+    public static void copyDirectoryStructure(Path src, Path dest) throws IOException {
+        FileUtils.copyDirectory(src.toFile(), dest.toFile());
+    }
+
+    public static String canonicalPath(Path path) throws IOException {
+        return path.toFile().getCanonicalPath();
+    }
 }

its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest.java

@@ -22,7 +22,6 @@
 import java.io.Reader;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
 import org.codehaus.plexus.util.xml.Xpp3DomBuilder;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
@@ -43,7 +42,7 @@ public void testitMNG3441() throws Exception {
 
         Path targetRepository = testDir.resolve("target-repo");
         ItUtils.deleteDirectory(targetRepository);
-        FileUtils.copyDirectoryStructure(testDir.resolve("deploy-repo").toFile(), targetRepository.toFile());
+        ItUtils.copyDirectoryStructure(testDir.resolve("deploy-repo"), targetRepository);
 
         Verifier verifier;
 

its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4309StrictChecksumValidationForMetadataTest.java

@@ -19,7 +19,6 @@
 package org.apache.maven.it;
 
 import java.nio.file.Path;
-import org.codehaus.plexus.util.FileUtils;
 import org.junit.jupiter.api.Test;
 
 /**
@@ -43,7 +42,7 @@ public void testit() throws Exception {
         verifier.setAutoclean(false);
         verifier.deleteDirectory("target");
         verifier.deleteArtifacts("org.apache.maven.its.mng4309");
-        FileUtils.copyDirectoryStructure(testDir.resolve("repo").toFile(), testDir.resolve("target/repo").toFile());
+        ItUtils.copyDirectoryStructure(testDir.resolve("repo"), testDir.resolve("target/repo"));
         verifier.addCliArgument("--strict-checksums");
         try {
             verifier.addCliArgument("validate");

its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4554PluginPrefixMappingUpdateTest.java

@@ -27,7 +27,6 @@
 import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import org.codehaus.plexus.util.FileUtils;
 import org.eclipse.jetty.server.NetworkConnector;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.Server;
@@ -262,7 +261,7 @@ public void handle(
             verifier.addCliArgument("-s");
             verifier.addCliArgument("settings.xml");
 
-            FileUtils.copyDirectoryStructure(testDir.resolve("repo-1").toFile(), testDir.resolve("repo-it").toFile());
+            ItUtils.copyDirectoryStructure(testDir.resolve("repo-1"), testDir.resolve("repo-it"));
 
             verifier.setLogFileName("log-refetched-1.txt");
             verifier.addCliArgument("a:touch");
@@ -275,7 +274,7 @@ public void handle(
             requestedUris.clear();
 
             // simulate deployment of new plugin which updates the prefix mapping in the remote repo
-            FileUtils.copyDirectoryStructure(testDir.resolve("repo-2").toFile(), testDir.resolve("repo-it").toFile());
+            ItUtils.copyDirectoryStructure(testDir.resolve("repo-2"), testDir.resolve("repo-it"));
 
             verifier.setLogFileName("log-refetched-2.txt");
             verifier.addCliArgument("b:touch");

its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5868NoDuplicateAttachedArtifacts.java

@@ -106,7 +106,7 @@ public void testNoDeployNotDuplicate() throws Exception {
         verifier.setAutoclean(false);
         verifier.deleteDirectory("target");
         verifier.deleteArtifacts("org.apache.maven.its.mng5868");
-        verifier.addCliArgument("-Dartifact.attachedFile=" + tmp.toFile().getCanonicalPath());
+        verifier.addCliArgument("-Dartifact.attachedFile=" + ItUtils.canonicalPath(tmp));
         verifier.addCliArgument("-DdeploymentPort=" + port);
         verifier.addCliArguments("org.apache.maven.its.plugins:maven-it-plugin-artifact:2.1-SNAPSHOT:attach", "deploy");
         verifier.execute();