Merge pull request #653 from zapcannon87/master

test: update

Author: zapcannon87

AVOS/LeanCloudObjcTests/IMClientTestCase.swift

@@ -47,20 +47,14 @@ class IMClientTestCase: RTMBaseTestCase {
         client2.currentDeviceToken = uuid
         expecting(
             description: "Session Conflict",
-            count: 3)
+            count: 2)
         { (exp) in
             delegator1.closed = { client, error in
                 XCTAssertTrue(Thread.isMainThread)
                 XCTAssertNotNil(error)
                 XCTAssertEqual((error as NSError?)?.code, LCIMErrorCode.sessionConflict.rawValue)
                 exp.fulfill()
             }
-            delegator1.offline = { client, error in
-                XCTAssertTrue(Thread.isMainThread)
-                XCTAssertNotNil(error)
-                XCTAssertEqual((error as NSError?)?.code, LCIMErrorCode.sessionConflict.rawValue)
-                exp.fulfill()
-            }
             client2.open { (success, error) in
                 XCTAssertTrue(success)
                 XCTAssertNil(error)
@@ -70,13 +64,8 @@ class IMClientTestCase: RTMBaseTestCase {
         delegator1.reset()
         expecting(
             description: "Reopen",
-            count: 2)
+            count: 1)
         { (exp) in
-            delegator1.offline = { client, error in
-                XCTAssertNotNil(error)
-                XCTAssertEqual((error as NSError?)?.code, LCIMErrorCode.sessionConflict.rawValue)
-                exp.fulfill()
-            }
             client1.open(with: .reopen) { (success, error) in
                 XCTAssertTrue(Thread.isMainThread)
                 XCTAssertFalse(success)
@@ -87,18 +76,13 @@ class IMClientTestCase: RTMBaseTestCase {
         }
         expecting(
             description: "Force Open",
-            count: 3)
+            count: 2)
         { (exp) in
             delegator2.closed = { client, error in
                 XCTAssertNotNil(error)
                 XCTAssertEqual((error as NSError?)?.code, LCIMErrorCode.sessionConflict.rawValue)
                 exp.fulfill()
             }
-            delegator2.offline = { client, error in
-                XCTAssertNotNil(error)
-                XCTAssertEqual((error as NSError?)?.code, LCIMErrorCode.sessionConflict.rawValue)
-                exp.fulfill()
-            }
             client1.open(with: .forceOpen) { (success, error) in
                 XCTAssertTrue(success)
                 XCTAssertNil(error)
@@ -173,7 +157,6 @@ class LCIMClientDelegator: NSObject, LCIMClientDelegate {
         resumed = nil
         paused = nil
         closed = nil
-        offline = nil
         didReceiveTypedMessage = nil
     }
 
@@ -197,11 +180,6 @@ class LCIMClientDelegator: NSObject, LCIMClientDelegate {
         closed?(imClient, error)
     }
 
-    var offline: ((LCIMClient, Error?) -> Void)?
-    func client(_ client: LCIMClient, didOfflineWithError error: Error?) {
-        offline?(client, error)
-    }
-    
     var didReceiveTypedMessage: ((LCIMConversation, LCIMTypedMessage) -> Void)?
     func conversation(_ conversation: LCIMConversation, didReceive message: LCIMTypedMessage) {
         didReceiveTypedMessage?(conversation, message)

AVOS/LeanCloudObjcTests/LCUserTestCase.swift

@@ -185,6 +185,7 @@ class LCUserTestCase: BaseTestCase {
 
         expecting { exp in
             query = user_1.followeeObjectsQuery()
+            query.whereKey("friendStatus", equalTo: true)
             query.findObjectsInBackground { followees, error in
                 let followee = followees?.first as? LCObject
                 XCTAssertNotNil(followee)
@@ -202,6 +203,7 @@ class LCUserTestCase: BaseTestCase {
                 exp.fulfill()
                 if succeeded {
                     query = user_2.followeeObjectsQuery()
+                    query.whereKey("friendStatus", equalTo: true)
                     query.findObjectsInBackground { followees, error in
                         let followee = followees?.first as? LCObject
                         XCTAssertNotNil(followee)
@@ -303,6 +305,21 @@ class LCUserTestCase: BaseTestCase {
             }
         }
 
+        expecting { exp in
+            query = LCFriendshipRequest.query()
+            query.whereKey("status", equalTo: "declined")
+            query.findObjectsInBackground { requests, error in
+                let request = requests?.first as? LCFriendshipRequest
+                let friend = request?["friend"] as? LCUser
+                let user = request?["user"] as? LCUser
+                XCTAssertNotNil(request)
+                XCTAssertNotNil(friend)
+                XCTAssertNotNil(user)
+                XCTAssertNil(error)
+                exp.fulfill()
+            }
+        }
+        
         LCUser.logOut()
     }
 }