WIP: broken generics

This commit is contained in:
John Estropia
2016-09-06 20:16:46 +09:00
parent b502895d63
commit 82de482191
95 changed files with 610 additions and 677 deletions

View File

@@ -41,18 +41,18 @@ final class WhereTests: XCTestCase {
let whereClause = Where()
XCTAssertEqual(whereClause, Where(true))
XCTAssertNotEqual(whereClause, Where(false))
XCTAssertEqual(whereClause.predicate, Predicate(value: true))
XCTAssertEqual(whereClause.predicate, NSPredicate(value: true))
}
do {
let whereClause = Where(true)
XCTAssertEqual(whereClause, Where())
XCTAssertNotEqual(whereClause, Where(false))
XCTAssertEqual(whereClause.predicate, Predicate(value: true))
XCTAssertEqual(whereClause.predicate, NSPredicate(value: true))
}
do {
let predicate = Predicate(format: "%K == %@", "key", "value")
let predicate = NSPredicate(format: "%K == %@", "key", "value")
let whereClause = Where(predicate)
XCTAssertEqual(whereClause, Where(predicate))
XCTAssertEqual(whereClause.predicate, predicate)
@@ -60,28 +60,28 @@ final class WhereTests: XCTestCase {
do {
let whereClause = Where("%K == %@", "key", "value")
let predicate = Predicate(format: "%K == %@", "key", "value")
let predicate = NSPredicate(format: "%K == %@", "key", "value")
XCTAssertEqual(whereClause, Where(predicate))
XCTAssertEqual(whereClause.predicate, predicate)
}
do {
let whereClause = Where("%K == %@", argumentArray: ["key", "value"])
let predicate = Predicate(format: "%K == %@", "key", "value")
let predicate = NSPredicate(format: "%K == %@", "key", "value")
XCTAssertEqual(whereClause, Where(predicate))
XCTAssertEqual(whereClause.predicate, predicate)
}
do {
let whereClause = Where("key", isEqualTo: "value")
let predicate = Predicate(format: "%K == %@", "key", "value")
let predicate = NSPredicate(format: "%K == %@", "key", "value")
XCTAssertEqual(whereClause, Where(predicate))
XCTAssertEqual(whereClause.predicate, predicate)
}
do {
let whereClause = Where("key", isMemberOf: ["value1", "value2", "value3"])
let predicate = Predicate(format: "%K IN %@", "key", ["value1", "value2", "value3"])
let predicate = NSPredicate(format: "%K IN %@", "key", ["value1", "value2", "value3"])
XCTAssertEqual(whereClause, Where(predicate))
XCTAssertEqual(whereClause.predicate, predicate)
}
@@ -97,7 +97,7 @@ final class WhereTests: XCTestCase {
do {
let notWhere = !whereClause1
let notPredicate = CompoundPredicate(
let notPredicate = NSCompoundPredicate(
type: .not,
subpredicates: [whereClause1.predicate]
)
@@ -107,10 +107,10 @@ final class WhereTests: XCTestCase {
do {
let andWhere = whereClause1 && whereClause2 && whereClause3
let andPredicate = CompoundPredicate(
let andPredicate = NSCompoundPredicate(
type: .and,
subpredicates: [
CompoundPredicate(
NSCompoundPredicate(
type: .and,
subpredicates: [whereClause1.predicate, whereClause2.predicate]
),
@@ -123,10 +123,10 @@ final class WhereTests: XCTestCase {
do {
let orWhere = whereClause1 || whereClause2 || whereClause3
let orPredicate = CompoundPredicate(
let orPredicate = NSCompoundPredicate(
type: .or,
subpredicates: [
CompoundPredicate(
NSCompoundPredicate(
type: .or,
subpredicates: [whereClause1.predicate, whereClause2.predicate]
),