Migrate back to unforked OCMock for SPM (firebase#8042)

MojtabaHs · May 11, 2021 · fd36167 · fd36167
1 parent 1c72498
commit fd36167
Show file tree

Hide file tree

Showing 67 changed files with 69 additions and 69 deletions.
diff --git a/FirebaseABTesting/Tests/Unit/ABTConditionalUserPropertyControllerTest.m b/FirebaseABTesting/Tests/Unit/ABTConditionalUserPropertyControllerTest.m
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#import <OCMock/OCMock.h>
 #import <XCTest/XCTest.h>
-#import "OCMock.h"
 
 #import "FirebaseABTesting/Sources/ABTConditionalUserPropertyController.h"
 #import "FirebaseABTesting/Sources/ABTConstants.h"

diff --git a/FirebaseABTesting/Tests/Unit/FIRExperimentControllerTest.m b/FirebaseABTesting/Tests/Unit/FIRExperimentControllerTest.m
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#import <OCMock/OCMock.h>
 #import <XCTest/XCTest.h>
-#import "OCMock.h"
 
 #import "FirebaseABTesting/Sources/ABTConditionalUserPropertyController.h"
 #import "FirebaseABTesting/Sources/ABTConstants.h"

diff --git a/FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckAPIServiceTests.m b/FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckAPIServiceTests.m
@@ -16,8 +16,8 @@
 
 #import <XCTest/XCTest.h>
 
+#import <OCMock/OCMock.h>
 #import "FBLPromise+Testing.h"
-#import "OCMock.h"
 
 #import <GoogleUtilities/GULURLSessionDataResponse.h>
 #import <GoogleUtilities/NSURLSession+GULPromises.h>

diff --git a/FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckIntegrationTests.m b/FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckIntegrationTests.m
@@ -16,7 +16,7 @@
 
 #import <XCTest/XCTest.h>
 
-#import "OCMock.h"
+#import <OCMock/OCMock.h>
 
 #import "FirebaseAppCheck/Sources/Core/TokenRefresh/FIRAppCheckTokenRefresher.h"
 #import "FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppCheck.h"

diff --git a/FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckSettingsTests.m b/FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckSettingsTests.m
@@ -16,7 +16,7 @@
 
 #import <XCTest/XCTest.h>
 
-#import "OCMock.h"
+#import <OCMock/OCMock.h>
 
 #import "FirebaseAppCheck/Sources/Core/FIRAppCheckSettings.h"
 

diff --git a/FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckStorageTests.m b/FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckStorageTests.m
@@ -18,8 +18,8 @@
 
 #import "FirebaseAppCheck/Sources/Core/Storage/FIRAppCheckStorage.h"
 
+#import <OCMock/OCMock.h>
 #import "FBLPromise+Testing.h"
-#import "OCMock.h"
 
 #import "FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppCheckToken.h"
 

diff --git a/FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckTests.m b/FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckTests.m
@@ -16,7 +16,7 @@
 
 #import <XCTest/XCTest.h>
 
-#import "OCMock.h"
+#import <OCMock/OCMock.h>
 
 #import "FBLPromise+Testing.h"
 

diff --git a/FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckTokenRefresherTests.m b/FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckTokenRefresherTests.m
@@ -16,7 +16,7 @@
 
 #import <XCTest/XCTest.h>
 
-#import "OCMock.h"
+#import <OCMock/OCMock.h>
 
 #import "FirebaseAppCheck/Sources/Core/FIRAppCheckSettings.h"
 #import "FirebaseAppCheck/Sources/Core/TokenRefresh/FIRAppCheckTokenRefresher.h"

diff --git a/FirebaseAppCheck/Tests/Unit/DebugProvider/FIRAppCheckDebugProviderAPIServiceTests.m b/FirebaseAppCheck/Tests/Unit/DebugProvider/FIRAppCheckDebugProviderAPIServiceTests.m
@@ -16,8 +16,8 @@
 
 #import <XCTest/XCTest.h>
 
+#import <OCMock/OCMock.h>
 #import "FBLPromise+Testing.h"
-#import "OCMock.h"
 
 #import <FirebaseAppCheck/FirebaseAppCheck.h>
 #import <GoogleUtilities/GULURLSessionDataResponse.h>

diff --git a/FirebaseAppCheck/Tests/Unit/DebugProvider/FIRAppCheckDebugProviderTests.m b/FirebaseAppCheck/Tests/Unit/DebugProvider/FIRAppCheckDebugProviderTests.m
@@ -16,8 +16,8 @@
 
 #import <XCTest/XCTest.h>
 
+#import <OCMock/OCMock.h>
 #import "FBLPromise+Testing.h"
-#import "OCMock.h"
 
 #import "FirebaseAppCheck/Sources/DebugProvider/API/FIRAppCheckDebugProviderAPIService.h"
 #import "FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppCheckDebugProvider.h"

diff --git a/FirebaseAppCheck/Tests/Unit/DeviceCheckProvider/FIRDeviceCheckAPIServiceTests.m b/FirebaseAppCheck/Tests/Unit/DeviceCheckProvider/FIRDeviceCheckAPIServiceTests.m
@@ -16,8 +16,8 @@
 
 #import <XCTest/XCTest.h>
 
+#import <OCMock/OCMock.h>
 #import "FBLPromise+Testing.h"
-#import "OCMock.h"
 
 #import <FirebaseAppCheck/FirebaseAppCheck.h>
 #import <GoogleUtilities/GULURLSessionDataResponse.h>

diff --git a/FirebaseAppCheck/Tests/Unit/DeviceCheckProvider/FIRDeviceCheckProviderTests.m b/FirebaseAppCheck/Tests/Unit/DeviceCheckProvider/FIRDeviceCheckProviderTests.m
@@ -16,8 +16,8 @@
 
 #import <XCTest/XCTest.h>
 
+#import <OCMock/OCMock.h>
 #import "FBLPromise+Testing.h"
-#import "OCMock.h"
 
 #import "FirebaseAppCheck/Sources/DeviceCheckProvider/API/FIRDeviceCheckAPIService.h"
 #import "FirebaseAppCheck/Sources/DeviceCheckProvider/FIRDeviceCheckTokenGenerator.h"

diff --git a/FirebaseAppDistribution/Tests/Unit/FIRAppDistributionTests.m b/FirebaseAppDistribution/Tests/Unit/FIRAppDistributionTests.m
@@ -13,8 +13,8 @@
 // limitations under the License.
 
 #import <Foundation/Foundation.h>
+#import <OCMock/OCMock.h>
 #import <XCTest/XCTest.h>
-#import "OCMock.h"
 
 #import <GoogleUtilities/GULAppDelegateSwizzler.h>
 #import <GoogleUtilities/GULUserDefaults.h>

diff --git a/FirebaseAppDistribution/Tests/Unit/FIRFADApiServiceTests.m b/FirebaseAppDistribution/Tests/Unit/FIRFADApiServiceTests.m
@@ -13,8 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 #import <Foundation/Foundation.h>
+#import <OCMock/OCMock.h>
 #import <XCTest/XCTest.h>
-#import "OCMock.h"
 
 #import "FirebaseAppDistribution/Sources/FIRFADApiService.h"
 #import "FirebaseAppDistribution/Sources/FIRFADLogger.h"

diff --git a/FirebaseAuth/Tests/Unit/FIRAdditionalUserInfoTests.m b/FirebaseAuth/Tests/Unit/FIRAdditionalUserInfoTests.m
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
+#import <OCMock/OCMock.h>
 #import <XCTest/XCTest.h>
-#import "OCMock.h"
 
 #import "FirebaseAuth/Sources/Backend/RPC/FIRVerifyAssertionResponse.h"
 #import "FirebaseAuth/Sources/User/FIRAdditionalUserInfo_Internal.h"

diff --git a/FirebaseAuth/Tests/Unit/FIRAuthAPNSTokenManagerTests.m b/FirebaseAuth/Tests/Unit/FIRAuthAPNSTokenManagerTests.m
@@ -17,8 +17,8 @@
 #import <TargetConditionals.h>
 #if TARGET_OS_IOS
 
+#import <OCMock/OCMock.h>
 #import <XCTest/XCTest.h>
-#import "OCMock.h"
 
 #import "FirebaseAuth/Sources/SystemService/FIRAuthAPNSToken.h"
 #import "FirebaseAuth/Sources/SystemService/FIRAuthAPNSTokenManager.h"

diff --git a/FirebaseAuth/Tests/Unit/FIRAuthAppCredentialManagerTests.m b/FirebaseAuth/Tests/Unit/FIRAuthAppCredentialManagerTests.m
@@ -17,8 +17,8 @@
 #import <TargetConditionals.h>
 #if !TARGET_OS_OSX
 
+#import <OCMock/OCMock.h>
 #import <XCTest/XCTest.h>
-#import "OCMock.h"
 
 #import "FirebaseAuth/Sources/Storage/FIRAuthKeychainServices.h"
 #import "FirebaseAuth/Sources/SystemService/FIRAuthAppCredential.h"

diff --git a/FirebaseAuth/Tests/Unit/FIRAuthNotificationManagerTests.m b/FirebaseAuth/Tests/Unit/FIRAuthNotificationManagerTests.m
@@ -17,8 +17,8 @@
 #import <TargetConditionals.h>
 #if TARGET_OS_IOS
 
+#import <OCMock/OCMock.h>
 #import <XCTest/XCTest.h>
-#import "OCMock.h"
 
 #import "FirebaseAuth/Sources/SystemService/FIRAuthAppCredential.h"
 #import "FirebaseAuth/Sources/SystemService/FIRAuthAppCredentialManager.h"

diff --git a/FirebaseAuth/Tests/Unit/FIRAuthTests.m b/FirebaseAuth/Tests/Unit/FIRAuthTests.m
@@ -15,8 +15,8 @@
  */
 
 #import <Foundation/Foundation.h>
+#import <OCMock/OCMock.h>
 #import <XCTest/XCTest.h>
-#import "OCMock.h"
 
 #import <GoogleUtilities/GULAppDelegateSwizzler.h>
 #import "FirebaseAuth/Sources/Public/FirebaseAuth/FIRActionCodeSettings.h"

diff --git a/FirebaseAuth/Tests/Unit/FIRAuthURLPresenterTests.m b/FirebaseAuth/Tests/Unit/FIRAuthURLPresenterTests.m
@@ -18,9 +18,9 @@
 #if TARGET_OS_IOS
 
 #import <Foundation/Foundation.h>
+#import <OCMock/OCMock.h>
 #import <SafariServices/SafariServices.h>
 #import <XCTest/XCTest.h>
-#import "OCMock.h"
 
 #import "FirebaseAuth/Sources/Public/FirebaseAuth/FIRAuthUIDelegate.h"
 

diff --git a/FirebaseAuth/Tests/Unit/FIRAuthUseUserAccessGroupTests.m b/FirebaseAuth/Tests/Unit/FIRAuthUseUserAccessGroupTests.m
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
+#import <OCMock/OCMock.h>
 #import <XCTest/XCTest.h>
-#import "OCMock.h"
 
 #import "FirebaseAuth/Sources/Public/FirebaseAuth/FirebaseAuth.h"
 

diff --git a/FirebaseAuth/Tests/Unit/FIROAuthProviderTests.m b/FirebaseAuth/Tests/Unit/FIROAuthProviderTests.m
@@ -17,8 +17,8 @@
 #import <TargetConditionals.h>
 #if TARGET_OS_IOS
 
+#import <OCMock/OCMock.h>
 #import <XCTest/XCTest.h>
-#import "OCMock.h"
 
 #import "FirebaseAuth/Sources/Public/FirebaseAuth/FIRAuthErrors.h"
 #import "FirebaseAuth/Sources/Public/FirebaseAuth/FIRAuthUIDelegate.h"

diff --git a/FirebaseAuth/Tests/Unit/FIRPhoneAuthProviderTests.m b/FirebaseAuth/Tests/Unit/FIRPhoneAuthProviderTests.m
@@ -17,14 +17,14 @@
 #import <TargetConditionals.h>
 #if TARGET_OS_IOS
 
+#import <OCMock/OCMock.h>
 #import <SafariServices/SafariServices.h>
 #import <XCTest/XCTest.h>
 #import "FirebaseAuth/Sources/Public/FirebaseAuth/FIRAuth.h"
 #import "FirebaseAuth/Sources/Public/FirebaseAuth/FIRAuthSettings.h"
 #import "FirebaseAuth/Sources/Public/FirebaseAuth/FIRAuthUIDelegate.h"
 #import "FirebaseAuth/Sources/Public/FirebaseAuth/FIRPhoneAuthProvider.h"
 #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
-#import "OCMock.h"
 
 #import "FirebaseAuth/Sources/Auth/FIRAuthGlobalWorkQueue.h"
 #import "FirebaseAuth/Sources/Auth/FIRAuth_Internal.h"

diff --git a/FirebaseAuth/Tests/Unit/FIRUserTests.m b/FirebaseAuth/Tests/Unit/FIRUserTests.m
@@ -15,8 +15,8 @@
  */
 
 #import <Foundation/Foundation.h>
+#import <OCMock/OCMock.h>
 #import <XCTest/XCTest.h>
-#import "OCMock.h"
 
 #import "FirebaseAuth/Sources/Public/FirebaseAuth/FIRAuthTokenResult.h"
 #import "FirebaseAuth/Sources/Public/FirebaseAuth/FIREmailAuthProvider.h"

diff --git a/FirebaseAuth/Tests/Unit/OCMStubRecorder+FIRAuthUnitTests.h b/FirebaseAuth/Tests/Unit/OCMStubRecorder+FIRAuthUnitTests.h
@@ -15,7 +15,7 @@
  */
 
 #import <Foundation/Foundation.h>
-#import "OCMStubRecorder.h"
+#import <OCMock/OCMStubRecorder.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/FirebaseCore/Tests/Unit/FIRTestCase.h b/FirebaseCore/Tests/Unit/FIRTestCase.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
+#import <OCMock/OCMock.h>
 #import <XCTest/XCTest.h>
-#import "OCMock.h"
 
 /**
  * Base test case for Firebase Core SDK tests.

diff --git a/FirebaseDatabase/Tests/Unit/FIRDatabaseConnectionContextProviderTests.m b/FirebaseDatabase/Tests/Unit/FIRDatabaseConnectionContextProviderTests.m
@@ -16,7 +16,7 @@
 
 #import <XCTest/XCTest.h>
 
-#import "OCMock.h"
+#import <OCMock/OCMock.h>
 
 #import "FirebaseDatabase/Sources/Login/FIRDatabaseConnectionContextProvider.h"
 

diff --git a/FirebaseDynamicLinks/Tests/Unit/FIRDLScionLoggingTest.m b/FirebaseDynamicLinks/Tests/Unit/FIRDLScionLoggingTest.m
@@ -16,8 +16,8 @@
 
 #import <XCTest/XCTest.h>
 
+#import <OCMock/OCMock.h>
 #import "FirebaseDynamicLinks/Sources/FIRDLScionLogging.h"
-#import "OCMock.h"
 
 static const NSTimeInterval kAsyncTestTimout = 0.5;
 

diff --git a/FirebaseMessaging/Tests/UnitTests/FIRMessagingAnalyticsTest.m b/FirebaseMessaging/Tests/UnitTests/FIRMessagingAnalyticsTest.m
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
+#import <OCMock/OCMock.h>
 #import <XCTest/XCTest.h>
-#import "OCMock.h"
 
 #import "Interop/Analytics/Public/FIRInteropEventNames.h"
 #import "Interop/Analytics/Public/FIRInteropParameterNames.h"

diff --git a/FirebaseMessaging/Tests/UnitTests/FIRMessagingAuthKeychainTest.m b/FirebaseMessaging/Tests/UnitTests/FIRMessagingAuthKeychainTest.m
@@ -18,8 +18,8 @@
 #if !TARGET_OS_MACCATALYST && !SWIFT_PACKAGE
 // Skip keychain tests on Catalyst and swift package
 
+#import <OCMock/OCMock.h>
 #import <XCTest/XCTest.h>
-#import "OCMock.h"
 
 #import "FirebaseMessaging/Sources/Token/FIRMessagingAuthKeychain.h"
 #import "FirebaseMessaging/Sources/Token/FIRMessagingCheckinPreferences.h"

diff --git a/FirebaseMessaging/Tests/UnitTests/FIRMessagingAuthServiceTest.m b/FirebaseMessaging/Tests/UnitTests/FIRMessagingAuthServiceTest.m
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
+#import <OCMock/OCMock.h>
 #import <XCTest/XCTest.h>
 #import "FirebaseMessaging/Sources/NSError+FIRMessaging.h"
 #import "FirebaseMessaging/Sources/Token/FIRMessagingAuthService.h"
 #import "FirebaseMessaging/Sources/Token/FIRMessagingCheckinPreferences.h"
 #import "FirebaseMessaging/Sources/Token/FIRMessagingCheckinService.h"
 #import "FirebaseMessaging/Sources/Token/FIRMessagingCheckinStore.h"
-#import "OCMock.h"
 
 static NSString *const kDeviceAuthId = @"device-id";
 static NSString *const kSecretToken = @"secret-token";

diff --git a/FirebaseMessaging/Tests/UnitTests/FIRMessagingBackupExcludedPlistTest.m b/FirebaseMessaging/Tests/UnitTests/FIRMessagingBackupExcludedPlistTest.m
@@ -16,11 +16,11 @@
 
 #import <XCTest/XCTest.h>
 
+#import <OCMock/OCMock.h>
 #import "FirebaseMessaging/Sources/Public/FirebaseMessaging/FIRMessaging.h"
 #import "FirebaseMessaging/Sources/Token/FIRMessagingAuthKeychain.h"
 #import "FirebaseMessaging/Sources/Token/FIRMessagingBackupExcludedPlist.h"
 #import "FirebaseMessaging/Sources/Token/FIRMessagingCheckinStore.h"
-#import "OCMock.h"
 
 static NSString *const kSubDirectoryName = @"FirebaseInstanceIDBackupPlistTest";
 static NSString *const kTestPlistFileName = @"com.google.test.IIDBackupExcludedPlist";

diff --git a/FirebaseMessaging/Tests/UnitTests/FIRMessagingCheckinServiceTest.m b/FirebaseMessaging/Tests/UnitTests/FIRMessagingCheckinServiceTest.m
@@ -16,11 +16,11 @@
 
 #import <XCTest/XCTest.h>
 
+#import <OCMock/OCMock.h>
 #import "FirebaseMessaging/Sources/FIRMessagingUtilities.h"
 #import "FirebaseMessaging/Sources/NSError+FIRMessaging.h"
 #import "FirebaseMessaging/Sources/Token/FIRMessagingCheckinPreferences.h"
 #import "FirebaseMessaging/Sources/Token/FIRMessagingCheckinService.h"
-#import "OCMock.h"
 #import "SharedTestUtilities/URLSession/FIRURLSessionOCMockStub.h"
 
 static NSString *const kDeviceAuthId = @"1234";

diff --git a/FirebaseMessaging/Tests/UnitTests/FIRMessagingCheckinStoreTest.m b/FirebaseMessaging/Tests/UnitTests/FIRMessagingCheckinStoreTest.m
@@ -18,6 +18,7 @@
 #if !TARGET_OS_MACCATALYST
 #import <XCTest/XCTest.h>
 
+#import <OCMock/OCMock.h>
 #import "FirebaseMessaging/Sources/FIRMessagingUtilities.h"
 #import "FirebaseMessaging/Sources/Public/FirebaseMessaging/FIRMessaging.h"
 #import "FirebaseMessaging/Sources/Token/FIRMessagingAuthKeychain.h"
@@ -26,7 +27,6 @@
 #import "FirebaseMessaging/Sources/Token/FIRMessagingCheckinService.h"
 #import "FirebaseMessaging/Sources/Token/FIRMessagingCheckinStore.h"
 #import "FirebaseMessaging/Tests/UnitTests/FIRMessagingFakeKeychain.h"
-#import "OCMock.h"
 
 static const NSTimeInterval kExpectationTimeout = 12;
 

diff --git a/FirebaseMessaging/Tests/UnitTests/FIRMessagingContextManagerServiceTest.m b/FirebaseMessaging/Tests/UnitTests/FIRMessagingContextManagerServiceTest.m
@@ -18,8 +18,8 @@
     __WATCH_OS_VERSION_MAX_ALLOWED >= __WATCHOS_3_0 || TARGET_OS_MACCATALYST
 #import <UserNotifications/UserNotifications.h>
 #endif
+#import <OCMock/OCMock.h>
 #import <XCTest/XCTest.h>
-#import "OCMock.h"
 
 #import "FirebaseMessaging/Sources/FIRMessagingContextManagerService.h"
 

diff --git a/FirebaseMessaging/Tests/UnitTests/FIRMessagingExtensionHelperTest.m b/FirebaseMessaging/Tests/UnitTests/FIRMessagingExtensionHelperTest.m
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
+#import <OCMock/OCMock.h>
 #import <XCTest/XCTest.h>
-#import "OCMock.h"
 
 #import "FirebaseMessaging/Sources/Public/FirebaseMessaging/FIRMessaging.h"
 #import "FirebaseMessaging/Sources/Public/FirebaseMessaging/FIRMessagingExtensionHelper.h"

diff --git a/FirebaseMessaging/Tests/UnitTests/FIRMessagingHandlingTest.m b/FirebaseMessaging/Tests/UnitTests/FIRMessagingHandlingTest.m
@@ -16,7 +16,7 @@
 
 #import <XCTest/XCTest.h>
 
-#import "OCMock.h"
+#import <OCMock/OCMock.h>
 
 #import <GoogleUtilities/GULUserDefaults.h>
 #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"

diff --git a/FirebaseMessaging/Tests/UnitTests/FIRMessagingLinkHandlingTest.m b/FirebaseMessaging/Tests/UnitTests/FIRMessagingLinkHandlingTest.m
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
+#import <OCMock/OCMock.h>
 #import <XCTest/XCTest.h>
-#import "OCMock.h"
 
 #import <GoogleUtilities/GULUserDefaults.h>
 #import "FirebaseMessaging/Sources/FIRMessagingConstants.h"