Updating iOS rootViewController use from loading time to showing time…

… for fullscreen ads (#1153) * Updating iOS rootViewController use from loading time to showing time for Fullscreen ads * Removed rootViewController reference for fullscreen ads
googleads · Aug 13, 2024 · 51d1465 · 51d1465
1 parent 9f989d3
commit 51d1465
Show file tree

Hide file tree

Showing 10 changed files with 71 additions and 133 deletions.
diff --git a/packages/google_mobile_ads/example/ios/Podfile b/packages/google_mobile_ads/example/ios/Podfile
@@ -36,7 +36,7 @@ target 'Runner' do
     inherit! :search_paths
 
     # Matches test_spec dependency.
-    pod 'OCMock', '3.6'
+    pod 'OCMock', '3.9.3'
   end
 end
 

diff --git a/packages/google_mobile_ads/example/ios/RunnerTests/FLTAppOpenAdTest.m b/packages/google_mobile_ads/example/ios/RunnerTests/FLTAppOpenAdTest.m
@@ -56,13 +56,9 @@ - (void)testLoadShowGAMRequest {
 // Helper method for testing with FLTAdRequest and FLTGAMAdRequest.
 - (void)testLoadShowAppOpenAd:(FLTAdRequest *)request
               gadOrGAMRequest:(GADRequest *)gadOrGAMRequest {
-  UIViewController *mockRootViewController =
-      OCMClassMock([UIViewController class]);
-  FLTAppOpenAd *ad =
-      [[FLTAppOpenAd alloc] initWithAdUnitId:@"testId"
-                                     request:request
-                          rootViewController:mockRootViewController
-                                        adId:@1];
+  FLTAppOpenAd *ad = [[FLTAppOpenAd alloc] initWithAdUnitId:@"testId"
+                                                    request:request
+                                                       adId:@1];
   ad.manager = mockManager;
 
   // Stub the load call to invoke successful load callback.
@@ -130,8 +126,7 @@ - (void)testLoadShowAppOpenAd:(FLTAdRequest *)request
 
   [ad show];
 
-  OCMVerify([appOpenClassMock
-      presentFromRootViewController:[OCMArg isEqual:mockRootViewController]]);
+  OCMVerify([appOpenClassMock presentFromRootViewController:[OCMArg isNil]]);
 
   // Verify full screen callbacks.
   OCMVerify([mockManager adWillPresentFullScreenContent:[OCMArg isEqual:ad]]);
@@ -162,13 +157,9 @@ - (void)testFailedToLoadGAMRequest {
 
 // Helper for testing failed to load.
 - (void)testFailedToLoad:(FLTAdRequest *)request {
-  UIViewController *mockRootViewController =
-      OCMClassMock([UIViewController class]);
-  FLTAppOpenAd *ad =
-      [[FLTAppOpenAd alloc] initWithAdUnitId:@"testId"
-                                     request:request
-                          rootViewController:mockRootViewController
-                                        adId:@1];
+  FLTAppOpenAd *ad = [[FLTAppOpenAd alloc] initWithAdUnitId:@"testId"
+                                                    request:request
+                                                       adId:@1];
   ad.manager = mockManager;
 
   id appOpenClassMock = OCMClassMock([GADAppOpenAd class]);

diff --git a/packages/google_mobile_ads/example/ios/RunnerTests/FLTGamInterstitialAdTest.m b/packages/google_mobile_ads/example/ios/RunnerTests/FLTGamInterstitialAdTest.m
@@ -35,12 +35,9 @@ - (void)testLoadShowInterstitialAd {
   GAMRequest *gadRequest = OCMClassMock([GAMRequest class]);
   OCMStub([request asGAMRequest:[OCMArg any]]).andReturn(gadRequest);
 
-  UIViewController *mockRootViewController =
-      OCMClassMock([UIViewController class]);
   FLTGAMInterstitialAd *ad =
       [[FLTGAMInterstitialAd alloc] initWithAdUnitId:@"testId"
                                              request:request
-                                  rootViewController:mockRootViewController
                                                 adId:@1];
   ad.manager = mockManager;
 
@@ -120,8 +117,8 @@ - (void)testLoadShowInterstitialAd {
   // Show the ad
   [ad show];
 
-  OCMVerify([interstitialClassMock
-      presentFromRootViewController:[OCMArg isEqual:mockRootViewController]]);
+  OCMVerify(
+      [interstitialClassMock presentFromRootViewController:[OCMArg isNil]]);
 
   // Verify full screen callbacks.
   OCMVerify([mockManager adWillPresentFullScreenContent:[OCMArg isEqual:ad]]);
@@ -145,12 +142,9 @@ - (void)testFailToLoad {
   GAMRequest *gadRequest = OCMClassMock([GAMRequest class]);
   OCMStub([request asGAMRequest:[OCMArg any]]).andReturn(gadRequest);
 
-  UIViewController *mockRootViewController =
-      OCMClassMock([UIViewController class]);
   FLTGAMInterstitialAd *ad =
       [[FLTGAMInterstitialAd alloc] initWithAdUnitId:@"testId"
                                              request:request
-                                  rootViewController:mockRootViewController
                                                 adId:@1];
   ad.manager = mockManager;
 

diff --git a/packages/google_mobile_ads/example/ios/RunnerTests/FLTGoogleMobileAdsTest.m b/packages/google_mobile_ads/example/ios/RunnerTests/FLTGoogleMobileAdsTest.m
@@ -249,11 +249,10 @@ - (void)testAdInstanceManagerOnNativeAdEvents {
 }
 
 - (void)testAdInstanceManagerOnRewardedAdUserEarnedReward {
-  FLTRewardedAd *ad = [[FLTRewardedAd alloc]
-        initWithAdUnitId:@"testId"
-                 request:[[FLTAdRequest alloc] init]
-      rootViewController:OCMClassMock([UIViewController class])
-                    adId:@1];
+  FLTRewardedAd *ad =
+      [[FLTRewardedAd alloc] initWithAdUnitId:@"testId"
+                                      request:[[FLTAdRequest alloc] init]
+                                         adId:@1];
   [_manager loadAd:ad];
 
   [_manager onRewardedAdUserEarnedReward:ad
@@ -277,10 +276,9 @@ - (void)testAdInstanceManagerOnRewardedAdUserEarnedReward {
 
 - (void)testAdInstanceManagerOnRewardedInterstitialAdUserEarnedReward {
   FLTRewardedInterstitialAd *ad = [[FLTRewardedInterstitialAd alloc]
-        initWithAdUnitId:@"testId"
-                 request:[[FLTAdRequest alloc] init]
-      rootViewController:OCMClassMock([UIViewController class])
-                    adId:@1];
+      initWithAdUnitId:@"testId"
+               request:[[FLTAdRequest alloc] init]
+                  adId:@1];
   [_manager loadAd:ad];
 
   [_manager
@@ -369,11 +367,10 @@ - (void)testBannerEvents {
 }
 
 - (void)testFullScreenEventsRewardedAd {
-  FLTRewardedAd *rewardedAd = [[FLTRewardedAd alloc]
-        initWithAdUnitId:@"testId"
-                 request:[[FLTAdRequest alloc] init]
-      rootViewController:OCMClassMock([UIViewController class])
-                    adId:@1];
+  FLTRewardedAd *rewardedAd =
+      [[FLTRewardedAd alloc] initWithAdUnitId:@"testId"
+                                      request:[[FLTAdRequest alloc] init]
+                                         adId:@1];
   [_manager loadAd:rewardedAd];
 
   [_manager adWillPresentFullScreenContent:rewardedAd];
@@ -400,10 +397,9 @@ - (void)testFullScreenEventsRewardedAd {
 - (void)testFullScreenEventsRewardedInterstitialAd {
   FLTRewardedInterstitialAd *rewardedInterstitialAd =
       [[FLTRewardedInterstitialAd alloc]
-            initWithAdUnitId:@"testId"
-                     request:[[FLTAdRequest alloc] init]
-          rootViewController:OCMClassMock([UIViewController class])
-                        adId:@1];
+          initWithAdUnitId:@"testId"
+                   request:[[FLTAdRequest alloc] init]
+                      adId:@1];
   [_manager loadAd:rewardedInterstitialAd];
 
   [_manager adWillPresentFullScreenContent:rewardedInterstitialAd];
@@ -464,10 +460,9 @@ - (NSData *)getDataForEvent:(NSString *)name adId:(NSNumber *)adId {
 - (void)testAdClick {
   FLTRewardedInterstitialAd *rewardedInterstitialAd =
       [[FLTRewardedInterstitialAd alloc]
-            initWithAdUnitId:@"testId"
-                     request:[[FLTAdRequest alloc] init]
-          rootViewController:OCMClassMock([UIViewController class])
-                        adId:@1];
+          initWithAdUnitId:@"testId"
+                   request:[[FLTAdRequest alloc] init]
+                      adId:@1];
 
   [_manager adDidRecordClick:rewardedInterstitialAd];
   NSData *impressionData = [self getDataForEvent:@"adDidRecordClick" adId:@1];

diff --git a/packages/google_mobile_ads/example/ios/RunnerTests/FLTInterstitialAdTest.m b/packages/google_mobile_ads/example/ios/RunnerTests/FLTInterstitialAdTest.m
@@ -35,13 +35,9 @@ - (void)testLoadShowInterstitialAd {
   GADRequest *gadRequest = OCMClassMock([GADRequest class]);
   OCMStub([request asGADRequest:[OCMArg any]]).andReturn(gadRequest);
 
-  UIViewController *mockRootViewController =
-      OCMClassMock([UIViewController class]);
-  FLTInterstitialAd *ad =
-      [[FLTInterstitialAd alloc] initWithAdUnitId:@"testId"
-                                          request:request
-                               rootViewController:mockRootViewController
-                                             adId:@1];
+  FLTInterstitialAd *ad = [[FLTInterstitialAd alloc] initWithAdUnitId:@"testId"
+                                                              request:request
+                                                                 adId:@1];
   ad.manager = mockManager;
 
   id interstitialClassMock = OCMClassMock([GADInterstitialAd class]);
@@ -109,8 +105,8 @@ - (void)testLoadShowInterstitialAd {
   // Show the ad
   [ad show];
 
-  OCMVerify([interstitialClassMock
-      presentFromRootViewController:[OCMArg isEqual:mockRootViewController]]);
+  OCMVerify(
+      [interstitialClassMock presentFromRootViewController:[OCMArg isNil]]);
 
   // Verify full screen callbacks.
   OCMVerify([mockManager adWillPresentFullScreenContent:[OCMArg isEqual:ad]]);
@@ -129,13 +125,9 @@ - (void)testFailedToLoad {
   GADRequest *gadRequest = OCMClassMock([GADRequest class]);
   OCMStub([request asGADRequest:[OCMArg any]]).andReturn(gadRequest);
 
-  UIViewController *mockRootViewController =
-      OCMClassMock([UIViewController class]);
-  FLTInterstitialAd *ad =
-      [[FLTInterstitialAd alloc] initWithAdUnitId:@"testId"
-                                          request:request
-                               rootViewController:mockRootViewController
-                                             adId:@1];
+  FLTInterstitialAd *ad = [[FLTInterstitialAd alloc] initWithAdUnitId:@"testId"
+                                                              request:request
+                                                                 adId:@1];
   ad.manager = mockManager;
 
   id interstitialClassMock = OCMClassMock([GADInterstitialAd class]);

diff --git a/packages/google_mobile_ads/example/ios/RunnerTests/FLTRewardedAdTest.m b/packages/google_mobile_ads/example/ios/RunnerTests/FLTRewardedAdTest.m
@@ -50,13 +50,9 @@ - (void)testLoadShowRewardedAdGAMRequest {
 // Helper method for testing with FLTAdRequest and FLTGAMAdRequest.
 - (void)testLoadShowRewardedAd:(FLTAdRequest *)request
                gadOrGAMRequest:(GADRequest *)gadOrGAMRequest {
-  UIViewController *mockRootViewController =
-      OCMClassMock([UIViewController class]);
-  FLTRewardedAd *ad =
-      [[FLTRewardedAd alloc] initWithAdUnitId:@"testId"
-                                      request:request
-                           rootViewController:mockRootViewController
-                                         adId:@1];
+  FLTRewardedAd *ad = [[FLTRewardedAd alloc] initWithAdUnitId:@"testId"
+                                                      request:request
+                                                         adId:@1];
   ad.manager = mockManager;
 
   // Stub the load call to invoke successful load callback.
@@ -149,9 +145,8 @@ - (void)testLoadShowRewardedAd:(FLTAdRequest *)request
   // Show the ad and verify callbacks invoked
   [ad show];
 
-  OCMVerify([rewardedClassMock
-      presentFromRootViewController:[OCMArg isEqual:mockRootViewController]
-           userDidEarnRewardHandler:[OCMArg any]]);
+  OCMVerify([rewardedClassMock presentFromRootViewController:[OCMArg isNil]
+                                    userDidEarnRewardHandler:[OCMArg any]]);
 
   [fullScreenContentDelegate adWillPresentFullScreenContent:rewardedClassMock];
   OCMVerify([mockManager adWillPresentFullScreenContent:[OCMArg isEqual:ad]]);
@@ -216,13 +211,9 @@ - (void)testFailedToLoadGAMRequest {
 
 // Helper for testing failed to load.
 - (void)testFailedToLoad:(FLTAdRequest *)request {
-  UIViewController *mockRootViewController =
-      OCMClassMock([UIViewController class]);
-  FLTRewardedAd *ad =
-      [[FLTRewardedAd alloc] initWithAdUnitId:@"testId"
-                                      request:request
-                           rootViewController:mockRootViewController
-                                         adId:@1];
+  FLTRewardedAd *ad = [[FLTRewardedAd alloc] initWithAdUnitId:@"testId"
+                                                      request:request
+                                                         adId:@1];
   ad.manager = mockManager;
 
   id rewardedClassMock = OCMClassMock([GADRewardedAd class]);

diff --git a/packages/google_mobile_ads/example/ios/RunnerTests/FLTRewardedInterstitialAdTest.m b/packages/google_mobile_ads/example/ios/RunnerTests/FLTRewardedInterstitialAdTest.m
@@ -50,12 +50,9 @@ - (void)testLoadShowRewardedInterstitialAdGAMRequest {
 // Helper method for testing with FLTAdRequest and FLTGAMAdRequest.
 - (void)testLoadShowRewardedInterstitialAd:(FLTAdRequest *)request
                            gadOrGAMRequest:(GADRequest *)gadOrGAMRequest {
-  UIViewController *mockRootViewController =
-      OCMClassMock([UIViewController class]);
   FLTRewardedInterstitialAd *ad =
       [[FLTRewardedInterstitialAd alloc] initWithAdUnitId:@"testId"
                                                   request:request
-                                       rootViewController:mockRootViewController
                                                      adId:@1];
   ad.manager = mockManager;
 
@@ -155,7 +152,7 @@ - (void)testLoadShowRewardedInterstitialAd:(FLTAdRequest *)request
   [ad show];
 
   OCMVerify([rewardedInterstitialClassMock
-      presentFromRootViewController:[OCMArg isEqual:mockRootViewController]
+      presentFromRootViewController:[OCMArg isNil]
            userDidEarnRewardHandler:[OCMArg any]]);
 
   // Verify full screen callbacks.
@@ -202,12 +199,9 @@ - (void)testFailedToLoadGAMRequest {
 
 // Helper for testing failed to load.
 - (void)testFailedToLoad:(FLTAdRequest *)request {
-  UIViewController *mockRootViewController =
-      OCMClassMock([UIViewController class]);
   FLTRewardedInterstitialAd *ad =
       [[FLTRewardedInterstitialAd alloc] initWithAdUnitId:@"testId"
                                                   request:request
-                                       rootViewController:mockRootViewController
                                                      adId:@1];
   ad.manager = mockManager;
 

diff --git a/packages/google_mobile_ads/ios/Classes/FLTAd_Internal.h b/packages/google_mobile_ads/ios/Classes/FLTAd_Internal.h
@@ -214,8 +214,6 @@
 @interface FLTInterstitialAd : FLTFullScreenAd
 - (instancetype _Nonnull)initWithAdUnitId:(NSString *_Nonnull)adUnitId
                                   request:(FLTAdRequest *_Nonnull)request
-                       rootViewController:
-                           (UIViewController *_Nonnull)rootViewController
                                      adId:(NSNumber *_Nonnull)adId;
 - (GADInterstitialAd *_Nullable)interstitial;
 - (NSString *_Nonnull)adUnitId;
@@ -226,16 +224,12 @@
 @interface FLTGAMInterstitialAd : FLTInterstitialAd <GADAppEventDelegate>
 - (instancetype _Nonnull)initWithAdUnitId:(NSString *_Nonnull)adUnitId
                                   request:(FLTGAMAdRequest *_Nonnull)request
-                       rootViewController:
-                           (UIViewController *_Nonnull)rootViewController
                                      adId:(NSNumber *_Nonnull)adId;
 @end
 
 @interface FLTRewardedAd : FLTFullScreenAd
 - (instancetype _Nonnull)initWithAdUnitId:(NSString *_Nonnull)adUnitId
                                   request:(FLTAdRequest *_Nonnull)request
-                       rootViewController:
-                           (UIViewController *_Nonnull)rootViewController
                                      adId:(NSNumber *_Nonnull)adId;
 - (GADRewardedAd *_Nullable)rewardedAd;
 - (void)setServerSideVerificationOptions:
@@ -245,8 +239,6 @@
 @interface FLTRewardedInterstitialAd : FLTFullScreenAd
 - (instancetype _Nonnull)initWithAdUnitId:(NSString *_Nonnull)adUnitId
                                   request:(FLTAdRequest *_Nonnull)request
-                       rootViewController:
-                           (UIViewController *_Nonnull)rootViewController
                                      adId:(NSNumber *_Nonnull)adId;
 - (GADRewardedInterstitialAd *_Nullable)rewardedInterstitialAd;
 - (void)setServerSideVerificationOptions:
@@ -256,8 +248,6 @@
 @interface FLTAppOpenAd : FLTFullScreenAd
 - (instancetype _Nonnull)initWithAdUnitId:(NSString *_Nonnull)adUnitId
                                   request:(FLTAdRequest *_Nonnull)request
-                       rootViewController:
-                           (UIViewController *_Nonnull)rootViewController
                                      adId:(NSNumber *_Nonnull)adId;
 - (GADAppOpenAd *_Nullable)appOpenAd;
 @end