Fixed some statics not being cleared between tests

* OneSignalHelp's lastMessageID is now being cleared correctly.
* OneSignalTrackFirebaseAnalytics statics are now being cleaned up between tests.
* Fixed double swizzling of AppDelegate methods which in some cases created recursion
* Some misc clean up.

Author: jkasten2

iOS_SDK/OneSignalSDK/Source/OneSignalHelper.m

@@ -283,9 +283,13 @@ - (NSString*)stringify {
 
 @implementation OneSignalHelper
 
+static var lastMessageID = @"";
+static NSString *_lastMessageIdFromAction;
+
 + (void)resetLocals {
     [OneSignalHelper lastMessageReceived:nil];
     _lastMessageIdFromAction = nil;
+    lastMessageID = @"";
 }
 
 UIBackgroundTaskIdentifier mediaBackgroundTask;
@@ -416,7 +420,6 @@ + (void)handleNotificationReceived:(OSNotificationDisplayType)displayType fromBa
     let notification = [[OSNotification alloc] initWithPayload:payload displayType:displayType];
 
     // Prevent duplicate calls to same receive event
-    static var lastMessageID = @"";
     if ([payload.notificationID isEqualToString:lastMessageID])
         return;
     lastMessageID = payload.notificationID;
@@ -428,8 +431,6 @@ + (void)handleNotificationReceived:(OSNotificationDisplayType)displayType fromBa
        handleNotificationReceived(notification);
 }
 
-static NSString *_lastMessageIdFromAction;
-
 + (void)handleNotificationAction:(OSNotificationActionType)actionType actionID:(NSString*)actionID displayType:(OSNotificationDisplayType)displayType {
     if (![self isOneSignalPayload:lastMessageReceived])
         return;

iOS_SDK/OneSignalSDK/Source/OneSignalTrackFirebaseAnalytics.m

@@ -36,6 +36,11 @@ @implementation OneSignalTrackFirebaseAnalytics
 static NSTimeInterval lastOpenedTime = 0;
 static var trackingEnabled = false;
 
++ (void)resetLocals {
+    lastOpenedTime = 0;
+    trackingEnabled = false;
+}
+
 + (BOOL)libraryExists {
     return NSClassFromString(@"FIRAnalytics") != nil;
 }

iOS_SDK/OneSignalSDK/UnitTests/OutcomeIntegrationTests.m

@@ -543,7 +543,6 @@ - (void)testSendingOutcomeWithValue_inUnattributedSession {
     [RestClientAsserts assertNumberOfMeasureRequests:2];
 }
 
-// TODO: This test is flaky, it fails even on it's own sometimes, on step 5
 - (void)testSendingOutcomeWithValue_inIndirectSession {
     // 1. Open app
     [UnitTestCommonMethods initOneSignalAndThreadWait];

iOS_SDK/OneSignalSDK/UnitTests/UnitTestCommonMethods.m

@@ -49,6 +49,7 @@
 #import "OneSignalLocation.h"
 #import "NSUserDefaultsOverrider.h"
 #import "OneSignalNotificationServiceExtensionHandler.h"
+#import "OneSignalTrackFirebaseAnalytics.h"
 
 NSString * serverUrlWithPath(NSString *path) {
     return [NSString stringWithFormat:@"%@%@%@", SERVER_URL, API_VERSION, path];
@@ -135,6 +136,7 @@ + (void)clearStateForAppRestart:(XCTestCase *)testCase {
     [OneSignal setValue:@0 forKeyPath:@"mSubscriptionStatus"];
 
     [OneSignalTracker performSelector:NSSelectorFromString(@"resetLocals")];
+    [OneSignalTrackFirebaseAnalytics performSelector:NSSelectorFromString(@"resetLocals")];
 
     [NSObjectOverrider reset];
 
@@ -162,17 +164,16 @@ + (void)beforeAllTest {
     if (setupUIApplicationDelegate)
         return;
 
+    // Force swizzle in all methods for tests.
+    OneSignalHelperOverrider.mockIOSVersion = 8;
+    
     // Normally this just loops internally, overwrote _run to work around this.
     UIApplicationMain(0, nil, nil, NSStringFromClass([UnitTestAppDelegate class]));
 
     setupUIApplicationDelegate = true;
 
     // InstallUncaughtExceptionHandler();
 
-    // Force swizzle in all methods for tests.
-    OneSignalHelperOverrider.mockIOSVersion = 8;
-    [OneSignalAppDelegate sizzlePreiOS10MethodsPhase1];
-    [OneSignalAppDelegate sizzlePreiOS10MethodsPhase2];
     OneSignalHelperOverrider.mockIOSVersion = 10;
 }
 

iOS_SDK/OneSignalSDK/UnitTests/UnitTests.m

@@ -1011,7 +1011,7 @@ - (void)testFirebaseAnalyticsInfluenceNotificationOpen {
     // Notification is recieved.
     // The Notification Service Extension runs where the notification received id tracked.
     //   Note: This is normally a separate process but can't emulate that here.
-    UNNotificationResponse *response = [self createNotificationResponseForAnalyticsTests];
+    let response = [self createNotificationResponseForAnalyticsTests];
     [OneSignal didReceiveNotificationExtensionRequest:response.notification.request
                        withMutableNotificationContent:nil];
 
@@ -1027,8 +1027,9 @@ - (void)testFirebaseAnalyticsInfluenceNotificationOpen {
     XCTAssertEqualObjects(OneSignalTrackFirebaseAnalyticsOverrider.loggedEvents[0], received_event);
 
     // Trigger a new app session
-    [self backgroundApp];
-    NSDateOverrider.timeOffset = 41;
+    [UnitTestCommonMethods backgroundApp];
+    [UnitTestCommonMethods runBackgroundThreads];
+    [NSDateOverrider advanceSystemTimeBy:41];
     [UnitTestCommonMethods foregroundApp];
     [UnitTestCommonMethods runBackgroundThreads];
 
@@ -1254,17 +1255,18 @@ - (void)testOpeningWithAdditionalData {
 
     [UnitTestCommonMethods runBackgroundThreads];
 
-    id userInfo = @{@"custom": @{
+    let userInfo = @{@"custom": @{
                       @"i": @"b2f7f966-d8cc-11e4-bed1-df8f05be55ba",
                       @"a": @{ @"foo": @"bar" }
                   }};
 
-    id notifResponse = [UnitTestCommonMethods createBasiciOSNotificationResponseWithPayload:userInfo];
-    UNUserNotificationCenter *notifCenter = [UNUserNotificationCenter currentNotificationCenter];
-    id notifCenterDelegate = notifCenter.delegate;
+    let notifResponse = [UnitTestCommonMethods createBasiciOSNotificationResponseWithPayload:userInfo];
+    let notifCenter = UNUserNotificationCenter.currentNotificationCenter;
+    let notifCenterDelegate = notifCenter.delegate;
 
     // UNUserNotificationCenterDelegate method iOS 10 calls directly when a notification is opend.
     [notifCenterDelegate userNotificationCenter:notifCenter didReceiveNotificationResponse:notifResponse withCompletionHandler:^() {}];
+    [UnitTestCommonMethods runBackgroundThreads];
     XCTAssertEqual(openedWasFire, true);
 
     // Part 2 - New paylaod test
@@ -1300,7 +1302,7 @@ - (void)receivedCallbackWithButtonsWithUserInfo:(NSDictionary *)userInfo {
     [UnitTestCommonMethods runBackgroundThreads];
 
     let notifResponse = [UnitTestCommonMethods createBasiciOSNotificationResponseWithPayload:userInfo];
-    UNUserNotificationCenter *notifCenter = [UNUserNotificationCenter currentNotificationCenter];
+    let notifCenter = UNUserNotificationCenter.currentNotificationCenter;
     let notifCenterDelegate = notifCenter.delegate;
 
     UIApplicationOverrider.currentUIApplicationState = UIApplicationStateInactive;
@@ -1337,7 +1339,6 @@ - (void)testReceiveNotificationDoesNotSubmitOpenedRequest {
     XCTAssertFalse([OneSignalClientOverrider hasExecutedRequestOfType:[OSRequestSubmitNotificationOpened class]]);
 }
 
-// TODO: FIx flaky test carry over, only fails when running all tests in this file
 - (void)testReceivedCallbackWithButtonsWithNewFormat {
     let newFormat = @{@"aps": @{@"content_available": @1},
                       @"os_data": @{