refactor:

tidy cleanup of files for filestore tests
bugsnag · Apr 19, 2018 · 45e8a35 · 45e8a35
1 parent 7bc8576
commit 45e8a35
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/sdk/src/androidTest/java/com/bugsnag/android/ErrorStoreTest.java b/sdk/src/androidTest/java/com/bugsnag/android/ErrorStoreTest.java
@@ -44,7 +44,7 @@ public void setUp() throws Exception {
         config = client.config;
         errorStore = client.errorStore;
         errorStorageDir = errorStore.storageDir;
-        FileUtils.clearFilesInDir(errorStorageDir);
+        FileUtils.clearFiles(errorStore);
     }
 
     /**
@@ -54,7 +54,7 @@ public void setUp() throws Exception {
      */
     @After
     public void tearDown() throws Exception {
-        FileUtils.clearFilesInDir(errorStorageDir);
+        FileUtils.clearFiles(errorStore);
     }
 
     @Test

diff --git a/sdk/src/androidTest/java/com/bugsnag/android/FileUtils.java b/sdk/src/androidTest/java/com/bugsnag/android/FileUtils.java
@@ -7,7 +7,13 @@ final class FileUtils {
     private FileUtils() {
     }
 
-    static void clearFilesInDir(File storageDir) {
+    static void clearFiles(FileStore fileStore) {
+        File storageDir = fileStore.storageDir;
+        clearFilesInDir(storageDir);
+        clearFilesInDir(new File(fileStore.oldDirectory));
+    }
+
+    private static void clearFilesInDir(File storageDir) {
         if (!storageDir.isDirectory()) {
             throw new IllegalArgumentException();
         }

diff --git a/sdk/src/androidTest/java/com/bugsnag/android/SessionStoreTest.java b/sdk/src/androidTest/java/com/bugsnag/android/SessionStoreTest.java
@@ -34,7 +34,7 @@ public void setUp() throws Exception {
         Client client = new Client(InstrumentationRegistry.getContext(), "api-key");
         sessionStore = client.sessionStore;
         storageDir = sessionStore.storageDir;
-        FileUtils.clearFilesInDir(storageDir);
+        FileUtils.clearFiles(sessionStore);
     }
 
     /**
@@ -44,7 +44,7 @@ public void setUp() throws Exception {
      */
     @After
     public void tearDown() throws Exception {
-        FileUtils.clearFilesInDir(storageDir);
+        FileUtils.clearFiles(sessionStore);
     }
 
     @Test

diff --git a/sdk/src/androidTest/java/com/bugsnag/android/SessionTrackingPayloadTest.java b/sdk/src/androidTest/java/com/bugsnag/android/SessionTrackingPayloadTest.java
@@ -26,7 +26,6 @@ public class SessionTrackingPayloadTest {
     private AppData appData;
 
     private SessionStore sessionStore;
-    private File storageDir;
 
     /**
      * Configures a session tracking payload and session store, ensuring that 0 files are present
@@ -38,8 +37,7 @@ public void setUp() throws Exception {
         Context context = InstrumentationRegistry.getContext();
         Client client = new Client(context, "api-key");
         sessionStore = client.sessionStore;
-        storageDir = sessionStore.storageDir;
-        FileUtils.clearFilesInDir(storageDir);
+        FileUtils.clearFiles(sessionStore);
 
         session = generateSession();
         appData = new AppData(context, new Configuration("a"), generateSessionTracker());
@@ -54,7 +52,7 @@ public void setUp() throws Exception {
      */
     @After
     public void tearDown() throws Exception {
-        FileUtils.clearFilesInDir(storageDir);
+        FileUtils.clearFiles(sessionStore);
     }
 
     @Test