add tests for expressio evaluations

CoreStoreTests/DynamicModelTests.swift

@@ -72,8 +72,13 @@ class Person: CoreStoreObject {
         affectedByKeyPaths: Person.keyPathsAffectingDisplayName()
     )
 
+    let spouse = Relationship.ToOne<Person>("spouse")
+    
     let pets = Relationship.ToManyUnordered<Animal>("pets", inverse: { $0.master })
 
+    private let _spouse = Relationship.ToOne<Person>("_spouseInverse", inverse: { $0.spouse })
+
+    
     private static func setTitle(_ partialObject: PartialObject<Person>, _ newValue: String) {
         
         partialObject.setPrimitiveValue(newValue, for: { $0.title })
@@ -127,7 +132,7 @@ class DynamicModelTests: BaseTestDataTestCase {
                 versionLock: [
                     "Animal": [0x1b59d511019695cf, 0xdeb97e86c5eff179, 0x1cfd80745646cb3, 0x4ff99416175b5b9a],
                     "Dog": [0xe3f0afeb109b283a, 0x29998d292938eb61, 0x6aab788333cfc2a3, 0x492ff1d295910ea7],
-                    "Person": [0x66d8bbfd8b21561f, 0xcecec69ecae3570f, 0xc4b73d71256214ef, 0x89b99bfe3e013e8b]
+                    "Person": [0x2831cf046084d96d, 0xbe19b13ace54641, 0x635a082728b0f6f0, 0x3d4ef2dd4b74a87c]
                 ]
             )
         )

CoreStoreTests/WhereTests.swift

@@ -62,6 +62,8 @@ final class WhereTests: XCTestCase {
     @objc
     dynamic func test_ThatExpressions_HaveCorrectKeyPaths() {
 
+        do {
+
             do {
 
                 XCTAssertEqual(
@@ -98,6 +100,9 @@ final class WhereTests: XCTestCase {
                     String(keyPath: \Animal.master ~ \.pets ~ \.master)
                 )
             }
+        }
+        do {
+
             do {
 
                 XCTAssertEqual(
@@ -119,6 +124,9 @@ final class WhereTests: XCTestCase {
                     String(keyPath: (\Animal.master ~ \.pets).count())
                 )
             }
+        }
+        do {
+
             do {
 
                 XCTAssertEqual(
@@ -145,6 +153,9 @@ final class WhereTests: XCTestCase {
                     String(keyPath: (\Animal.master ~ \.pets ~ \.species).any())
                 )
             }
+        }
+        do {
+
             do {
 
                 XCTAssertEqual(
@@ -171,6 +182,9 @@ final class WhereTests: XCTestCase {
                     String(keyPath: (\Animal.master ~ \.pets ~ \.species).all())
                 )
             }
+        }
+        do {
+
             do {
 
                 XCTAssertEqual(
@@ -198,6 +212,7 @@ final class WhereTests: XCTestCase {
                 )
             }
         }
+    }
 
     @objc
     dynamic func test_ThatWhereClauses_CanBeCreatedFromExpressionsCorrectly() {
@@ -205,35 +220,111 @@ final class WhereTests: XCTestCase {
         do {
 
             let dummy = "dummy"
+            do {
+
                 let whereClause: Where<TestEntity1> = (\.testToOne ~ \.testString) == dummy
                 let predicate = NSPredicate(format: "\(#keyPath(TestEntity1.testToOne.testString)) == %@", dummy)
                 XCTAssertEqual(whereClause, Where<TestEntity1>(predicate))
                 XCTAssertEqual(whereClause.predicate, predicate)
             }
+            do {
+
+                let whereClause: Where<Animal> = (\.master ~ \.name) == dummy
+                let predicate = NSPredicate(format: "master.name == %@", dummy)
+                XCTAssertEqual(whereClause, Where<Animal>(predicate))
+                XCTAssertEqual(whereClause.predicate, predicate)
+            }
+        }
         do {
 
             let dummy = "dummy"
+            do {
+
                 let whereClause: Where<TestEntity1> = (\.testToOne ~ \.testToOne ~ \.testString) == dummy
                 let predicate = NSPredicate(format: "\(#keyPath(TestEntity1.testToOne.testToOne.testString)) == %@", dummy)
                 XCTAssertEqual(whereClause, Where<TestEntity1>(predicate))
                 XCTAssertEqual(whereClause.predicate, predicate)
             }
+            do {
+
+                let whereClause: Where<Animal> = (\.master ~ \.spouse ~ \.name) == dummy
+                let predicate = NSPredicate(format: "master.spouse.name == %@", dummy)
+                XCTAssertEqual(whereClause, Where<Animal>(predicate))
+                XCTAssertEqual(whereClause.predicate, predicate)
+            }
+        }
         do {
 
             let count = 3
+            do {
+
                 let whereClause: Where<TestEntity1> = (\.testToOne ~ \.testToManyUnordered).count() == count
                 let predicate = NSPredicate(format: "\(#keyPath(TestEntity1.testToOne.testToManyUnordered)).@count == %d", count)
                 XCTAssertEqual(whereClause, Where<TestEntity1>(predicate))
                 XCTAssertEqual(whereClause.predicate, predicate)
             }
+            do {
+
+                let whereClause: Where<Animal> = (\.master ~ \.pets).count() == count
+                let predicate = NSPredicate(format: "master.pets.@count == %d", count)
+                XCTAssertEqual(whereClause, Where<Animal>(predicate))
+                XCTAssertEqual(whereClause.predicate, predicate)
+            }
+        }
         do {
 
             let dummy = "dummy"
+            do {
+
                 let whereClause: Where<TestEntity1> = (\.testToOne ~ \.testToManyUnordered ~ \TestEntity1.testString).any() == dummy
                 let predicate = NSPredicate(format: "ANY \(#keyPath(TestEntity1.testToOne.testToManyUnordered)).\(#keyPath(TestEntity1.testString)) == %@", dummy)
                 XCTAssertEqual(whereClause, Where<TestEntity1>(predicate))
                 XCTAssertEqual(whereClause.predicate, predicate)
             }
+            do {
+
+                let whereClause: Where<Animal> = (\.master ~ \.pets ~ \.species).any() == dummy
+                let predicate = NSPredicate(format: "ANY master.pets.species == %@", dummy)
+                XCTAssertEqual(whereClause, Where<Animal>(predicate))
+                XCTAssertEqual(whereClause.predicate, predicate)
+            }
+        }
+        do {
+
+            let dummy = "dummy"
+            do {
+
+                let whereClause: Where<TestEntity1> = (\.testToOne ~ \.testToManyUnordered ~ \TestEntity1.testString).all() == dummy
+                let predicate = NSPredicate(format: "ALL \(#keyPath(TestEntity1.testToOne.testToManyUnordered)).\(#keyPath(TestEntity1.testString)) == %@", dummy)
+                XCTAssertEqual(whereClause, Where<TestEntity1>(predicate))
+                XCTAssertEqual(whereClause.predicate, predicate)
+            }
+            do {
+
+                let whereClause: Where<Animal> = (\.master ~ \.pets ~ \.species).all() == dummy
+                let predicate = NSPredicate(format: "ALL master.pets.species == %@", dummy)
+                XCTAssertEqual(whereClause, Where<Animal>(predicate))
+                XCTAssertEqual(whereClause.predicate, predicate)
+            }
+        }
+        do {
+
+            let dummy = "dummy"
+            do {
+
+                let whereClause: Where<TestEntity1> = (\.testToOne ~ \.testToManyUnordered ~ \TestEntity1.testString).none() == dummy
+                let predicate = NSPredicate(format: "NONE \(#keyPath(TestEntity1.testToOne.testToManyUnordered)).\(#keyPath(TestEntity1.testString)) == %@", dummy)
+                XCTAssertEqual(whereClause, Where<TestEntity1>(predicate))
+                XCTAssertEqual(whereClause.predicate, predicate)
+            }
+            do {
+
+                let whereClause: Where<Animal> = (\.master ~ \.pets ~ \.species).none() == dummy
+                let predicate = NSPredicate(format: "NONE master.pets.species == %@", dummy)
+                XCTAssertEqual(whereClause, Where<Animal>(predicate))
+                XCTAssertEqual(whereClause.predicate, predicate)
+            }
+        }
     }
     
     @objc