@@ -155,7 +155,7 @@ - (void)testMessageDisplayedAfterTimer {
155155 expectation.expectedFulfillmentCount = 1 ;
156156
157157 dispatch_after (dispatch_time (DISPATCH_TIME_NOW, (int64_t )(0.06 * NSEC_PER_SEC)), dispatch_get_main_queue (), ^{
158- XCTAssertEqual ([[ OSMessagingControllerOverrider messageDisplayQueue ] count ] , 1 );
158+ XCTAssertEqual (OSMessagingControllerOverrider. messageDisplayQueue . count , 1 );
159159
160160 [expectation fulfill ];
161161 });
@@ -210,24 +210,24 @@ - (void)testMessageWithRedisplay {
210210 [OneSignal addTrigger: @" prop1" withValue: @2 ];
211211
212212 // IAM should be shown instantly and be within the messageDisplayQueue
213- XCTAssertTrue ( OSMessagingControllerOverrider.messageDisplayQueue .count == 1 );
213+ XCTAssertEqual ( 1 , OSMessagingControllerOverrider.messageDisplayQueue .count );
214214
215215 // The display should cause an "viewed" API request
216216 XCTAssertEqualObjects (OneSignalClientOverrider.lastHTTPRequestType , NSStringFromClass ([OSRequestInAppMessageViewed class ]));
217217
218218 let iamDisplayed = [[OSMessagingControllerOverrider messageDisplayQueue ] objectAtIndex: 0 ];
219- XCTAssertTrue ( iamDisplayed.displayStats .lastDisplayTime == - 1 );
219+ XCTAssertEqual (- 1 , iamDisplayed.displayStats .lastDisplayTime );
220220
221221 [OSMessagingControllerOverrider dismissCurrentMessage ];
222222 [OneSignalClientOverrider reset: self ];
223223
224- XCTAssertTrue ([[OSMessagingControllerOverrider messagesForRedisplay ] objectForKey: message.messageId] != nil );
224+ XCTAssertNotNil ([[OSMessagingControllerOverrider messagesForRedisplay ] objectForKey: message.messageId]);
225225 OSInAppMessage *dismissedMessage = [[OSMessagingControllerOverrider messagesForRedisplay ] objectForKey: message.messageId];
226226 let lastDisplayTime = dismissedMessage.displayStats .lastDisplayTime ;
227227 XCTAssertEqual (1 , dismissedMessage.displayStats .displayQuantity );
228228 XCTAssertEqual (firstInterval, lastDisplayTime);
229229
230- XCTAssertTrue ( OSMessagingControllerOverrider.messageDisplayQueue .count == 0 );
230+ XCTAssertEqual ( 0 , OSMessagingControllerOverrider.messageDisplayQueue .count );
231231
232232 comps.minute = 1 + delay/60 ; // delay/60 -> minutes
233233
@@ -240,13 +240,13 @@ - (void)testMessageWithRedisplay {
240240
241241 [OneSignal addTrigger: @" prop1" withValue: @2 ];
242242
243- XCTAssertTrue ( OSMessagingControllerOverrider.messageDisplayQueue .count == 1 );
243+ XCTAssertEqual ( 1 , OSMessagingControllerOverrider.messageDisplayQueue .count );
244244 // The display should cause an new "viewed" API request
245245 XCTAssertEqualObjects (OneSignalClientOverrider.lastHTTPRequestType , NSStringFromClass ([OSRequestInAppMessageViewed class ]));
246246
247247 [OSMessagingControllerOverrider dismissCurrentMessage ];
248248
249- XCTAssertTrue ([[OSMessagingControllerOverrider messagesForRedisplay ] objectForKey: message.messageId] != nil );
249+ XCTAssertNotNil ([[OSMessagingControllerOverrider messagesForRedisplay ] objectForKey: message.messageId]);
250250 OSInAppMessage *secondDismissedMessage = [[OSMessagingControllerOverrider messagesForRedisplay ] objectForKey: message.messageId];
251251 let secondLastDisplayTime = secondDismissedMessage.displayStats .lastDisplayTime ;
252252 XCTAssertEqual (2 , secondDismissedMessage.displayStats .displayQuantity );
@@ -279,16 +279,16 @@ - (void)testClickedLaunchesAPIRequestMultipleTimes_MessageWithRedisplay {
279279 let standardUserDefaults = OneSignalUserDefaults.initStandard ;
280280 let clickedClickIds = [standardUserDefaults getSavedSetForKey: OS_IAM_CLICKED_SET_KEY defaultValue: [NSMutableSet new ]];
281281
282- XCTAssertTrue ( clickedClickIds.count == 1 );
282+ XCTAssertEqual ( 1 , clickedClickIds.count );
283283 NSString *clickedId = [[clickedClickIds allObjects ] objectAtIndex: 0 ];
284284
285285 XCTAssertEqual (action.clickId , clickedId);
286- XCTAssertEqual (1 , [ message getClickedClickIds ] .count );
286+ XCTAssertEqual (1 , message. getClickedClickIds .count );
287287 XCTAssertEqual (action.clickId , [[message.getClickedClickIds allObjects ] objectAtIndex: 0 ]);
288288
289289 [message clearClickIds ];
290290 [OneSignalClientOverrider reset: self ];
291- XCTAssertEqual (0 , [ message getClickedClickIds ] .count );
291+ XCTAssertEqual (0 , message. getClickedClickIds .count );
292292 XCTAssertEqualObjects (nil , OneSignalClientOverrider.lastHTTPRequestType );
293293
294294 [OSMessagingController.sharedInstance messageViewDidSelectAction: message withAction: action];
@@ -297,11 +297,11 @@ - (void)testClickedLaunchesAPIRequestMultipleTimes_MessageWithRedisplay {
297297
298298 let secondClickedClickIds = [standardUserDefaults getSavedSetForKey: OS_IAM_CLICKED_SET_KEY defaultValue: nil ];
299299
300- XCTAssertTrue ( secondClickedClickIds.count == 1 );
300+ XCTAssertEqual ( 1 , secondClickedClickIds.count );
301301 NSString *secondClickedId = [[secondClickedClickIds allObjects ] objectAtIndex: 0 ];
302302
303303 XCTAssertEqual (action.clickId , secondClickedId);
304- XCTAssertEqual (1 , [ message getClickedClickIds ] .count );
304+ XCTAssertEqual (1 , message. getClickedClickIds .count );
305305 XCTAssertEqual (action.clickId , [[message.getClickedClickIds allObjects ] objectAtIndex: 0 ]);
306306}
307307
@@ -310,17 +310,17 @@ - (void)testRemoveTriggers {
310310 [UnitTestCommonMethods initOneSignalAndThreadWait ];
311311
312312 [OneSignal addTrigger: @" test1" withValue: @" value1" ];
313- XCTAssertTrue ( [OneSignal getTriggers ].count == 1 );
313+ XCTAssertEqual ( 1 , [OneSignal getTriggers ].count );
314314
315315 [OneSignal addTriggers: @{@" test2" : @33 }];
316316 XCTAssertEqualObjects (OneSignal.getTriggers [@" test2" ], @33 );
317- XCTAssertTrue ( [OneSignal getTriggers ].count == 2 );
317+ XCTAssertEqual ( 2 , [OneSignal getTriggers ].count );
318318
319319 [OneSignal addTriggers: @{@" test2" : @" 44" }];
320- XCTAssertTrue ( [OneSignal getTriggers ].count == 2 );
320+ XCTAssertEqual ( 2 , [OneSignal getTriggers ].count );
321321
322322 [OneSignal addTriggers: @{@" test3" : @" " }];
323- XCTAssertTrue ( [OneSignal getTriggers ].count == 3 );
323+ XCTAssertEqual ( 3 , [OneSignal getTriggers ].count );
324324
325325 [OneSignal removeTriggerForKey: @" test1" ];
326326 XCTAssertNil (OneSignal.getTriggers [@" test1" ]);
@@ -332,7 +332,7 @@ - (void)testRemoveTriggers {
332332 [OneSignal removeTriggerForKey: @" test2" ];
333333 [OneSignal removeTriggerForKey: @" test3" ];
334334
335- XCTAssertTrue ( [OneSignal getTriggers ].count == 0 );
335+ XCTAssertEqual ( 0 , [OneSignal getTriggers ].count );
336336}
337337
338338// FINISH TEST MAKE DOC OF QUESTIONS
@@ -370,11 +370,11 @@ - (void)testNoTriggersDisplayOnePerSession_MessageWithRedisplay {
370370 }];
371371 [self initOneSignalWithInAppMessage: message];
372372
373- XCTAssertTrue ( OSMessagingControllerOverrider.messagesForRedisplay .count == 1 );
373+ XCTAssertEqual ( 1 , OSMessagingControllerOverrider.messagesForRedisplay .count );
374374 // IAM should be shown instantly and be within the messageDisplayQueue
375- XCTAssertTrue ( OSMessagingControllerOverrider.messageDisplayQueue .count == 1 );
375+ XCTAssertEqual ( 1 , OSMessagingControllerOverrider.messageDisplayQueue .count );
376376 [OSMessagingControllerOverrider dismissCurrentMessage ];
377- XCTAssertTrue ( OSMessagingControllerOverrider.messageDisplayQueue .count == 0 );
377+ XCTAssertEqual ( 0 , OSMessagingControllerOverrider.messageDisplayQueue .count );
378378
379379 // Time travel for delay
380380 comps.minute = 1 + delay/60 ; // delay/60 -> minutes
@@ -388,7 +388,7 @@ - (void)testNoTriggersDisplayOnePerSession_MessageWithRedisplay {
388388 // Add trigger to call evaluateInAppMessage
389389 [OneSignal addTrigger: @" prop1" withValue: @2 ];
390390 // IAM shouldn't display again because It don't have triggers
391- XCTAssertTrue ( OSMessagingControllerOverrider.messageDisplayQueue .count == 0 );
391+ XCTAssertEqual ( 0 , OSMessagingControllerOverrider.messageDisplayQueue .count );
392392}
393393
394394- (void )testRemoveTriggersMakesRedisplay_MessageWithRedisplay {
@@ -416,18 +416,18 @@ - (void)testRemoveTriggersMakesRedisplay_MessageWithRedisplay {
416416 return firstInterval;
417417 }];
418418
419- XCTAssertTrue ( OSMessagingControllerOverrider.messagesForRedisplay .count == 0 );
419+ XCTAssertEqual ( 0 , OSMessagingControllerOverrider.messagesForRedisplay .count );
420420 [OneSignal removeTriggerForKey: @" prop1" ];
421421
422422 // IAM should be shown instantly and be within the messageDisplayQueue
423- XCTAssertTrue ( OSMessagingControllerOverrider.messageDisplayQueue .count == 1 );
423+ XCTAssertEqual ( 1 , OSMessagingControllerOverrider.messageDisplayQueue .count );
424424
425425 let iamDisplayed = [OSMessagingControllerOverrider.messageDisplayQueue objectAtIndex: 0 ];
426- XCTAssertTrue ( iamDisplayed.displayStats .lastDisplayTime == - 1 );
426+ XCTAssertEqual (- 1 , iamDisplayed.displayStats .lastDisplayTime );
427427
428428 [OSMessagingControllerOverrider dismissCurrentMessage ];
429429
430- XCTAssertTrue ( OSMessagingControllerOverrider.messagesForRedisplay .count == 1 );
430+ XCTAssertEqual ( 1 , OSMessagingControllerOverrider.messagesForRedisplay .count );
431431
432432 OSInAppMessage *dismissedMessage = [[OSMessagingControllerOverrider messagesForRedisplay ] objectForKey: message.messageId];
433433 let lastDisplayTime = dismissedMessage.displayStats .lastDisplayTime ;
@@ -444,13 +444,13 @@ - (void)testRemoveTriggersMakesRedisplay_MessageWithRedisplay {
444444 }];
445445
446446 [OneSignal addTrigger: @" prop1" withValue: @2 ];
447- XCTAssertTrue ( OSMessagingControllerOverrider.messageDisplayQueue .count == 0 );
447+ XCTAssertEqual ( 0 , OSMessagingControllerOverrider.messageDisplayQueue .count );
448448 [OneSignal removeTriggerForKey: @" prop1" ];
449- XCTAssertTrue ( OSMessagingControllerOverrider.messageDisplayQueue .count == 1 );
449+ XCTAssertEqual ( 1 , OSMessagingControllerOverrider.messageDisplayQueue .count );
450450
451451 [OSMessagingControllerOverrider dismissCurrentMessage ];
452452
453- XCTAssertTrue ([[OSMessagingControllerOverrider messagesForRedisplay ] objectForKey: message.messageId] != nil );
453+ XCTAssertNotNil ([[OSMessagingControllerOverrider messagesForRedisplay ] objectForKey: message.messageId]);
454454 OSInAppMessage *secondDismissedMessage = [[OSMessagingControllerOverrider messagesForRedisplay ] objectForKey: message.messageId];
455455 let secondLastDisplayTime = secondDismissedMessage.displayStats .lastDisplayTime ;
456456 XCTAssertEqual (2 , secondDismissedMessage.displayStats .displayQuantity );
@@ -475,7 +475,7 @@ - (void)testRemoveMessagesFromCache_MessageWithRedisplay {
475475 return firstInterval;
476476 }];
477477
478- let sixMonthsInSeconds = 6 * 30 * 24 * 60 * 60 ;
478+ let maxCacheTime = 6 * 30 * 24 * 60 * 60 ; // Six month in seconds
479479 let standardUserDefaults = OneSignalUserDefaults.initStandard ;
480480
481481 [OSMessagingController.sharedInstance setTriggerWithName: @" prop1" withValue: @2 ];
@@ -485,9 +485,9 @@ - (void)testRemoveMessagesFromCache_MessageWithRedisplay {
485485
486486 let message = [OSInAppMessageTestHelper testMessageWithTriggers: @[@[firstTrigger]] withRedisplayLimit: limit delay: @(delay)];
487487 let message1 = [OSInAppMessageTestHelper testMessageWithTriggers: @[@[firstTrigger]] withRedisplayLimit: limit delay: @(delay)];
488- message1.displayStats .lastDisplayTime = firstInterval - sixMonthsInSeconds + 1 ;
488+ message1.displayStats .lastDisplayTime = firstInterval - maxCacheTime + 1 ;
489489 let message2 = [OSInAppMessageTestHelper testMessageWithTriggers: @[@[firstTrigger]] withRedisplayLimit: limit delay: @(delay)];
490- message2.displayStats .lastDisplayTime = firstInterval - sixMonthsInSeconds - 1 ;
490+ message2.displayStats .lastDisplayTime = firstInterval - maxCacheTime - 1 ;
491491
492492 NSMutableDictionary <NSString *, OSInAppMessage *> * redisplayedInAppMessages = [NSMutableDictionary new ];
493493 [redisplayedInAppMessages setObject: message1 forKey: message1.messageId];
@@ -514,7 +514,7 @@ - (void)testTimeSinceLastInAppMessageTrigger_withNoPreviousInAppMessages {
514514 XCTAssertFalse (NSTimerOverrider.hasScheduledTimer );
515515
516516 // IAM should be shown instantly and be within the messageDisplayQueue
517- XCTAssertTrue ( OSMessagingControllerOverrider.messageDisplayQueue .count == 1 );
517+ XCTAssertEqual ( 1 , OSMessagingControllerOverrider.messageDisplayQueue .count );
518518}
519519
520520// If a message is scheduled to be displayed in the past, it should not be shown at all.
@@ -529,7 +529,7 @@ - (void)testExpiredExactTimeTrigger {
529529 XCTAssertFalse (NSTimerOverrider.hasScheduledTimer );
530530
531531 // IAM should be shown instantly and be within the messageDisplayQueue essentially ignoring the negative number in seconds
532- XCTAssertTrue ( OSMessagingControllerOverrider.messageDisplayQueue .count == 1 );
532+ XCTAssertEqual ( 1 , OSMessagingControllerOverrider.messageDisplayQueue .count );
533533}
534534
535535// This test checks to make sure that if you are using the > operator for an exact time trigger,
0 commit comments