Change unit tests to avoid OCMock verifying a method call on a real object

Firebase/InAppMessaging/Flows/FIRIAMFetchFlow.h

@@ -18,6 +18,7 @@
 
 #import "FIRIAMActivityLogger.h"
 #import "FIRIAMBookKeeper.h"
+#import "FIRIAMDisplayExecutor.h"
 #import "FIRIAMMessageClientCache.h"
 #import "FIRIAMSDKModeManager.h"
 #import "FIRIAMTimeFetcher.h"
@@ -50,7 +51,8 @@ typedef void (^FIRIAMFetchMessageCompletionHandler)(
                      bookKeeper:(id<FIRIAMBookKeeper>)displayBookKeeper
                  activityLogger:(FIRIAMActivityLogger *)activityLogger
            analyticsEventLogger:(id<FIRIAMAnalyticsEventLogger>)analyticsEventLogger
-           FIRIAMSDKModeManager:(FIRIAMSDKModeManager *)sdkModeManager;
+           FIRIAMSDKModeManager:(FIRIAMSDKModeManager *)sdkModeManager
+                displayExecutor:(FIRIAMDisplayExecutor *)displayExecutor;
 
 // Triggers a potential fetch of in-app messaging from the source. It would check and respect the
 // the fetchMinIntervalInMinutes defined in setting

Firebase/InAppMessaging/Flows/FIRIAMFetchFlow.m

@@ -36,8 +36,9 @@ @interface FIRIAMFetchFlow ()
 @property(nonatomic, nonnull, readonly) id<FIRIAMBookKeeper> fetchBookKeeper;
 @property(nonatomic, nonnull, readonly) FIRIAMActivityLogger *activityLogger;
 @property(nonatomic, nonnull, readonly) id<FIRIAMAnalyticsEventLogger> analyticsEventLogger;
-
 @property(nonatomic, nonnull, readonly) FIRIAMSDKModeManager *sdkModeManager;
+@property(nonatomic, nonnull, readonly) FIRIAMDisplayExecutor *displayExecutor;
+
 @end
 
 @implementation FIRIAMFetchFlow
@@ -48,7 +49,8 @@ - (instancetype)initWithSetting:(FIRIAMFetchSetting *)setting
                      bookKeeper:(id<FIRIAMBookKeeper>)fetchBookKeeper
                  activityLogger:(FIRIAMActivityLogger *)activityLogger
            analyticsEventLogger:(id<FIRIAMAnalyticsEventLogger>)analyticsEventLogger
-           FIRIAMSDKModeManager:(FIRIAMSDKModeManager *)sdkModeManager {
+           FIRIAMSDKModeManager:(FIRIAMSDKModeManager *)sdkModeManager
+                displayExecutor:(FIRIAMDisplayExecutor *)displayExecutor {
   if (self = [super init]) {
     _timeFetcher = timeFetcher;
     _lastFetchTime = [fetchBookKeeper lastFetchTime];
@@ -59,6 +61,7 @@ - (instancetype)initWithSetting:(FIRIAMFetchSetting *)setting
     _activityLogger = activityLogger;
     _analyticsEventLogger = analyticsEventLogger;
     _sdkModeManager = sdkModeManager;
+    _displayExecutor = displayExecutor;
   }
   return self;
 }
@@ -257,7 +260,6 @@ - (void)checkAndFetchForInitialAppLaunch:(BOOL)forInitialAppLaunch {
 }
 
 - (void)checkForAppLaunchMessage {
-  [[FIRIAMRuntimeManager getSDKRuntimeInstance]
-          .displayExecutor checkAndDisplayNextAppLaunchMessage];
+  [self.displayExecutor checkAndDisplayNextAppLaunchMessage];
 }
 @end

Firebase/InAppMessaging/Runtime/FIRIAMRuntimeManager.m

@@ -325,16 +325,6 @@ - (void)internalStartRuntimeWithSDKSettings:(FIRIAMSDKSettings *)settings {
       [[FIRIAMSDKModeManager alloc] initWithUserDefaults:NSUserDefaults.standardUserDefaults
                                      testingModeListener:self];
 
-  self.fetchOnAppForegroundFlow =
-      [[FIRIAMFetchOnAppForegroundFlow alloc] initWithSetting:fetchSetting
-                                                 messageCache:self.messageCache
-                                               messageFetcher:self.restfulFetcher
-                                                  timeFetcher:timeFetcher
-                                                   bookKeeper:self.bookKeeper
-                                               activityLogger:self.activityLogger
-                                         analyticsEventLogger:analyticsEventLogger
-                                         FIRIAMSDKModeManager:sdkModeManager];
-
   FIRIAMActionURLFollower *actionFollower = [FIRIAMActionURLFollower actionURLFollower];
 
   self.displayExecutor =
@@ -347,6 +337,17 @@ - (void)internalStartRuntimeWithSDKSettings:(FIRIAMSDKSettings *)settings {
                                              activityLogger:self.activityLogger
                                        analyticsEventLogger:analyticsEventLogger];
 
+  self.fetchOnAppForegroundFlow =
+      [[FIRIAMFetchOnAppForegroundFlow alloc] initWithSetting:fetchSetting
+                                                 messageCache:self.messageCache
+                                               messageFetcher:self.restfulFetcher
+                                                  timeFetcher:timeFetcher
+                                                   bookKeeper:self.bookKeeper
+                                               activityLogger:self.activityLogger
+                                         analyticsEventLogger:analyticsEventLogger
+                                         FIRIAMSDKModeManager:sdkModeManager
+                                              displayExecutor:self.displayExecutor];
+
   // Setting the message display component and suppression. It's needed in case
   // headless SDK is initialized after the these properties are already set on FIRInAppMessaging.
   self.displayExecutor.messageDisplayComponent =

InAppMessaging/Example/Podfile

@@ -26,5 +26,5 @@ target 'InAppMessaging_Tests_iOS' do
   pod 'FirebaseInAppMessaging', :path => '../..'
   pod 'FirebaseInstanceID',  :path => '../..'
   pod 'FirebaseAnalyticsInterop',  :path => '../..'
-  pod 'OCMock', '~> 3.4.0'
+  pod 'OCMock'
 end

InAppMessaging/Example/Tests/FIRIAMFetchFlowTests.m

@@ -38,6 +38,7 @@ @interface FIRIAMFetchFlowTests : XCTestCase
 @property FIRIAMFetchFlow *flow;
 @property FIRIAMActivityLogger *activityLogger;
 @property FIRIAMSDKModeManager *mockSDKModeManager;
+@property FIRIAMDisplayExecutor *mockDisplayExecutor;
 
 @property id<FIRIAMAnalyticsEventLogger> mockAnaltycisEventLogger;
 
@@ -159,6 +160,7 @@ - (void)setUp {
   self.mockSDKModeManager = OCMClassMock([FIRIAMSDKModeManager class]);
 
   self.mockTimeFetcher = OCMProtocolMock(@protocol(FIRIAMTimeFetcher));
+  self.mockDisplayExecutor = OCMClassMock([FIRIAMDisplayExecutor class]);
 
   self.flow = [[FIRIAMFetchFlow alloc] initWithSetting:self.fetchSetting
                                           messageCache:self.clientMessageCache
@@ -167,7 +169,8 @@ - (void)setUp {
                                             bookKeeper:self.mockBookkeeper
                                         activityLogger:self.activityLogger
                                   analyticsEventLogger:self.mockAnaltycisEventLogger
-                                  FIRIAMSDKModeManager:self.mockSDKModeManager];
+                                  FIRIAMSDKModeManager:self.mockSDKModeManager
+                                       displayExecutor:self.mockDisplayExecutor];
 }
 
 - (void)tearDown {
@@ -276,7 +279,7 @@ - (void)testAlwaysFetchForNewlyInstalledMode {
   OCMVerify([self.mockSDKModeManager registerOneMoreFetch]);
 
   // we expect that the message cache is checked for app launch messages
-  OCMVerify([self.flow checkForAppLaunchMessage]);
+  OCMVerify([self.mockDisplayExecutor checkAndDisplayNextAppLaunchMessage]);
 }
 
 // Fetch always in testing app instance mode