Skip to content

Commit 2838c08

Browse files
nickolas-dimitrakasnickolas-dimitrakas
committed
remove listener protocol
1 parent dc199fe commit 2838c08

File tree

1 file changed

+1
-101
lines changed

1 file changed

+1
-101
lines changed

‎mParticle-Apple-Media-SDKTests/mParticle_Apple_MediaTests.swift‎

Lines changed: 1 addition & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import XCTest
33

44
private let defaultTimeout = 10.0
55

6-
class mParticle_Apple_MediaTests: XCTestCase, MPListenerProtocol {
6+
class mParticle_Apple_MediaTests: XCTestCase {
77
var coreSDK: MParticle?
88
var mediaSession: MPMediaSession?
99

@@ -28,62 +28,14 @@ class mParticle_Apple_MediaTests: XCTestCase, MPListenerProtocol {
2828
return _mediaEventHandler
2929
}
3030
}
31-
private var _coreMediaEventExpectation: XCTestExpectation?
32-
private var _coreMediaEventHandler: ((MPMediaEvent) -> Void)? = {(event: MPMediaEvent) -> Void in XCTFail("Unexpected MediaEvent sent to Core")
33-
}
34-
var coreMediaEventHandler: ((MPMediaEvent) -> Void)? {
35-
set {
36-
guard let mediaEventHandler = newValue else {
37-
_coreMediaEventHandler = nil
38-
return
39-
}
40-
self._coreMediaEventExpectation = self.expectation(description: "Core SDK MediaEvent Listener")
41-
self._coreMediaEventHandler = { (event: MPMediaEvent) -> Void in
42-
XCTAssertEqual(event.messageType, MPMessageType.media)
43-
mediaEventHandler(event)
44-
self._coreMediaEventExpectation?.fulfill()
45-
}
46-
}
47-
get {
48-
return self._coreMediaEventHandler
49-
}
50-
}
51-
52-
private var _coreMPEventExpectation: XCTestExpectation?
53-
private var _coreMPEventHandler: ((MPEvent) -> Void)? = {(event: MPEvent) -> Void in XCTFail("Unexpected MPEvent sent to Core")
54-
}
55-
var coreMPEventHandler: ((MPEvent) -> Void)? {
56-
set {
57-
guard let mpEventHandler = newValue else {
58-
self._coreMPEventHandler = nil
59-
return
60-
}
61-
self._coreMPEventExpectation = self.expectation(description: "Core SDK MPEvent Listener")
62-
self._coreMPEventHandler = { (event: MPEvent) -> Void in
63-
XCTAssertEqual(event.type, MPEventType.media)
64-
XCTAssertEqual(event.messageType, MPMessageType.event)
65-
mpEventHandler(event)
66-
self._coreMPEventExpectation?.fulfill()
67-
}
68-
}
69-
get {
70-
return self._coreMPEventHandler
71-
}
72-
}
7331

7432
override func setUp() {
75-
// Put setup code here. This method is called before the invocation of each test method in the class.
7633
coreSDK = MParticle.sharedInstance()
7734
mediaSession = MPMediaSession(coreSDK: coreSDK, mediaContentId: "12345", title: "foo title", duration: 90000, contentType: .video, streamType: .onDemand, logMPEvents: false, logMediaEvents: true, completeLimit: 90, excludeAdBreaksFromContentTime: true, testing: true)
78-
MPListenerController.sharedInstance().addSdkListener(self)
7935
}
8036

8137
override func tearDown() {
82-
// Put teardown code here. This method is called after the invocation of each test method in the class.
83-
MPListenerController.sharedInstance().removeSdkListener(self)
8438
mediaEventHandler = nil
85-
coreMPEventHandler = nil
86-
coreMediaEventHandler = nil
8739
}
8840

8941
func testInits() {
@@ -159,7 +111,6 @@ class mParticle_Apple_MediaTests: XCTestCase, MPListenerProtocol {
159111
XCTAssertEqual(event.mediaEventName, .sessionStart)
160112
}
161113
self.mediaEventHandler = mediaHandler
162-
self.coreMediaEventHandler = mediaHandler
163114

164115
mediaSession?.logMediaSessionStart()
165116
self.waitForExpectations(timeout: defaultTimeout, handler: nil)
@@ -180,7 +131,6 @@ class mParticle_Apple_MediaTests: XCTestCase, MPListenerProtocol {
180131

181132
}
182133
self.mediaEventHandler = mediaHandler
183-
self.coreMediaEventHandler = mediaHandler
184134

185135
mediaSession?.logMediaSessionStart(options: option)
186136
self.waitForExpectations(timeout: defaultTimeout, handler: nil)
@@ -202,7 +152,6 @@ class mParticle_Apple_MediaTests: XCTestCase, MPListenerProtocol {
202152

203153
}
204154
self.mediaEventHandler = mediaHandler
205-
self.coreMediaEventHandler = mediaHandler
206155

207156
mediaSession?.mediaSessionAttributes = ["testKey2": "testValue2"]
208157
mediaSession?.logMediaSessionStart(options: option)
@@ -216,10 +165,6 @@ class mParticle_Apple_MediaTests: XCTestCase, MPListenerProtocol {
216165
XCTAssertEqual(event.mediaEventName, .sessionStart)
217166
}
218167

219-
self.coreMPEventHandler = { (event: MPEvent) -> Void in
220-
XCTAssertEqual(event.name, MPMediaEventNameString.sessionStart.rawValue)
221-
}
222-
223168
mediaSession?.logMediaSessionStart()
224169
self.waitForExpectations(timeout: defaultTimeout, handler: nil)
225170
}
@@ -229,7 +174,6 @@ class mParticle_Apple_MediaTests: XCTestCase, MPListenerProtocol {
229174
XCTAssertEqual(event.mediaEventName, .sessionEnd)
230175
}
231176
self.mediaEventHandler = mediaHandler
232-
self.coreMediaEventHandler = mediaHandler
233177

234178
mediaSession?.logMediaSessionEnd()
235179
self.waitForExpectations(timeout: defaultTimeout, handler: nil)
@@ -240,7 +184,6 @@ class mParticle_Apple_MediaTests: XCTestCase, MPListenerProtocol {
240184
XCTAssertEqual(event.mediaEventName, .contentEnd)
241185
}
242186
self.mediaEventHandler = mediaHandler
243-
self.coreMediaEventHandler = mediaHandler
244187

245188
mediaSession?.logMediaContentEnd()
246189
self.waitForExpectations(timeout: defaultTimeout, handler: nil)
@@ -251,7 +194,6 @@ class mParticle_Apple_MediaTests: XCTestCase, MPListenerProtocol {
251194
XCTAssertEqual(event.mediaEventName, .play)
252195
}
253196
self.mediaEventHandler = mediaHandler
254-
self.coreMediaEventHandler = mediaHandler
255197

256198
mediaSession?.logPlay()
257199
self.waitForExpectations(timeout: defaultTimeout, handler: nil)
@@ -263,7 +205,6 @@ class mParticle_Apple_MediaTests: XCTestCase, MPListenerProtocol {
263205
XCTAssertEqual(event.playheadPosition, 1400)
264206
}
265207
self.mediaEventHandler = mediaHandler
266-
self.coreMediaEventHandler = mediaHandler
267208

268209
mediaSession?.currentPlayheadPosition = 1400
269210
mediaSession?.logPlay()
@@ -281,7 +222,6 @@ class mParticle_Apple_MediaTests: XCTestCase, MPListenerProtocol {
281222
XCTAssertEqual(event.playheadPosition, 45000)
282223
}
283224
self.mediaEventHandler = mediaHandler
284-
self.coreMediaEventHandler = mediaHandler
285225

286226
mediaSession?.logPlay(options: options)
287227
self.waitForExpectations(timeout: defaultTimeout, handler: nil)
@@ -292,7 +232,6 @@ class mParticle_Apple_MediaTests: XCTestCase, MPListenerProtocol {
292232
XCTAssertEqual(event.mediaEventName, .pause)
293233
}
294234
self.mediaEventHandler = mediaHandler
295-
self.coreMediaEventHandler = mediaHandler
296235

297236
mediaSession?.logPause()
298237
self.waitForExpectations(timeout: defaultTimeout, handler: nil)
@@ -309,7 +248,6 @@ class mParticle_Apple_MediaTests: XCTestCase, MPListenerProtocol {
309248
XCTAssertEqual(event.customAttributes?["test"] as? String, "tester")
310249
}
311250
self.mediaEventHandler = mediaHandler
312-
self.coreMediaEventHandler = mediaHandler
313251

314252
mediaSession?.logPause(options: options)
315253
self.waitForExpectations(timeout: defaultTimeout, handler: nil)
@@ -321,7 +259,6 @@ class mParticle_Apple_MediaTests: XCTestCase, MPListenerProtocol {
321259
XCTAssertEqual(event.seekPosition, 20000)
322260
}
323261
self.mediaEventHandler = mediaHandler
324-
self.coreMediaEventHandler = mediaHandler
325262

326263
mediaSession?.logSeekStart(position: 20000)
327264
self.waitForExpectations(timeout: defaultTimeout, handler: nil)
@@ -333,7 +270,6 @@ class mParticle_Apple_MediaTests: XCTestCase, MPListenerProtocol {
333270
XCTAssertEqual(event.seekPosition, 30000)
334271
}
335272
self.mediaEventHandler = mediaHandler
336-
self.coreMediaEventHandler = mediaHandler
337273

338274
mediaSession?.logSeekEnd(position: 30000)
339275
self.waitForExpectations(timeout: defaultTimeout, handler: nil)
@@ -349,7 +285,6 @@ class mParticle_Apple_MediaTests: XCTestCase, MPListenerProtocol {
349285
XCTAssertEqual(event.adContent, adContent)
350286
}
351287
self.mediaEventHandler = mediaHandler
352-
self.coreMediaEventHandler = mediaHandler
353288

354289
mediaSession?.logAdStart(adContent: adContent)
355290
self.waitForExpectations(timeout: defaultTimeout, handler: nil)
@@ -360,7 +295,6 @@ class mParticle_Apple_MediaTests: XCTestCase, MPListenerProtocol {
360295
XCTAssertEqual(event.mediaEventName, .adEnd)
361296
}
362297
self.mediaEventHandler = mediaHandler
363-
self.coreMediaEventHandler = mediaHandler
364298

365299
mediaSession?.logAdEnd()
366300
self.waitForExpectations(timeout: defaultTimeout, handler: nil)
@@ -371,7 +305,6 @@ class mParticle_Apple_MediaTests: XCTestCase, MPListenerProtocol {
371305
XCTAssertEqual(event.mediaEventName, .adClick)
372306
}
373307
self.mediaEventHandler = mediaHandler
374-
self.coreMediaEventHandler = mediaHandler
375308

376309
mediaSession?.logAdClick()
377310
self.waitForExpectations(timeout: defaultTimeout, handler: nil)
@@ -382,7 +315,6 @@ class mParticle_Apple_MediaTests: XCTestCase, MPListenerProtocol {
382315
XCTAssertEqual(event.mediaEventName, .adSkip)
383316
}
384317
self.mediaEventHandler = mediaHandler
385-
self.coreMediaEventHandler = mediaHandler
386318

387319
mediaSession?.logAdSkip()
388320
self.waitForExpectations(timeout: defaultTimeout, handler: nil)
@@ -397,7 +329,6 @@ class mParticle_Apple_MediaTests: XCTestCase, MPListenerProtocol {
397329
XCTAssertEqual(event.adBreak?.duration, 50)
398330
}
399331
self.mediaEventHandler = mediaHandler
400-
self.coreMediaEventHandler = mediaHandler
401332

402333
mediaSession?.logAdBreakStart(adBreak: adBreak)
403334
self.waitForExpectations(timeout: defaultTimeout, handler: nil)
@@ -408,7 +339,6 @@ class mParticle_Apple_MediaTests: XCTestCase, MPListenerProtocol {
408339
XCTAssertEqual(event.mediaEventName, .adBreakEnd)
409340
}
410341
self.mediaEventHandler = mediaHandler
411-
self.coreMediaEventHandler = mediaHandler
412342

413343
mediaSession?.logAdBreakEnd()
414344
self.waitForExpectations(timeout: defaultTimeout, handler: nil)
@@ -528,7 +458,6 @@ class mParticle_Apple_MediaTests: XCTestCase, MPListenerProtocol {
528458
XCTAssertEqual(event.segment, segment)
529459
}
530460
self.mediaEventHandler = mediaHandler
531-
self.coreMediaEventHandler = mediaHandler
532461

533462
mediaSession?.logSegmentStart(segment: segment)
534463
self.waitForExpectations(timeout: defaultTimeout, handler: nil)
@@ -539,7 +468,6 @@ class mParticle_Apple_MediaTests: XCTestCase, MPListenerProtocol {
539468
XCTAssertEqual(event.mediaEventName, .segmentEnd)
540469
}
541470
self.mediaEventHandler = mediaHandler
542-
self.coreMediaEventHandler = mediaHandler
543471

544472
mediaSession?.logSegmentEnd()
545473
self.waitForExpectations(timeout: defaultTimeout, handler: nil)
@@ -550,7 +478,6 @@ class mParticle_Apple_MediaTests: XCTestCase, MPListenerProtocol {
550478
XCTAssertEqual(event.mediaEventName, .segmentSkip)
551479
}
552480
self.mediaEventHandler = mediaHandler
553-
self.coreMediaEventHandler = mediaHandler
554481

555482
mediaSession?.logSegmentSkip()
556483
self.waitForExpectations(timeout: defaultTimeout, handler: nil)
@@ -562,7 +489,6 @@ class mParticle_Apple_MediaTests: XCTestCase, MPListenerProtocol {
562489
XCTAssertEqual(event.playheadPosition, 45000)
563490
}
564491
self.mediaEventHandler = mediaHandler
565-
self.coreMediaEventHandler = mediaHandler
566492

567493
mediaSession?.logPlayheadPosition(position: 45000)
568494
self.waitForExpectations(timeout: defaultTimeout, handler: nil)
@@ -577,7 +503,6 @@ class mParticle_Apple_MediaTests: XCTestCase, MPListenerProtocol {
577503
XCTAssertEqual(event.qos?.startupTime, 2000)
578504
}
579505
self.mediaEventHandler = mediaHandler
580-
self.coreMediaEventHandler = mediaHandler
581506

582507
let qos = MPMediaQoS()
583508
qos.bitRate = 80
@@ -588,31 +513,6 @@ class mParticle_Apple_MediaTests: XCTestCase, MPListenerProtocol {
588513
self.waitForExpectations(timeout: defaultTimeout, handler: nil)
589514
}
590515

591-
func onAPICalled(_: String, stackTrace: [Any], isExternal: Bool, objects: [Any]?) {
592-
let firstObj: Any
593-
guard let objects = objects else {
594-
XCTAssert(false); return
595-
}
596-
if (objects.count > 0) {
597-
firstObj = objects[0]
598-
599-
if let first = firstObj as? MPMediaEvent {
600-
guard let mediaHandler = self.coreMediaEventHandler else {
601-
return
602-
}
603-
604-
mediaHandler(first)
605-
}
606-
607-
if let first = firstObj as? MPEvent {
608-
guard let eventHandler = self.coreMPEventHandler else {
609-
return
610-
}
611-
612-
eventHandler(first)
613-
}
614-
}
615-
}
616516

617517
func testEmptyDuration() {
618518
XCTAssertNotNil(mediaSession)

0 commit comments

Comments
 (0)