starred/CoreStore
1
0
Fork 0
mirror of https://github.com/JohnEstropia/CoreStore.git synced 2026-03-24 10:21:40 +01:00
Code Issues 95 Packages Projects Releases 10 Wiki Activity

make unit tests happy

Browse Source
This commit is contained in:
John Estropia
2017-05-24 12:15:55 +09:00
parent 35885b40de
commit ef0937fec4
4 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@@ -1,5 +1,5 @@
language: objective-c language: objective-c
osx_image: xcode8.3.2 osx_image: xcode8.3
sudo: false sudo: false
git: git:
submodules: false submodules: false

11
CoreStoreTests/DynamicModelTests.swift
View File

@@ -28,12 +28,18 @@ import XCTest
@testable @testable
import CoreStore import CoreStore
#if os(OSX)
typealias Color = NSColor
#else
typealias Color = UIColor
#endif
class Animal: CoreStoreObject { class Animal: CoreStoreObject {
let species = Value.Required<String>("species", default: "Swift") let species = Value.Required<String>("species", default: "Swift")
let master = Relationship.ToOne<Person>("master") let master = Relationship.ToOne<Person>("master")
let color = Transformable.Optional<UIColor>("color") let color = Transformable.Optional<Color>("color")
} }
class Dog: Animal { class Dog: Animal {
@@ -102,7 +108,7 @@ class DynamicModelTests: BaseTestDataTestCase {
XCTAssertEqual(animal.species.value, "Sparrow") XCTAssertEqual(animal.species.value, "Sparrow")
animal.color .= .yellow animal.color .= .yellow
XCTAssertEqual(animal.color.value, UIColor.yellow) XCTAssertEqual(animal.color.value, Color.yellow)
let dog = transaction.create(Into<Dog>()) let dog = transaction.create(Into<Dog>())
XCTAssertEqual(dog.species.value, "Swift") XCTAssertEqual(dog.species.value, "Swift")
@@ -168,7 +174,6 @@ class DynamicModelTests: BaseTestDataTestCase {
success: { success: {
fetchDone.fulfill() fetchDone.fulfill()
withExtendedLifetime(stack, {})
}, },
failure: { _ in failure: { _ in

10
Sources/CSUnsafeDataTransaction.swift
View File

@@ -47,6 +47,10 @@ public final class CSUnsafeDataTransaction: CSBaseDataTransaction {
self.bridgeToSwift.context.saveAsynchronouslyWithCompletion { (_, error) in self.bridgeToSwift.context.saveAsynchronouslyWithCompletion { (_, error) in
defer {
withExtendedLifetime(self, {})
}
if let error = error { if let error = error {
failure?(error.bridgeToObjectiveC) failure?(error.bridgeToObjectiveC)
@@ -55,7 +59,6 @@ public final class CSUnsafeDataTransaction: CSBaseDataTransaction {
success?() success?()
} }
withExtendedLifetime(self, {})
} }
} }
@@ -217,6 +220,10 @@ public final class CSUnsafeDataTransaction: CSBaseDataTransaction {
self.bridgeToSwift.context.saveAsynchronouslyWithCompletion { (hasChanges, error) in self.bridgeToSwift.context.saveAsynchronouslyWithCompletion { (hasChanges, error) in
defer {
withExtendedLifetime(self, {})
}
if let error = error { if let error = error {
completion?(SaveResult(error).bridgeToObjectiveC) completion?(SaveResult(error).bridgeToObjectiveC)
@@ -225,7 +232,6 @@ public final class CSUnsafeDataTransaction: CSBaseDataTransaction {
completion?(SaveResult(hasChanges: hasChanges).bridgeToObjectiveC) completion?(SaveResult(hasChanges: hasChanges).bridgeToObjectiveC)
} }
withExtendedLifetime(self, {})
} }
} }

4
Sources/DataStack+Transaction.swift
View File

@@ -63,7 +63,7 @@ public extension DataStack {
defer { defer {
withExtendedLifetime(transaction, {}) withExtendedLifetime((self, transaction), {})
} }
let userInfo: T let userInfo: T
do { do {
@@ -112,7 +112,7 @@ public extension DataStack {
defer { defer {
withExtendedLifetime(transaction, {}) withExtendedLifetime((self, transaction), {})
} }
let userInfo: T let userInfo: T
do { do {