Skip to content

Commit e0b8a17

Browse files
zapcannon87zapcannon87
committed
test: update case
1 parent 5fa8b90 commit e0b8a17

File tree

1 file changed

+93
-100
lines changed

1 file changed

+93
-100
lines changed

‎LeanCloudTests/IMConversationTestCase.swift‎

Lines changed: 93 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -703,12 +703,10 @@ class IMConversationTestCase: RTMBaseTestCase {
703703
}
704704

705705
func testMembersChange() {
706-
guard
707-
let clientA = newOpenedClient(),
708-
let clientB = newOpenedClient() else
709-
{
710-
XCTFail()
711-
return
706+
guard let clientA = newOpenedClient(),
707+
let clientB = newOpenedClient() else {
708+
XCTFail()
709+
return
712710
}
713711

714712
let delegatorA = IMClientTestCase.Delegator()
@@ -718,13 +716,10 @@ class IMConversationTestCase: RTMBaseTestCase {
718716

719717
var convA: IMConversation?
720718

721-
multiExpecting(expectations: { () -> [XCTestExpectation] in
722-
let exp = self.expectation(description: "create conversation")
723-
exp.expectedFulfillmentCount = 5
724-
return [exp]
725-
}) { (exps) in
726-
let exp = exps[0]
727-
719+
expecting(
720+
description: "create conversation",
721+
count: 5)
722+
{ (exp) in
728723
delegatorA.conversationEvent = { client, conv, event in
729724
switch event {
730725
case let .joined(byClientID: byClientID, at: at):
@@ -742,7 +737,6 @@ class IMConversationTestCase: RTMBaseTestCase {
742737
break
743738
}
744739
}
745-
746740
delegatorB.conversationEvent = { client, conv, event in
747741
switch event {
748742
case let .joined(byClientID: byClientID, at: at):
@@ -760,7 +754,6 @@ class IMConversationTestCase: RTMBaseTestCase {
760754
break
761755
}
762756
}
763-
764757
try! clientA.createConversation(clientIDs: [clientB.ID]) { (result) in
765758
XCTAssertTrue(result.isSuccess)
766759
XCTAssertNil(result.error)
@@ -772,13 +765,10 @@ class IMConversationTestCase: RTMBaseTestCase {
772765
let convB = clientB.convCollection[convA?.ID ?? ""]
773766
XCTAssertNotNil(convB)
774767

775-
multiExpecting(expectations: { () -> [XCTestExpectation] in
776-
let exp = self.expectation(description: "leave")
777-
exp.expectedFulfillmentCount = 3
778-
return [exp]
779-
}) { (exps) in
780-
let exp = exps[0]
781-
768+
expecting(
769+
description: "leave",
770+
count: 3)
771+
{ (exp) in
782772
delegatorA.conversationEvent = { client, conv, event in
783773
switch event {
784774
case let .membersLeft(members: members, byClientID: byClientID, at: at):
@@ -794,7 +784,6 @@ class IMConversationTestCase: RTMBaseTestCase {
794784
break
795785
}
796786
}
797-
798787
delegatorB.conversationEvent = { client, conv, event in
799788
switch event {
800789
case let .left(byClientID: byClientID, at: at):
@@ -808,7 +797,6 @@ class IMConversationTestCase: RTMBaseTestCase {
808797
break
809798
}
810799
}
811-
812800
try! convB?.leave(completion: { (result) in
813801
XCTAssertTrue(Thread.isMainThread)
814802
XCTAssertTrue(result.isSuccess)
@@ -817,13 +805,10 @@ class IMConversationTestCase: RTMBaseTestCase {
817805
})
818806
}
819807

820-
multiExpecting(expectations: { () -> [XCTestExpectation] in
821-
let exp = self.expectation(description: "join")
822-
exp.expectedFulfillmentCount = 4
823-
return [exp]
824-
}) { (exps) in
825-
let exp = exps[0]
826-
808+
expecting(
809+
description: "join",
810+
count: 4)
811+
{ (exp) in
827812
delegatorA.conversationEvent = { client, conv, event in
828813
switch event {
829814
case let .membersJoined(members: members, byClientID: byClientID, at: at):
@@ -840,7 +825,6 @@ class IMConversationTestCase: RTMBaseTestCase {
840825
break
841826
}
842827
}
843-
844828
delegatorB.conversationEvent = { client, conv, event in
845829
switch event {
846830
case let .joined(byClientID: byClientID, at: at):
@@ -865,7 +849,6 @@ class IMConversationTestCase: RTMBaseTestCase {
865849
break
866850
}
867851
}
868-
869852
try! convB?.join(completion: { (result) in
870853
XCTAssertTrue(Thread.isMainThread)
871854
XCTAssertTrue(result.isSuccess)
@@ -874,13 +857,10 @@ class IMConversationTestCase: RTMBaseTestCase {
874857
})
875858
}
876859

877-
multiExpecting(expectations: { () -> [XCTestExpectation] in
878-
let exp = self.expectation(description: "remove")
879-
exp.expectedFulfillmentCount = 3
880-
return [exp]
881-
}) { (exps) in
882-
let exp = exps[0]
883-
860+
expecting(
861+
description: "remove",
862+
count: 3)
863+
{ (exp) in
884864
delegatorA.conversationEvent = { client, conv, event in
885865
switch event {
886866
case let .membersLeft(members: members, byClientID: byClientID, at: at):
@@ -896,7 +876,6 @@ class IMConversationTestCase: RTMBaseTestCase {
896876
break
897877
}
898878
}
899-
900879
delegatorB.conversationEvent = { client, conv, event in
901880
switch event {
902881
case let .left(byClientID: byClientID, at: at):
@@ -910,7 +889,6 @@ class IMConversationTestCase: RTMBaseTestCase {
910889
break
911890
}
912891
}
913-
914892
try! convA?.remove(members: [clientB.ID], completion: { (result) in
915893
XCTAssertTrue(Thread.isMainThread)
916894
XCTAssertTrue(result.isSuccess)
@@ -919,13 +897,10 @@ class IMConversationTestCase: RTMBaseTestCase {
919897
})
920898
}
921899

922-
multiExpecting(expectations: { () -> [XCTestExpectation] in
923-
let exp = self.expectation(description: "add")
924-
exp.expectedFulfillmentCount = 4
925-
return [exp]
926-
}) { (exps) in
927-
let exp = exps[0]
928-
900+
expecting(
901+
description: "add",
902+
count: 4)
903+
{ (exp) in
929904
delegatorA.conversationEvent = { client, conv, event in
930905
switch event {
931906
case let .membersJoined(members: members, byClientID: byClientID, at: at):
@@ -942,7 +917,6 @@ class IMConversationTestCase: RTMBaseTestCase {
942917
break
943918
}
944919
}
945-
946920
delegatorB.conversationEvent = { client, conv, event in
947921
switch event {
948922
case let .joined(byClientID: byClientID, at: at):
@@ -967,89 +941,108 @@ class IMConversationTestCase: RTMBaseTestCase {
967941
break
968942
}
969943
}
970-
971944
try! convA?.add(members: [clientB.ID], completion: { (result) in
972945
XCTAssertTrue(Thread.isMainThread)
973946
XCTAssertTrue(result.isSuccess)
974947
XCTAssertNil(result.error)
975948
exp.fulfill()
976949
})
977950
}
951+
952+
expecting { (exp) in
953+
convA?.countMembers(completion: { (result) in
954+
XCTAssertTrue(Thread.isMainThread)
955+
XCTAssertTrue(result.isSuccess)
956+
XCTAssertNil(result.error)
957+
XCTAssertEqual(result.intValue, 2);
958+
exp.fulfill()
959+
})
960+
}
978961
}
979962

980963
func testGetChatRoomOnlineMembers() {
981-
guard
982-
let clientA = newOpenedClient(),
983-
let clientB = newOpenedClient()
984-
else
985-
{
986-
XCTFail()
987-
return
964+
guard let clientA = newOpenedClient(),
965+
let clientB = newOpenedClient() else {
966+
XCTFail()
967+
return
988968
}
989969

990-
var chatRoomA: IMChatRoom? = nil
970+
var chatRoomA: IMChatRoom?
991971

992-
let createExp = expectation(description: "create chat room")
993-
try? clientA.createChatRoom(completion: { (result) in
994-
XCTAssertTrue(result.isSuccess)
995-
XCTAssertNil(result.error)
996-
chatRoomA = result.value
997-
createExp.fulfill()
998-
})
999-
wait(for: [createExp], timeout: timeout)
1000-
1001-
var chatRoomB: IMChatRoom? = nil
1002-
1003-
let queryExp = expectation(description: "query chat room")
1004-
if let ID = chatRoomA?.ID {
1005-
try? clientB.conversationQuery.getConversation(by: ID, completion: { (result) in
972+
expecting { (exp) in
973+
try! clientA.createChatRoom(completion: { (result) in
1006974
XCTAssertTrue(result.isSuccess)
1007975
XCTAssertNil(result.error)
1008-
chatRoomB = result.value as? IMChatRoom
1009-
queryExp.fulfill()
976+
chatRoomA = result.value
977+
exp.fulfill()
1010978
})
1011979
}
1012-
wait(for: [queryExp], timeout: timeout)
1013980

1014-
let countExp = expectation(description: "get online count")
1015-
countExp.expectedFulfillmentCount = 6
1016-
chatRoomA?.getOnlineMembersCount(completion: { (result) in
1017-
XCTAssertTrue(result.isSuccess)
1018-
XCTAssertNil(result.error)
1019-
XCTAssertEqual(result.intValue, 1)
1020-
countExp.fulfill()
1021-
try? chatRoomB?.join(completion: { (result) in
981+
var chatRoomB: IMChatRoom?
982+
983+
expecting { (exp) in
984+
if let ID = chatRoomA?.ID {
985+
try? clientB.conversationQuery.getConversation(by: ID, completion: { (result) in
986+
XCTAssertTrue(result.isSuccess)
987+
XCTAssertNil(result.error)
988+
chatRoomB = result.value as? IMChatRoom
989+
exp.fulfill()
990+
})
991+
} else {
992+
XCTFail()
993+
exp.fulfill()
994+
}
995+
}
996+
997+
expecting(
998+
description: "get online count",
999+
count: 7)
1000+
{ (exp) in
1001+
chatRoomA?.getOnlineMembersCount(completion: { (result) in
10221002
XCTAssertTrue(result.isSuccess)
10231003
XCTAssertNil(result.error)
1024-
countExp.fulfill()
1025-
chatRoomA?.getOnlineMembersCount(completion: { (result) in
1004+
XCTAssertEqual(result.intValue, 1)
1005+
exp.fulfill()
1006+
try? chatRoomB?.join(completion: { (result) in
10261007
XCTAssertTrue(result.isSuccess)
10271008
XCTAssertNil(result.error)
1028-
XCTAssertEqual(result.intValue, 2)
1029-
countExp.fulfill()
1030-
chatRoomA?.getOnlineMembers(completion: { (result) in
1009+
exp.fulfill()
1010+
chatRoomA?.getOnlineMembersCount(completion: { (result) in
10311011
XCTAssertTrue(result.isSuccess)
10321012
XCTAssertNil(result.error)
1033-
XCTAssertEqual(result.value?.count, 2)
1034-
XCTAssertEqual(result.value?.contains(clientA.ID), true)
1035-
XCTAssertEqual(result.value?.contains(clientB.ID), true)
1036-
countExp.fulfill()
1037-
try? chatRoomB?.leave(completion: { (result) in
1013+
XCTAssertEqual(result.intValue, 2)
1014+
exp.fulfill()
1015+
chatRoomA?.getOnlineMembers(completion: { (result) in
10381016
XCTAssertTrue(result.isSuccess)
10391017
XCTAssertNil(result.error)
1040-
countExp.fulfill()
1041-
chatRoomA?.getOnlineMembersCount(completion: { (result) in
1018+
XCTAssertEqual(result.value?.count, 2)
1019+
XCTAssertEqual(result.value?.contains(clientA.ID), true)
1020+
XCTAssertEqual(result.value?.contains(clientB.ID), true)
1021+
exp.fulfill()
1022+
try? chatRoomB?.leave(completion: { (result) in
10421023
XCTAssertTrue(result.isSuccess)
10431024
XCTAssertNil(result.error)
1044-
XCTAssertEqual(result.intValue, 1)
1045-
countExp.fulfill()
1025+
exp.fulfill()
1026+
chatRoomA?.getOnlineMembersCount(completion: { (result) in
1027+
XCTAssertTrue(Thread.isMainThread)
1028+
XCTAssertTrue(result.isSuccess)
1029+
XCTAssertNil(result.error)
1030+
XCTAssertEqual(result.intValue, 1)
1031+
exp.fulfill()
1032+
chatRoomA?.countMembers(completion: { (result) in
1033+
XCTAssertTrue(Thread.isMainThread)
1034+
XCTAssertTrue(result.isSuccess)
1035+
XCTAssertNil(result.error)
1036+
XCTAssertEqual(result.intValue, 1)
1037+
exp.fulfill()
1038+
})
1039+
})
10461040
})
10471041
})
10481042
})
10491043
})
10501044
})
1051-
})
1052-
wait(for: [countExp], timeout: timeout)
1045+
}
10531046
}
10541047

10551048
func testMuteAndUnmute() {

0 commit comments

Comments
 (0)