commit 6e68de5bd8f87beff22e2dcacfd295609868a65b
author Nikita Iashchenko <nikitai@google.com> Tue May 18 22:13:56 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 18 22:13:56 2021 +0000
tree bb1d7488b197c9ab518d20256950a41850842cc5
parent 14935e0deeda1bcad9d025a78301bbf8c7b3736b
parent d105be9c56ce285c410b99265266969824ce5e6a

Merge "Move IoUtils#deleteContents from CorePlatformApi set to framework"

tests/src/com/android/providers/downloads/FsHelper.java

diff --git a/tests/src/com/android/providers/downloads/FsHelper.java b/tests/src/com/android/providers/downloads/FsHelper.java
new file mode 100644
index 0000000..d83827c
--- /dev/null
+++ b/tests/src/com/android/providers/downloads/FsHelper.java
@@ -0,0 +1,24 @@
+package com.android.providers.downloads;
+
+import java.io.File;
+
+public class FsHelper {
+
+    /**
+     * Deletes all files under a given directory. Deliberately ignores errors, on the assumption
+     * that test cleanup is only supposed to be best-effort.
+     *
+     * @param directory directory to clear its contents
+     */
+    public static void deleteContents(File directory) {
+        File[] files = directory.listFiles();
+        if (files != null) {
+            for (File file : files) {
+                if (file.isDirectory()) {
+                    deleteContents(file);
+                }
+                file.delete();
+            }
+        }
+    }
+}

tests/src/com/android/providers/downloads/HelpersTest.java

diff --git a/tests/src/com/android/providers/downloads/HelpersTest.java b/tests/src/com/android/providers/downloads/HelpersTest.java
index 61515ce..08c0b13 100644
--- a/tests/src/com/android/providers/downloads/HelpersTest.java
+++ b/tests/src/com/android/providers/downloads/HelpersTest.java
@@ -79,8 +79,8 @@
     @Override
     protected void tearDown() throws Exception {
         mMockitoHelper.tearDown();
-        IoUtils.deleteContents(getContext().getFilesDir());
-        IoUtils.deleteContents(getContext().getCacheDir());
+        FsHelper.deleteContents(getContext().getFilesDir());
+        FsHelper.deleteContents(getContext().getCacheDir());
 
         super.tearDown();
     }

tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java

diff --git a/tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java b/tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java
index 3ec3940..f45e102 100644
--- a/tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java
+++ b/tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java
@@ -54,8 +54,6 @@
 
 import androidx.test.filters.FlakyTest;
 
-import libcore.io.IoUtils;
-
 import com.google.mockwebserver.MockResponse;
 import com.google.mockwebserver.RecordedRequest;
 import com.google.mockwebserver.SocketPolicy;
@@ -93,7 +91,7 @@
                 Environment.DIRECTORY_DOWNLOADS)
                 + File.separator + "download_manager_functional_test");
         if (mTestDirectory.exists()) {
-            IoUtils.deleteContents(mTestDirectory);
+            FsHelper.deleteContents(mTestDirectory);
         } else {
             mTestDirectory.mkdir();
         }
@@ -102,7 +100,7 @@
     @Override
     protected void tearDown() throws Exception {
         if (mTestDirectory != null && mTestDirectory.exists()) {
-            IoUtils.deleteContents(mTestDirectory);
+            FsHelper.deleteContents(mTestDirectory);
             mTestDirectory.delete();
         }
         super.tearDown();