Skip to content

Commit 34b0216

Browse files
Fix nightly build (#8551)
1 parent d938383 commit 34b0216

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

FirebaseMessaging/Tests/UnitTests/FIRMessagingAuthServiceTest.m

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ @interface FIRMessagingAuthService (ExposedForTest)
3838
NSMutableArray<FIRMessagingDeviceCheckinCompletion> *checkinHandlers;
3939
@property(nonatomic, readwrite, strong) FIRMessagingCheckinService *checkinService;
4040
@property(nonatomic, readwrite, strong) FIRMessagingCheckinStore *checkinStore;
41+
@property(nonatomic, readwrite, strong) FIRMessagingCheckinPreferences *checkinPreferences;
4142
@end
4243

4344
@interface FIRMessagingAuthServiceTest : XCTestCase
@@ -56,8 +57,12 @@ - (void)setUp {
5657
[super setUp];
5758
_authService = [[FIRMessagingAuthService alloc] init];
5859
_mockStore = OCMPartialMock(_authService.checkinStore);
59-
6060
_mockCheckinService = OCMPartialMock(_authService.checkinService);
61+
// Ensure cached checkin is reset when testing initial checkin call.
62+
FIRMessagingCheckinPreferences *preferences =
63+
[[FIRMessagingCheckinPreferences alloc] initWithDeviceID:@"" secretToken:@""];
64+
_authService.checkinPreferences = preferences;
65+
6166
// The tests here are to focus on checkin interval not locale change, so always set locale as
6267
// non-changed.
6368
[[NSUserDefaults standardUserDefaults] setObject:FIRMessagingCurrentLocale()
@@ -81,7 +86,7 @@ - (void)testScheduleCheckin_initialSuccess {
8186
FIRMessagingCheckinPreferences *checkinPreferences = [self validCheckinPreferences];
8287

8388
OCMStub([self.mockCheckinService
84-
checkinWithExistingCheckin:self.checkinService.checkinPreferences
89+
checkinWithExistingCheckin:[OCMArg any]
8590
completion:([OCMArg checkWithBlock:^BOOL(id obj) {
8691
[checkinExpectation fulfill];
8792
self.checkinCompletion = obj;
@@ -110,7 +115,7 @@ - (void)testScheduleCheckin_successButFailureInSaving {
110115
[self expectationWithDescription:@"Did receive error after checkin"];
111116

112117
FIRMessagingCheckinPreferences *checkinPreferences = [self validCheckinPreferences];
113-
OCMStub([self.mockCheckinService checkinWithExistingCheckin:self.checkinService.checkinPreferences
118+
OCMStub([self.mockCheckinService checkinWithExistingCheckin:[OCMArg any]
114119
completion:[OCMArg checkWithBlock:^BOOL(id obj) {
115120
[checkinFailureExpectation fulfill];
116121
self.checkinCompletion = obj;
@@ -140,7 +145,7 @@ - (void)testMultipleScheduleCheckin_immediately {
140145
__block int checkinHandlerInvocationCount = 0;
141146

142147
FIRMessagingCheckinPreferences *checkinPreferences = [self validCheckinPreferences];
143-
OCMStub([self.mockCheckinService checkinWithExistingCheckin:self.checkinService.checkinPreferences
148+
OCMStub([self.mockCheckinService checkinWithExistingCheckin:[OCMArg any]
144149
completion:[OCMArg checkWithBlock:^BOOL(id obj) {
145150
self.checkinCompletion = obj;
146151
return obj != nil;
@@ -184,7 +189,7 @@ - (void)testMultipleScheduleCheckin_notImmediately {
184189
[self expectationWithDescription:@"Did call checkin service"];
185190

186191
FIRMessagingCheckinPreferences *checkinPreferences = [self validCheckinPreferences];
187-
OCMStub([self.mockCheckinService checkinWithExistingCheckin:self.checkinService.checkinPreferences
192+
OCMStub([self.mockCheckinService checkinWithExistingCheckin:[OCMArg any]
188193
completion:[OCMArg checkWithBlock:^BOOL(id obj) {
189194
self.checkinCompletion = obj;
190195
return obj != nil;

0 commit comments

Comments
 (0)