Merge pull request #148 from rvanmil/master

fixes #147

Author: onmyway133

Source/Shared/Storage/DiskStorage.swift

@@ -80,6 +80,7 @@ extension DiskStorage: StorageAware {
 
   func removeAll() throws {
     try fileManager.removeItem(atPath: path)
+    try createDirectory()
   }
 
   func removeExpiredObjects() throws {

Tests/iOS/Tests/Storage/DiskStorageTests.swift

@@ -145,20 +145,24 @@ final class DiskStorageTests: XCTestCase {
       }
     }
 
-    then("the folder should be deleted") {
+    then("the folder should exist") {
       let fileExist = fileManager.fileExists(atPath: storage.path)
-      XCTAssertFalse(fileExist)
+      XCTAssertTrue(fileExist)
     }
-  }
+
+    then("the folder should be empty") {
+      let contents = try? fileManager.contentsOfDirectory(atPath: storage.path)
+      XCTAssertEqual(contents?.count, 0)
+    }
+}
 
   /// Test that it clears cache files, but keeps root directory
   func testCreateDirectory() {
     do {
       try storage.removeAll()
-      XCTAssertFalse(fileManager.fileExists(atPath: storage.path))
-
-      try storage.createDirectory()
       XCTAssertTrue(fileManager.fileExists(atPath: storage.path))
+      let contents = try? fileManager.contentsOfDirectory(atPath: storage.path)
+      XCTAssertEqual(contents?.count, 0)
     } catch {
       XCTFail(error.localizedDescription)
     }

Tests/iOS/Tests/Storage/HybridStorageTests.swift

@@ -110,8 +110,9 @@ final class HybridStorageTests: XCTestCase {
     try storage.setObject(testObject, forKey: key)
     try storage.removeAll()
 
-    then("the disk directory is removed") {
-      XCTAssertFalse(fileManager.fileExists(atPath: storage.diskStorage.path))
+    then("the disk directory is empty") {
+      let contents = try? fileManager.contentsOfDirectory(atPath: storage.diskStorage.path)
+      XCTAssertEqual(contents?.count, 0)
     }
   }