commit c849db89d32bdc8c5a0f5c123201ad74f1006934
author Éamonn McManus <emcmanus@google.com> Tue Nov 12 16:08:14 2024 -0800
committer Éamonn McManus <emcmanus@google.com> Tue Nov 12 16:08:14 2024 -0800
tree 6f99632ed0ec9e734eae39d1ab4dba5688122567
parent 58f203aa69528ea5b1e05e503fa0c3f5354e45a5

Use Guava's `MoreFiles` for recursive deletion.

The Apache `FileUtils.deleteDirectory` has historically been unstable.
Most recently,
https://issues.apache.org/jira/projects/IO/issues/IO-862
causes `SymlinkValidatorTest` to fail at HEAD.

Change-Id: Id783a2b9fdd67608d72bdd3b6fbf03ccd4cbe425

src/test/java/com/googlesource/gerrit/plugins/uploadvalidator/ValidatorTestCase.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/uploadvalidator/ValidatorTestCase.java b/src/test/java/com/googlesource/gerrit/plugins/uploadvalidator/ValidatorTestCase.java
index 07a78ab..2702f95 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/uploadvalidator/ValidatorTestCase.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/uploadvalidator/ValidatorTestCase.java
@@ -14,9 +14,9 @@
 
 package com.googlesource.gerrit.plugins.uploadvalidator;
 
+import com.google.common.io.MoreFiles;
 import java.io.File;
 import java.io.IOException;
-import org.apache.commons.io.FileUtils;
 import org.eclipse.jgit.lib.Repository;
 import org.junit.After;
 import org.junit.Before;
@@ -36,7 +36,7 @@
   public void cleanup() throws IOException {
     repo.close();
     if (repoFolder.exists()) {
-      FileUtils.deleteDirectory(repoFolder);
+      MoreFiles.deleteRecursively(repoFolder.toPath());
     }
   }
 }