Clean up mix of OCMock V2 and V3 syntax (#11032)

Author: paulb777

FirebaseCore/Tests/Unit/FIRBundleUtilTest.m

@@ -44,7 +44,7 @@ - (void)testRelevantBundles_mainIsFirst {
 // once the use-case is understood.
 
 - (void)testFindOptionsDictionaryPath {
-  [OCMStub([self.mockBundle pathForResource:kResourceName ofType:kFileType]) andReturn:kResultPath];
+  OCMStub([self.mockBundle pathForResource:kResourceName ofType:kFileType]).andReturn(kResultPath);
   XCTAssertEqualObjects([FIRBundleUtil optionsDictionaryPathWithResourceName:kResourceName
                                                                  andFileType:kFileType
                                                                    inBundles:@[ self.mockBundle ]],
@@ -59,7 +59,7 @@ - (void)testFindOptionsDictionaryPath_notFound {
 
 - (void)testFindOptionsDictionaryPath_secondBundle {
   NSBundle *mockBundleEmpty = OCMClassMock([NSBundle class]);
-  [OCMStub([self.mockBundle pathForResource:kResourceName ofType:kFileType]) andReturn:kResultPath];
+  OCMStub([self.mockBundle pathForResource:kResourceName ofType:kFileType]).andReturn(kResultPath);
 
   NSArray *bundles = @[ mockBundleEmpty, self.mockBundle ];
   XCTAssertEqualObjects([FIRBundleUtil optionsDictionaryPathWithResourceName:kResourceName
@@ -70,12 +70,12 @@ - (void)testFindOptionsDictionaryPath_secondBundle {
 
 - (void)testBundleIdentifierExistsInBundles {
   NSString *bundleID = @"com.google.test";
-  [OCMStub([self.mockBundle bundleIdentifier]) andReturn:bundleID];
+  OCMStub([self.mockBundle bundleIdentifier]).andReturn(bundleID);
   XCTAssertTrue([FIRBundleUtil hasBundleIdentifierPrefix:bundleID inBundles:@[ self.mockBundle ]]);
 }
 
 - (void)testBundleIdentifierExistsInBundles_notExist {
-  [OCMStub([self.mockBundle bundleIdentifier]) andReturn:@"com.google.test"];
+  OCMStub([self.mockBundle bundleIdentifier]).andReturn(@"com.google.test");
   XCTAssertFalse([FIRBundleUtil hasBundleIdentifierPrefix:@"not-exist"
                                                 inBundles:@[ self.mockBundle ]]);
 }
@@ -89,7 +89,7 @@ - (void)testBundleIdentifierHasPrefixInBundlesForExtension {
   [[[environmentUtilsMock stub] andReturnValue:@(YES)] isAppExtension];
 
   // Mock bundle should have what app extension has, the extension bundle ID.
-  [OCMStub([self.mockBundle bundleIdentifier]) andReturn:@"com.google.test.someextension"];
+  OCMStub([self.mockBundle bundleIdentifier]).andReturn(@"com.google.test.someextension");
   XCTAssertTrue([FIRBundleUtil hasBundleIdentifierPrefix:@"com.google.test"
                                                inBundles:@[ self.mockBundle ]]);
 
@@ -101,7 +101,7 @@ - (void)testBundleIdentifierExistsInBundlesForExtensions_exactMatch {
   [[[environmentUtilsMock stub] andReturnValue:@(YES)] isAppExtension];
 
   // Mock bundle should have what app extension has, the extension bundle ID.
-  [OCMStub([self.mockBundle bundleIdentifier]) andReturn:@"com.google.test.someextension"];
+  OCMStub([self.mockBundle bundleIdentifier]).andReturn(@"com.google.test.someextension");
   XCTAssertTrue([FIRBundleUtil hasBundleIdentifierPrefix:@"com.google.test.someextension"
                                                inBundles:@[ self.mockBundle ]]);
 
@@ -112,19 +112,19 @@ - (void)testBundleIdentifierHasPrefixInBundlesNotValidExtension {
   id environmentUtilsMock = [OCMockObject mockForClass:[GULAppEnvironmentUtil class]];
   [[[environmentUtilsMock stub] andReturnValue:@(YES)] isAppExtension];
 
-  [OCMStub([self.mockBundle bundleIdentifier]) andReturn:@"com.google.test.someextension.some"];
+  OCMStub([self.mockBundle bundleIdentifier]).andReturn(@"com.google.test.someextension.some");
   XCTAssertFalse([FIRBundleUtil hasBundleIdentifierPrefix:@"com.google.test"
                                                 inBundles:@[ self.mockBundle ]]);
 
-  [OCMStub([self.mockBundle bundleIdentifier]) andReturn:@"com.google.testsomeextension"];
+  OCMStub([self.mockBundle bundleIdentifier]).andReturn(@"com.google.testsomeextension");
   XCTAssertFalse([FIRBundleUtil hasBundleIdentifierPrefix:@"com.google.test"
                                                 inBundles:@[ self.mockBundle ]]);
 
-  [OCMStub([self.mockBundle bundleIdentifier]) andReturn:@"com.google.testsomeextension.some"];
+  OCMStub([self.mockBundle bundleIdentifier]).andReturn(@"com.google.testsomeextension.some");
   XCTAssertFalse([FIRBundleUtil hasBundleIdentifierPrefix:@"com.google.test"
                                                 inBundles:@[ self.mockBundle ]]);
 
-  [OCMStub([self.mockBundle bundleIdentifier]) andReturn:@"not-exist"];
+  OCMStub([self.mockBundle bundleIdentifier]).andReturn(@"not-exist");
   XCTAssertFalse([FIRBundleUtil hasBundleIdentifierPrefix:@"com.google.test"
                                                 inBundles:@[ self.mockBundle ]]);
 

FirebaseCore/Tests/Unit/FIROptionsTest.m

@@ -57,19 +57,19 @@ - (void)testInit {
 
 - (void)testDefaultOptionsDictionaryWithNilFilePath {
   id mockBundleUtil = OCMClassMock([FIRBundleUtil class]);
-  [OCMStub([mockBundleUtil optionsDictionaryPathWithResourceName:kServiceInfoFileName
-                                                     andFileType:kServiceInfoFileType
-                                                       inBundles:[FIRBundleUtil relevantBundles]])
-      andReturn:nil];
+  OCMStub([mockBundleUtil optionsDictionaryPathWithResourceName:kServiceInfoFileName
+                                                    andFileType:kServiceInfoFileType
+                                                      inBundles:[FIRBundleUtil relevantBundles]])
+      .andReturn(nil);
   XCTAssertNil([FIROptions defaultOptionsDictionary]);
 }
 
 - (void)testDefaultOptionsDictionaryWithInvalidSourceFile {
   id mockBundleUtil = OCMClassMock([FIRBundleUtil class]);
-  [OCMStub([mockBundleUtil optionsDictionaryPathWithResourceName:kServiceInfoFileName
-                                                     andFileType:kServiceInfoFileType
-                                                       inBundles:[FIRBundleUtil relevantBundles]])
-      andReturn:@"invalid.plist"];
+  OCMStub([mockBundleUtil optionsDictionaryPathWithResourceName:kServiceInfoFileName
+                                                    andFileType:kServiceInfoFileType
+                                                      inBundles:[FIRBundleUtil relevantBundles]])
+      .andReturn(@"invalid.plist");
   XCTAssertNil([FIROptions defaultOptionsDictionary]);
 }