changed keyPath string utility to use String initializer

This commit is contained in:
John Rommel Estropia
2017-12-29 00:05:11 +09:00
parent f447bcfb95
commit 15edabdbb5
11 changed files with 407 additions and 318 deletions

View File

@@ -101,8 +101,8 @@ class Person: CoreStoreObject {
static func keyPathsAffectingDisplayName() -> Set<String> {
return [
self.keyPath({ $0.title }),
self.keyPath({ $0.name })
String(keyPath: \Person.title),
String(keyPath: \Person.name)
]
}
}
@@ -112,7 +112,8 @@ class Person: CoreStoreObject {
class DynamicModelTests: BaseTestDataTestCase {
func testDynamicModels_CanBeDeclaredCorrectly() {
@objc
dynamic func test_ThatDynamicModels_CanBeDeclaredCorrectly() {
let dataStack = DataStack(
CoreStoreSchema(
@@ -131,13 +132,13 @@ class DynamicModelTests: BaseTestDataTestCase {
)
self.prepareStack(dataStack, configurations: [nil]) { (stack) in
let k1 = Animal.keyPath({ $0.species })
let k1 = String(keyPath: \Animal.species)
XCTAssertEqual(k1, "species")
let k2 = Dog.keyPath({ $0.species })
let k2 = String(keyPath: \Dog.species)
XCTAssertEqual(k2, "species")
let k3 = Dog.keyPath({ $0.nickname })
let k3 = String(keyPath: \Dog.nickname)
XCTAssertEqual(k3, "nickname")
let updateDone = self.expectation(description: "update-done")
@@ -273,6 +274,13 @@ class DynamicModelTests: BaseTestDataTestCase {
}
}
@objc
dynamic func test_ThatDynamicModelKeyPaths_CanBeCreated() {
XCTAssertEqual(String(keyPath: \Animal.species), "species")
XCTAssertEqual(String(keyPath: \Dog.species), "species")
}
@nonobjc
func prepareStack(_ dataStack: DataStack, configurations: [ModelConfiguration] = [nil], _ closure: (_ dataStack: DataStack) -> Void) {

View File

@@ -52,6 +52,12 @@ private func XCTAssertAllEqual<D>(_ whereClauses: [Where<D>]) {
final class WhereTests: XCTestCase {
@objc
dynamic func test_ThatDynamicModelKeyPaths_CanBeCreated() {
XCTAssertEqual(String(keyPath: \TestEntity1.testEntityID), "testEntityID")
}
@objc
dynamic func test_ThatWhereClauses_ConfigureCorrectly() {