From ade11c6b125ce26c2300cd9c0671162b5851cade Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Fri, 4 Apr 2025 13:34:27 -0700 Subject: [PATCH 1/3] [FCM] Fix cases of multiple stubs on the same method on a mock --- .../UnitTests/FIRMessagingRemoteNotificationsProxyTest.m | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/FirebaseMessaging/Tests/UnitTests/FIRMessagingRemoteNotificationsProxyTest.m b/FirebaseMessaging/Tests/UnitTests/FIRMessagingRemoteNotificationsProxyTest.m index 846f428ddf2..dc973219040 100644 --- a/FirebaseMessaging/Tests/UnitTests/FIRMessagingRemoteNotificationsProxyTest.m +++ b/FirebaseMessaging/Tests/UnitTests/FIRMessagingRemoteNotificationsProxyTest.m @@ -128,6 +128,7 @@ @interface FIRMessagingRemoteNotificationsProxyTest : XCTestCase @property(nonatomic, strong) id mockProxyClass; @property(nonatomic, strong) id mockMessaging; @property(nonatomic, strong) id mockUserNotificationCenter; +@property(nonatomic, strong) UNUserNotificationCenter *currentNotificationCenter; @end @@ -147,8 +148,13 @@ - (void)setUp { OCMStub([_mockProxyClass sharedProxy]).andReturn(self.proxy); if (@available(macOS 10.14, iOS 10.0, *)) { _mockUserNotificationCenter = OCMClassMock([UNUserNotificationCenter class]); + _currentNotificationCenter = _mockUserNotificationCenter; OCMStub([_mockUserNotificationCenter currentNotificationCenter]) - .andReturn(_mockUserNotificationCenter); + .andDo(^(NSInvocation *invocation) { + __autoreleasing UNUserNotificationCenter *currentNotificationCenter = + _currentNotificationCenter; + [invocation setReturnValue:¤tNotificationCenter]; + }); } } From 2260c0c59e9e6540d9e97052cae3786bdce496cc Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Fri, 4 Apr 2025 13:48:09 -0700 Subject: [PATCH 2/3] Fix build warning --- .../Tests/UnitTests/FIRMessagingRemoteNotificationsProxyTest.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FirebaseMessaging/Tests/UnitTests/FIRMessagingRemoteNotificationsProxyTest.m b/FirebaseMessaging/Tests/UnitTests/FIRMessagingRemoteNotificationsProxyTest.m index dc973219040..f99108395d6 100644 --- a/FirebaseMessaging/Tests/UnitTests/FIRMessagingRemoteNotificationsProxyTest.m +++ b/FirebaseMessaging/Tests/UnitTests/FIRMessagingRemoteNotificationsProxyTest.m @@ -152,7 +152,7 @@ - (void)setUp { OCMStub([_mockUserNotificationCenter currentNotificationCenter]) .andDo(^(NSInvocation *invocation) { __autoreleasing UNUserNotificationCenter *currentNotificationCenter = - _currentNotificationCenter; + self->_currentNotificationCenter; [invocation setReturnValue:¤tNotificationCenter]; }); } From b9896bdc85dcd70c9ed55a5686f0c4ffa5b00b1c Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Fri, 4 Apr 2025 13:55:24 -0700 Subject: [PATCH 3/3] style --- .../Tests/UnitTests/FIRMessagingRemoteNotificationsProxyTest.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FirebaseMessaging/Tests/UnitTests/FIRMessagingRemoteNotificationsProxyTest.m b/FirebaseMessaging/Tests/UnitTests/FIRMessagingRemoteNotificationsProxyTest.m index f99108395d6..3233358a2d0 100644 --- a/FirebaseMessaging/Tests/UnitTests/FIRMessagingRemoteNotificationsProxyTest.m +++ b/FirebaseMessaging/Tests/UnitTests/FIRMessagingRemoteNotificationsProxyTest.m @@ -152,7 +152,7 @@ - (void)setUp { OCMStub([_mockUserNotificationCenter currentNotificationCenter]) .andDo(^(NSInvocation *invocation) { __autoreleasing UNUserNotificationCenter *currentNotificationCenter = - self->_currentNotificationCenter; + self->_currentNotificationCenter; [invocation setReturnValue:¤tNotificationCenter]; }); }