[7.67.x-blue] flaky test fixed (#1448)

Author: yesamer

uberfire-extensions/uberfire-metadata/uberfire-metadata-backends/uberfire-metadata-backend-infinispan/src/test/java/org/uberfire/ext/metadata/backend/infinispan/provider/InfinispanPingServiceTest.java

@@ -52,6 +52,7 @@ public void setUp() {
     public void testPingSuccess() {
         {
             InfinispanPingService service = spy(new InfinispanPingService(remoteCache));
+            when(pingResponse.isSuccess()).thenReturn(true);
             assertTrue(service.ping());
             service.stop();
         }

uberfire-nio2-backport/uberfire-nio2-impls/uberfire-nio2-fs/src/main/java/org/uberfire/java/nio/fs/file/SimpleFileSystemProvider.java

@@ -33,6 +33,8 @@
 import java.util.concurrent.ExecutorService;
 
 import org.apache.commons.io.FileUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.uberfire.java.nio.IOException;
 import org.uberfire.java.nio.base.BasicFileAttributesImpl;
 import org.uberfire.java.nio.base.ExtendedAttributeView;
@@ -73,8 +75,10 @@
 
 public class SimpleFileSystemProvider implements FileSystemProvider {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(SimpleFileSystemProvider.class);
     private static final String STREAM_CLOSED = "This stream is closed.";
     private static final String USER_DIR = "user.dir";
+
     protected BaseSimpleFileSystem fileSystem;
     private final OSType osType;
     private final File[] roots;
@@ -419,7 +423,7 @@ public void delete(final Path path,
     @Override
     public boolean deleteIfExists(final Path path,
                                   final DeleteOption... options)
-            throws DirectoryNotEmptyException, IOException, SecurityException {
+            throws IOException, SecurityException {
         checkNotNull("path",
                      path);
         synchronized (this) {
@@ -430,16 +434,18 @@ public boolean deleteIfExists(final Path path,
                     throw new DirectoryNotEmptyException(path.toString());
                 }
 
-                final boolean result = file.exists();
+                boolean fileRemoved = file.exists();
 
-                try {
-                    FileUtils.forceDelete(file);
-                } catch (final FileNotFoundException ignore) {
-                } catch (java.io.IOException e) {
-                    throw new IOException(e);
+                if (file.exists()) {
+                    try {
+                        FileUtils.forceDelete(file);
+                    } catch (java.io.IOException e) {
+                        fileRemoved = false;
+                        LOGGER.error("Error trying to delete file {}", file.getAbsolutePath(), e);
+                    }
                 }
 
-                return result;
+                return fileRemoved;
             } finally {
                 toGeneralPathImpl(path).clearCache();
             }

uberfire-nio2-backport/uberfire-nio2-impls/uberfire-nio2-fs/src/test/java/org/uberfire/java/nio/fs/file/SimpleFileSystemProviderTest.java

@@ -594,7 +594,7 @@ public void checkDeleteIfExists() throws IOException {
         assertThat(path.toFile()).doesNotExist();
     }
 
-    @Test(expected = org.uberfire.java.nio.IOException.class)
+    @Test
     public void checkDeleteIfExistsNonExistent() {
         final SimpleFileSystemProvider fsProvider = new SimpleFileSystemProvider();