@@ -38,6 +38,7 @@ @interface FIRMessagingAuthService (ExposedForTest)
38
38
NSMutableArray <FIRMessagingDeviceCheckinCompletion> *checkinHandlers;
39
39
@property (nonatomic , readwrite , strong ) FIRMessagingCheckinService *checkinService;
40
40
@property (nonatomic , readwrite , strong ) FIRMessagingCheckinStore *checkinStore;
41
+ @property (nonatomic , readwrite , strong ) FIRMessagingCheckinPreferences *checkinPreferences;
41
42
@end
42
43
43
44
@interface FIRMessagingAuthServiceTest : XCTestCase
@@ -56,8 +57,12 @@ - (void)setUp {
56
57
[super setUp ];
57
58
_authService = [[FIRMessagingAuthService alloc ] init ];
58
59
_mockStore = OCMPartialMock (_authService.checkinStore );
59
-
60
60
_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
+
61
66
// The tests here are to focus on checkin interval not locale change, so always set locale as
62
67
// non-changed.
63
68
[[NSUserDefaults standardUserDefaults ] setObject: FIRMessagingCurrentLocale ()
@@ -81,7 +86,7 @@ - (void)testScheduleCheckin_initialSuccess {
81
86
FIRMessagingCheckinPreferences *checkinPreferences = [self validCheckinPreferences ];
82
87
83
88
OCMStub ([self .mockCheckinService
84
- checkinWithExistingCheckin: self .checkinService.checkinPreferences
89
+ checkinWithExistingCheckin: [OCMArg any ]
85
90
completion: ([OCMArg checkWithBlock: ^BOOL (id obj) {
86
91
[checkinExpectation fulfill ];
87
92
self.checkinCompletion = obj;
@@ -110,7 +115,7 @@ - (void)testScheduleCheckin_successButFailureInSaving {
110
115
[self expectationWithDescription: @" Did receive error after checkin" ];
111
116
112
117
FIRMessagingCheckinPreferences *checkinPreferences = [self validCheckinPreferences ];
113
- OCMStub ([self .mockCheckinService checkinWithExistingCheckin: self .checkinService.checkinPreferences
118
+ OCMStub ([self .mockCheckinService checkinWithExistingCheckin: [OCMArg any ]
114
119
completion: [OCMArg checkWithBlock: ^BOOL (id obj) {
115
120
[checkinFailureExpectation fulfill ];
116
121
self.checkinCompletion = obj;
@@ -140,7 +145,7 @@ - (void)testMultipleScheduleCheckin_immediately {
140
145
__block int checkinHandlerInvocationCount = 0 ;
141
146
142
147
FIRMessagingCheckinPreferences *checkinPreferences = [self validCheckinPreferences ];
143
- OCMStub ([self .mockCheckinService checkinWithExistingCheckin: self .checkinService.checkinPreferences
148
+ OCMStub ([self .mockCheckinService checkinWithExistingCheckin: [OCMArg any ]
144
149
completion: [OCMArg checkWithBlock: ^BOOL (id obj) {
145
150
self.checkinCompletion = obj;
146
151
return obj != nil ;
@@ -184,7 +189,7 @@ - (void)testMultipleScheduleCheckin_notImmediately {
184
189
[self expectationWithDescription: @" Did call checkin service" ];
185
190
186
191
FIRMessagingCheckinPreferences *checkinPreferences = [self validCheckinPreferences ];
187
- OCMStub ([self .mockCheckinService checkinWithExistingCheckin: self .checkinService.checkinPreferences
192
+ OCMStub ([self .mockCheckinService checkinWithExistingCheckin: [OCMArg any ]
188
193
completion: [OCMArg checkWithBlock: ^BOOL (id obj) {
189
194
self.checkinCompletion = obj;
190
195
return obj != nil ;
0 commit comments