From b70faf738bca16dc8bd2b3eaabf229b2655379d6 Mon Sep 17 00:00:00 2001 From: Nan Date: Wed, 31 Jul 2024 15:21:47 -0700 Subject: [PATCH] [tests] add OneSignalOSCoreMocks module * Add new framework called `OneSignalOSCoreMocks ` to access the Operation Repo and reset it between tests. * Part of the cause for flaky tests is state carrying over in the Operation Repo singleton. For example, Deltas that have not been flushed yet from the preceding test are flushed in the next one. --- .../OneSignal.xcodeproj/project.pbxproj | 315 ++++++++++++++++++ .../Source/OSOperationRepo.swift | 2 +- .../OneSignalOSCoreMocks/OSCoreMocks.swift | 51 +++ .../OneSignalOSCoreMocks.h | 38 +++ .../OneSignalUserMocks.swift | 4 +- 5 files changed, 407 insertions(+), 3 deletions(-) create mode 100644 iOS_SDK/OneSignalSDK/OneSignalOSCoreMocks/OSCoreMocks.swift create mode 100644 iOS_SDK/OneSignalSDK/OneSignalOSCoreMocks/OneSignalOSCoreMocks.h diff --git a/iOS_SDK/OneSignalSDK/OneSignal.xcodeproj/project.pbxproj b/iOS_SDK/OneSignalSDK/OneSignal.xcodeproj/project.pbxproj index 56c2f8466..ea3a1245c 100644 --- a/iOS_SDK/OneSignalSDK/OneSignal.xcodeproj/project.pbxproj +++ b/iOS_SDK/OneSignalSDK/OneSignal.xcodeproj/project.pbxproj @@ -96,6 +96,12 @@ 3C7A39C12B7BED900082665E /* OneSignalCoreMocks.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3CC0639A2B6D7A8C002BB07F /* OneSignalCoreMocks.framework */; }; 3C7A39C22B7BED900082665E /* OneSignalCoreMocks.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3CC0639A2B6D7A8C002BB07F /* OneSignalCoreMocks.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 3C7A39DC2B7C1C580082665E /* UNUserNotificationCenterOverrider.m in Sources */ = {isa = PBXBuildFile; fileRef = 4529DEE61FA82CDC00CEAB1D /* UNUserNotificationCenterOverrider.m */; }; + 3C8544B92C5AEFF700F542A9 /* OneSignalOSCoreMocks.h in Headers */ = {isa = PBXBuildFile; fileRef = 3C8544B82C5AEFF700F542A9 /* OneSignalOSCoreMocks.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3C8544BC2C5AEFF700F542A9 /* OneSignalOSCoreMocks.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3C8544B62C5AEFF600F542A9 /* OneSignalOSCoreMocks.framework */; }; + 3C8544BD2C5AEFF700F542A9 /* OneSignalOSCoreMocks.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3C8544B62C5AEFF600F542A9 /* OneSignalOSCoreMocks.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 3C8544C32C5AF18B00F542A9 /* OSCoreMocks.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C8544C22C5AF18B00F542A9 /* OSCoreMocks.swift */; }; + 3C8544C42C5AF2E900F542A9 /* OneSignalOSCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3C115161289A259500565C41 /* OneSignalOSCore.framework */; }; + 3C8544C52C5AF2E900F542A9 /* OneSignalOSCore.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3C115161289A259500565C41 /* OneSignalOSCore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 3C87066D2BDE05B8000D8CD2 /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3C7A39D42B7C18EE0082665E /* XCTest.framework */; }; 3C87066E2BDE05B8000D8CD2 /* XCTest.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3C7A39D42B7C18EE0082665E /* XCTest.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 3C8706702BDE0957000D8CD2 /* MockUserRequests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C87066F2BDE0957000D8CD2 /* MockUserRequests.swift */; }; @@ -638,6 +644,20 @@ remoteGlobalIDString = DEF5CCF02539321A0003E9CC; remoteInfo = UnitTestApp; }; + 3C8544BA2C5AEFF700F542A9 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 37747F8B19147D6400558FAD /* Project object */; + proxyType = 1; + remoteGlobalIDString = 3C8544B52C5AEFF600F542A9; + remoteInfo = OneSignalOSCoreMocks; + }; + 3C8544C62C5AF2E900F542A9 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 37747F8B19147D6400558FAD /* Project object */; + proxyType = 1; + remoteGlobalIDString = 3C115160289A259500565C41; + remoteInfo = OneSignalOSCore; + }; 3C9AD6D82B22A8DF00BC1540 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 37747F8B19147D6400558FAD /* Project object */; @@ -1063,6 +1083,17 @@ name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; }; + 3C8544C82C5AF2E900F542A9 /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + 3C8544C52C5AF2E900F542A9 /* OneSignalOSCore.framework in Embed Frameworks */, + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; 3C9AD6DA2B22A8DF00BC1540 /* Embed Frameworks */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; @@ -1141,6 +1172,7 @@ DEA4B4662888C59E00E9FE12 /* OneSignalExtension.framework in Embed Frameworks */, DEBAAE2F2A4211DA00BF2C1C /* OneSignalInAppMessages.framework in Embed Frameworks */, 475F47252B8E398E00EC05B3 /* OneSignalLiveActivities.framework in Embed Frameworks */, + 3C8544BD2C5AEFF700F542A9 /* OneSignalOSCoreMocks.framework in Embed Frameworks */, DEA4B4632888C4DC00E9FE12 /* OneSignalOutcomes.framework in Embed Frameworks */, 3CEE934B2B7C73B6008440BD /* OneSignalUserMocks.framework in Embed Frameworks */, DEA4B45D2888C1D000E9FE12 /* OneSignalCore.framework in Embed Frameworks */, @@ -1206,6 +1238,9 @@ 3C6299AA2BEEA4C000649187 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = ""; }; 3C67F7792BEB2B710085A0F0 /* SwitchUserIntegrationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwitchUserIntegrationTests.swift; sourceTree = ""; }; 3C7A39D42B7C18EE0082665E /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Platforms/iPhoneOS.platform/Developer/Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; }; + 3C8544B62C5AEFF600F542A9 /* OneSignalOSCoreMocks.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = OneSignalOSCoreMocks.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 3C8544B82C5AEFF700F542A9 /* OneSignalOSCoreMocks.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OneSignalOSCoreMocks.h; sourceTree = ""; }; + 3C8544C22C5AF18B00F542A9 /* OSCoreMocks.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OSCoreMocks.swift; sourceTree = ""; }; 3C87066F2BDE0957000D8CD2 /* MockUserRequests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockUserRequests.swift; sourceTree = ""; }; 3C8706712BDEE076000D8CD2 /* MockUserDefines.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockUserDefines.swift; sourceTree = ""; }; 3C8706752BDEED75000D8CD2 /* NSDictionary+UnitTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSDictionary+UnitTests.swift"; sourceTree = ""; }; @@ -1647,6 +1682,14 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 3C8544B32C5AEFF600F542A9 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 3C8544C42C5AF2E900F542A9 /* OneSignalOSCore.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 3CC063972B6D7A8C002BB07F /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -1838,6 +1881,7 @@ DEA4B4652888C59100E9FE12 /* OneSignalExtension.framework in Frameworks */, DEF7842F2912DEBA00A1F3A5 /* OneSignalNotifications.framework in Frameworks */, 3CEE93462B7C73AB008440BD /* OneSignalCoreMocks.framework in Frameworks */, + 3C8544BC2C5AEFF700F542A9 /* OneSignalOSCoreMocks.framework in Frameworks */, DEA4B4622888C4D500E9FE12 /* OneSignalOutcomes.framework in Frameworks */, DEA4B45C2888C1D000E9FE12 /* OneSignalCore.framework in Frameworks */, 475F47242B8E398E00EC05B3 /* OneSignalLiveActivities.framework in Frameworks */, @@ -1912,6 +1956,7 @@ DEBAAE292A4211DA00BF2C1C /* OneSignalInAppMessages */, 475F471F2B8E398E00EC05B3 /* OneSignalLiveActivities */, 3CC0639B2B6D7A8D002BB07F /* OneSignalCoreMocks */, + 3C8544B72C5AEFF700F542A9 /* OneSignalOSCoreMocks */, 3CC063DE2B6D7F2A002BB07F /* OneSignalUserMocks */, 3CC063A52B6D7A8E002BB07F /* OneSignalCoreTests */, 3CC063EC2B6D7FE8002BB07F /* OneSignalUserTests */, @@ -1944,6 +1989,7 @@ 4735424A2B8F93330016DB4C /* OneSignalLiveActivitiesTests.xctest */, DEBA2A1A2C20E35E00E234DB /* OneSignalNotificationsTests.xctest */, 3C01518E2C2E298E0079E076 /* OneSignalInAppMessagesTests.xctest */, + 3C8544B62C5AEFF600F542A9 /* OneSignalOSCoreMocks.framework */, ); name = Products; sourceTree = ""; @@ -2015,6 +2061,15 @@ path = Source; sourceTree = ""; }; + 3C8544B72C5AEFF700F542A9 /* OneSignalOSCoreMocks */ = { + isa = PBXGroup; + children = ( + 3C8544B82C5AEFF700F542A9 /* OneSignalOSCoreMocks.h */, + 3C8544C22C5AF18B00F542A9 /* OSCoreMocks.swift */, + ); + path = OneSignalOSCoreMocks; + sourceTree = ""; + }; 3C8706742BDEED53000D8CD2 /* Extensions */ = { isa = PBXGroup; children = ( @@ -2899,6 +2954,14 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 3C8544B12C5AEFF600F542A9 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 3C8544B92C5AEFF700F542A9 /* OneSignalOSCoreMocks.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 3CC063952B6D7A8C002BB07F /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; @@ -3152,6 +3215,26 @@ productReference = 3C115161289A259500565C41 /* OneSignalOSCore.framework */; productType = "com.apple.product-type.framework"; }; + 3C8544B52C5AEFF600F542A9 /* OneSignalOSCoreMocks */ = { + isa = PBXNativeTarget; + buildConfigurationList = 3C8544C12C5AEFF800F542A9 /* Build configuration list for PBXNativeTarget "OneSignalOSCoreMocks" */; + buildPhases = ( + 3C8544B12C5AEFF600F542A9 /* Headers */, + 3C8544B22C5AEFF600F542A9 /* Sources */, + 3C8544B32C5AEFF600F542A9 /* Frameworks */, + 3C8544B42C5AEFF600F542A9 /* Resources */, + 3C8544C82C5AF2E900F542A9 /* Embed Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + 3C8544C72C5AF2E900F542A9 /* PBXTargetDependency */, + ); + name = OneSignalOSCoreMocks; + productName = OneSignalOSCoreMocks; + productReference = 3C8544B62C5AEFF600F542A9 /* OneSignalOSCoreMocks.framework */; + productType = "com.apple.product-type.framework"; + }; 3CC063992B6D7A8C002BB07F /* OneSignalCoreMocks */ = { isa = PBXNativeTarget; buildConfigurationList = 3CC063AF2B6D7A8E002BB07F /* Build configuration list for PBXNativeTarget "OneSignalCoreMocks" */; @@ -3493,6 +3576,7 @@ 3CEE93492B7C73AB008440BD /* PBXTargetDependency */, 3CEE934D2B7C73B6008440BD /* PBXTargetDependency */, 475F47232B8E398E00EC05B3 /* PBXTargetDependency */, + 3C8544BB2C5AEFF700F542A9 /* PBXTargetDependency */, ); name = UnitTestApp; productName = UnitTestApp; @@ -3543,6 +3627,10 @@ DevelopmentTeam = 99SW8E36CT; ProvisioningStyle = Automatic; }; + 3C8544B52C5AEFF600F542A9 = { + CreatedOnToolsVersion = 15.2; + LastSwiftMigration = 1520; + }; 3CC063992B6D7A8C002BB07F = { CreatedOnToolsVersion = 15.2; DevelopmentTeam = 99SW8E36CT; @@ -3686,6 +3774,7 @@ DEBAAE272A4211D900BF2C1C /* OneSignalInAppMessages */, 475F471D2B8E398D00EC05B3 /* OneSignalLiveActivities */, 3CC063992B6D7A8C002BB07F /* OneSignalCoreMocks */, + 3C8544B52C5AEFF600F542A9 /* OneSignalOSCoreMocks */, 3CC063DC2B6D7F2A002BB07F /* OneSignalUserMocks */, 3CC063A02B6D7A8D002BB07F /* OneSignalCoreTests */, 3CC063EA2B6D7FE8002BB07F /* OneSignalUserTests */, @@ -3712,6 +3801,13 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 3C8544B42C5AEFF600F542A9 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; 3CC063982B6D7A8C002BB07F /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -3946,6 +4042,14 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 3C8544B22C5AEFF600F542A9 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 3C8544C32C5AF18B00F542A9 /* OSCoreMocks.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 3CC063962B6D7A8C002BB07F /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -4347,6 +4451,16 @@ target = DEF5CCF02539321A0003E9CC /* UnitTestApp */; targetProxy = 3C7A39DF2B7C1C8B0082665E /* PBXContainerItemProxy */; }; + 3C8544BB2C5AEFF700F542A9 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 3C8544B52C5AEFF600F542A9 /* OneSignalOSCoreMocks */; + targetProxy = 3C8544BA2C5AEFF700F542A9 /* PBXContainerItemProxy */; + }; + 3C8544C72C5AF2E900F542A9 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 3C115160289A259500565C41 /* OneSignalOSCore */; + targetProxy = 3C8544C62C5AF2E900F542A9 /* PBXContainerItemProxy */; + }; 3C9AD6D92B22A8DF00BC1540 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = DEBAADF82A420A3700BF2C1C /* OneSignalLocation */; @@ -4928,6 +5042,197 @@ }; name = Debug; }; + 3C8544BE2C5AEFF800F542A9 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CODE_SIGN_STYLE = Automatic; + COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = 99SW8E36CT; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_MODULE_VERIFIER = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; + GCC_C_LANGUAGE_STANDARD = gnu17; + GENERATE_INFOPLIST_FILE = YES; + INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2024 Hiptic. All rights reserved."; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + LOCALIZATION_PREFERS_STRING_CATALOGS = YES; + MARKETING_VERSION = 1.0; + MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++"; + MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 gnu++20"; + MTL_ENABLE_DEBUG_INFO = NO; + MTL_FAST_MATH = YES; + PRODUCT_BUNDLE_IDENTIFIER = com.onesignal.OneSignalOSCoreMocks; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + SKIP_INSTALL = YES; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_EMIT_LOC_STRINGS = YES; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Release; + }; + 3C8544BF2C5AEFF800F542A9 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CODE_SIGN_STYLE = Automatic; + COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1; + DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = 99SW8E36CT; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_MODULE_VERIFIER = YES; + ENABLE_TESTABILITY = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; + GCC_C_LANGUAGE_STANDARD = gnu17; + GCC_DYNAMIC_NO_PIC = NO; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GENERATE_INFOPLIST_FILE = YES; + INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2024 Hiptic. All rights reserved."; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + LOCALIZATION_PREFERS_STRING_CATALOGS = YES; + MARKETING_VERSION = 1.0; + MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++"; + MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 gnu++20"; + MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; + MTL_FAST_MATH = YES; + ONLY_ACTIVE_ARCH = YES; + PRODUCT_BUNDLE_IDENTIFIER = com.onesignal.OneSignalOSCoreMocks; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + SKIP_INSTALL = YES; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)"; + SWIFT_EMIT_LOC_STRINGS = YES; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Debug; + }; + 3C8544C02C5AEFF800F542A9 /* Test */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CODE_SIGN_STYLE = Automatic; + COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = 99SW8E36CT; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_MODULE_VERIFIER = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; + GCC_C_LANGUAGE_STANDARD = gnu17; + GENERATE_INFOPLIST_FILE = YES; + INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2024 Hiptic. All rights reserved."; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + LOCALIZATION_PREFERS_STRING_CATALOGS = YES; + MARKETING_VERSION = 1.0; + MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++"; + MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 gnu++20"; + MTL_ENABLE_DEBUG_INFO = NO; + MTL_FAST_MATH = YES; + PRODUCT_BUNDLE_IDENTIFIER = com.onesignal.OneSignalOSCoreMocks; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + SKIP_INSTALL = YES; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_EMIT_LOC_STRINGS = YES; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Test; + }; 3CC063A92B6D7A8E002BB07F /* Release */ = { isa = XCBuildConfiguration; buildSettings = { @@ -8260,6 +8565,16 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + 3C8544C12C5AEFF800F542A9 /* Build configuration list for PBXNativeTarget "OneSignalOSCoreMocks" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 3C8544BE2C5AEFF800F542A9 /* Release */, + 3C8544BF2C5AEFF800F542A9 /* Debug */, + 3C8544C02C5AEFF800F542A9 /* Test */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; 3CC063AF2B6D7A8E002BB07F /* Build configuration list for PBXNativeTarget "OneSignalCoreMocks" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/OSOperationRepo.swift b/iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/OSOperationRepo.swift index dd81de171..338fadd50 100644 --- a/iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/OSOperationRepo.swift +++ b/iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/OSOperationRepo.swift @@ -42,7 +42,7 @@ public class OSOperationRepo: NSObject { // Maps delta names to the interfaces for the operation executors var deltasToExecutorMap: [String: OSOperationExecutor] = [:] var executors: [OSOperationExecutor] = [] - private var deltaQueue: [OSDelta] = [] + var deltaQueue: [OSDelta] = [] // non-private for unit test access // TODO: This could come from a config, plist, method, remote params var pollIntervalMilliseconds = Int(POLL_INTERVAL_MS) diff --git a/iOS_SDK/OneSignalSDK/OneSignalOSCoreMocks/OSCoreMocks.swift b/iOS_SDK/OneSignalSDK/OneSignalOSCoreMocks/OSCoreMocks.swift new file mode 100644 index 000000000..c0e041ecd --- /dev/null +++ b/iOS_SDK/OneSignalSDK/OneSignalOSCoreMocks/OSCoreMocks.swift @@ -0,0 +1,51 @@ +/* + Modified MIT License + + Copyright 2024 OneSignal + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + 1. The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + 2. All copies of substantial portions of the Software may only be used in connection + with services provided by OneSignal. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + */ + +import Foundation +import OneSignalCore +@testable import OneSignalOSCore + +@objc +public class OSCoreMocks: NSObject { + public static func resetOperationRepo() { + OSOperationRepo.sharedInstance.reset() + } +} + +extension OSOperationRepo { + /** + The Operation Repo needs to reset between tests until we dependency inject the Operation Repo, + to prevent state from carrying over between tests. + */ + func reset() { + deltaQueue.removeAll() + executors.removeAll() + deltasToExecutorMap.removeAll() + pollIntervalMilliseconds = Int(POLL_INTERVAL_MS) + paused = false + } +} diff --git a/iOS_SDK/OneSignalSDK/OneSignalOSCoreMocks/OneSignalOSCoreMocks.h b/iOS_SDK/OneSignalSDK/OneSignalOSCoreMocks/OneSignalOSCoreMocks.h new file mode 100644 index 000000000..0c6e6d949 --- /dev/null +++ b/iOS_SDK/OneSignalSDK/OneSignalOSCoreMocks/OneSignalOSCoreMocks.h @@ -0,0 +1,38 @@ +/* + Modified MIT License + + Copyright 2024 OneSignal + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + 1. The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + 2. All copies of substantial portions of the Software may only be used in connection + with services provided by OneSignal. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + */ + +#import + +//! Project version number for OneSignalOSCoreMocks. +FOUNDATION_EXPORT double OneSignalOSCoreMocksVersionNumber; + +//! Project version string for OneSignalOSCoreMocks. +FOUNDATION_EXPORT const unsigned char OneSignalOSCoreMocksVersionString[]; + +// In this header, you should import all the public headers of your framework using statements like #import + + diff --git a/iOS_SDK/OneSignalSDK/OneSignalUserMocks/OneSignalUserMocks.swift b/iOS_SDK/OneSignalSDK/OneSignalUserMocks/OneSignalUserMocks.swift index 5e7b48f4b..3230ac5dc 100644 --- a/iOS_SDK/OneSignalSDK/OneSignalUserMocks/OneSignalUserMocks.swift +++ b/iOS_SDK/OneSignalSDK/OneSignalUserMocks/OneSignalUserMocks.swift @@ -27,6 +27,7 @@ import Foundation import OneSignalOSCore +import OneSignalOSCoreMocks @testable import OneSignalUser @objc @@ -35,8 +36,7 @@ public class OneSignalUserMocks: NSObject { // TODO: create mocked server responses to user requests @objc public static func reset() { - // TODO: Reset Operation Repo first - // OSCoreMocks.resetOperationRepo() + OSCoreMocks.resetOperationRepo() OneSignalUserManagerImpl.sharedInstance.reset() } }