From fcc2aabae8eb4c3441a64834c12ed76d5cfd99db Mon Sep 17 00:00:00 2001
From: Chen Liang <chliang@google.com>
Date: Tue, 19 Nov 2019 19:21:26 -0800
Subject: [PATCH] Fix a few misuse of OCMock in Messaging and InstanceID
 (#4363)

---
 Example/InstanceID/Tests/FIRInstanceIDStoreTest.m    | 2 +-
 Example/InstanceID/Tests/FIRInstanceIDTest.m         | 2 +-
 Example/Messaging/Tests/FIRMessagingConnectionTest.m | 5 +++--
 FirebaseInstanceID.podspec                           | 2 +-
 FirebaseMessaging.podspec                            | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Example/InstanceID/Tests/FIRInstanceIDStoreTest.m b/Example/InstanceID/Tests/FIRInstanceIDStoreTest.m
index fc3b5da167..238a3462ee 100644
--- a/Example/InstanceID/Tests/FIRInstanceIDStoreTest.m
+++ b/Example/InstanceID/Tests/FIRInstanceIDStoreTest.m
@@ -248,7 +248,7 @@ static NSString *const kSecret = @"test-secret";
   [[niceMockCheckinStore reject]
       removeCheckinPreferencesWithHandler:[OCMArg invokeBlockWithArgs:[NSNull null], nil]];
   // Always setting up stub after expect.
-  OCMStub([_checkinStore cachedCheckinPreferences]).andReturn(nil);
+  OCMStub([_mockCheckinStore cachedCheckinPreferences]).andReturn(nil);
 
   [_instanceIDStore resetCredentialsIfNeeded];
   OCMVerifyAll(niceMockCheckinStore);
diff --git a/Example/InstanceID/Tests/FIRInstanceIDTest.m b/Example/InstanceID/Tests/FIRInstanceIDTest.m
index eb19bde46a..07dc4f4b0f 100644
--- a/Example/InstanceID/Tests/FIRInstanceIDTest.m
+++ b/Example/InstanceID/Tests/FIRInstanceIDTest.m
@@ -578,8 +578,8 @@ static NSString *const kGoogleAppID = @"1:123:ios:123abc";
 
   OCMExpect([self.mockInstanceID defaultTokenWithHandler:nil]);
   XCTAssertNil([self.mockInstanceID token]);
-  [self.mockInstanceID stopMocking];
   OCMVerify([self.mockInstanceID defaultTokenWithHandler:nil]);
+  [self.mockInstanceID stopMocking];
 }
 
 /**
diff --git a/Example/Messaging/Tests/FIRMessagingConnectionTest.m b/Example/Messaging/Tests/FIRMessagingConnectionTest.m
index 2183b1dc17..dbb0661101 100644
--- a/Example/Messaging/Tests/FIRMessagingConnectionTest.m
+++ b/Example/Messaging/Tests/FIRMessagingConnectionTest.m
@@ -207,8 +207,8 @@ static FIRMessagingProtoTag currentProtoSendTag;
          rmqId:[OCMArg isNil]];
 
   // swizzle disconnect socket
-  OCMVerify([[[socketMock stub] andCall:@selector(_disconnectSocket)
-                               onObject:self] disconnect]);
+  [[[socketMock stub] andCall:@selector(_disconnectSocket)
+                     onObject:self] disconnect];
 
   currentProtoSendTag = kFIRMessagingProtoTagLoginRequest;
   // send login request
@@ -217,6 +217,7 @@ static FIRMessagingProtoTag currentProtoSendTag;
   // verify login request sent
   XCTAssertEqual(1, self.fakeConnection.outStreamId);
   XCTAssertTrue(self.didSuccessfullySendData);
+  [socketMock verify];
 }
 
 - (void)testLoginRequest_withPendingMessagesInRmq {
diff --git a/FirebaseInstanceID.podspec b/FirebaseInstanceID.podspec
index f6206787cb..9d20e3d5fd 100644
--- a/FirebaseInstanceID.podspec
+++ b/FirebaseInstanceID.podspec
@@ -44,7 +44,7 @@ services.
   s.test_spec 'unit' do |unit_tests|
     unit_tests.source_files = 'Example/InstanceID/Tests/*.[mh]'
     unit_tests.requires_app_host = true
-    unit_tests.dependency 'OCMock', '~> 3.4.0'
+    unit_tests.dependency 'OCMock'
     unit_tests.pod_target_xcconfig = {
       # Unit tests do library imports using repo-root relative paths.
       'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}"',
diff --git a/FirebaseMessaging.podspec b/FirebaseMessaging.podspec
index 237fadd450..ab6d361f1d 100644
--- a/FirebaseMessaging.podspec
+++ b/FirebaseMessaging.podspec
@@ -57,6 +57,6 @@ device, and it is completely free.
     unit_tests.pod_target_xcconfig = {
      'CLANG_ENABLE_OBJC_WEAK' => 'YES'
     }
-    unit_tests.dependency 'OCMock', '~> 3.4.0'
+    unit_tests.dependency 'OCMock'
   end
 end