From 5693fed0aea9669ae005c7c43490c00a0352904b Mon Sep 17 00:00:00 2001 From: praveek Date: Fri, 2 Jul 2021 12:57:10 -0700 Subject: [PATCH] Fix tests --- .../OfflineFunctionalTests.swift | 8 +++---- .../RealTimeFunctionalTests.swift | 24 +++++++++---------- AEPMedia/Tests/TestHelpers/TestHelpers.swift | 7 ++++++ 3 files changed, 23 insertions(+), 16 deletions(-) diff --git a/AEPMedia/Tests/FunctionalTests/OfflineFunctionalTests.swift b/AEPMedia/Tests/FunctionalTests/OfflineFunctionalTests.swift index d64552e..b90a957 100644 --- a/AEPMedia/Tests/FunctionalTests/OfflineFunctionalTests.swift +++ b/AEPMedia/Tests/FunctionalTests/OfflineFunctionalTests.swift @@ -99,7 +99,7 @@ class OfflineFunctionalTests: MediaFunctionalTestBase { let requests = mockNetworkService.calledNetworkRequests XCTAssertEqual(1, requests.count) XCTAssertTrue(mockNetworkService.connectAsyncCalled) - let sessionRequestURLString = requests[0]?.connectPayload ?? "" + let sessionRequestURLString = requests[0]?.payloadAsString() ?? "" XCTAssertTrue(compareJsonArray(expected: expectedResponse, payload: sessionRequestURLString)) } @@ -138,7 +138,7 @@ class OfflineFunctionalTests: MediaFunctionalTestBase { XCTAssertTrue(mockNetworkService.connectAsyncCalled) // Get payload of succeessful network request XCTAssertEqual(failedNetworkRequestsCount+1, requests.count) - let sessionRequestURLString = requests[requests.count-1]?.connectPayload ?? "" + let sessionRequestURLString = requests[requests.count-1]?.payloadAsString() ?? "" XCTAssertTrue(compareJsonArray(expected: expectedResponse, payload: sessionRequestURLString)) } @@ -210,7 +210,7 @@ class OfflineFunctionalTests: MediaFunctionalTestBase { let requests = mockNetworkService.calledNetworkRequests XCTAssertEqual(1, requests.count) XCTAssertTrue(mockNetworkService.connectAsyncCalled) - let sessionRequestURLString = requests[0]?.connectPayload ?? "" + let sessionRequestURLString = requests[0]?.payloadAsString() ?? "" XCTAssertTrue(compareJsonArray(expected: expectedResponse, payload: sessionRequestURLString)) } @@ -288,7 +288,7 @@ class OfflineFunctionalTests: MediaFunctionalTestBase { XCTAssertEqual(1, requests.count) XCTAssertTrue(mockNetworkService.connectAsyncCalled) - let sessionRequestURLString = requests[0]?.connectPayload ?? "" + let sessionRequestURLString = requests[0]?.payloadAsString() ?? "" XCTAssertTrue(compareJsonArray(expected: expectedResponse, payload: sessionRequestURLString)) } } diff --git a/AEPMedia/Tests/FunctionalTests/RealTimeFunctionalTests.swift b/AEPMedia/Tests/FunctionalTests/RealTimeFunctionalTests.swift index f1ac235..9ede170 100644 --- a/AEPMedia/Tests/FunctionalTests/RealTimeFunctionalTests.swift +++ b/AEPMedia/Tests/FunctionalTests/RealTimeFunctionalTests.swift @@ -227,9 +227,9 @@ class RealTimeFunctionalTests: MediaFunctionalTestBase { XCTAssertTrue(mockNetworkService.connectAsyncCalled) let sessionStartRequest = requests[0] - let sessionStartRequestURLString = sessionStartRequest?.connectPayload ?? "" + let sessionStartRequestURLString = sessionStartRequest?.payloadAsString() ?? "" let playRequest = requests[1] - let playRequestURLString = playRequest?.connectPayload ?? "" + let playRequestURLString = playRequest?.payloadAsString() ?? "" XCTAssertTrue(playRequest?.url.absoluteString.contains("MediaCollectionServerSessionId") ?? false) XCTAssertTrue(compareJsonArray(expected: mockMediaData.sessionStartJsonWithState, payload: sessionStartRequestURLString)) @@ -260,7 +260,7 @@ class RealTimeFunctionalTests: MediaFunctionalTestBase { XCTAssertTrue(mockNetworkService.connectAsyncCalled) let sessionStartRequest = requests[0] - let sessionStartRequestURLString = sessionStartRequest?.connectPayload ?? "" + let sessionStartRequestURLString = sessionStartRequest?.payloadAsString() ?? "" XCTAssertTrue(compareJsonArray(expected: mockMediaData.sessionStartJsonWithState, payload: sessionStartRequestURLString)) } @@ -288,11 +288,11 @@ class RealTimeFunctionalTests: MediaFunctionalTestBase { XCTAssertEqual(5, requests.count) XCTAssertTrue(mockNetworkService.connectAsyncCalled) - let sessionStartRequestURLString = requests[0]?.connectPayload ?? "" - let playRequestURLString1 = requests[1]?.connectPayload ?? "" - let pauseRequestURLString = requests[2]?.connectPayload ?? "" - let playRequestURLString2 = requests[1]?.connectPayload ?? "" - let completeRequestURLString = requests[4]?.connectPayload ?? "" + let sessionStartRequestURLString = requests[0]?.payloadAsString() ?? "" + let playRequestURLString1 = requests[1]?.payloadAsString() ?? "" + let pauseRequestURLString = requests[2]?.payloadAsString() ?? "" + let playRequestURLString2 = requests[1]?.payloadAsString() ?? "" + let completeRequestURLString = requests[4]?.payloadAsString() ?? "" XCTAssertTrue(compareJsonArray(expected: mockMediaData.sessionStartJsonWithState, payload: sessionStartRequestURLString)) XCTAssertTrue(compareJsonArray(expected: mockMediaData.playJson, payload: playRequestURLString1)) @@ -322,8 +322,8 @@ class RealTimeFunctionalTests: MediaFunctionalTestBase { XCTAssertEqual(2, requests.count) XCTAssertTrue(mockNetworkService.connectAsyncCalled) - let sessionStartRequestURLString = requests[0]?.connectPayload ?? "" - let playRequestURLString1 = requests[1]?.connectPayload ?? "" + let sessionStartRequestURLString = requests[0]?.payloadAsString() ?? "" + let playRequestURLString1 = requests[1]?.payloadAsString() ?? "" XCTAssertTrue(compareJsonArray(expected: mockMediaData.sessionStartJsonWithState, payload: sessionStartRequestURLString)) XCTAssertTrue(compareJsonArray(expected: mockMediaData.playJson, payload: playRequestURLString1)) @@ -350,7 +350,7 @@ class RealTimeFunctionalTests: MediaFunctionalTestBase { XCTAssertEqual(1, requests.count) XCTAssertTrue(mockNetworkService.connectAsyncCalled) - let sessionStartRequestURLString = requests[0]?.connectPayload ?? "" + let sessionStartRequestURLString = requests[0]?.payloadAsString() ?? "" XCTAssertTrue(compareJsonArray(expected: mockMediaData.sessionStartJsonWithState, payload: sessionStartRequestURLString)) } @@ -377,7 +377,7 @@ class RealTimeFunctionalTests: MediaFunctionalTestBase { XCTAssertEqual(1, requests.count) XCTAssertTrue(mockNetworkService.connectAsyncCalled) - let sessionStartRequestURLString = requests[0]?.connectPayload ?? "" + let sessionStartRequestURLString = requests[0]?.payloadAsString() ?? "" XCTAssertTrue(compareJsonArray(expected: mockMediaData.sessionStartJsonWithState, payload: sessionStartRequestURLString)) } diff --git a/AEPMedia/Tests/TestHelpers/TestHelpers.swift b/AEPMedia/Tests/TestHelpers/TestHelpers.swift index 395dff1..1b92bdd 100644 --- a/AEPMedia/Tests/TestHelpers/TestHelpers.swift +++ b/AEPMedia/Tests/TestHelpers/TestHelpers.swift @@ -12,6 +12,7 @@ import XCTest @testable import AEPCore @testable import AEPMedia +import AEPServices extension EventHub { static func reset() { @@ -79,3 +80,9 @@ func convertToDictionary(jsonString: String?) -> [String: Any] { return dataAsDictionary } + +extension NetworkRequest { + func payloadAsString() -> String { + return String(data: connectPayload, encoding: .utf8) ?? "" + } +}