Skip to content

Commit 6c13151

Browse files
Release load_ad futures in flaky gma tests (#1373)
1 parent 1adbf0a commit 6c13151

File tree

1 file changed

+22
-9
lines changed

1 file changed

+22
-9
lines changed

gma/integration_test/src/integration_test.cc

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1734,6 +1734,7 @@ TEST_F(FirebaseGmaTest, TestInterstitialAdLoadEmptyRequest) {
17341734
EXPECT_FALSE(result_ptr->response_info().response_id().empty());
17351735
EXPECT_FALSE(result_ptr->response_info().ToString().empty());
17361736

1737+
load_ad_future.Release();
17371738
delete interstitial;
17381739
}
17391740

@@ -1827,6 +1828,9 @@ TEST_F(FirebaseGmaTest, TestInterstitialAdErrorLoadInProgress) {
18271828
const firebase::gma::ResponseInfo response_info =
18281829
result_ptr->ad_error().response_info();
18291830
EXPECT_TRUE(response_info.adapter_responses().empty());
1831+
1832+
first_load_ad.Release();
1833+
second_load_ad.Release();
18301834
delete interstitial_ad;
18311835
}
18321836

@@ -1841,12 +1845,12 @@ TEST_F(FirebaseGmaTest, TestInterstitialAdErrorBadAdUnitId) {
18411845

18421846
// Load the interstitial ad.
18431847
firebase::gma::AdRequest request = GetAdRequest();
1844-
firebase::Future<firebase::gma::AdResult> load_ad =
1848+
firebase::Future<firebase::gma::AdResult> load_ad_future =
18451849
interstitial_ad->LoadAd(kBadAdUnit, request);
1846-
WaitForCompletion(load_ad, "LoadAd",
1850+
WaitForCompletion(load_ad_future, "LoadAd",
18471851
firebase::gma::kAdErrorCodeInvalidRequest);
18481852

1849-
const firebase::gma::AdResult* result_ptr = load_ad.result();
1853+
const firebase::gma::AdResult* result_ptr = load_ad_future.result();
18501854
ASSERT_NE(result_ptr, nullptr);
18511855
EXPECT_FALSE(result_ptr->is_successful());
18521856
EXPECT_EQ(result_ptr->ad_error().code(),
@@ -1856,6 +1860,8 @@ TEST_F(FirebaseGmaTest, TestInterstitialAdErrorBadAdUnitId) {
18561860
const firebase::gma::ResponseInfo response_info =
18571861
result_ptr->ad_error().response_info();
18581862
EXPECT_TRUE(response_info.adapter_responses().empty());
1863+
1864+
load_ad_future.Release();
18591865
delete interstitial_ad;
18601866
}
18611867

@@ -2011,6 +2017,9 @@ TEST_F(FirebaseGmaTest, TestRewardedAdErrorLoadInProgress) {
20112017
const firebase::gma::ResponseInfo response_info =
20122018
result_ptr->ad_error().response_info();
20132019
EXPECT_TRUE(response_info.adapter_responses().empty());
2020+
2021+
first_load_ad.Release();
2022+
second_load_ad.Release();
20142023
delete rewarded;
20152024
}
20162025

@@ -2023,12 +2032,12 @@ TEST_F(FirebaseGmaTest, TestRewardedAdErrorBadAdUnitId) {
20232032

20242033
// Load the rewarded ad.
20252034
firebase::gma::AdRequest request = GetAdRequest();
2026-
firebase::Future<firebase::gma::AdResult> load_ad =
2035+
firebase::Future<firebase::gma::AdResult> load_ad_future =
20272036
rewarded->LoadAd(kBadAdUnit, request);
2028-
WaitForCompletion(load_ad, "LoadAd",
2037+
WaitForCompletion(load_ad_future, "LoadAd",
20292038
firebase::gma::kAdErrorCodeInvalidRequest);
20302039

2031-
const firebase::gma::AdResult* result_ptr = load_ad.result();
2040+
const firebase::gma::AdResult* result_ptr = load_ad_future.result();
20322041
ASSERT_NE(result_ptr, nullptr);
20332042
EXPECT_FALSE(result_ptr->is_successful());
20342043
EXPECT_EQ(result_ptr->ad_error().code(),
@@ -2038,6 +2047,8 @@ TEST_F(FirebaseGmaTest, TestRewardedAdErrorBadAdUnitId) {
20382047
const firebase::gma::ResponseInfo response_info =
20392048
result_ptr->ad_error().response_info();
20402049
EXPECT_TRUE(response_info.adapter_responses().empty());
2050+
2051+
load_ad_future.Release();
20412052
delete rewarded;
20422053
}
20432054

@@ -2253,12 +2264,12 @@ TEST_F(FirebaseGmaTest, TestNativeAdErrorBadAdUnitId) {
22532264

22542265
// Load the native ad.
22552266
firebase::gma::AdRequest request = GetAdRequest();
2256-
firebase::Future<firebase::gma::AdResult> load_ad =
2267+
firebase::Future<firebase::gma::AdResult> load_ad_future =
22572268
native_ad->LoadAd(kBadAdUnit, request);
2258-
WaitForCompletion(load_ad, "LoadAd",
2269+
WaitForCompletion(load_ad_future, "LoadAd",
22592270
firebase::gma::kAdErrorCodeInvalidRequest);
22602271

2261-
const firebase::gma::AdResult* result_ptr = load_ad.result();
2272+
const firebase::gma::AdResult* result_ptr = load_ad_future.result();
22622273
ASSERT_NE(result_ptr, nullptr);
22632274
EXPECT_FALSE(result_ptr->is_successful());
22642275
EXPECT_EQ(result_ptr->ad_error().code(),
@@ -2268,6 +2279,8 @@ TEST_F(FirebaseGmaTest, TestNativeAdErrorBadAdUnitId) {
22682279
const firebase::gma::ResponseInfo response_info =
22692280
result_ptr->ad_error().response_info();
22702281
EXPECT_TRUE(response_info.adapter_responses().empty());
2282+
2283+
load_ad_future.Release();
22712284
delete native_ad;
22722285
}
22732286

0 commit comments

Comments
 (0)