clean up after tests

jessesquires · Jun 6, 2016 · f6d6251 · f6d6251
1 parent 4af88f3
commit f6d6251
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 2 deletions.
diff --git a/Tests/MigrationTests.swift b/Tests/MigrationTests.swift
@@ -34,6 +34,11 @@ class MigrationTests: TestCase {
         _ = try? model.removeExistingStore()
     }
 
+    override func tearDown() {
+        _ = try? model.removeExistingStore()
+        super.tearDown()
+    }
+
     func test_ThatCoreDataModel_NeedsMigration_WhenUsingOldModel() {
         // GIVEN: an existing SQLite file with metadata pointing to an old version of the model
         createSQLitePersistentStore(managedObjectModel: managedObjectModel(versionName: "Version 1"))

diff --git a/Tests/StackFactoryTests.swift b/Tests/StackFactoryTests.swift
@@ -28,11 +28,15 @@ import JSQCoreDataKit
 class StackFactoryTests: TestCase {
 
     override func setUp() {
-        let model = CoreDataModel(name: modelName, bundle: modelBundle)
-        _ = try? model.removeExistingStore()
+        cleanUp()
         super.setUp()
     }
 
+    override func tearDown() {
+        cleanUp()
+        super.tearDown()
+    }
+
     func test_ThatStackFactory_InitializesSuccessFully() {
         let factory = CoreDataStackFactory(model: inMemoryModel)
         XCTAssertEqual(factory.model, inMemoryModel)

diff --git a/Tests/StackTests.swift b/Tests/StackTests.swift
@@ -27,6 +27,12 @@ import JSQCoreDataKit
 
 class StackTests: XCTestCase {
 
+    override func tearDown() {
+        let model = CoreDataModel(name: modelName, bundle: modelBundle)
+        _ = try? model.removeExistingStore()
+        super.tearDown()
+    }
+
     func test_ThatSQLiteStack_InitializesSuccessfully() {
         // GIVEN: a SQLite model
         let sqliteModel = CoreDataModel(name: modelName, bundle: modelBundle)

diff --git a/Tests/TestCase.swift b/Tests/TestCase.swift
@@ -40,6 +40,14 @@ extension CoreDataStackFactory {
 }
 
 
+extension XCTestCase {
+    func cleanUp() {
+        let model = CoreDataModel(name: modelName, bundle: modelBundle)
+        _ = try? model.removeExistingStore()
+    }
+}
+
+
 class TestCase: XCTestCase {
 
     let inMemoryModel = CoreDataModel(name: modelName, bundle: modelBundle, storeType: .inMemory)