From c47b9e1f80db4f35dba37d9305067e9ba69117a3 Mon Sep 17 00:00:00 2001 From: Nan Date: Mon, 27 Jan 2025 20:01:53 -0800 Subject: [PATCH 01/10] Add Swift `IAMIntegrationTests` test file Add Swift `IAMIntegrationTests` test file and check for accessibility of `OSMessagingController` from the test file --- .../OneSignal.xcodeproj/project.pbxproj | 6 ++- .../IAMIntegrationTests.swift | 43 +++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 iOS_SDK/OneSignalSDK/OneSignalInAppMessagesTests/IAMIntegrationTests.swift diff --git a/iOS_SDK/OneSignalSDK/OneSignal.xcodeproj/project.pbxproj b/iOS_SDK/OneSignalSDK/OneSignal.xcodeproj/project.pbxproj index cabab70a0..a749378c1 100644 --- a/iOS_SDK/OneSignalSDK/OneSignal.xcodeproj/project.pbxproj +++ b/iOS_SDK/OneSignalSDK/OneSignal.xcodeproj/project.pbxproj @@ -73,6 +73,7 @@ 3C277D7E2BD76E0000857606 /* OSIdentityModelRepo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C277D7D2BD76E0000857606 /* OSIdentityModelRepo.swift */; }; 3C2C7DC8288F3C020020F9AE /* OSSubscriptionModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C2C7DC7288F3C020020F9AE /* OSSubscriptionModel.swift */; }; 3C2D8A5928B4C4E300BE41F6 /* OSDelta.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C2D8A5828B4C4E300BE41F6 /* OSDelta.swift */; }; + 3C3FABA52D488DDD00B7090D /* IAMIntegrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C3FABA42D488DDD00B7090D /* IAMIntegrationTests.swift */; }; 3C44673E296D099D0039A49E /* OneSignalMobileProvision.m in Sources */ = {isa = PBXBuildFile; fileRef = 912411FD1E73342200E41FD7 /* OneSignalMobileProvision.m */; }; 3C44673F296D09CC0039A49E /* OneSignalMobileProvision.h in Headers */ = {isa = PBXBuildFile; fileRef = 912411FC1E73342200E41FD7 /* OneSignalMobileProvision.h */; settings = {ATTRIBUTES = (Public, ); }; }; 3C448B9D2936ADFD002F96BC /* OSBackgroundTaskHandlerImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 3C448B9B2936ADFD002F96BC /* OSBackgroundTaskHandlerImpl.h */; }; @@ -1251,6 +1252,7 @@ 3C2C7DC2288E007E0020F9AE /* UnitTests-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UnitTests-Bridging-Header.h"; sourceTree = ""; }; 3C2C7DC7288F3C020020F9AE /* OSSubscriptionModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OSSubscriptionModel.swift; sourceTree = ""; }; 3C2D8A5828B4C4E300BE41F6 /* OSDelta.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OSDelta.swift; sourceTree = ""; }; + 3C3FABA42D488DDD00B7090D /* IAMIntegrationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IAMIntegrationTests.swift; sourceTree = ""; }; 3C448B9B2936ADFD002F96BC /* OSBackgroundTaskHandlerImpl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OSBackgroundTaskHandlerImpl.h; sourceTree = ""; }; 3C448B9C2936ADFD002F96BC /* OSBackgroundTaskHandlerImpl.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OSBackgroundTaskHandlerImpl.m; sourceTree = ""; }; 3C448BA12936B474002F96BC /* OSBackgroundTaskManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OSBackgroundTaskManager.swift; sourceTree = ""; }; @@ -2080,6 +2082,7 @@ isa = PBXGroup; children = ( 3C01519B2C2E29F90079E076 /* IAMRequestTests.m */, + 3C3FABA42D488DDD00B7090D /* IAMIntegrationTests.swift */, ); path = OneSignalInAppMessagesTests; sourceTree = ""; @@ -3739,7 +3742,7 @@ }; 3C01518D2C2E298E0079E076 = { CreatedOnToolsVersion = 15.2; - LastSwiftMigration = 1520; + LastSwiftMigration = 1610; TestTargetID = DEF5CCF02539321A0003E9CC; }; 3C115160289A259500565C41 = { @@ -4149,6 +4152,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 3C3FABA52D488DDD00B7090D /* IAMIntegrationTests.swift in Sources */, 3C01519C2C2E29F90079E076 /* IAMRequestTests.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/iOS_SDK/OneSignalSDK/OneSignalInAppMessagesTests/IAMIntegrationTests.swift b/iOS_SDK/OneSignalSDK/OneSignalInAppMessagesTests/IAMIntegrationTests.swift new file mode 100644 index 000000000..119ef343d --- /dev/null +++ b/iOS_SDK/OneSignalSDK/OneSignalInAppMessagesTests/IAMIntegrationTests.swift @@ -0,0 +1,43 @@ +/* + 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 XCTest +@testable import OneSignalInAppMessages + +final class IAMIntegrationTests: XCTestCase { + override func setUpWithError() throws { + // Put setup code here. This method is called before the invocation of each test method in the class. + } + override func tearDownWithError() throws { + // Put teardown code here. This method is called after the invocation of each test method in the class. + } + func testExample() throws { + OneSignalLog.setLogLevel(.LL_VERBOSE) + OneSignalInAppMessages.getFromServer("foobar") + // OSMessagingController.sharedInstance() + } +} From 22ee2652573b0cc49025e1ebd9d721eb7556912f Mon Sep 17 00:00:00 2001 From: Nan Date: Mon, 27 Jan 2025 20:07:03 -0800 Subject: [PATCH 02/10] nit: remove unused methods `getTriggerValueForKey` * no longer used, dead code --- .../Controller/OSMessagingController.h | 1 - .../Controller/OSMessagingController.m | 5 ----- .../OneSignalInAppMessages/Controller/OSTriggerController.h | 1 - .../OneSignalInAppMessages/Controller/OSTriggerController.m | 6 ------ 4 files changed, 13 deletions(-) diff --git a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSMessagingController.h b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSMessagingController.h index b5d443112..49c0b2124 100644 --- a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSMessagingController.h +++ b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSMessagingController.h @@ -61,7 +61,6 @@ NS_ASSUME_NONNULL_BEGIN - (void)removeTriggersForKeys:(NSArray *)keys; - (void)clearTriggers; - (NSDictionary *)getTriggers; -- (id)getTriggerValueForKey:(NSString *)key; - (void)addInAppMessageClickListener:(NSObject *_Nullable)listener; - (void)removeInAppMessageClickListener:(NSObject *_Nullable)listener; diff --git a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSMessagingController.m b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSMessagingController.m index 2cc5d964a..f5f6ba942 100644 --- a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSMessagingController.m +++ b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSMessagingController.m @@ -815,10 +815,6 @@ - (void)clearTriggers { return self.triggerController.getTriggers; } -- (id)getTriggerValueForKey:(NSString *)key { - return [self.triggerController getTriggerValueForKey:key]; -} - #pragma mark OSInAppMessageViewControllerDelegate Methods - (void)messageViewControllerDidDisplay:(OSInAppMessageInternal *)message { [self onDidDisplayInAppMessage:message]; @@ -1227,7 +1223,6 @@ - (void)addTriggers:(NSDictionary *)triggers {} - (void)removeTriggersForKeys:(NSArray *)keys {} - (void)clearTriggers {} - (NSDictionary *)getTriggers { return @{}; } -- (id)getTriggerValueForKey:(NSString *)key { return 0; } #pragma mark OSInAppMessageViewControllerDelegate Methods - (void)messageViewControllerWasDismissed {} - (void)messageViewDidSelectAction:(OSInAppMessageInternal *)message withAction:(OSInAppMessageClickResult *)action {} diff --git a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSTriggerController.h b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSTriggerController.h index ce99b69db..e036086d3 100644 --- a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSTriggerController.h +++ b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSTriggerController.h @@ -52,7 +52,6 @@ NS_ASSUME_NONNULL_BEGIN - (void)addTriggers:(NSDictionary *)triggers; - (void)removeTriggersForKeys:(NSArray *)keys; - (NSDictionary *)getTriggers; -- (id)getTriggerValueForKey:(NSString *)key; - (void)timeSinceLastMessage:(NSDate *)date; @end diff --git a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSTriggerController.m b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSTriggerController.m index 8499192ab..f3b99da28 100644 --- a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSTriggerController.m +++ b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSTriggerController.m @@ -69,12 +69,6 @@ - (void)removeTriggersForKeys:(NSArray *)keys { } } -- (id)getTriggerValueForKey:(NSString *)key { - @synchronized (self.triggers) { - return self.triggers[key]; - } -} - /* * Part of redisplay logic * From 0cdd45a5893355e72c9d75fa375677a346f81a3f Mon Sep 17 00:00:00 2001 From: Nan Date: Wed, 15 Jan 2025 15:47:06 -0800 Subject: [PATCH 03/10] nit: remove methods from OSMessagingController header * Aren't called by anything so no need to be on the interface, these are called by the class itself. --- .../Controller/OSMessagingController.h | 5 ----- .../Controller/OSMessagingController.m | 1 + .../UnitTests/Shadows/OSMessagingControllerOverrider.m | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSMessagingController.h b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSMessagingController.h index 49c0b2124..aa1709e65 100644 --- a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSMessagingController.h +++ b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSMessagingController.h @@ -49,18 +49,13 @@ NS_ASSUME_NONNULL_BEGIN + (OSMessagingController *)sharedInstance; + (void)start; -+ (void)removeInstance; -- (void)presentInAppMessage:(OSInAppMessageInternal *)message; - (void)getInAppMessagesFromServer:(NSString * _Nullable)subscriptionId; -- (void)messageViewImpressionRequest:(OSInAppMessageInternal *)message; -- (void)messageViewPageImpressionRequest:(OSInAppMessageInternal *)message withPageId:(NSString *)pageId; - (BOOL)isInAppMessagingPaused; - (void)setInAppMessagingPaused:(BOOL)pause; - (void)addTriggers:(NSDictionary *)triggers; - (void)removeTriggersForKeys:(NSArray *)keys; - (void)clearTriggers; -- (NSDictionary *)getTriggers; - (void)addInAppMessageClickListener:(NSObject *_Nullable)listener; - (void)removeInAppMessageClickListener:(NSObject *_Nullable)listener; diff --git a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSMessagingController.m b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSMessagingController.m index f5f6ba942..f5369492a 100644 --- a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSMessagingController.m +++ b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSMessagingController.m @@ -165,6 +165,7 @@ + (OSMessagingController *)sharedInstance { return sharedInstance; } +// TODO: Used by tests only? Come back and see if this is needed. + (void)removeInstance { sharedInstance = nil; once = 0; diff --git a/iOS_SDK/OneSignalSDK/UnitTests/Shadows/OSMessagingControllerOverrider.m b/iOS_SDK/OneSignalSDK/UnitTests/Shadows/OSMessagingControllerOverrider.m index 9d3d1d406..239700648 100644 --- a/iOS_SDK/OneSignalSDK/UnitTests/Shadows/OSMessagingControllerOverrider.m +++ b/iOS_SDK/OneSignalSDK/UnitTests/Shadows/OSMessagingControllerOverrider.m @@ -112,7 +112,7 @@ - (void)overrideShowMessage:(OSInAppMessageInternal *)message { - (void)overrideWebViewContentFinishedLoading:(OSInAppMessageInternal *)message { if (message) { - [OSMessagingController.sharedInstance messageViewImpressionRequest:message]; + // [OSMessagingController.sharedInstance messageViewImpressionRequest:message]; } } From b3cd3701af8a70439d7d950ef07d7c40913ba763 Mon Sep 17 00:00:00 2001 From: Nan Date: Mon, 27 Jan 2025 10:45:35 -0800 Subject: [PATCH 04/10] Add description to `OSRequestGetInAppMessages` * Without a description, the object will return something like ``. By adding a predictable description, we can operate on the object. --- .../Requests/OSInAppMessagingRequests.m | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Requests/OSInAppMessagingRequests.m b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Requests/OSInAppMessagingRequests.m index 4682ced91..de6e1c524 100644 --- a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Requests/OSInAppMessagingRequests.m +++ b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Requests/OSInAppMessagingRequests.m @@ -28,6 +28,10 @@ of this software and associated documentation files (the "Software"), to deal #import "OSInAppMessagingRequests.h" @implementation OSRequestGetInAppMessages +- (NSString *)description { + return [NSString stringWithFormat:@"", self.path]; +} + + (instancetype _Nonnull) withSubscriptionId:(NSString * _Nonnull)subscriptionId withSessionDuration:(NSNumber * _Nonnull)sessionDuration withRetryCount:(NSNumber *)retryCount From 0768f8d68a83f1e3ea1287e865f8c174638d6cca Mon Sep 17 00:00:00 2001 From: Nan Date: Mon, 27 Jan 2025 20:46:03 -0800 Subject: [PATCH 05/10] Add framework for `OneSignalInAppMessagesMocks` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Re-usable test helpers and mock functionality * Include own swiftlint file * ❗️ After `OneSignalInAppMessagesMocks` was created, I had to then manually "convert to group" or else the CI had build errors about the following: xcodebuild: error: Unable to read project 'OneSignal.xcodeproj' Reason: The project ‘OneSignal’ is damaged and cannot be opened. Examine the project file for invalid edits or unresolved source control conflicts. Exception: didn't find classname for 'isa' key --- .../OneSignal.xcodeproj/project.pbxproj | 323 ++++++++++++++++++ .../.swiftlint.yml | 2 + .../IAMTestHelpers.swift | 98 ++++++ .../OneSignalInAppMessagesMocks.h | 38 +++ 4 files changed, 461 insertions(+) create mode 100644 iOS_SDK/OneSignalSDK/OneSignalInAppMessagesMocks/.swiftlint.yml create mode 100644 iOS_SDK/OneSignalSDK/OneSignalInAppMessagesMocks/IAMTestHelpers.swift create mode 100644 iOS_SDK/OneSignalSDK/OneSignalInAppMessagesMocks/OneSignalInAppMessagesMocks.h diff --git a/iOS_SDK/OneSignalSDK/OneSignal.xcodeproj/project.pbxproj b/iOS_SDK/OneSignalSDK/OneSignal.xcodeproj/project.pbxproj index a749378c1..cb75d5e76 100644 --- a/iOS_SDK/OneSignalSDK/OneSignal.xcodeproj/project.pbxproj +++ b/iOS_SDK/OneSignalSDK/OneSignal.xcodeproj/project.pbxproj @@ -55,6 +55,9 @@ 37E6B2BB19D9CAF300D0C601 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 37E6B2BA19D9CAF300D0C601 /* UIKit.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; 3C0151922C2E298F0079E076 /* OneSignalInAppMessages.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DEBAAE282A4211D900BF2C1C /* OneSignalInAppMessages.framework */; }; 3C01519C2C2E29F90079E076 /* IAMRequestTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C01519B2C2E29F90079E076 /* IAMRequestTests.m */; }; + 3C0C67172D493E5A00F80448 /* IAMTestHelpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C0C67162D493E5A00F80448 /* IAMTestHelpers.swift */; }; + 3C0C671C2D49449C00F80448 /* OneSignalInAppMessages.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DEBAAE282A4211D900BF2C1C /* OneSignalInAppMessages.framework */; }; + 3C0C671D2D49449C00F80448 /* OneSignalInAppMessages.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DEBAAE282A4211D900BF2C1C /* OneSignalInAppMessages.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 3C0EF49E28A1DBCB00E5434B /* OSUserInternalImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C0EF49D28A1DBCB00E5434B /* OSUserInternalImpl.swift */; }; 3C115165289A259500565C41 /* OneSignalOSCore.docc in Sources */ = {isa = PBXBuildFile; fileRef = 3C115164289A259500565C41 /* OneSignalOSCore.docc */; }; 3C115171289A259500565C41 /* OneSignalOSCore.h in Headers */ = {isa = PBXBuildFile; fileRef = 3C115163289A259500565C41 /* OneSignalOSCore.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -74,6 +77,9 @@ 3C2C7DC8288F3C020020F9AE /* OSSubscriptionModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C2C7DC7288F3C020020F9AE /* OSSubscriptionModel.swift */; }; 3C2D8A5928B4C4E300BE41F6 /* OSDelta.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C2D8A5828B4C4E300BE41F6 /* OSDelta.swift */; }; 3C3FABA52D488DDD00B7090D /* IAMIntegrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C3FABA42D488DDD00B7090D /* IAMIntegrationTests.swift */; }; + 3C3FABD02D48985100B7090D /* OneSignalInAppMessagesMocks.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3C3FABCA2D48985100B7090D /* OneSignalInAppMessagesMocks.framework */; }; + 3C3FABD12D48985100B7090D /* OneSignalInAppMessagesMocks.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3C3FABCA2D48985100B7090D /* OneSignalInAppMessagesMocks.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 3C3FABD92D4898E500B7090D /* OneSignalInAppMessagesMocks.h in Headers */ = {isa = PBXBuildFile; fileRef = 3C3FABD72D4898E500B7090D /* OneSignalInAppMessagesMocks.h */; settings = {ATTRIBUTES = (Public, ); }; }; 3C44673E296D099D0039A49E /* OneSignalMobileProvision.m in Sources */ = {isa = PBXBuildFile; fileRef = 912411FD1E73342200E41FD7 /* OneSignalMobileProvision.m */; }; 3C44673F296D09CC0039A49E /* OneSignalMobileProvision.h in Headers */ = {isa = PBXBuildFile; fileRef = 912411FC1E73342200E41FD7 /* OneSignalMobileProvision.h */; settings = {ATTRIBUTES = (Public, ); }; }; 3C448B9D2936ADFD002F96BC /* OSBackgroundTaskHandlerImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 3C448B9B2936ADFD002F96BC /* OSBackgroundTaskHandlerImpl.h */; }; @@ -624,6 +630,13 @@ remoteGlobalIDString = DEF5CCF02539321A0003E9CC; remoteInfo = UnitTestApp; }; + 3C0C671E2D49449C00F80448 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 37747F8B19147D6400558FAD /* Project object */; + proxyType = 1; + remoteGlobalIDString = DEBAAE272A4211D900BF2C1C; + remoteInfo = OneSignalInAppMessages; + }; 3C115194289AF85400565C41 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 37747F8B19147D6400558FAD /* Project object */; @@ -638,6 +651,13 @@ remoteGlobalIDString = 3C115160289A259500565C41; remoteInfo = OneSignalOSCore; }; + 3C3FABCE2D48985100B7090D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 37747F8B19147D6400558FAD /* Project object */; + proxyType = 1; + remoteGlobalIDString = 3C3FABC92D48985100B7090D; + remoteInfo = OneSignalInAppMessagesMocks; + }; 3C7A39C32B7BED900082665E /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 37747F8B19147D6400558FAD /* Project object */; @@ -1099,6 +1119,17 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 3C0C67202D49449C00F80448 /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + 3C0C671D2D49449C00F80448 /* OneSignalInAppMessages.framework in Embed Frameworks */, + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; 3C7A39C52B7BED910082665E /* Embed Frameworks */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; @@ -1202,6 +1233,7 @@ DEBAAE2F2A4211DA00BF2C1C /* OneSignalInAppMessages.framework in Embed Frameworks */, 475F47252B8E398E00EC05B3 /* OneSignalLiveActivities.framework in Embed Frameworks */, 3C8544BD2C5AEFF700F542A9 /* OneSignalOSCoreMocks.framework in Embed Frameworks */, + 3C3FABD12D48985100B7090D /* OneSignalInAppMessagesMocks.framework in Embed Frameworks */, DEA4B4632888C4DC00E9FE12 /* OneSignalOutcomes.framework in Embed Frameworks */, 3CEE934B2B7C73B6008440BD /* OneSignalUserMocks.framework in Embed Frameworks */, DEA4B45D2888C1D000E9FE12 /* OneSignalCore.framework in Embed Frameworks */, @@ -1235,6 +1267,7 @@ 37E6B2BA19D9CAF300D0C601 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; 3C01518E2C2E298E0079E076 /* OneSignalInAppMessagesTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = OneSignalInAppMessagesTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 3C01519B2C2E29F90079E076 /* IAMRequestTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = IAMRequestTests.m; sourceTree = ""; }; + 3C0C67162D493E5A00F80448 /* IAMTestHelpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IAMTestHelpers.swift; sourceTree = ""; }; 3C0EF49D28A1DBCB00E5434B /* OSUserInternalImpl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OSUserInternalImpl.swift; sourceTree = ""; }; 3C115161289A259500565C41 /* OneSignalOSCore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = OneSignalOSCore.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 3C115163289A259500565C41 /* OneSignalOSCore.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OneSignalOSCore.h; sourceTree = ""; }; @@ -1253,6 +1286,8 @@ 3C2C7DC7288F3C020020F9AE /* OSSubscriptionModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OSSubscriptionModel.swift; sourceTree = ""; }; 3C2D8A5828B4C4E300BE41F6 /* OSDelta.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OSDelta.swift; sourceTree = ""; }; 3C3FABA42D488DDD00B7090D /* IAMIntegrationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IAMIntegrationTests.swift; sourceTree = ""; }; + 3C3FABCA2D48985100B7090D /* OneSignalInAppMessagesMocks.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = OneSignalInAppMessagesMocks.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 3C3FABD72D4898E500B7090D /* OneSignalInAppMessagesMocks.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OneSignalInAppMessagesMocks.h; sourceTree = ""; }; 3C448B9B2936ADFD002F96BC /* OSBackgroundTaskHandlerImpl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OSBackgroundTaskHandlerImpl.h; sourceTree = ""; }; 3C448B9C2936ADFD002F96BC /* OSBackgroundTaskHandlerImpl.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OSBackgroundTaskHandlerImpl.m; sourceTree = ""; }; 3C448BA12936B474002F96BC /* OSBackgroundTaskManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OSBackgroundTaskManager.swift; sourceTree = ""; }; @@ -1728,6 +1763,14 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 3C3FABC72D48985100B7090D /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 3C0C671C2D49449C00F80448 /* OneSignalInAppMessages.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 3C8544B32C5AEFF600F542A9 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -1929,6 +1972,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 3C3FABD02D48985100B7090D /* OneSignalInAppMessagesMocks.framework in Frameworks */, 3C11518E289AF83600565C41 /* OneSignalOSCore.framework in Frameworks */, DE3784852888D00300453A8E /* OneSignalUser.framework in Frameworks */, DEBAAE2E2A4211DA00BF2C1C /* OneSignalInAppMessages.framework in Frameworks */, @@ -2010,6 +2054,7 @@ DEBAAE292A4211DA00BF2C1C /* OneSignalInAppMessages */, 475F471F2B8E398E00EC05B3 /* OneSignalLiveActivities */, 3CC0639B2B6D7A8D002BB07F /* OneSignalCoreMocks */, + 3C3FABD82D4898E500B7090D /* OneSignalInAppMessagesMocks */, 3C8544B72C5AEFF700F542A9 /* OneSignalOSCoreMocks */, 3CC063DE2B6D7F2A002BB07F /* OneSignalUserMocks */, 3CC063A52B6D7A8E002BB07F /* OneSignalCoreTests */, @@ -2046,6 +2091,7 @@ 3C01518E2C2E298E0079E076 /* OneSignalInAppMessagesTests.xctest */, 3C8544B62C5AEFF600F542A9 /* OneSignalOSCoreMocks.framework */, 5B053FB82CAE07EB002F30C4 /* OneSignalOSCoreTests.xctest */, + 3C3FABCA2D48985100B7090D /* OneSignalInAppMessagesMocks.framework */, ); name = Products; sourceTree = ""; @@ -2120,6 +2166,15 @@ path = Source; sourceTree = ""; }; + 3C3FABD82D4898E500B7090D /* OneSignalInAppMessagesMocks */ = { + isa = PBXGroup; + children = ( + 3C3FABD72D4898E500B7090D /* OneSignalInAppMessagesMocks.h */, + 3C0C67162D493E5A00F80448 /* IAMTestHelpers.swift */, + ); + path = OneSignalInAppMessagesMocks; + sourceTree = ""; + }; 3C8544B72C5AEFF700F542A9 /* OneSignalOSCoreMocks */ = { isa = PBXGroup; children = ( @@ -3057,6 +3112,14 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 3C3FABC52D48985100B7090D /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 3C3FABD92D4898E500B7090D /* OneSignalInAppMessagesMocks.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 3C8544B12C5AEFF600F542A9 /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; @@ -3319,6 +3382,28 @@ productReference = 3C115161289A259500565C41 /* OneSignalOSCore.framework */; productType = "com.apple.product-type.framework"; }; + 3C3FABC92D48985100B7090D /* OneSignalInAppMessagesMocks */ = { + isa = PBXNativeTarget; + buildConfigurationList = 3C3FABD62D48985100B7090D /* Build configuration list for PBXNativeTarget "OneSignalInAppMessagesMocks" */; + buildPhases = ( + 3C3FABC52D48985100B7090D /* Headers */, + 3C3FABC62D48985100B7090D /* Sources */, + 3C3FABC72D48985100B7090D /* Frameworks */, + 3C3FABC82D48985100B7090D /* Resources */, + 3C0C67202D49449C00F80448 /* Embed Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + 3C0C671F2D49449C00F80448 /* PBXTargetDependency */, + ); + name = OneSignalInAppMessagesMocks; + packageProductDependencies = ( + ); + productName = OneSignalInAppMessagesMocks; + productReference = 3C3FABCA2D48985100B7090D /* OneSignalInAppMessagesMocks.framework */; + productType = "com.apple.product-type.framework"; + }; 3C8544B52C5AEFF600F542A9 /* OneSignalOSCoreMocks */ = { isa = PBXNativeTarget; buildConfigurationList = 3C8544C12C5AEFF800F542A9 /* Build configuration list for PBXNativeTarget "OneSignalOSCoreMocks" */; @@ -3700,6 +3785,7 @@ 3CEE934D2B7C73B6008440BD /* PBXTargetDependency */, 475F47232B8E398E00EC05B3 /* PBXTargetDependency */, 3C8544BB2C5AEFF700F542A9 /* PBXTargetDependency */, + 3C3FABCF2D48985100B7090D /* PBXTargetDependency */, ); name = UnitTestApp; productName = UnitTestApp; @@ -3750,6 +3836,10 @@ DevelopmentTeam = 99SW8E36CT; ProvisioningStyle = Automatic; }; + 3C3FABC92D48985100B7090D = { + CreatedOnToolsVersion = 16.1; + LastSwiftMigration = 1610; + }; 3C8544B52C5AEFF600F542A9 = { CreatedOnToolsVersion = 15.2; LastSwiftMigration = 1520; @@ -3903,6 +3993,7 @@ 3CC063992B6D7A8C002BB07F /* OneSignalCoreMocks */, 3C8544B52C5AEFF600F542A9 /* OneSignalOSCoreMocks */, 3CC063DC2B6D7F2A002BB07F /* OneSignalUserMocks */, + 3C3FABC92D48985100B7090D /* OneSignalInAppMessagesMocks */, 3CC063A02B6D7A8D002BB07F /* OneSignalCoreTests */, 3CC063EA2B6D7FE8002BB07F /* OneSignalUserTests */, 473542492B8F93330016DB4C /* OneSignalLiveActivitiesTests */, @@ -3929,6 +4020,13 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 3C3FABC82D48985100B7090D /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; 3C8544B42C5AEFF600F542A9 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -4185,6 +4283,14 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 3C3FABC62D48985100B7090D /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 3C0C67172D493E5A00F80448 /* IAMTestHelpers.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 3C8544B22C5AEFF600F542A9 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -4581,6 +4687,11 @@ target = DEF5CCF02539321A0003E9CC /* UnitTestApp */; targetProxy = 3C0151992C2E29AC0079E076 /* PBXContainerItemProxy */; }; + 3C0C671F2D49449C00F80448 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = DEBAAE272A4211D900BF2C1C /* OneSignalInAppMessages */; + targetProxy = 3C0C671E2D49449C00F80448 /* PBXContainerItemProxy */; + }; 3C115195289AF85400565C41 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = DE7D17E527026B95002D3A5D /* OneSignalCore */; @@ -4591,6 +4702,11 @@ target = 3C115160289A259500565C41 /* OneSignalOSCore */; targetProxy = 3C115199289AF86C00565C41 /* PBXContainerItemProxy */; }; + 3C3FABCF2D48985100B7090D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 3C3FABC92D48985100B7090D /* OneSignalInAppMessagesMocks */; + targetProxy = 3C3FABCE2D48985100B7090D /* PBXContainerItemProxy */; + }; 3C7A39C42B7BED900082665E /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 3CC063992B6D7A8C002BB07F /* OneSignalCoreMocks */; @@ -5208,6 +5324,203 @@ }; name = Debug; }; + 3C3FABD22D48985100B7090D /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + BUILD_LIBRARY_FOR_DISTRIBUTION = 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 © 2025 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.OneSignalInAppMessagesMocks; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + SKIP_INSTALL = YES; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_EMIT_LOC_STRINGS = YES; + SWIFT_INSTALL_OBJC_HEADER = NO; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Release; + }; + 3C3FABD32D48985100B7090D /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + BUILD_LIBRARY_FOR_DISTRIBUTION = 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 © 2025 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.OneSignalInAppMessagesMocks; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + SKIP_INSTALL = YES; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)"; + SWIFT_EMIT_LOC_STRINGS = YES; + SWIFT_INSTALL_OBJC_HEADER = NO; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Debug; + }; + 3C3FABD42D48985100B7090D /* Test */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + BUILD_LIBRARY_FOR_DISTRIBUTION = 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 © 2025 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.OneSignalInAppMessagesMocks; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + SKIP_INSTALL = YES; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_EMIT_LOC_STRINGS = YES; + SWIFT_INSTALL_OBJC_HEADER = NO; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Test; + }; 3C8544BE2C5AEFF800F542A9 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { @@ -8889,6 +9202,16 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + 3C3FABD62D48985100B7090D /* Build configuration list for PBXNativeTarget "OneSignalInAppMessagesMocks" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 3C3FABD22D48985100B7090D /* Release */, + 3C3FABD32D48985100B7090D /* Debug */, + 3C3FABD42D48985100B7090D /* Test */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; 3C8544C12C5AEFF800F542A9 /* Build configuration list for PBXNativeTarget "OneSignalOSCoreMocks" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/iOS_SDK/OneSignalSDK/OneSignalInAppMessagesMocks/.swiftlint.yml b/iOS_SDK/OneSignalSDK/OneSignalInAppMessagesMocks/.swiftlint.yml new file mode 100644 index 000000000..9cbe9dd8f --- /dev/null +++ b/iOS_SDK/OneSignalSDK/OneSignalInAppMessagesMocks/.swiftlint.yml @@ -0,0 +1,2 @@ +disabled_rules: + - identifier_name diff --git a/iOS_SDK/OneSignalSDK/OneSignalInAppMessagesMocks/IAMTestHelpers.swift b/iOS_SDK/OneSignalSDK/OneSignalInAppMessagesMocks/IAMTestHelpers.swift new file mode 100644 index 000000000..449c8ca22 --- /dev/null +++ b/iOS_SDK/OneSignalSDK/OneSignalInAppMessagesMocks/IAMTestHelpers.swift @@ -0,0 +1,98 @@ +/* + 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 OneSignalInAppMessages + +let OS_TEST_MESSAGE_ID = "a4b3gj7f-d8cc-11e4-bed1-df8f05be55ba" +let OS_TEST_MESSAGE_VARIANT_ID = "m8dh7234f-d8cc-11e4-bed1-df8f05be55ba" +let OS_TEST_ENGLISH_VARIANT_ID = "11e4-bed1-df8f05be55ba-m8dh7234f-d8cc" + +let OS_DUMMY_HTML = "

Hello World

" + +@objc +public class IAMTestHelpers: NSObject { + /// Convert OSTriggerOperatorType enum to string + private static func OS_OPERATOR_TO_STRING(_ type: Int32) -> String { + // Trigger operator strings + let OS_OPERATOR_STRINGS: [String] = [ + "greater", + "less", + "equal", + "not_equal", + "less_or_equal", + "greater_or_equal", + "exists", + "not_exists", + "in" + ] + + return OS_OPERATOR_STRINGS[Int(type)] + } + + @objc + public static func testDefaultMessageJson() -> [String: Any] { + return [ + "id": String(format: "%@_%i", OS_TEST_MESSAGE_ID, UUID().uuidString), + "variants": [ + "ios": [ + "default": OS_TEST_MESSAGE_VARIANT_ID, + "en": OS_TEST_ENGLISH_VARIANT_ID + ], + "all": [ + "default": "should_never_be_used_by_any_test" + ] + ], + "triggers": [] + ] + } + + @objc + public static func testMessageJsonWithTrigger(property: String, triggerId: String, type: Int32, value: Any) -> [String: Any] { + var testMessage = self.testDefaultMessageJson() + + testMessage["triggers"] = [ + [ + [ + "kind": property, + "property": property, + "operator": OS_OPERATOR_TO_STRING(type), + "value": value, + "id": triggerId + ] + ] + ] + return testMessage + } + + @objc + public static func testFetchMessagesResponse(messages: [[String: Any]]) -> [String: Any] { + return [ + "in_app_messages": messages + ] + } +} diff --git a/iOS_SDK/OneSignalSDK/OneSignalInAppMessagesMocks/OneSignalInAppMessagesMocks.h b/iOS_SDK/OneSignalSDK/OneSignalInAppMessagesMocks/OneSignalInAppMessagesMocks.h new file mode 100644 index 000000000..5da597314 --- /dev/null +++ b/iOS_SDK/OneSignalSDK/OneSignalInAppMessagesMocks/OneSignalInAppMessagesMocks.h @@ -0,0 +1,38 @@ +/* + Modified MIT License + + Copyright 2025 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 OneSignalInAppMessagesMocks. +FOUNDATION_EXPORT double OneSignalInAppMessagesMocksVersionNumber; + +//! Project version string for OneSignalInAppMessagesMocks. +FOUNDATION_EXPORT const unsigned char OneSignalInAppMessagesMocksVersionString[]; + +// In this header, you should import all the public headers of your framework using statements like #import + + From ecdd49a933a76e911c88e13790e1a7fb4a721149 Mon Sep 17 00:00:00 2001 From: Nan Date: Tue, 28 Jan 2025 09:10:43 -0800 Subject: [PATCH 06/10] Make a `MockMessagingController` * Make a `MockMessagingController` in Objective C to allow us to access internal APIs on the OSMessagingController without needing to make them public. This is needed because Swift code cannot access Objective-C APIs unless they are public. This is a workaround for this limitation. --- .../OneSignal.xcodeproj/project.pbxproj | 25 ++++++++++ .../MockMessagingController.h | 38 +++++++++++++++ .../MockMessagingController.m | 48 +++++++++++++++++++ .../OneSignalInAppMessagesMocks.h | 2 +- 4 files changed, 112 insertions(+), 1 deletion(-) create mode 100644 iOS_SDK/OneSignalSDK/OneSignalInAppMessagesMocks/MockMessagingController.h create mode 100644 iOS_SDK/OneSignalSDK/OneSignalInAppMessagesMocks/MockMessagingController.m diff --git a/iOS_SDK/OneSignalSDK/OneSignal.xcodeproj/project.pbxproj b/iOS_SDK/OneSignalSDK/OneSignal.xcodeproj/project.pbxproj index cb75d5e76..45d938121 100644 --- a/iOS_SDK/OneSignalSDK/OneSignal.xcodeproj/project.pbxproj +++ b/iOS_SDK/OneSignalSDK/OneSignal.xcodeproj/project.pbxproj @@ -58,6 +58,10 @@ 3C0C67172D493E5A00F80448 /* IAMTestHelpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C0C67162D493E5A00F80448 /* IAMTestHelpers.swift */; }; 3C0C671C2D49449C00F80448 /* OneSignalInAppMessages.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DEBAAE282A4211D900BF2C1C /* OneSignalInAppMessages.framework */; }; 3C0C671D2D49449C00F80448 /* OneSignalInAppMessages.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DEBAAE282A4211D900BF2C1C /* OneSignalInAppMessages.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 3C0C67232D49469200F80448 /* MockMessagingController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C0C67222D49469200F80448 /* MockMessagingController.m */; }; + 3C0C67242D49469200F80448 /* MockMessagingController.h in Headers */ = {isa = PBXBuildFile; fileRef = 3C0C67212D49469200F80448 /* MockMessagingController.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3C0C67252D4946BD00F80448 /* OneSignalCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DE7D17E627026B95002D3A5D /* OneSignalCore.framework */; }; + 3C0C67262D4946BD00F80448 /* OneSignalCore.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DE7D17E627026B95002D3A5D /* OneSignalCore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 3C0EF49E28A1DBCB00E5434B /* OSUserInternalImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C0EF49D28A1DBCB00E5434B /* OSUserInternalImpl.swift */; }; 3C115165289A259500565C41 /* OneSignalOSCore.docc in Sources */ = {isa = PBXBuildFile; fileRef = 3C115164289A259500565C41 /* OneSignalOSCore.docc */; }; 3C115171289A259500565C41 /* OneSignalOSCore.h in Headers */ = {isa = PBXBuildFile; fileRef = 3C115163289A259500565C41 /* OneSignalOSCore.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -637,6 +641,13 @@ remoteGlobalIDString = DEBAAE272A4211D900BF2C1C; remoteInfo = OneSignalInAppMessages; }; + 3C0C67272D4946BD00F80448 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 37747F8B19147D6400558FAD /* Project object */; + proxyType = 1; + remoteGlobalIDString = DE7D17E527026B95002D3A5D; + remoteInfo = OneSignalCore; + }; 3C115194289AF85400565C41 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 37747F8B19147D6400558FAD /* Project object */; @@ -1125,6 +1136,7 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( + 3C0C67262D4946BD00F80448 /* OneSignalCore.framework in Embed Frameworks */, 3C0C671D2D49449C00F80448 /* OneSignalInAppMessages.framework in Embed Frameworks */, ); name = "Embed Frameworks"; @@ -1268,6 +1280,8 @@ 3C01518E2C2E298E0079E076 /* OneSignalInAppMessagesTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = OneSignalInAppMessagesTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 3C01519B2C2E29F90079E076 /* IAMRequestTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = IAMRequestTests.m; sourceTree = ""; }; 3C0C67162D493E5A00F80448 /* IAMTestHelpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IAMTestHelpers.swift; sourceTree = ""; }; + 3C0C67212D49469200F80448 /* MockMessagingController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MockMessagingController.h; sourceTree = ""; }; + 3C0C67222D49469200F80448 /* MockMessagingController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MockMessagingController.m; sourceTree = ""; }; 3C0EF49D28A1DBCB00E5434B /* OSUserInternalImpl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OSUserInternalImpl.swift; sourceTree = ""; }; 3C115161289A259500565C41 /* OneSignalOSCore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = OneSignalOSCore.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 3C115163289A259500565C41 /* OneSignalOSCore.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OneSignalOSCore.h; sourceTree = ""; }; @@ -1767,6 +1781,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 3C0C67252D4946BD00F80448 /* OneSignalCore.framework in Frameworks */, 3C0C671C2D49449C00F80448 /* OneSignalInAppMessages.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -2171,6 +2186,8 @@ children = ( 3C3FABD72D4898E500B7090D /* OneSignalInAppMessagesMocks.h */, 3C0C67162D493E5A00F80448 /* IAMTestHelpers.swift */, + 3C0C67212D49469200F80448 /* MockMessagingController.h */, + 3C0C67222D49469200F80448 /* MockMessagingController.m */, ); path = OneSignalInAppMessagesMocks; sourceTree = ""; @@ -3117,6 +3134,7 @@ buildActionMask = 2147483647; files = ( 3C3FABD92D4898E500B7090D /* OneSignalInAppMessagesMocks.h in Headers */, + 3C0C67242D49469200F80448 /* MockMessagingController.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3396,6 +3414,7 @@ ); dependencies = ( 3C0C671F2D49449C00F80448 /* PBXTargetDependency */, + 3C0C67282D4946BD00F80448 /* PBXTargetDependency */, ); name = OneSignalInAppMessagesMocks; packageProductDependencies = ( @@ -4287,6 +4306,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 3C0C67232D49469200F80448 /* MockMessagingController.m in Sources */, 3C0C67172D493E5A00F80448 /* IAMTestHelpers.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -4692,6 +4712,11 @@ target = DEBAAE272A4211D900BF2C1C /* OneSignalInAppMessages */; targetProxy = 3C0C671E2D49449C00F80448 /* PBXContainerItemProxy */; }; + 3C0C67282D4946BD00F80448 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = DE7D17E527026B95002D3A5D /* OneSignalCore */; + targetProxy = 3C0C67272D4946BD00F80448 /* PBXContainerItemProxy */; + }; 3C115195289AF85400565C41 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = DE7D17E527026B95002D3A5D /* OneSignalCore */; diff --git a/iOS_SDK/OneSignalSDK/OneSignalInAppMessagesMocks/MockMessagingController.h b/iOS_SDK/OneSignalSDK/OneSignalInAppMessagesMocks/MockMessagingController.h new file mode 100644 index 000000000..8f1ad4115 --- /dev/null +++ b/iOS_SDK/OneSignalSDK/OneSignalInAppMessagesMocks/MockMessagingController.h @@ -0,0 +1,38 @@ +/* + Modified MIT License + + Copyright 2025 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 +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface MockMessagingController : NSObject ++ (NSArray *)messageDisplayQueue; // TODO: may need to be changed to return OSInAppMessageInternal ++ (BOOL)isInAppMessageShowing; +@end + +NS_ASSUME_NONNULL_END diff --git a/iOS_SDK/OneSignalSDK/OneSignalInAppMessagesMocks/MockMessagingController.m b/iOS_SDK/OneSignalSDK/OneSignalInAppMessagesMocks/MockMessagingController.m new file mode 100644 index 000000000..fcefc7dff --- /dev/null +++ b/iOS_SDK/OneSignalSDK/OneSignalInAppMessagesMocks/MockMessagingController.m @@ -0,0 +1,48 @@ +/* + Modified MIT License + + Copyright 2025 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 "MockMessagingController.h" +#import "OSMessagingController.h" + +@interface OSMessagingController () +@property (strong, nonatomic, nonnull) NSMutableArray *messageDisplayQueue; +@end + +@implementation MockMessagingController ++ (void)resetState { + // TODO: reseting OSMessagingController state between tests +} + ++ (NSArray *)messageDisplayQueue { + return OSMessagingController.sharedInstance.messageDisplayQueue; +} + ++ (BOOL)isInAppMessageShowing { + return OSMessagingController.sharedInstance.isInAppMessageShowing; +} + +@end diff --git a/iOS_SDK/OneSignalSDK/OneSignalInAppMessagesMocks/OneSignalInAppMessagesMocks.h b/iOS_SDK/OneSignalSDK/OneSignalInAppMessagesMocks/OneSignalInAppMessagesMocks.h index 5da597314..e1e060e6b 100644 --- a/iOS_SDK/OneSignalSDK/OneSignalInAppMessagesMocks/OneSignalInAppMessagesMocks.h +++ b/iOS_SDK/OneSignalSDK/OneSignalInAppMessagesMocks/OneSignalInAppMessagesMocks.h @@ -35,4 +35,4 @@ FOUNDATION_EXPORT const unsigned char OneSignalInAppMessagesMocksVersionString[] // In this header, you should import all the public headers of your framework using statements like #import - +#import From 64c25b606161c5da2f2f615ad6e262a8e3be2327 Mon Sep 17 00:00:00 2001 From: Nan Date: Tue, 28 Jan 2025 09:54:27 -0800 Subject: [PATCH 07/10] Move `UIApplication+OneSignal` from OneSIgnal > OneSignalInAppMessages * This extension on `UIApplication` is only used in the `OneSignalInAppMessages` framework, so there is no need to keep it in the umbrella `OneSignalFramework` framework, which causes errors if only `OneSignalInAppMessages` is tested (without also importing OneSignalFramework). --- .../OneSignal.xcodeproj/project.pbxproj | 28 +++++++++++-------- .../Categories}/UIApplication+OneSignal.h | 0 .../Categories}/UIApplication+OneSignal.m | 0 .../Controller/OSMessagingController.m | 4 +-- .../Source/OneSignalLifecycleObserver.m | 1 - 5 files changed, 18 insertions(+), 15 deletions(-) rename iOS_SDK/OneSignalSDK/{Source => OneSignalInAppMessages/Categories}/UIApplication+OneSignal.h (100%) rename iOS_SDK/OneSignalSDK/{Source => OneSignalInAppMessages/Categories}/UIApplication+OneSignal.m (100%) diff --git a/iOS_SDK/OneSignalSDK/OneSignal.xcodeproj/project.pbxproj b/iOS_SDK/OneSignalSDK/OneSignal.xcodeproj/project.pbxproj index 45d938121..3c9a377ce 100644 --- a/iOS_SDK/OneSignalSDK/OneSignal.xcodeproj/project.pbxproj +++ b/iOS_SDK/OneSignalSDK/OneSignal.xcodeproj/project.pbxproj @@ -62,6 +62,8 @@ 3C0C67242D49469200F80448 /* MockMessagingController.h in Headers */ = {isa = PBXBuildFile; fileRef = 3C0C67212D49469200F80448 /* MockMessagingController.h */; settings = {ATTRIBUTES = (Public, ); }; }; 3C0C67252D4946BD00F80448 /* OneSignalCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DE7D17E627026B95002D3A5D /* OneSignalCore.framework */; }; 3C0C67262D4946BD00F80448 /* OneSignalCore.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DE7D17E627026B95002D3A5D /* OneSignalCore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 3C0C67372D49503E00F80448 /* UIApplication+OneSignal.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C0C672F2D49501D00F80448 /* UIApplication+OneSignal.m */; }; + 3C0C67382D49505700F80448 /* UIApplication+OneSignal.h in Headers */ = {isa = PBXBuildFile; fileRef = 3C0C672E2D49501D00F80448 /* UIApplication+OneSignal.h */; }; 3C0EF49E28A1DBCB00E5434B /* OSUserInternalImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C0EF49D28A1DBCB00E5434B /* OSUserInternalImpl.swift */; }; 3C115165289A259500565C41 /* OneSignalOSCore.docc in Sources */ = {isa = PBXBuildFile; fileRef = 3C115164289A259500565C41 /* OneSignalOSCore.docc */; }; 3C115171289A259500565C41 /* OneSignalOSCore.h in Headers */ = {isa = PBXBuildFile; fileRef = 3C115163289A259500565C41 /* OneSignalOSCore.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -365,9 +367,6 @@ DE16C14524D3724700670EFA /* OneSignalLifecycleObserver.m in Sources */ = {isa = PBXBuildFile; fileRef = DE16C14324D3724700670EFA /* OneSignalLifecycleObserver.m */; }; DE16C14724D3727200670EFA /* OneSignalLifecycleObserver.h in Headers */ = {isa = PBXBuildFile; fileRef = DE16C14624D3727200670EFA /* OneSignalLifecycleObserver.h */; }; DE16C17024D3989A00670EFA /* OneSignalLifecycleObserver.m in Sources */ = {isa = PBXBuildFile; fileRef = DE16C14324D3724700670EFA /* OneSignalLifecycleObserver.m */; }; - DE20425E24E21C2C00350E4F /* UIApplication+OneSignal.m in Sources */ = {isa = PBXBuildFile; fileRef = DE20425D24E21C2C00350E4F /* UIApplication+OneSignal.m */; }; - DE20425F24E21C2C00350E4F /* UIApplication+OneSignal.m in Sources */ = {isa = PBXBuildFile; fileRef = DE20425D24E21C2C00350E4F /* UIApplication+OneSignal.m */; }; - DE20426024E21C2C00350E4F /* UIApplication+OneSignal.m in Sources */ = {isa = PBXBuildFile; fileRef = DE20425D24E21C2C00350E4F /* UIApplication+OneSignal.m */; }; DE2D8F452947D85800844084 /* OneSignalExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DE7D17F927026BA3002D3A5D /* OneSignalExtension.framework */; }; DE2D8F4A2947D86200844084 /* OneSignalOutcomes.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DE7D188027037F43002D3A5D /* OneSignalOutcomes.framework */; }; DE3784842888CFF900453A8E /* OneSignalUser.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DE69E19B282ED8060090BB3D /* OneSignalUser.framework */; }; @@ -574,7 +573,6 @@ DEC08B012947D4E900C81DA3 /* OneSignalSwiftInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEC08AFF2947D4E900C81DA3 /* OneSignalSwiftInterface.swift */; }; DEC08B022947D4E900C81DA3 /* OneSignalSwiftInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEC08AFF2947D4E900C81DA3 /* OneSignalSwiftInterface.swift */; }; DECE6F5B28C90821007058EE /* OneSignalOSCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3C115161289A259500565C41 /* OneSignalOSCore.framework */; }; - DEE8198D24E21DF000868CBA /* UIApplication+OneSignal.h in Headers */ = {isa = PBXBuildFile; fileRef = DE20425C24E21C1500350E4F /* UIApplication+OneSignal.h */; }; DEF5CCF52539321A0003E9CC /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = DEF5CCF42539321A0003E9CC /* AppDelegate.m */; }; DEF5CCFB2539321A0003E9CC /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DEF5CCFA2539321A0003E9CC /* ViewController.m */; }; DEF5CCFE2539321A0003E9CC /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = DEF5CCFC2539321A0003E9CC /* Main.storyboard */; }; @@ -1282,6 +1280,8 @@ 3C0C67162D493E5A00F80448 /* IAMTestHelpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IAMTestHelpers.swift; sourceTree = ""; }; 3C0C67212D49469200F80448 /* MockMessagingController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MockMessagingController.h; sourceTree = ""; }; 3C0C67222D49469200F80448 /* MockMessagingController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MockMessagingController.m; sourceTree = ""; }; + 3C0C672E2D49501D00F80448 /* UIApplication+OneSignal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UIApplication+OneSignal.h"; sourceTree = ""; }; + 3C0C672F2D49501D00F80448 /* UIApplication+OneSignal.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UIApplication+OneSignal.m"; sourceTree = ""; }; 3C0EF49D28A1DBCB00E5434B /* OSUserInternalImpl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OSUserInternalImpl.swift; sourceTree = ""; }; 3C115161289A259500565C41 /* OneSignalOSCore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = OneSignalOSCore.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 3C115163289A259500565C41 /* OneSignalOSCore.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OneSignalOSCore.h; sourceTree = ""; }; @@ -1587,8 +1587,6 @@ CACBAAAB218A662B000ACAA5 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; }; DE16C14324D3724700670EFA /* OneSignalLifecycleObserver.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OneSignalLifecycleObserver.m; sourceTree = ""; }; DE16C14624D3727200670EFA /* OneSignalLifecycleObserver.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OneSignalLifecycleObserver.h; sourceTree = ""; }; - DE20425C24E21C1500350E4F /* UIApplication+OneSignal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UIApplication+OneSignal.h"; sourceTree = ""; }; - DE20425D24E21C2C00350E4F /* UIApplication+OneSignal.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UIApplication+OneSignal.m"; sourceTree = ""; }; DE3CD2FE270FA9F200A5BECD /* OSOutcomes.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OSOutcomes.m; sourceTree = ""; }; DE51DDE3294262AB0073D5C4 /* OSRemoteParamController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OSRemoteParamController.m; sourceTree = ""; }; DE51DDE4294262AB0073D5C4 /* OSRemoteParamController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OSRemoteParamController.h; sourceTree = ""; }; @@ -2148,6 +2146,15 @@ path = OneSignalInAppMessagesTests; sourceTree = ""; }; + 3C0C67302D49501D00F80448 /* Categories */ = { + isa = PBXGroup; + children = ( + 3C0C672E2D49501D00F80448 /* UIApplication+OneSignal.h */, + 3C0C672F2D49501D00F80448 /* UIApplication+OneSignal.m */, + ); + path = Categories; + sourceTree = ""; + }; 3C115162289A259500565C41 /* OneSignalOSCore */ = { isa = PBXGroup; children = ( @@ -2578,8 +2585,6 @@ CA1A6E6820DC2E31001C41B9 /* OneSignalDialogController.m */, CA1A6E6D20DC2E73001C41B9 /* OneSignalDialogRequest.h */, CA1A6E6E20DC2E73001C41B9 /* OneSignalDialogRequest.m */, - DE20425C24E21C1500350E4F /* UIApplication+OneSignal.h */, - DE20425D24E21C2C00350E4F /* UIApplication+OneSignal.m */, ); name = Categories; sourceTree = ""; @@ -2966,6 +2971,7 @@ DEBAAE4E2A42159000BF2C1C /* Model */, DEBAAE4D2A42158600BF2C1C /* Controller */, DEBAAE4C2A42157B00BF2C1C /* UI */, + 3C0C67302D49501D00F80448 /* Categories */, DEBAAE2A2A4211DA00BF2C1C /* OneSignalInAppMessages.h */, DEBAAE982A42179A00BF2C1C /* OneSignalInAppMessages.m */, DEBAAE962A42178800BF2C1C /* OSInAppMessagingDefines.h */, @@ -3179,7 +3185,6 @@ 9124123D1E73342200E41FD7 /* UIApplicationDelegate+OneSignal.h in Headers */, 7AF9865324451F3900C36EAE /* OSFocusCallParams.h in Headers */, DE7D18DD2703B44B002D3A5D /* OSFocusRequests.h in Headers */, - DEE8198D24E21DF000868CBA /* UIApplication+OneSignal.h in Headers */, 7AECE59C23675F5700537907 /* OSFocusTimeProcessorFactory.h in Headers */, 7AECE59A23674ADC00537907 /* OSUnattributedFocusTimeProcessor.h in Headers */, 9124121D1E73342200E41FD7 /* OneSignalJailbreakDetection.h in Headers */, @@ -3314,6 +3319,7 @@ DEBAAE622A42175A00BF2C1C /* OSInAppMessageController.h in Headers */, DEBAAE662A42175A00BF2C1C /* OSDynamicTriggerController.h in Headers */, DEBAAE642A42175A00BF2C1C /* OSTriggerController.h in Headers */, + 3C0C67382D49505700F80448 /* UIApplication+OneSignal.h in Headers */, DEBAAE562A42174A00BF2C1C /* OSInAppMessageViewController.h in Headers */, DEBAAEB82A4381AE00BF2C1C /* OSInAppMessageMigrationController.h in Headers */, DEBAAE7E2A42176800BF2C1C /* OSInAppMessageDisplayStats.h in Headers */, @@ -4256,7 +4262,6 @@ 7AFE856B2368DDB80091D6A5 /* OSFocusCallParams.m in Sources */, 7AECE59E23675F6300537907 /* OSFocusTimeProcessorFactory.m in Sources */, 7A93269C25AF4F0200BBEC27 /* OSPendingCallbacks.m in Sources */, - DE20425E24E21C2C00350E4F /* UIApplication+OneSignal.m in Sources */, 7AECE59623674AB700537907 /* OSUnattributedFocusTimeProcessor.m in Sources */, 3C448B9E2936ADFD002F96BC /* OSBackgroundTaskHandlerImpl.m in Sources */, 7AECE59023674A9700537907 /* OSAttributedFocusTimeProcessor.m in Sources */, @@ -4383,7 +4388,6 @@ 7A674F1C2360D82E001F9ACD /* OSBaseFocusTimeProcessor.m in Sources */, 7AFE856C2368DDB80091D6A5 /* OSFocusCallParams.m in Sources */, 7A93269D25AF4F0200BBEC27 /* OSPendingCallbacks.m in Sources */, - DE20425F24E21C2C00350E4F /* UIApplication+OneSignal.m in Sources */, 3C448B9F2936ADFD002F96BC /* OSBackgroundTaskHandlerImpl.m in Sources */, 912412371E73342200E41FD7 /* OneSignalTrackIAP.m in Sources */, 7AECE59123674A9700537907 /* OSAttributedFocusTimeProcessor.m in Sources */, @@ -4466,7 +4470,6 @@ 7AECE59223674A9700537907 /* OSAttributedFocusTimeProcessor.m in Sources */, 912412341E73342200E41FD7 /* OneSignalTracker.m in Sources */, 03866CBD2378A33B0009C1D8 /* OutcomeIntegrationTests.m in Sources */, - DE20426024E21C2C00350E4F /* UIApplication+OneSignal.m in Sources */, 03389F691FB548A0006537F0 /* OneSignalTrackFirebaseAnalyticsOverrider.m in Sources */, 7ABAF9D62457D3FF0074DFA0 /* ChannelTrackersTests.m in Sources */, 4529DED51FA823B900CEAB1D /* TestHelperFunctions.m in Sources */, @@ -4660,6 +4663,7 @@ DEBAAE602A42175A00BF2C1C /* OSDynamicTriggerController.m in Sources */, DEBAAE8A2A42176800BF2C1C /* OSInAppMessageInternal.m in Sources */, DE70EB932A5CACF5003166D3 /* OneSignalWebView.m in Sources */, + 3C0C67372D49503E00F80448 /* UIApplication+OneSignal.m in Sources */, DEBAAE872A42176800BF2C1C /* OSInAppMessageBridgeEvent.m in Sources */, DEBAAE892A42176800BF2C1C /* OSInAppMessageClickEvent.m in Sources */, DEBAAE842A42176800BF2C1C /* OSInAppMessageDisplayStats.m in Sources */, diff --git a/iOS_SDK/OneSignalSDK/Source/UIApplication+OneSignal.h b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Categories/UIApplication+OneSignal.h similarity index 100% rename from iOS_SDK/OneSignalSDK/Source/UIApplication+OneSignal.h rename to iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Categories/UIApplication+OneSignal.h diff --git a/iOS_SDK/OneSignalSDK/Source/UIApplication+OneSignal.m b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Categories/UIApplication+OneSignal.m similarity index 100% rename from iOS_SDK/OneSignalSDK/Source/UIApplication+OneSignal.m rename to iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Categories/UIApplication+OneSignal.m diff --git a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSMessagingController.m b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSMessagingController.m index f5369492a..17213b87a 100644 --- a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSMessagingController.m +++ b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSMessagingController.m @@ -26,8 +26,8 @@ */ #import "OSMessagingController.h" -#import "UIApplication+OneSignal.h" // Previously imported via "OneSignalHelper.h" -#import "NSDateFormatter+OneSignal.h" // Previously imported via "OneSignalHelper.h" +#import "UIApplication+OneSignal.h" +#import "NSDateFormatter+OneSignal.h" #import #import "OSInAppMessageClickResult.h" #import "OSInAppMessageClickEvent.h" diff --git a/iOS_SDK/OneSignalSDK/Source/OneSignalLifecycleObserver.m b/iOS_SDK/OneSignalSDK/Source/OneSignalLifecycleObserver.m index 0e1389a2b..943fb2df3 100644 --- a/iOS_SDK/OneSignalSDK/Source/OneSignalLifecycleObserver.m +++ b/iOS_SDK/OneSignalSDK/Source/OneSignalLifecycleObserver.m @@ -31,7 +31,6 @@ of this software and associated documentation files (the "Software"), to deal #import "OneSignalCommonDefines.h" #import "OneSignalTracker.h" #import -#import "UIApplication+OneSignal.h" @implementation OneSignalLifecycleObserver From dfbd6d4b9a1932d714233775e04df71490fdd5a9 Mon Sep 17 00:00:00 2001 From: Nan Date: Tue, 28 Jan 2025 10:07:15 -0800 Subject: [PATCH 08/10] Add `ConsistencyManagerTestHelpers` to tests * Has helper methods for repeating functionality --- .../OneSignal.xcodeproj/project.pbxproj | 4 ++ .../ConsistencyManagerTestHelpers.swift | 39 +++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 iOS_SDK/OneSignalSDK/OneSignalOSCoreMocks/ConsistencyManagerTestHelpers.swift diff --git a/iOS_SDK/OneSignalSDK/OneSignal.xcodeproj/project.pbxproj b/iOS_SDK/OneSignalSDK/OneSignal.xcodeproj/project.pbxproj index 3c9a377ce..bc4f95135 100644 --- a/iOS_SDK/OneSignalSDK/OneSignal.xcodeproj/project.pbxproj +++ b/iOS_SDK/OneSignalSDK/OneSignal.xcodeproj/project.pbxproj @@ -64,6 +64,7 @@ 3C0C67262D4946BD00F80448 /* OneSignalCore.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DE7D17E627026B95002D3A5D /* OneSignalCore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 3C0C67372D49503E00F80448 /* UIApplication+OneSignal.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C0C672F2D49501D00F80448 /* UIApplication+OneSignal.m */; }; 3C0C67382D49505700F80448 /* UIApplication+OneSignal.h in Headers */ = {isa = PBXBuildFile; fileRef = 3C0C672E2D49501D00F80448 /* UIApplication+OneSignal.h */; }; + 3C0C673A2D49540700F80448 /* ConsistencyManagerTestHelpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C0C67392D49540700F80448 /* ConsistencyManagerTestHelpers.swift */; }; 3C0EF49E28A1DBCB00E5434B /* OSUserInternalImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C0EF49D28A1DBCB00E5434B /* OSUserInternalImpl.swift */; }; 3C115165289A259500565C41 /* OneSignalOSCore.docc in Sources */ = {isa = PBXBuildFile; fileRef = 3C115164289A259500565C41 /* OneSignalOSCore.docc */; }; 3C115171289A259500565C41 /* OneSignalOSCore.h in Headers */ = {isa = PBXBuildFile; fileRef = 3C115163289A259500565C41 /* OneSignalOSCore.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -1282,6 +1283,7 @@ 3C0C67222D49469200F80448 /* MockMessagingController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MockMessagingController.m; sourceTree = ""; }; 3C0C672E2D49501D00F80448 /* UIApplication+OneSignal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UIApplication+OneSignal.h"; sourceTree = ""; }; 3C0C672F2D49501D00F80448 /* UIApplication+OneSignal.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UIApplication+OneSignal.m"; sourceTree = ""; }; + 3C0C67392D49540700F80448 /* ConsistencyManagerTestHelpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConsistencyManagerTestHelpers.swift; sourceTree = ""; }; 3C0EF49D28A1DBCB00E5434B /* OSUserInternalImpl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OSUserInternalImpl.swift; sourceTree = ""; }; 3C115161289A259500565C41 /* OneSignalOSCore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = OneSignalOSCore.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 3C115163289A259500565C41 /* OneSignalOSCore.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OneSignalOSCore.h; sourceTree = ""; }; @@ -2203,6 +2205,7 @@ isa = PBXGroup; children = ( 3C8544B82C5AEFF700F542A9 /* OneSignalOSCoreMocks.h */, + 3C0C67392D49540700F80448 /* ConsistencyManagerTestHelpers.swift */, 3C8544C22C5AF18B00F542A9 /* OSCoreMocks.swift */, 3CF11E3F2C6E6DE2002856F5 /* MockNewRecordsState.swift */, ); @@ -4320,6 +4323,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 3C0C673A2D49540700F80448 /* ConsistencyManagerTestHelpers.swift in Sources */, 3C8544C32C5AF18B00F542A9 /* OSCoreMocks.swift in Sources */, 3CF11E402C6E6DE2002856F5 /* MockNewRecordsState.swift in Sources */, ); diff --git a/iOS_SDK/OneSignalSDK/OneSignalOSCoreMocks/ConsistencyManagerTestHelpers.swift b/iOS_SDK/OneSignalSDK/OneSignalOSCoreMocks/ConsistencyManagerTestHelpers.swift new file mode 100644 index 000000000..53d105943 --- /dev/null +++ b/iOS_SDK/OneSignalSDK/OneSignalOSCoreMocks/ConsistencyManagerTestHelpers.swift @@ -0,0 +1,39 @@ +/* + Modified MIT License + + Copyright 2025 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 OneSignalOSCore + +public class ConsistencyManagerTestHelpers { + /// Unblocks the Consistency Manager, which allows fetching of IAMs for example. + public static func setDefaultRywToken(id: String) { + let key = OSIamFetchOffsetKey.userUpdate + let rywToken = "123" + let rywDelay: NSNumber = 0 + let rywData = OSReadYourWriteData(rywToken: rywToken, rywDelay: rywDelay) + OSConsistencyManager.shared.setRywTokenAndDelay(id: id, key: key, value: rywData) + } +} From 9de20c770966f66f7af30ef42b6d568a6be024d4 Mon Sep 17 00:00:00 2001 From: Nan Date: Tue, 28 Jan 2025 10:15:17 -0800 Subject: [PATCH 09/10] Add / migrate one existing IAM integration test * Attempt to migrate `testDisablingIAMs_stillCreatesMessageQueue_butPreventsMessageDisplay` to new tests, but behavior has changed. * It becomes `testPausingIAMs_doesNotCreateMessageQueue` --- .../IAMIntegrationTests.swift | 64 ++++++++++++++++--- .../InAppMessagingIntegrationTests.m | 1 + 2 files changed, 57 insertions(+), 8 deletions(-) diff --git a/iOS_SDK/OneSignalSDK/OneSignalInAppMessagesTests/IAMIntegrationTests.swift b/iOS_SDK/OneSignalSDK/OneSignalInAppMessagesTests/IAMIntegrationTests.swift index 119ef343d..4af25cffe 100644 --- a/iOS_SDK/OneSignalSDK/OneSignalInAppMessagesTests/IAMIntegrationTests.swift +++ b/iOS_SDK/OneSignalSDK/OneSignalInAppMessagesTests/IAMIntegrationTests.swift @@ -27,17 +27,65 @@ with services provided by OneSignal. import XCTest @testable import OneSignalInAppMessages +import OneSignalOSCore +import OneSignalUser +import OneSignalCoreMocks +import OneSignalOSCoreMocks +import OneSignalUserMocks +import OneSignalInAppMessagesMocks +/** + These tests can include some Obj-C InAppMessagingIntegrationTests migrations. + */ final class IAMIntegrationTests: XCTestCase { override func setUpWithError() throws { - // Put setup code here. This method is called before the invocation of each test method in the class. - } - override func tearDownWithError() throws { - // Put teardown code here. This method is called after the invocation of each test method in the class. - } - func testExample() throws { + OneSignalCoreMocks.clearUserDefaults() + OneSignalUserMocks.reset() + OSConsistencyManager.shared.reset() + // Temp. logging to help debug during testing OneSignalLog.setLogLevel(.LL_VERBOSE) - OneSignalInAppMessages.getFromServer("foobar") - // OSMessagingController.sharedInstance() + } + + override func tearDownWithError() throws { } + + /** + Pausing IAMs will not evaluate messages. + */ + func testPausingIAMs_doesNotCreateMessageQueue() throws { + /* Setup */ + + let client = MockOneSignalClient() + OneSignalCoreImpl.setSharedClient(client) + + // 1. App ID is set because there are guards against nil App ID + OneSignalConfigManager.setAppId("test-app-id") + + // 2. Set up mock responses for the anonymous user, as the user needs an OSID + MockUserRequests.setDefaultCreateAnonUserResponses(with: client) + + // 3. Set up mock responses for fetching IAMs + let message = IAMTestHelpers.testMessageJsonWithTrigger(property: "session_time", triggerId: "test_id1", type: 1, value: 10.0) + let response = IAMTestHelpers.testFetchMessagesResponse(messages: [message]) + client.setMockResponseForRequest( + request: "", + response: response) + + // 4. Unblock the Consistency Manager to allow fetching of IAMs + ConsistencyManagerTestHelpers.setDefaultRywToken(id: anonUserOSID) + + // 5. Pausing should prevent messages from being evaluated and shown + OneSignalInAppMessages.__paused(true) + + // 6. Start the user manager to generate a user instance + OneSignalUserManagerImpl.sharedInstance.start() + OneSignalCoreMocks.waitForBackgroundThreads(seconds: 0.5) + + // 7. Fetch IAMs + OneSignalInAppMessages.getFromServer(testPushSubId) + OneSignalCoreMocks.waitForBackgroundThreads(seconds: 0.5) + + // Make sure no IAM is showing, and the queue has no IAMs + XCTAssertFalse(MockMessagingController.isInAppMessageShowing()) + XCTAssertEqual(MockMessagingController.messageDisplayQueue().count, 0) } } diff --git a/iOS_SDK/OneSignalSDK/UnitTests/InAppMessagingIntegrationTests.m b/iOS_SDK/OneSignalSDK/UnitTests/InAppMessagingIntegrationTests.m index 9ae73b67f..0acdc59f7 100644 --- a/iOS_SDK/OneSignalSDK/UnitTests/InAppMessagingIntegrationTests.m +++ b/iOS_SDK/OneSignalSDK/UnitTests/InAppMessagingIntegrationTests.m @@ -1422,6 +1422,7 @@ of this software and associated documentation files (the "Software"), to deal // XCTAssertTrue(action.promptActions[1].hasPrompted); // } +/// ✅ Migrated to `testPausingIAMs_doesNotCreateMessageQueue`... This test statement below is no longer true as of `5.2.9`. // - (void)testDisablingIAMs_stillCreatesMessageQueue_butPreventsMessageDisplay { // let message = [OSInAppMessageTestHelper testMessageJsonWithTriggerPropertyName:OS_DYNAMIC_TRIGGER_KIND_SESSION_TIME withId:@"test_id1" withOperator:OSTriggerOperatorTypeLessThan withValue:@10.0]; // let registrationResponse = [OSInAppMessageTestHelper testRegistrationJsonWithMessages:@[message]]; From 1df97836aead29171cbd16d7739ec03a1286d6eb Mon Sep 17 00:00:00 2001 From: Nan Date: Wed, 12 Mar 2025 13:12:39 -0700 Subject: [PATCH 10/10] wip --- .../Controller/OSMessagingController.m | 2 +- .../IAMTestHelpers.swift | 24 ++++++++++++++---- .../IAMIntegrationTests.swift | 25 +++++++++++++++++-- .../InAppMessagingIntegrationTests.m | 2 +- .../Shadows/OSMessagingControllerOverrider.h | 1 + .../Shadows/OSMessagingControllerOverrider.m | 2 +- 6 files changed, 46 insertions(+), 10 deletions(-) diff --git a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSMessagingController.m b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSMessagingController.m index 17213b87a..48c4b1ac8 100644 --- a/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSMessagingController.m +++ b/iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSMessagingController.m @@ -165,7 +165,7 @@ + (OSMessagingController *)sharedInstance { return sharedInstance; } -// TODO: Used by tests only? Come back and see if this is needed. +/// Note: This method is used in tests only. + (void)removeInstance { sharedInstance = nil; once = 0; diff --git a/iOS_SDK/OneSignalSDK/OneSignalInAppMessagesMocks/IAMTestHelpers.swift b/iOS_SDK/OneSignalSDK/OneSignalInAppMessagesMocks/IAMTestHelpers.swift index 449c8ca22..e453f4d54 100644 --- a/iOS_SDK/OneSignalSDK/OneSignalInAppMessagesMocks/IAMTestHelpers.swift +++ b/iOS_SDK/OneSignalSDK/OneSignalInAppMessagesMocks/IAMTestHelpers.swift @@ -36,6 +36,9 @@ let OS_DUMMY_HTML = "

Hello World

" @objc public class IAMTestHelpers: NSObject { + + static var messageIdIncrementer = 0 + /// Convert OSTriggerOperatorType enum to string private static func OS_OPERATOR_TO_STRING(_ type: Int32) -> String { // Trigger operator strings @@ -54,10 +57,12 @@ public class IAMTestHelpers: NSObject { return OS_OPERATOR_STRINGS[Int(type)] } + /// Returns the JSON of a minimal in-app message that can be used as a building block. @objc - public static func testDefaultMessageJson() -> [String: Any] { + public static func defaultMessageJson() -> [String: Any] { + messageIdIncrementer += 1 return [ - "id": String(format: "%@_%i", OS_TEST_MESSAGE_ID, UUID().uuidString), + "id": String(format: "%@_%i", OS_TEST_MESSAGE_ID, messageIdIncrementer), "variants": [ "ios": [ "default": OS_TEST_MESSAGE_VARIANT_ID, @@ -71,9 +76,10 @@ public class IAMTestHelpers: NSObject { ] } + /// Returns the JSON of an in-app message with trigger. @objc - public static func testMessageJsonWithTrigger(property: String, triggerId: String, type: Int32, value: Any) -> [String: Any] { - var testMessage = self.testDefaultMessageJson() + public static func messageWithTriggerJson(property: String, triggerId: String, type: Int32, value: Any) -> [String: Any] { + var testMessage = self.defaultMessageJson() testMessage["triggers"] = [ [ @@ -90,9 +96,17 @@ public class IAMTestHelpers: NSObject { } @objc - public static func testFetchMessagesResponse(messages: [[String: Any]]) -> [String: Any] { + public static func fetchMessagesResponse(messages: [[String: Any]]) -> [String: Any] { return [ "in_app_messages": messages ] } + + /// Returns the JSON of a preview or test in-app message. + @objc + public static func testMessagePreviewJson() -> [String: Any] { + var message = self.defaultMessageJson() + message["is_preview"] = true + return message + } } diff --git a/iOS_SDK/OneSignalSDK/OneSignalInAppMessagesTests/IAMIntegrationTests.swift b/iOS_SDK/OneSignalSDK/OneSignalInAppMessagesTests/IAMIntegrationTests.swift index 4af25cffe..5338cdbf3 100644 --- a/iOS_SDK/OneSignalSDK/OneSignalInAppMessagesTests/IAMIntegrationTests.swift +++ b/iOS_SDK/OneSignalSDK/OneSignalInAppMessagesTests/IAMIntegrationTests.swift @@ -48,6 +48,27 @@ final class IAMIntegrationTests: XCTestCase { override func tearDownWithError() throws { } + /* + + - (void)testPreviewIAMIsDisplayedOnPause { + [OneSignal pauseInAppMessages:true]; + + let message = [OSInAppMessageTestHelper testMessageWithPreview]; + + [self initOneSignalWithInAppMessage:message]; + + XCTAssertTrue(OSMessagingControllerOverrider.isInAppMessageShowing); + } + */ + + + /** + Test IAMs should display even when IAMs are paused. + */ + func testPreviewIAMIsDisplayedOnPause() throws { + OneSignalInAppMessages.__paused(true) + } + /** Pausing IAMs will not evaluate messages. */ @@ -64,8 +85,8 @@ final class IAMIntegrationTests: XCTestCase { MockUserRequests.setDefaultCreateAnonUserResponses(with: client) // 3. Set up mock responses for fetching IAMs - let message = IAMTestHelpers.testMessageJsonWithTrigger(property: "session_time", triggerId: "test_id1", type: 1, value: 10.0) - let response = IAMTestHelpers.testFetchMessagesResponse(messages: [message]) + let message = IAMTestHelpers.messageWithTriggerJson(property: "session_time", triggerId: "test_id1", type: 1, value: 10.0) + let response = IAMTestHelpers.fetchMessagesResponse(messages: [message]) client.setMockResponseForRequest( request: "", response: response) diff --git a/iOS_SDK/OneSignalSDK/UnitTests/InAppMessagingIntegrationTests.m b/iOS_SDK/OneSignalSDK/UnitTests/InAppMessagingIntegrationTests.m index 0acdc59f7..5e64e9bfa 100644 --- a/iOS_SDK/OneSignalSDK/UnitTests/InAppMessagingIntegrationTests.m +++ b/iOS_SDK/OneSignalSDK/UnitTests/InAppMessagingIntegrationTests.m @@ -117,7 +117,7 @@ of this software and associated documentation files (the "Software"), to deal // OneSignalOverrider.shouldOverrideSessionLaunchTime = false; -// [OSMessagingController.sharedInstance resetState]; +// [OSMessagingController.sharedInstance in]; // NSTimerOverrider.shouldScheduleTimers = true; // } diff --git a/iOS_SDK/OneSignalSDK/UnitTests/Shadows/OSMessagingControllerOverrider.h b/iOS_SDK/OneSignalSDK/UnitTests/Shadows/OSMessagingControllerOverrider.h index 32cb38a30..3f56bdc9b 100644 --- a/iOS_SDK/OneSignalSDK/UnitTests/Shadows/OSMessagingControllerOverrider.h +++ b/iOS_SDK/OneSignalSDK/UnitTests/Shadows/OSMessagingControllerOverrider.h @@ -47,6 +47,7 @@ NS_ASSUME_NONNULL_BEGIN - (void)resetState; - (void)messageViewDidSelectAction:(OSInAppMessageInternal *)message withAction:(OSInAppMessageClickResult *)action; +- (void)messageViewImpressionRequest:(OSInAppMessageInternal *)message; - (void)persistInAppMessageForRedisplay:(OSInAppMessageInternal *)message; - (void)messageViewControllerWasDismissed:(OSInAppMessageInternal *)message displayed:(BOOL)displayed; - (void)setLastTimeGenerator:(NSTimeInterval(^)(void))dateGenerator; diff --git a/iOS_SDK/OneSignalSDK/UnitTests/Shadows/OSMessagingControllerOverrider.m b/iOS_SDK/OneSignalSDK/UnitTests/Shadows/OSMessagingControllerOverrider.m index 239700648..9d3d1d406 100644 --- a/iOS_SDK/OneSignalSDK/UnitTests/Shadows/OSMessagingControllerOverrider.m +++ b/iOS_SDK/OneSignalSDK/UnitTests/Shadows/OSMessagingControllerOverrider.m @@ -112,7 +112,7 @@ - (void)overrideShowMessage:(OSInAppMessageInternal *)message { - (void)overrideWebViewContentFinishedLoading:(OSInAppMessageInternal *)message { if (message) { - // [OSMessagingController.sharedInstance messageViewImpressionRequest:message]; + [OSMessagingController.sharedInstance messageViewImpressionRequest:message]; } }