Skip to content

Commit db24c89

Browse files
maratalmaratal
committed
Fix test.
1 parent dbcc6dc commit db24c89

6 files changed

Lines changed: 19 additions & 19 deletions

File tree

‎Test/AblyTests/Test Utilities/TestUtilities.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -695,7 +695,7 @@ func extractBodyAsJSON(_ request: URLRequest?) -> Result<NSDictionary> {
695695
return Result.success(Box(httpBody))
696696
}
697697

698-
func extractBodyAsMsgPack(_ request: URLRequest?) -> Result<NSDictionary> {
698+
func extractBodyAsMsgPackDictionary(_ request: URLRequest?) -> Result<NSDictionary> {
699699
guard let request = request
700700
else { return Result(error: "No request found") }
701701

@@ -715,7 +715,7 @@ func extractBodyAsMsgPack(_ request: URLRequest?) -> Result<NSDictionary> {
715715
return Result.success(Box(httpBody))
716716
}
717717

718-
func extractBodyAsMessages(_ request: URLRequest?) -> Result<[NSDictionary]> {
718+
func extractBodyAsMsgPackArray(_ request: URLRequest?) -> Result<[NSDictionary]> {
719719
guard let request = request
720720
else { return Result(error: "No request found") }
721721

‎Test/AblyTests/Tests/AuthTests.swift‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -907,7 +907,7 @@ class AuthTests: XCTestCase {
907907

908908
let request = try XCTUnwrap(testHTTPExecutor.requests.first, "No request found")
909909

910-
switch extractBodyAsMsgPack(request) {
910+
switch extractBodyAsMsgPackDictionary(request) {
911911
case let .failure(error):
912912
XCTFail(error)
913913
case let .success(httpBody):
@@ -1086,7 +1086,7 @@ class AuthTests: XCTestCase {
10861086

10871087
let request = try XCTUnwrap(testHTTPExecutor.requests.first, "No request found")
10881088

1089-
switch extractBodyAsMsgPack(request) {
1089+
switch extractBodyAsMsgPackDictionary(request) {
10901090
case let .failure(error):
10911091
fail(error)
10921092
case let .success(httpBody):
@@ -1118,7 +1118,7 @@ class AuthTests: XCTestCase {
11181118

11191119
let request = try XCTUnwrap(testHTTPExecutor.requests.first, "No request found")
11201120

1121-
switch extractBodyAsMsgPack(request) {
1121+
switch extractBodyAsMsgPackDictionary(request) {
11221122
case let .failure(error):
11231123
fail(error)
11241124
case let .success(httpBody):
@@ -1143,11 +1143,11 @@ class AuthTests: XCTestCase {
11431143
done()
11441144
}
11451145
}
1146-
switch extractBodyAsMsgPack(testHTTPExecutor.requests.last) {
1146+
switch extractBodyAsMsgPackArray(testHTTPExecutor.requests.last) {
11471147
case let .failure(error):
11481148
fail(error)
11491149
case let .success(httpBody):
1150-
let message = httpBody.unbox
1150+
let message = try XCTUnwrap(httpBody.unbox.first)
11511151
XCTAssertNil(message["clientId"])
11521152
XCTAssertEqual(message["name"] as? String, "foo")
11531153
}
@@ -1313,7 +1313,7 @@ class AuthTests: XCTestCase {
13131313
}
13141314

13151315
// TokenRequest
1316-
switch extractBodyAsMsgPack(testHTTPExecutor.requests.last) {
1316+
switch extractBodyAsMsgPackDictionary(testHTTPExecutor.requests.last) {
13171317
case let .failure(error):
13181318
XCTFail(error)
13191319
case let .success(httpBody):
@@ -1890,7 +1890,7 @@ class AuthTests: XCTestCase {
18901890
XCTAssertNil(message.clientId)
18911891
channel.publish([message]) { error in
18921892
XCTAssertNil(error)
1893-
switch extractBodyAsMessages(testHTTPExecutor.requests.first) {
1893+
switch extractBodyAsMsgPackArray(testHTTPExecutor.requests.first) {
18941894
case let .failure(error):
18951895
fail(error)
18961896
case let .success(httpBody):
@@ -1953,7 +1953,7 @@ class AuthTests: XCTestCase {
19531953
XCTAssertNil(message.clientId)
19541954
channel.publish([message]) { error in
19551955
XCTAssertNil(error)
1956-
switch extractBodyAsMessages(testHTTPExecutor.requests.first) {
1956+
switch extractBodyAsMsgPackArray(testHTTPExecutor.requests.first) {
19571957
case let .failure(error):
19581958
fail(error)
19591959
case let .success(httpBody):

‎Test/AblyTests/Tests/MessageUpdatesDeletesTests.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ class MessageUpdatesDeletesTests: XCTestCase {
187187

188188
var bodyDict: [String: Any]!
189189

190-
switch extractBodyAsMsgPack(request) {
190+
switch extractBodyAsMsgPackDictionary(request) {
191191
case let .failure(error):
192192
XCTFail(error); return
193193
case let .success(httpBody):
@@ -304,7 +304,7 @@ class MessageUpdatesDeletesTests: XCTestCase {
304304

305305
var bodyDict: [String: Any]!
306306

307-
switch extractBodyAsMsgPack(request) {
307+
switch extractBodyAsMsgPackDictionary(request) {
308308
case let .failure(error):
309309
XCTFail(error)
310310
case let .success(httpBody):

‎Test/AblyTests/Tests/PushAdminTests.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ class PushAdminTests: XCTestCase {
208208

209209
expect(url.absoluteString).to(contain("/push/publish"))
210210

211-
switch extractBodyAsMsgPack(request) {
211+
switch extractBodyAsMsgPackDictionary(request) {
212212
case let .failure(error):
213213
XCTFail(error)
214214
case let .success(httpBody):

‎Test/AblyTests/Tests/PushTests.swift‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ class PushTests: XCTestCase {
178178
req.httpMethod == "POST" && req.url?.path == "/push/deviceRegistrations"
179179
}.first
180180

181-
switch extractBodyAsMsgPack(registerRequest) {
181+
switch extractBodyAsMsgPackDictionary(registerRequest) {
182182
case let .failure(error):
183183
fail(error)
184184
case let .success(httpBody):
@@ -520,7 +520,7 @@ class PushTests: XCTestCase {
520520
req.httpMethod == "POST" && req.url!.path == "/push/deviceRegistrations"
521521
}.first
522522

523-
switch extractBodyAsMsgPack(registerRequest) {
523+
switch extractBodyAsMsgPackDictionary(registerRequest) {
524524
case let .failure(error):
525525
fail(error)
526526
case let .success(httpBody):
@@ -535,7 +535,7 @@ class PushTests: XCTestCase {
535535
req.httpMethod == "PATCH" && req.url!.path.hasPrefix("/push/deviceRegistrations/")
536536
}.first
537537

538-
switch extractBodyAsMsgPack(updateRequest) {
538+
switch extractBodyAsMsgPackDictionary(updateRequest) {
539539
case let .failure(error):
540540
fail(error)
541541
case let .success(httpBody):
@@ -583,7 +583,7 @@ class PushTests: XCTestCase {
583583
req.httpMethod == "POST" && req.url!.path == "/push/deviceRegistrations"
584584
}.first
585585

586-
switch extractBodyAsMsgPack(registerRequest) {
586+
switch extractBodyAsMsgPackDictionary(registerRequest) {
587587
case let .failure(error):
588588
fail(error)
589589
case let .success(httpBody):
@@ -598,7 +598,7 @@ class PushTests: XCTestCase {
598598
req.httpMethod == "PATCH" && req.url!.path.hasPrefix("/push/deviceRegistrations/")
599599
}.first
600600

601-
switch extractBodyAsMsgPack(updateRequest) {
601+
switch extractBodyAsMsgPackDictionary(updateRequest) {
602602
case let .failure(error):
603603
fail(error)
604604
case let .success(httpBody):

‎Test/AblyTests/Tests/RestClientTests.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1654,7 +1654,7 @@ class RestClientTests: XCTestCase {
16541654

16551655
let request = try XCTUnwrap(testHTTPExecutor.requests.first, "No request found")
16561656

1657-
switch extractBodyAsMsgPack(request) {
1657+
switch extractBodyAsMsgPackDictionary(request) {
16581658
case let .failure(error):
16591659
fail(error)
16601660
default: break

0 commit comments

Comments
 (0)