diff --git a/CoreStore.xcodeproj/project.pbxproj b/CoreStore.xcodeproj/project.pbxproj index 8ecec76..02af12f 100644 --- a/CoreStore.xcodeproj/project.pbxproj +++ b/CoreStore.xcodeproj/project.pbxproj @@ -299,6 +299,12 @@ B5677D411CD3B1E400322BFC /* ICloudStoreObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5677D3C1CD3B1E400322BFC /* ICloudStoreObserver.swift */; }; B56964D41B22FFAD0075EE4A /* DataStack+Migration.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56964D31B22FFAD0075EE4A /* DataStack+Migration.swift */; }; B56965241B356B820075EE4A /* MigrationResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56965231B356B820075EE4A /* MigrationResult.swift */; }; + B580857A1CDF808C004C2EEB /* SetupTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B58085741CDF7F00004C2EEB /* SetupTests.swift */; }; + B580857B1CDF808D004C2EEB /* SetupTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B58085741CDF7F00004C2EEB /* SetupTests.swift */; }; + B580857C1CDF808F004C2EEB /* SetupTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B58085741CDF7F00004C2EEB /* SetupTests.swift */; }; + B580857E1CDF8149004C2EEB /* BaseTestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = B580857D1CDF8149004C2EEB /* BaseTestCase.swift */; }; + B580857F1CDF8149004C2EEB /* BaseTestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = B580857D1CDF8149004C2EEB /* BaseTestCase.swift */; }; + B58085801CDF8149004C2EEB /* BaseTestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = B580857D1CDF8149004C2EEB /* BaseTestCase.swift */; }; B58B22F51C93C1BA00521925 /* CoreStore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2F03A53019C5C6DA005002A5 /* CoreStore.framework */; }; B59851491C90289D00C99590 /* NSPersistentStoreCoordinator+Setup.swift in Sources */ = {isa = PBXBuildFile; fileRef = B59AFF401C6593E400C0ABE2 /* NSPersistentStoreCoordinator+Setup.swift */; }; B598514A1C90289E00C99590 /* NSPersistentStoreCoordinator+Setup.swift in Sources */ = {isa = PBXBuildFile; fileRef = B59AFF401C6593E400C0ABE2 /* NSPersistentStoreCoordinator+Setup.swift */; }; @@ -666,6 +672,8 @@ B5677D3C1CD3B1E400322BFC /* ICloudStoreObserver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ICloudStoreObserver.swift; sourceTree = ""; }; B56964D31B22FFAD0075EE4A /* DataStack+Migration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "DataStack+Migration.swift"; sourceTree = ""; }; B56965231B356B820075EE4A /* MigrationResult.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MigrationResult.swift; sourceTree = ""; }; + B58085741CDF7F00004C2EEB /* SetupTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SetupTests.swift; sourceTree = ""; }; + B580857D1CDF8149004C2EEB /* BaseTestCase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BaseTestCase.swift; sourceTree = ""; }; B59AFF401C6593E400C0ABE2 /* NSPersistentStoreCoordinator+Setup.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSPersistentStoreCoordinator+Setup.swift"; sourceTree = ""; }; B59FA0AD1CCBAC95007C9BCA /* ICloudStore.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ICloudStore.swift; sourceTree = ""; }; B5A261201B64BFDB006EB6D3 /* MigrationType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MigrationType.swift; sourceTree = ""; }; @@ -895,6 +903,7 @@ 2F03A53C19C5C6DA005002A5 /* CoreStoreTests */ = { isa = PBXGroup; children = ( + B58085741CDF7F00004C2EEB /* SetupTests.swift */, 2F03A53F19C5C6DA005002A5 /* CoreStoreTests.swift */, B5DC47C91C93D9C800FA3BF3 /* StorageInterfaceTests.swift */, B5DBE2DD1C9939E100B5CEFA /* BridgingTests.h */, @@ -904,6 +913,7 @@ B5D372851A39CDDB00F583D9 /* TestEntity1.swift */, B5D5E0CE1A4D6AAB006468AF /* TestEntity2.swift */, 2F03A53D19C5C6DA005002A5 /* Supporting Files */, + B580857D1CDF8149004C2EEB /* BaseTestCase.swift */, ); path = CoreStoreTests; sourceTree = ""; @@ -1676,9 +1686,11 @@ files = ( B5519A401CA1B17B002BEF78 /* ErrorTests.swift in Sources */, 2F03A54019C5C6DA005002A5 /* CoreStoreTests.swift in Sources */, + B580857E1CDF8149004C2EEB /* BaseTestCase.swift in Sources */, B5DC47C61C93D22900FA3BF3 /* MigrationChainTests.swift in Sources */, B5D372861A39CDDB00F583D9 /* TestEntity1.swift in Sources */, B5D372841A39CD6900F583D9 /* Model.xcdatamodeld in Sources */, + B580857A1CDF808C004C2EEB /* SetupTests.swift in Sources */, B5DBE2DF1C9939E100B5CEFA /* BridgingTests.m in Sources */, B5D5E0CF1A4D6AAB006468AF /* TestEntity2.swift in Sources */, B5DC47CA1C93D9C800FA3BF3 /* StorageInterfaceTests.swift in Sources */, @@ -1807,9 +1819,11 @@ files = ( B5519A411CA1B17B002BEF78 /* ErrorTests.swift in Sources */, 82BA18DA1C4BBD9700A0916E /* TestEntity1.swift in Sources */, + B580857F1CDF8149004C2EEB /* BaseTestCase.swift in Sources */, B5DC47C71C93D22900FA3BF3 /* MigrationChainTests.swift in Sources */, 82BA18DB1C4BBD9700A0916E /* TestEntity2.swift in Sources */, B5DBE2E01C9939E100B5CEFA /* BridgingTests.m in Sources */, + B580857B1CDF808D004C2EEB /* SetupTests.swift in Sources */, 82BA18D91C4BBD9700A0916E /* CoreStoreTests.swift in Sources */, 82BA18DC1C4BBD9C00A0916E /* Model.xcdatamodeld in Sources */, B5DC47CB1C93D9C800FA3BF3 /* StorageInterfaceTests.swift in Sources */, @@ -1919,9 +1933,11 @@ files = ( B5519A421CA1B17B002BEF78 /* ErrorTests.swift in Sources */, B52DD1CD1BE1F94D00949AFE /* TestEntity1.swift in Sources */, + B58085801CDF8149004C2EEB /* BaseTestCase.swift in Sources */, B5DC47C81C93D22900FA3BF3 /* MigrationChainTests.swift in Sources */, B52DD1CE1BE1F94D00949AFE /* TestEntity2.swift in Sources */, B5DBE2E11C9939E100B5CEFA /* BridgingTests.m in Sources */, + B580857C1CDF808F004C2EEB /* SetupTests.swift in Sources */, B52DD1CC1BE1F94D00949AFE /* CoreStoreTests.swift in Sources */, B5598BCC1BE2093D0092EFCE /* Model.xcdatamodeld in Sources */, B5DC47CC1C93D9C800FA3BF3 /* StorageInterfaceTests.swift in Sources */, diff --git a/CoreStoreTests/BaseTestCase.swift b/CoreStoreTests/BaseTestCase.swift new file mode 100644 index 0000000..19707ae --- /dev/null +++ b/CoreStoreTests/BaseTestCase.swift @@ -0,0 +1,40 @@ +// +// BaseTestCase.swift +// CoreStore +// +// Created by John Rommel Estropia on 2016/05/08. +// Copyright © 2016 John Rommel Estropia. All rights reserved. +// + +import XCTest + +@testable +import CoreStore + + +// MARK: - BaseTestCase + +class BaseTestCase: XCTestCase { + + // MARK: XCTestCase + + override func setUp() { + + super.setUp() + self.deleteStores() + } + + override func tearDown() { + + self.deleteStores() + super.tearDown() + } + + + // MARK: Private + + private func deleteStores() { + + _ = try? NSFileManager.defaultManager().removeItemAtURL(SQLiteStore.defaultRootDirectory) + } +} diff --git a/CoreStoreTests/SetupTests.swift b/CoreStoreTests/SetupTests.swift new file mode 100644 index 0000000..4bf449c --- /dev/null +++ b/CoreStoreTests/SetupTests.swift @@ -0,0 +1,209 @@ +// +// SetupTests.swift +// CoreStore +// +// Copyright © 2016 John Rommel Estropia +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. +// + +@testable +import CoreStore + + +// MARK: - SetupTests + +class SetupTests: BaseTestCase { + + func testInMemoryStores() { + + let stack = DataStack( + modelName: "Model", + bundle: NSBundle(forClass: self.dynamicType) + ) + CoreStore.defaultStack = stack + XCTAssertEqual(CoreStore.defaultStack, stack) + XCTAssertEqual(stack.modelVersion, "Model") + XCTAssert(stack.migrationChain.valid) + XCTAssert(stack.migrationChain.empty) + XCTAssert(stack.migrationChain.rootVersions.isEmpty) + XCTAssert(stack.migrationChain.leafVersions.isEmpty) + + do { + + let sqliteStore = SQLiteStore() + XCTAssertEqual(sqliteStore.fileURL, SQLiteStore.defaultFileURL) + XCTAssertEqual(sqliteStore.configuration, nil) + XCTAssertEqual(sqliteStore.mappingModelBundles, NSBundle.allBundles()) + XCTAssertEqual(sqliteStore.localStorageOptions, LocalStorageOptions.None) + + do { + + try stack.addStorageAndWait(sqliteStore) + } + catch let error as NSError { + + XCTFail(error.description) + } + let persistentStore = stack.persistentStoreForStorage(sqliteStore) + XCTAssertNotNil(persistentStore) + XCTAssert(sqliteStore.matchesPersistentStore(persistentStore!)) + } + + do { + + let sqliteStore = SQLiteStore( + fileName: "ConfigStore1.sqlite", + configuration: "Config1", + localStorageOptions: .RecreateStoreOnModelMismatch + ) + XCTAssertEqual(sqliteStore.fileURL, SQLiteStore.defaultRootDirectory + .URLByAppendingPathComponent("ConfigStore1.sqlite", isDirectory: false)) + XCTAssertEqual(sqliteStore.configuration, "Config1") + XCTAssertEqual(sqliteStore.mappingModelBundles, NSBundle.allBundles()) + XCTAssertEqual(sqliteStore.localStorageOptions, LocalStorageOptions.RecreateStoreOnModelMismatch) + + do { + + try stack.addStorageAndWait(sqliteStore) + } + catch let error as NSError { + + XCTFail(error.description) + } + let persistentStore = stack.persistentStoreForStorage(sqliteStore) + XCTAssertNotNil(persistentStore) + XCTAssert(sqliteStore.matchesPersistentStore(persistentStore!)) + } + + do { + + let sqliteStore = SQLiteStore( + fileName: "ConfigStore2.sqlite", + configuration: "Config2", + localStorageOptions: .RecreateStoreOnModelMismatch + ) + XCTAssertEqual(sqliteStore.fileURL, SQLiteStore.defaultRootDirectory + .URLByAppendingPathComponent("ConfigStore2.sqlite", isDirectory: false)) + XCTAssertEqual(sqliteStore.configuration, "Config2") + XCTAssertEqual(sqliteStore.mappingModelBundles, NSBundle.allBundles()) + XCTAssertEqual(sqliteStore.localStorageOptions, LocalStorageOptions.RecreateStoreOnModelMismatch) + + do { + + try stack.addStorageAndWait(sqliteStore) + } + catch let error as NSError { + + XCTFail(error.description) + } + let persistentStore = stack.persistentStoreForStorage(sqliteStore) + XCTAssertNotNil(persistentStore) + XCTAssert(sqliteStore.matchesPersistentStore(persistentStore!)) + } + } + + func testSQLiteStores() { + + let stack = DataStack( + modelName: "Model", + bundle: NSBundle(forClass: self.dynamicType) + ) + CoreStore.defaultStack = stack + XCTAssertEqual(CoreStore.defaultStack, stack) + XCTAssertEqual(stack.modelVersion, "Model") + XCTAssert(stack.migrationChain.valid) + XCTAssert(stack.migrationChain.empty) + XCTAssert(stack.migrationChain.rootVersions.isEmpty) + XCTAssert(stack.migrationChain.leafVersions.isEmpty) + + do { + + let sqliteStore = SQLiteStore() + XCTAssertEqual(sqliteStore.fileURL, SQLiteStore.defaultFileURL) + XCTAssertEqual(sqliteStore.configuration, nil) + XCTAssertEqual(sqliteStore.mappingModelBundles, NSBundle.allBundles()) + XCTAssertEqual(sqliteStore.localStorageOptions, LocalStorageOptions.None) + + do { + + try stack.addStorageAndWait(sqliteStore) + } + catch let error as NSError { + + XCTFail(error.description) + } + let persistentStore = stack.persistentStoreForStorage(sqliteStore) + XCTAssertNotNil(persistentStore) + XCTAssert(sqliteStore.matchesPersistentStore(persistentStore!)) + } + + do { + + let sqliteStore = SQLiteStore( + fileName: "ConfigStore1.sqlite", + configuration: "Config1", + localStorageOptions: .RecreateStoreOnModelMismatch + ) + XCTAssertEqual(sqliteStore.fileURL, SQLiteStore.defaultRootDirectory + .URLByAppendingPathComponent("ConfigStore1.sqlite", isDirectory: false)) + XCTAssertEqual(sqliteStore.configuration, "Config1") + XCTAssertEqual(sqliteStore.mappingModelBundles, NSBundle.allBundles()) + XCTAssertEqual(sqliteStore.localStorageOptions, LocalStorageOptions.RecreateStoreOnModelMismatch) + + do { + + try stack.addStorageAndWait(sqliteStore) + } + catch let error as NSError { + + XCTFail(error.description) + } + let persistentStore = stack.persistentStoreForStorage(sqliteStore) + XCTAssertNotNil(persistentStore) + XCTAssert(sqliteStore.matchesPersistentStore(persistentStore!)) + } + + do { + + let sqliteStore = SQLiteStore( + fileName: "ConfigStore2.sqlite", + configuration: "Config2", + localStorageOptions: .RecreateStoreOnModelMismatch + ) + XCTAssertEqual(sqliteStore.fileURL, SQLiteStore.defaultRootDirectory + .URLByAppendingPathComponent("ConfigStore2.sqlite", isDirectory: false)) + XCTAssertEqual(sqliteStore.configuration, "Config2") + XCTAssertEqual(sqliteStore.mappingModelBundles, NSBundle.allBundles()) + XCTAssertEqual(sqliteStore.localStorageOptions, LocalStorageOptions.RecreateStoreOnModelMismatch) + + do { + + try stack.addStorageAndWait(sqliteStore) + } + catch let error as NSError { + + XCTFail(error.description) + } + let persistentStore = stack.persistentStoreForStorage(sqliteStore) + XCTAssertNotNil(persistentStore) + XCTAssert(sqliteStore.matchesPersistentStore(persistentStore!)) + } + } +} diff --git a/Sources/ObjectiveC/CSDataStack.swift b/Sources/ObjectiveC/CSDataStack.swift index 80dfc8f..f416664 100644 --- a/Sources/ObjectiveC/CSDataStack.swift +++ b/Sources/ObjectiveC/CSDataStack.swift @@ -250,7 +250,7 @@ public final class CSDataStack: NSObject, CoreStoreObjectiveCType { return false } - return self.bridgeToSwift === object.bridgeToSwift + return self.bridgeToSwift == object.bridgeToSwift } public override var description: String { diff --git a/Sources/Setup/DataStack.swift b/Sources/Setup/DataStack.swift index 5b0bd7c..2aa4949 100644 --- a/Sources/Setup/DataStack.swift +++ b/Sources/Setup/DataStack.swift @@ -592,3 +592,14 @@ public final class DataStack { return self.persistentStoreForStorage(storage)! } } + + +// MARK: - DataStack: Equatable + +@warn_unused_result +public func == (lhs: DataStack, rhs: DataStack) -> Bool { + + return lhs === rhs +} + +extension DataStack: Equatable {}