Skip to content

Commit d6d10ce

Browse files
zapcannon87zapcannon87
authored
Merge pull request #680 from harryphone/master
test: add conversation test case and message test case
2 parents 1ee348b + 818e337 commit d6d10ce

18 files changed

+4129
-797
lines changed

‎AVOS/AVOS.xcodeproj/project.pbxproj‎

Lines changed: 32 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,18 @@
99
/* Begin PBXBuildFile section */
1010
C43D444627281D39006A31FD /* LCTestObject.m in Sources */ = {isa = PBXBuildFile; fileRef = C43D444527281D39006A31FD /* LCTestObject.m */; };
1111
C474960127672EC600DBBF06 /* yellowicon.png in Resources */ = {isa = PBXBuildFile; fileRef = C474960027672EC500DBBF06 /* yellowicon.png */; };
12+
C48D1B0527747095004568E4 /* test.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = C48D1B0027747095004568E4 /* test.mp4 */; };
13+
C48D1B0627747095004568E4 /* test.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = C48D1B0127747095004568E4 /* test.mp3 */; };
14+
C48D1B0727747095004568E4 /* test.zip in Resources */ = {isa = PBXBuildFile; fileRef = C48D1B0227747095004568E4 /* test.zip */; };
15+
C48D1B0827747095004568E4 /* test.jpg in Resources */ = {isa = PBXBuildFile; fileRef = C48D1B0327747095004568E4 /* test.jpg */; };
16+
C48D1B0927747095004568E4 /* test.png in Resources */ = {isa = PBXBuildFile; fileRef = C48D1B0427747095004568E4 /* test.png */; };
1217
C497609E276B5C1E00E8045D /* LCIMMessageTestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = C497609D276B5C1E00E8045D /* LCIMMessageTestCase.swift */; };
1318
C497E8C52760A77300441160 /* LCPushTestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = C497E8C42760A77300441160 /* LCPushTestCase.swift */; };
14-
C4997A2F2761D6B30055EF2E /* LCIMTestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4997A2E2761D6B30055EF2E /* LCIMTestCase.swift */; };
1519
C4997A312761F6630055EF2E /* TestCaseDelegator.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4997A302761F6630055EF2E /* TestCaseDelegator.swift */; };
1620
C49BC44B275F6ABE00032059 /* LCLiveQueryTestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = C49BC44A275F6ABE00032059 /* LCLiveQueryTestCase.swift */; };
1721
C4B25E3D27267DE700F9414F /* LCObjectTestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4B25E3C27267DE700F9414F /* LCObjectTestCase.swift */; };
1822
C4B7A99327698C4A00D8833B /* LCIMClientTestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4B7A99227698C4A00D8833B /* LCIMClientTestCase.swift */; };
23+
C4E9B1CB276C3293004CA642 /* LCIMConversationTestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4E9B1CA276C3293004CA642 /* LCIMConversationTestCase.swift */; };
1924
D305F7B0235577AD00222EBC /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = D305F7AF235577AD00222EBC /* main.swift */; };
2025
D30B6A1424A09978006ABE09 /* LeanCloudObjc.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D30B6A0B24A09978006ABE09 /* LeanCloudObjc.framework */; };
2126
D30B6A1B24A09978006ABE09 /* LeanCloudObjc.h in Headers */ = {isa = PBXBuildFile; fileRef = D30B6A0D24A09978006ABE09 /* LeanCloudObjc.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -541,13 +546,18 @@
541546
C43D444427281D39006A31FD /* LCTestObject.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LCTestObject.h; sourceTree = "<group>"; };
542547
C43D444527281D39006A31FD /* LCTestObject.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LCTestObject.m; sourceTree = "<group>"; };
543548
C474960027672EC500DBBF06 /* yellowicon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = yellowicon.png; sourceTree = "<group>"; };
549+
C48D1B0027747095004568E4 /* test.mp4 */ = {isa = PBXFileReference; lastKnownFileType = file; path = test.mp4; sourceTree = "<group>"; };
550+
C48D1B0127747095004568E4 /* test.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = test.mp3; sourceTree = "<group>"; };
551+
C48D1B0227747095004568E4 /* test.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = test.zip; sourceTree = "<group>"; };
552+
C48D1B0327747095004568E4 /* test.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = test.jpg; sourceTree = "<group>"; };
553+
C48D1B0427747095004568E4 /* test.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = test.png; sourceTree = "<group>"; };
544554
C497609D276B5C1E00E8045D /* LCIMMessageTestCase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LCIMMessageTestCase.swift; sourceTree = "<group>"; };
545555
C497E8C42760A77300441160 /* LCPushTestCase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LCPushTestCase.swift; sourceTree = "<group>"; };
546-
C4997A2E2761D6B30055EF2E /* LCIMTestCase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LCIMTestCase.swift; sourceTree = "<group>"; };
547556
C4997A302761F6630055EF2E /* TestCaseDelegator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestCaseDelegator.swift; sourceTree = "<group>"; };
548557
C49BC44A275F6ABE00032059 /* LCLiveQueryTestCase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LCLiveQueryTestCase.swift; sourceTree = "<group>"; };
549558
C4B25E3C27267DE700F9414F /* LCObjectTestCase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LCObjectTestCase.swift; sourceTree = "<group>"; };
550559
C4B7A99227698C4A00D8833B /* LCIMClientTestCase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LCIMClientTestCase.swift; sourceTree = "<group>"; };
560+
C4E9B1CA276C3293004CA642 /* LCIMConversationTestCase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LCIMConversationTestCase.swift; sourceTree = "<group>"; };
551561
D305F7A72355760100222EBC /* CLI */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = CLI; sourceTree = BUILT_PRODUCTS_DIR; };
552562
D305F7AF235577AD00222EBC /* main.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = main.swift; path = ../main.swift; sourceTree = "<group>"; };
553563
D30B6A0B24A09978006ABE09 /* LeanCloudObjc.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = LeanCloudObjc.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -1228,6 +1238,18 @@
12281238
path = Protobuf;
12291239
sourceTree = "<group>";
12301240
};
1241+
C48D1AFF27747095004568E4 /* Resources */ = {
1242+
isa = PBXGroup;
1243+
children = (
1244+
C48D1B0027747095004568E4 /* test.mp4 */,
1245+
C48D1B0127747095004568E4 /* test.mp3 */,
1246+
C48D1B0227747095004568E4 /* test.zip */,
1247+
C48D1B0327747095004568E4 /* test.jpg */,
1248+
C48D1B0427747095004568E4 /* test.png */,
1249+
);
1250+
path = Resources;
1251+
sourceTree = "<group>";
1252+
};
12311253
D305F7AE2355771B00222EBC /* CLI */ = {
12321254
isa = PBXGroup;
12331255
children = (
@@ -1250,6 +1272,7 @@
12501272
D30B6A1724A09978006ABE09 /* LeanCloudObjcTests */ = {
12511273
isa = PBXGroup;
12521274
children = (
1275+
C48D1AFF27747095004568E4 /* Resources */,
12531276
D30B6B6024A0A932006ABE09 /* LeanCloudObjcTests-Bridging-Header.h */,
12541277
C43D444427281D39006A31FD /* LCTestObject.h */,
12551278
C43D444527281D39006A31FD /* LCTestObject.m */,
@@ -1266,8 +1289,8 @@
12661289
D39724C524A852400099A518 /* IMClientTestCase.swift */,
12671290
C4997A302761F6630055EF2E /* TestCaseDelegator.swift */,
12681291
D36A095925BEA75000A4F312 /* IMMessageTestCase.swift */,
1269-
C4997A2E2761D6B30055EF2E /* LCIMTestCase.swift */,
12701292
C4B7A99227698C4A00D8833B /* LCIMClientTestCase.swift */,
1293+
C4E9B1CA276C3293004CA642 /* LCIMConversationTestCase.swift */,
12711294
C497609D276B5C1E00E8045D /* LCIMMessageTestCase.swift */,
12721295
C474960027672EC500DBBF06 /* yellowicon.png */,
12731296
D30B6A1A24A09978006ABE09 /* Info.plist */,
@@ -1695,6 +1718,11 @@
16951718
buildActionMask = 2147483647;
16961719
files = (
16971720
C474960127672EC600DBBF06 /* yellowicon.png in Resources */,
1721+
C48D1B0827747095004568E4 /* test.jpg in Resources */,
1722+
C48D1B0727747095004568E4 /* test.zip in Resources */,
1723+
C48D1B0527747095004568E4 /* test.mp4 in Resources */,
1724+
C48D1B0627747095004568E4 /* test.mp3 in Resources */,
1725+
C48D1B0927747095004568E4 /* test.png in Resources */,
16981726
);
16991727
runOnlyForDeploymentPostprocessing = 0;
17001728
};
@@ -1845,8 +1873,8 @@
18451873
D36A095A25BEA75000A4F312 /* IMMessageTestCase.swift in Sources */,
18461874
C43D444627281D39006A31FD /* LCTestObject.m in Sources */,
18471875
C4B25E3D27267DE700F9414F /* LCObjectTestCase.swift in Sources */,
1848-
C4997A2F2761D6B30055EF2E /* LCIMTestCase.swift in Sources */,
18491876
C49BC44B275F6ABE00032059 /* LCLiveQueryTestCase.swift in Sources */,
1877+
C4E9B1CB276C3293004CA642 /* LCIMConversationTestCase.swift in Sources */,
18501878
D3AD74AB24BC216200D1BBEE /* LCUserTestCase.swift in Sources */,
18511879
D33127D526CE391500BBDE09 /* LCLeaderboardTestCase.swift in Sources */,
18521880
C4997A312761F6630055EF2E /* TestCaseDelegator.swift in Sources */,

‎AVOS/LeanCloudObjcTests/BaseTestCase.swift‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,11 @@ extension BaseTestCase {
161161
}
162162
application.setWithIdentifier(appInfo.id, key: appInfo.key)
163163
}
164+
165+
func bundleResourceURL(name: String, ext: String) -> URL {
166+
return Bundle(for: type(of: self))
167+
.url(forResource: name, withExtension: ext)!
168+
}
164169
}
165170

166171

@@ -231,7 +236,7 @@ extension BaseTestCase {
231236
}
232237

233238

234-
static func verifyLCObjectValues(objectID: String, needVerifyFields: [TestField: Any], className: String = LCObjectTestCase.TestName) {
239+
static func verifyLCObjectValues(objectID: String, needVerifyFields: [TestField: Any], className: String = BaseTestCase.TestName) {
235240
let object = LCObject.init(className: className, objectId: objectID)
236241
XCTAssert(object.fetch())
237242
verifyLCObjectValues(object: object, needVerifyFields: needVerifyFields)
@@ -247,7 +252,7 @@ extension BaseTestCase {
247252
}
248253
}
249254

250-
static func createLCObject(fields: [TestField: Any], save: Bool = true, className: String = LCObjectTestCase.TestName) -> LCObject {
255+
static func createLCObject(fields: [TestField: Any], save: Bool = true, className: String = BaseTestCase.TestName) -> LCObject {
251256
let object = LCObject.init(className: className)
252257
object.set(fields: fields)
253258
if save {
@@ -264,7 +269,7 @@ extension BaseTestCase {
264269
// }
265270
// }
266271

267-
static func updateLCObject(objectID: String, className: String = LCObjectTestCase.TestName, updateAction: ((LCObject) -> ())) {
272+
static func updateLCObject(objectID: String, className: String = BaseTestCase.TestName, updateAction: ((LCObject) -> ())) {
268273
let object = LCObject.init(className: className, objectId: objectID)
269274
updateAction(object)
270275
XCTAssert(object.save())

‎AVOS/LeanCloudObjcTests/IMClientTestCase.swift‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,9 @@ class IMClientTestCase: RTMBaseTestCase {
147147
}
148148
XCTAssertEqual(client.currentDeviceToken, deviceToken)
149149
XCTAssertNotNil(observer)
150+
if let observer = observer {
151+
NotificationCenter.default.removeObserver(observer)
152+
}
150153
}
151154
}
152155

0 commit comments

Comments
 (0)