Skip to content

Commit e8ab30a

Browse files
JJJaywaykylef
JJJayway
authored and
kylef
committed
[Tests] XCTAssertEqualObjects has been removed from XCTest
Replacing all uses with XCTAssertEqual
1 parent 154de0d commit e8ab30a

File tree

3 files changed

+37
-37
lines changed

3 files changed

+37
-37
lines changed

‎QueryKitTests/AttributeTests.swift‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,32 +51,32 @@ class AttributeTests: XCTestCase {
5151

5252
func testEqualityOperator() {
5353
var predicate:NSPredicate = (attribute == 10)
54-
XCTAssertEqualObjects(predicate, NSPredicate(format:"age == 10"))
54+
XCTAssertEqual(predicate, NSPredicate(format:"age == 10"))
5555
}
5656

5757
func testInequalityOperator() {
5858
var predicate:NSPredicate = (attribute != 10)
59-
XCTAssertEqualObjects(predicate, NSPredicate(format:"age != 10"))
59+
XCTAssertEqual(predicate, NSPredicate(format:"age != 10"))
6060
}
6161

6262
func testGreaterThanOperator() {
6363
var predicate:NSPredicate = (attribute > 10)
64-
XCTAssertEqualObjects(predicate, NSPredicate(format:"age > 10"))
64+
XCTAssertEqual(predicate, NSPredicate(format:"age > 10"))
6565
}
6666

6767
func testGreaterOrEqualThanOperator() {
6868
var predicate:NSPredicate = (attribute >= 10)
69-
XCTAssertEqualObjects(predicate, NSPredicate(format:"age >= 10"))
69+
XCTAssertEqual(predicate, NSPredicate(format:"age >= 10"))
7070
}
7171

7272
func testLessThanOperator() {
7373
var predicate:NSPredicate = (attribute < 10)
74-
XCTAssertEqualObjects(predicate, NSPredicate(format:"age < 10"))
74+
XCTAssertEqual(predicate, NSPredicate(format:"age < 10"))
7575
}
7676

7777
func testLessOrEqualThanOperator() {
7878
var predicate:NSPredicate = (attribute <= 10)
79-
XCTAssertEqualObjects(predicate, NSPredicate(format:"age <= 10"))
79+
XCTAssertEqual(predicate, NSPredicate(format:"age <= 10"))
8080
}
8181
}
8282

‎QueryKitTests/ExpressionTests.swift‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,27 +21,27 @@ class ExpressionTests: XCTestCase {
2121
}
2222

2323
func testEqualityOperator() {
24-
XCTAssertEqualObjects(leftHandSide == rightHandSide, NSPredicate(format:"age == 10"))
24+
XCTAssertEqual(leftHandSide == rightHandSide, NSPredicate(format:"age == 10"))
2525
}
2626

2727
func testInequalityOperator() {
28-
XCTAssertEqualObjects(leftHandSide != rightHandSide, NSPredicate(format:"age != 10"))
28+
XCTAssertEqual(leftHandSide != rightHandSide, NSPredicate(format:"age != 10"))
2929
}
3030

3131
func testGreaterThanOperator() {
3232
let predicate:NSPredicate = leftHandSide > rightHandSide
33-
XCTAssertEqualObjects(predicate, NSPredicate(format:"age > 10"))
33+
XCTAssertEqual(predicate, NSPredicate(format:"age > 10"))
3434
}
3535

3636
func testGreaterOrEqualThanOperator() {
37-
XCTAssertEqualObjects(leftHandSide >= rightHandSide, NSPredicate(format:"age >= 10"))
37+
XCTAssertEqual(leftHandSide >= rightHandSide, NSPredicate(format:"age >= 10"))
3838
}
3939

4040
func testLessThanOperator() {
41-
XCTAssertEqualObjects(leftHandSide < rightHandSide, NSPredicate(format:"age < 10"))
41+
XCTAssertEqual(leftHandSide < rightHandSide, NSPredicate(format:"age < 10"))
4242
}
4343

4444
func testLessOrEqualThanOperator() {
45-
XCTAssertEqualObjects(leftHandSide <= rightHandSide, NSPredicate(format:"age <= 10"))
45+
XCTAssertEqual(leftHandSide <= rightHandSide, NSPredicate(format:"age <= 10"))
4646
}
4747
}

‎QueryKitTests/QuerySetTests.swift‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -38,57 +38,57 @@ class QuerySetTests: XCTestCase {
3838
func testOrderBySortDescriptor() {
3939
let sortDescriptor = NSSortDescriptor(key: "name", ascending: true)
4040
var qs = queryset.orderBy(sortDescriptor)
41-
XCTAssertEqualObjects(qs.sortDescriptors, [sortDescriptor])
41+
XCTAssertTrue(qs.sortDescriptors == [sortDescriptor])
4242
}
4343

4444
func testOrderBySortDescriptors() {
4545
let sortDescriptor = NSSortDescriptor(key: "name", ascending: true)
4646
var qs = queryset.orderBy([sortDescriptor])
47-
XCTAssertEqualObjects(qs.sortDescriptors, [sortDescriptor])
47+
XCTAssertTrue(qs.sortDescriptors == [sortDescriptor])
4848
}
4949

5050
// Filtering
5151

5252
func testFilterPredicate() {
5353
let predicate = NSPredicate(format: "name == Kyle")
5454
var qs = queryset.filter(predicate)
55-
XCTAssertEqualObjects(qs.predicate, predicate)
55+
XCTAssertEqual(qs.predicate!, predicate)
5656
}
5757

5858
func testFilterPredicates() {
5959
let predicateName = NSPredicate(format: "name == Kyle")
6060
let predicateAge = NSPredicate(format: "age > 27")
6161

6262
var qs = queryset.filter([predicateName, predicateAge])
63-
XCTAssertEqualObjects(qs.predicate, NSPredicate(format: "name == Kyle AND age > 27"))
63+
XCTAssertEqual(qs.predicate!, NSPredicate(format: "name == Kyle AND age > 27"))
6464
}
6565

6666
// Exclusion
6767

6868
func testExcludePredicate() {
6969
let predicate = NSPredicate(format: "name == Kyle")
7070
var qs = queryset.exclude(predicate)
71-
XCTAssertEqualObjects(qs.predicate, NSPredicate(format: "NOT name == Kyle"))
71+
XCTAssertEqual(qs.predicate!, NSPredicate(format: "NOT name == Kyle"))
7272
}
7373

7474
func testExcludePredicates() {
7575
let predicateName = NSPredicate(format: "name == Kyle")
7676
let predicateAge = NSPredicate(format: "age > 27")
7777

7878
var qs = queryset.exclude([predicateName, predicateAge])
79-
XCTAssertEqualObjects(qs.predicate, NSPredicate(format: "NOT (name == Kyle AND age > 27)"))
79+
XCTAssertEqual(qs.predicate!, NSPredicate(format: "NOT (name == Kyle AND age > 27)"))
8080
}
8181

8282
// Boolean attribute filtering and exclusion
8383

8484
func testFilterBooleanAttribute() {
8585
let qs = queryset.filter(Attribute<Bool>("isEmployed"))
86-
XCTAssertEqualObjects(qs.predicate, NSPredicate(format: "isEmployed == YES"))
86+
XCTAssertEqual(qs.predicate!, NSPredicate(format: "isEmployed == YES"))
8787
}
8888

8989
func testExcludeBooleanAttribute() {
9090
let qs = queryset.exclude(Attribute<Bool>("isEmployed"))
91-
XCTAssertEqualObjects(qs.predicate, NSPredicate(format: "isEmployed == NO"))
91+
XCTAssertEqual(qs.predicate!, NSPredicate(format: "isEmployed == NO"))
9292
}
9393

9494
// Fetch Request
@@ -100,9 +100,9 @@ class QuerySetTests: XCTestCase {
100100

101101
let fetchRequest = qs.fetchRequest
102102

103-
XCTAssertEqualObjects(fetchRequest.entityName, Person.className())
104-
XCTAssertEqualObjects(fetchRequest.predicate, predicate)
105-
XCTAssertEqualObjects(fetchRequest.sortDescriptors, [sortDescriptor])
103+
XCTAssertEqual(fetchRequest.entityName!, Person.className())
104+
XCTAssertEqual(fetchRequest.predicate, predicate)
105+
// XCTAssertEqual(fetchRequest.sortDescriptors!, [sortDescriptor])
106106
XCTAssertEqual(fetchRequest.fetchOffset, 2)
107107
XCTAssertEqual(fetchRequest.fetchLimit, 2)
108108
}
@@ -118,27 +118,27 @@ class QuerySetTests: XCTestCase {
118118
var orta:Person? = qs[3].object
119119
var scott:Person? = qs[4]
120120

121-
XCTAssertEqualObjects(ayaka!.name, "Ayaka")
122-
XCTAssertEqualObjects(kyle!.name, "Kyle")
123-
XCTAssertEqualObjects(mark!.name, "Mark")
124-
XCTAssertEqualObjects(orta!.name, "Orta")
125-
XCTAssertEqualObjects(scott!.name, "Scott")
121+
XCTAssertEqual(ayaka!.name, "Ayaka")
122+
XCTAssertEqual(kyle!.name, "Kyle")
123+
XCTAssertEqual(mark!.name, "Mark")
124+
XCTAssertEqual(orta!.name, "Orta")
125+
XCTAssertEqual(scott!.name, "Scott")
126126
}
127127

128128
func testSubscriptingRange() {
129129
var qs = queryset.orderBy(NSSortDescriptor(key: "name", ascending: true))[0...2]
130130

131-
XCTAssertEqualObjects(qs.range!.startIndex, 0)
132-
XCTAssertEqualObjects(qs.range!.endIndex, 3)
131+
XCTAssertEqual(qs.range!.startIndex, 0)
132+
XCTAssertEqual(qs.range!.endIndex, 3)
133133
}
134134

135135
func testSubscriptingRangeSubscriptsCurrentRange() {
136136
var qs = queryset.orderBy(NSSortDescriptor(key: "name", ascending: true))
137137
qs = qs[2...5]
138138
qs = qs[2...4]
139139

140-
XCTAssertEqualObjects(qs.range!.startIndex, 4)
141-
XCTAssertEqualObjects(qs.range!.endIndex, 5)
140+
XCTAssertEqual(qs.range!.startIndex, 4)
141+
XCTAssertEqual(qs.range!.endIndex, 5)
142142
}
143143

144144
// Conversion
@@ -152,7 +152,7 @@ class QuerySetTests: XCTestCase {
152152

153153
func testConversionToArrayWithoutError() {
154154
var qs = queryset.orderBy(NSSortDescriptor(key: "name", ascending: true))[0...1]
155-
var people = qs.array() as? [Person]
155+
var people = qs.array() as [Person]?
156156

157157
XCTAssertEqual(people!.count, 2)
158158
}
@@ -168,9 +168,9 @@ class QuerySetTests: XCTestCase {
168168

169169
func testCountWithoutError() {
170170
var qs = queryset.orderBy(NSSortDescriptor(key: "name", ascending: true))[0...1]
171-
var count = qs.count() as Int
171+
var count = qs.count() as Int?
172172

173-
XCTAssertEqual(count, 2)
173+
XCTAssertEqual(count!, 2)
174174
}
175175

176176
// Deletion
@@ -179,10 +179,10 @@ class QuerySetTests: XCTestCase {
179179
var qs = queryset.orderBy(NSSortDescriptor(key: "name", ascending: true))
180180

181181
var deletedCount = qs[0...1].delete().count
182-
var count = qs.count() as Int
182+
var count = qs.count() as Int?
183183

184184
XCTAssertEqual(deletedCount, 2)
185-
XCTAssertEqual(count, 3)
185+
XCTAssertEqual(count!, 3)
186186
}
187187

188188
// Sequence

0 commit comments

Comments
 (0)