From 118662c54e363d597c51955cef3c5b56b1bd46ba Mon Sep 17 00:00:00 2001 From: Prathyush Reddy Lakkidi Date: Thu, 19 Oct 2023 17:18:08 -0500 Subject: [PATCH 1/2] Fixed flaky test --- core/src/test/java/org/apache/cxf/helpers/FileUtilsTest.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/src/test/java/org/apache/cxf/helpers/FileUtilsTest.java b/core/src/test/java/org/apache/cxf/helpers/FileUtilsTest.java index fab931fc807..9491a5436b8 100644 --- a/core/src/test/java/org/apache/cxf/helpers/FileUtilsTest.java +++ b/core/src/test/java/org/apache/cxf/helpers/FileUtilsTest.java @@ -24,6 +24,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; +import java.util.Collections; import java.util.List; import java.util.Optional; @@ -77,6 +78,8 @@ public void testGetFiles() throws URISyntaxException { List foundFiles2 = FileUtils.getFiles(directory, ".*\\.class$"); + Collections.sort(foundFiles); + Collections.sort(foundFiles2); assertEquals(foundFiles, foundFiles2); } } From 74ac89f87db56a374cb18816f52ffd544dc56381 Mon Sep 17 00:00:00 2001 From: Prathyush Reddy Lakkidi Date: Thu, 2 Nov 2023 20:14:17 -0500 Subject: [PATCH 2/2] updated the code based on the feedback recieved --- .../src/test/java/org/apache/cxf/helpers/FileUtilsTest.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/core/src/test/java/org/apache/cxf/helpers/FileUtilsTest.java b/core/src/test/java/org/apache/cxf/helpers/FileUtilsTest.java index 9491a5436b8..f816dd9c2c0 100644 --- a/core/src/test/java/org/apache/cxf/helpers/FileUtilsTest.java +++ b/core/src/test/java/org/apache/cxf/helpers/FileUtilsTest.java @@ -24,13 +24,11 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import java.util.Collections; import java.util.List; import java.util.Optional; import org.junit.Test; -import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -78,8 +76,6 @@ public void testGetFiles() throws URISyntaxException { List foundFiles2 = FileUtils.getFiles(directory, ".*\\.class$"); - Collections.sort(foundFiles); - Collections.sort(foundFiles2); - assertEquals(foundFiles, foundFiles2); + assertTrue(foundFiles.containsAll(foundFiles2) && foundFiles2.containsAll(foundFiles)); } }