From cb05fc86180cd9b8affa4e022465d78f18423079 Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Mon, 4 Aug 2025 08:10:48 -0700
Subject: [PATCH] Remove `StringUtils` from `PathRemoverTest` (#10887)

Co-authored-by: Tim Jacomb <21194782+timja@users.noreply.github.com>
---
 core/src/test/java/jenkins/util/io/PathRemoverTest.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/src/test/java/jenkins/util/io/PathRemoverTest.java b/core/src/test/java/jenkins/util/io/PathRemoverTest.java
index 5c59c3ac93..7163087db7 100644
--- a/core/src/test/java/jenkins/util/io/PathRemoverTest.java
+++ b/core/src/test/java/jenkins/util/io/PathRemoverTest.java
@@ -68,12 +68,12 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
-import org.apache.commons.lang.StringUtils;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
 import org.junit.jupiter.api.io.TempDir;
 import org.jvnet.hudson.test.Issue;
+import org.opentest4j.MultipleFailuresError;
 
 @Timeout(value = 30, unit = TimeUnit.SECONDS)
 class PathRemoverTest {
@@ -94,7 +94,11 @@ class PathRemoverTest {
                 exceptions.add(e);
             }
         }
-        assertTrue(exceptions.isEmpty(), "Could not unlock all files" + StringUtils.join(exceptions, '\n'));
+        if (!exceptions.isEmpty()) {
+            MultipleFailuresError e = new MultipleFailuresError("Could not unlock all files", exceptions);
+            exceptions.forEach(e::addSuppressed);
+            throw e;
+        }
     }
 
     private synchronized void acquireLock(@NonNull File file) throws IOException {