Improved the OpeningFilesFromStorageTest, EncodedUrlTest.

kiwix · Sep 30, 2024 · fe60f58 · fe60f58
1 parent 1553e37
commit fe60f58
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/localLibrary/OpeningFilesFromStorageTest.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/localLibrary/OpeningFilesFromStorageTest.kt
@@ -124,6 +124,7 @@ class OpeningFilesFromStorageTest : BaseActivityTest() {
       } catch (ignore: Exception) {
         fail("Could not open file from file manager. Original exception = $ignore")
       } finally {
+        deleteAllFilesInDirectory(File(sharedPreferenceUtil.prefStorage))
         deleteZimFileFromDownloadsFolder(uri!!)
       }
     }
@@ -149,6 +150,7 @@ class OpeningFilesFromStorageTest : BaseActivityTest() {
       } catch (ignore: Exception) {
         fail("Could not open file from file manager. Original exception = $ignore")
       } finally {
+        deleteAllFilesInDirectory(File(sharedPreferenceUtil.prefStorage))
         deleteZimFileFromDownloadsFolder(uri!!)
       }
     }
@@ -272,6 +274,18 @@ class OpeningFilesFromStorageTest : BaseActivityTest() {
     return uri
   }
 
+  private fun deleteAllFilesInDirectory(directory: File) {
+    if (directory.isDirectory) {
+      directory.listFiles()?.forEach { file ->
+        if (file.isDirectory) {
+          // Recursively delete files in subdirectories
+          deleteAllFilesInDirectory(file)
+        }
+        file.delete()
+      }
+    }
+  }
+
   @After
   fun release() {
     Intents.release()

diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/reader/EncodedUrlTest.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/reader/EncodedUrlTest.kt
@@ -30,6 +30,7 @@ import org.junit.Before
 import org.junit.Test
 import org.kiwix.kiwixmobile.BaseActivityTest
 import org.kiwix.kiwixmobile.core.DarkModeConfig
+import org.kiwix.kiwixmobile.core.extensions.deleteFile
 import org.kiwix.kiwixmobile.core.reader.ZimFileReader
 import org.kiwix.kiwixmobile.core.reader.ZimReaderSource
 import org.kiwix.kiwixmobile.core.utils.LanguageUtils.Companion.handleLocaleChange
@@ -161,7 +162,9 @@ class EncodedUrlTest : BaseActivityTest() {
       )
     }
     // dispose the ZimFileReader
-    zimFileReader.dispose()
+    zimFileReader.dispose().also {
+      zimFile.deleteFile()
+    }
   }
 
   data class EncodedUrl(val url: String, val expectedUrl: String)