[flaky tests] move reset code into before tests

* Instead of resetting after tests, reset before tests for cleanest starting state

Author: nan-li

iOS_SDK/OneSignalSDK/OneSignalLiveActivitiesTests/OSLiveActivitiesExecutorTests.swift

@@ -37,17 +37,16 @@ final class OSLiveActivitiesExecutorTests: XCTestCase {
 
     override func setUpWithError() throws {
         // TODO: Something like the existing [UnitTestCommonMethods beforeEachTest:self];
+        // TODO: Need to clear all data between tests for user manager, models, etc.
+        OneSignalCoreMocks.clearUserDefaults()
+        OneSignalUserMocks.reset()
         // App ID is set because User Manager has guards against nil App ID
         OneSignalConfigManager.setAppId("test-app-id")
         // Temp. logging to help debug during testing
         OneSignalLog.setLogLevel(.LL_VERBOSE)
     }
 
-    override func tearDownWithError() throws {
-        // TODO: Need to clear all data between tests for user manager, models, etc.
-        OneSignalCoreMocks.clearUserDefaults()
-        OneSignalUserMocks.reset()
-    }
+    override func tearDownWithError() throws { }
 
     func testAppendSetStartTokenWithSuccessfulRequest() throws {
         /* Setup */

iOS_SDK/OneSignalSDK/OneSignalUserTests/OneSignalUserObjcTests.m

@@ -13,17 +13,16 @@ @implementation OneSignalUserObjcTests
 
 - (void)setUp {
     // TODO: Something like the existing [UnitTestCommonMethods beforeEachTest:self];
+    // TODO: Need to clear all data between tests for client, user manager, models, etc.
+    [OneSignalCoreMocks clearUserDefaults];
+    [OneSignalUserMocks reset];
     // App ID is set because User Manager has guards against nil App ID
     [OneSignalConfigManager setAppId:@"test-app-id"];
     // Temp. logging to help debug during testing
     [OneSignalLog setLogLevel:ONE_S_LL_VERBOSE];
 }
 
-- (void)tearDown {
-    // TODO: Need to clear all data between tests for client, user manager, models, etc.
-    [OneSignalCoreMocks clearUserDefaults];
-    [OneSignalUserMocks reset];
-}
+- (void)tearDown { }
 
 /**
  Tests passing purchase data to the User Manager to process and send.

iOS_SDK/OneSignalSDK/OneSignalUserTests/OneSignalUserTests.swift

@@ -37,17 +37,16 @@ final class OneSignalUserTests: XCTestCase {
 
     override func setUpWithError() throws {
         // TODO: Something like the existing [UnitTestCommonMethods beforeEachTest:self];
+        // TODO: Need to clear all data between tests for client, user manager, models, etc.
+        OneSignalCoreMocks.clearUserDefaults()
+        OneSignalUserMocks.reset()
         // App ID is set because User Manager has guards against nil App ID
         OneSignalConfigManager.setAppId("test-app-id")
         // Temp. logging to help debug during testing
         OneSignalLog.setLogLevel(.LL_VERBOSE)
     }
 
-    override func tearDownWithError() throws {
-        // TODO: Need to clear all data between tests for client, user manager, models, etc.
-        OneSignalCoreMocks.clearUserDefaults()
-        OneSignalUserMocks.reset()
-    }
+    override func tearDownWithError() throws { }
 
     // Comparable to Android test: "externalId is backed by the identity model"
     func testLoginSetsExternalId() throws {

iOS_SDK/OneSignalSDK/OneSignalUserTests/SwitchUserIntegrationTests.swift

@@ -8,17 +8,16 @@ final class SwitchUserIntegrationTests: XCTestCase {
 
     override func setUpWithError() throws {
         // TODO: Something like the existing [UnitTestCommonMethods beforeEachTest:self];
+        // TODO: Need to clear all data between tests for client, user manager, models, etc.
+        OneSignalCoreMocks.clearUserDefaults()
+        OneSignalUserMocks.reset()
         // App ID is set because User Manager has guards against nil App ID
         OneSignalConfigManager.setAppId("test-app-id")
         // Temp. logging to help debug during testing
         OneSignalLog.setLogLevel(.LL_VERBOSE)
     }
 
-    override func tearDownWithError() throws {
-        // TODO: Need to clear all data between tests for client, user manager, models, etc.
-        OneSignalCoreMocks.clearUserDefaults()
-        OneSignalUserMocks.reset()
-    }
+    override func tearDownWithError() throws { }
 
     func testIdentifyUserSuccessfully_thenLogin_sendsCorrectTags() throws {
         /* Setup */