Fix lint warnings (#840)

3 files changed, 8 insertions, 8 deletions

diff --git a/Firestore/Example/Tests/API/FIRTimestampTest.m b/Firestore/Example/Tests/API/FIRTimestampTest.m
index 070da96..98ec804 100644
--- a/Firestore/Example/Tests/API/FIRTimestampTest.m
+++ b/Firestore/Example/Tests/API/FIRTimestampTest.m
@@ -47,12 +47,12 @@ NSDate *TestDate(int year, int month, int day, int hour, int minute, int second)
   FIRTimestamp *actual = [FIRTimestamp timestampWithDate:input];
   static const int64_t kSecondsFromEpochToReferenceDate = 978307200;
   XCTAssertEqual(kSecondsFromEpochToReferenceDate + 1, actual.seconds);
-  XCTAssertEqual(500000000, actual.nanoseconds);
+  XCTAssertEqual(actual.nanoseconds, 500000000);
 
   FIRTimestamp *expected =
       [[FIRTimestamp alloc] initWithSeconds:(kSecondsFromEpochToReferenceDate + 1)
                                 nanoseconds:500000000];
-  XCTAssertEqualObjects(expected, actual);
+  XCTAssertEqualObjects(actual, expected);
 }
 
 - (void)testSO8601String {
@@ -92,8 +92,8 @@ NSDate *TestDate(int year, int month, int day, int hour, int minute, int second)
     [[FIRTimestamp alloc] initWithSeconds:12346 nanoseconds:0],
   ];
   for (int i = 0; i < timestamps.count - 1; ++i) {
-    XCTAssertEqual(NSOrderedAscending, [timestamps[i] compare:timestamps[i + 1]]);
-    XCTAssertEqual(NSOrderedDescending, [timestamps[i + 1] compare:timestamps[i]]);
+    XCTAssertEqual([timestamps[i] compare:timestamps[i + 1]], NSOrderedAscending);
+    XCTAssertEqual([timestamps[i + 1] compare:timestamps[i]], NSOrderedDescending);
   }
 }
 
diff --git a/Firestore/Example/Tests/Local/FSTQueryCacheTests.mm b/Firestore/Example/Tests/Local/FSTQueryCacheTests.mm
index 6ab655a..5cdfd66 100644
--- a/Firestore/Example/Tests/Local/FSTQueryCacheTests.mm
+++ b/Firestore/Example/Tests/Local/FSTQueryCacheTests.mm
@@ -89,7 +89,7 @@ NS_ASSUME_NONNULL_BEGIN
 
   FSTQueryData *data2 = [self queryDataWithQuery:q2];
   [self addQueryData:data2];
-  XCTAssertEqual(2, [self.queryCache count]);
+  XCTAssertEqual([self.queryCache count], 2);
 
   XCTAssertEqualObjects([self.queryCache queryDataForQuery:q1], data1);
   XCTAssertEqualObjects([self.queryCache queryDataForQuery:q2], data2);
@@ -97,12 +97,12 @@ NS_ASSUME_NONNULL_BEGIN
   [self removeQueryData:data1];
   XCTAssertNil([self.queryCache queryDataForQuery:q1]);
   XCTAssertEqualObjects([self.queryCache queryDataForQuery:q2], data2);
-  XCTAssertEqual(1, [self.queryCache count]);
+  XCTAssertEqual([self.queryCache count], 1);
 
   [self removeQueryData:data2];
   XCTAssertNil([self.queryCache queryDataForQuery:q1]);
   XCTAssertNil([self.queryCache queryDataForQuery:q2]);
-  XCTAssertEqual(0, [self.queryCache count]);
+  XCTAssertEqual([self.queryCache count], 0);
 }
 
 - (void)testSetQueryToNewValue {
diff --git a/Firestore/core/test/firebase/firestore/model/maybe_document_test.cc b/Firestore/core/test/firebase/firestore/model/maybe_document_test.cc
index 005798a..70ae319 100644
--- a/Firestore/core/test/firebase/firestore/model/maybe_document_test.cc
+++ b/Firestore/core/test/firebase/firestore/model/maybe_document_test.cc
@@ -49,7 +49,7 @@ TEST(MaybeDocument, Getter) {
 TEST(MaybeDocument, Comparison) {
   EXPECT_TRUE(MakeMaybeDocument("root/123", Timestamp(456, 123)) <
               MakeMaybeDocument("root/456", Timestamp(123, 456)));
-  // MaybeDocument comparision is purely key-based.
+  // MaybeDocument comparison is purely key-based.
   EXPECT_FALSE(MakeMaybeDocument("root/123", Timestamp(111, 111)) <
                MakeMaybeDocument("root/123", Timestamp(222, 222)));