From ee5e8d1c9c70de0e5fffb5fa54880f4c4316f1fb Mon Sep 17 00:00:00 2001 From: Terry Mancey Date: Mon, 27 Jun 2022 17:49:32 -0500 Subject: [PATCH] Add missing RemoveObserver calls from Brave Ads tests --- .../bat/ads/internal/account/account_unittest.cc | 6 ++++++ .../inline_content_ad_unittest.cc | 16 +++++++++++++--- .../new_tab_page_ad_if_ads_disabled_unittest.cc | 6 ++++++ .../new_tab_page_ads/new_tab_page_ad_unittest.cc | 16 +++++++++++++--- .../notification_ads/notification_ad_unittest.cc | 16 +++++++++++++--- .../promoted_content_ad_unittest.cc | 16 +++++++++++++--- .../search_result_ad_unittest.cc | 16 +++++++++++++--- 7 files changed, 77 insertions(+), 15 deletions(-) diff --git a/vendor/bat-native-ads/src/bat/ads/internal/account/account_unittest.cc b/vendor/bat-native-ads/src/bat/ads/internal/account/account_unittest.cc index 6864952a197..e3396808ca5 100644 --- a/vendor/bat-native-ads/src/bat/ads/internal/account/account_unittest.cc +++ b/vendor/bat-native-ads/src/bat/ads/internal/account/account_unittest.cc @@ -61,6 +61,12 @@ class BatAdsAccountTest : public AccountObserver, public UnitTestBase { account_->AddObserver(this); } + void TearDown() override { + account_->RemoveObserver(this); + + UnitTestBase::TearDown(); + } + void Save(const CreativeNotificationAdList& creative_ads) { database::table::CreativeNotificationAds database_table; database_table.Save(creative_ads, diff --git a/vendor/bat-native-ads/src/bat/ads/internal/ad_events/inline_content_ads/inline_content_ad_unittest.cc b/vendor/bat-native-ads/src/bat/ads/internal/ad_events/inline_content_ads/inline_content_ad_unittest.cc index af3794ab2cf..fce1055a7ef 100644 --- a/vendor/bat-native-ads/src/bat/ads/internal/ad_events/inline_content_ads/inline_content_ad_unittest.cc +++ b/vendor/bat-native-ads/src/bat/ads/internal/ad_events/inline_content_ads/inline_content_ad_unittest.cc @@ -37,12 +37,22 @@ constexpr char kInvalidCreativeInstanceId[] = ""; class BatAdsInlineContentAdTest : public InlineContentAdObserver, public UnitTestBase { protected: - BatAdsInlineContentAdTest() - : inline_content_ad_(std::make_unique()) { + BatAdsInlineContentAdTest() = default; + + ~BatAdsInlineContentAdTest() override = default; + + void SetUp() override { + UnitTestBase::SetUp(); + + inline_content_ad_ = std::make_unique(); inline_content_ad_->AddObserver(this); } - ~BatAdsInlineContentAdTest() override = default; + void TearDown() override { + inline_content_ad_->RemoveObserver(this); + + UnitTestBase::TearDown(); + } void OnInlineContentAdServed(const InlineContentAdInfo& ad) override { ad_ = ad; diff --git a/vendor/bat-native-ads/src/bat/ads/internal/ad_events/new_tab_page_ads/new_tab_page_ad_if_ads_disabled_unittest.cc b/vendor/bat-native-ads/src/bat/ads/internal/ad_events/new_tab_page_ads/new_tab_page_ad_if_ads_disabled_unittest.cc index ca8308644d9..e2a383510ec 100644 --- a/vendor/bat-native-ads/src/bat/ads/internal/ad_events/new_tab_page_ads/new_tab_page_ad_if_ads_disabled_unittest.cc +++ b/vendor/bat-native-ads/src/bat/ads/internal/ad_events/new_tab_page_ads/new_tab_page_ad_if_ads_disabled_unittest.cc @@ -55,6 +55,12 @@ class BatAdsNewTabPageAdIfAdsDisabledTest : public NewTabPageAdObserver, new_tab_page_ad_->AddObserver(this); } + void TearDown() override { + new_tab_page_ad_->RemoveObserver(this); + + UnitTestBase::TearDown(); + } + void OnNewTabPageAdServed(const NewTabPageAdInfo& ad) override { ad_ = ad; did_serve_ad_ = true; diff --git a/vendor/bat-native-ads/src/bat/ads/internal/ad_events/new_tab_page_ads/new_tab_page_ad_unittest.cc b/vendor/bat-native-ads/src/bat/ads/internal/ad_events/new_tab_page_ads/new_tab_page_ad_unittest.cc index 1f67e792f62..9154bc70d2b 100644 --- a/vendor/bat-native-ads/src/bat/ads/internal/ad_events/new_tab_page_ads/new_tab_page_ad_unittest.cc +++ b/vendor/bat-native-ads/src/bat/ads/internal/ad_events/new_tab_page_ads/new_tab_page_ad_unittest.cc @@ -40,12 +40,22 @@ constexpr char kInvalidCreativeInstanceId[] = ""; class BatAdsNewTabPageAdTest : public NewTabPageAdObserver, public UnitTestBase { protected: - BatAdsNewTabPageAdTest() - : new_tab_page_ad_(std::make_unique()) { + BatAdsNewTabPageAdTest() = default; + + ~BatAdsNewTabPageAdTest() override = default; + + void SetUp() override { + UnitTestBase::SetUp(); + + new_tab_page_ad_ = std::make_unique(); new_tab_page_ad_->AddObserver(this); } - ~BatAdsNewTabPageAdTest() override = default; + void TearDown() override { + new_tab_page_ad_->RemoveObserver(this); + + UnitTestBase::TearDown(); + } void OnNewTabPageAdServed(const NewTabPageAdInfo& ad) override { ad_ = ad; diff --git a/vendor/bat-native-ads/src/bat/ads/internal/ad_events/notification_ads/notification_ad_unittest.cc b/vendor/bat-native-ads/src/bat/ads/internal/ad_events/notification_ads/notification_ad_unittest.cc index dbaa59833eb..687eb1a9698 100644 --- a/vendor/bat-native-ads/src/bat/ads/internal/ad_events/notification_ads/notification_ad_unittest.cc +++ b/vendor/bat-native-ads/src/bat/ads/internal/ad_events/notification_ads/notification_ad_unittest.cc @@ -32,12 +32,22 @@ constexpr char kPlacementId[] = "d2ef9bb0-a0dc-472c-bc49-62105bb6da68"; class BatAdsNotificationAdTest : public NotificationAdObserver, public UnitTestBase { protected: - BatAdsNotificationAdTest() - : notification_ad_(std::make_unique()) { + BatAdsNotificationAdTest() = default; + + ~BatAdsNotificationAdTest() override = default; + + void SetUp() override { + UnitTestBase::SetUp(); + + notification_ad_ = std::make_unique(); notification_ad_->AddObserver(this); } - ~BatAdsNotificationAdTest() override = default; + void TearDown() override { + notification_ad_->RemoveObserver(this); + + UnitTestBase::TearDown(); + } void OnNotificationAdServed(const NotificationAdInfo& ad) override { ad_ = ad; diff --git a/vendor/bat-native-ads/src/bat/ads/internal/ad_events/promoted_content_ads/promoted_content_ad_unittest.cc b/vendor/bat-native-ads/src/bat/ads/internal/ad_events/promoted_content_ads/promoted_content_ad_unittest.cc index 52357830385..daad0ec84e1 100644 --- a/vendor/bat-native-ads/src/bat/ads/internal/ad_events/promoted_content_ads/promoted_content_ad_unittest.cc +++ b/vendor/bat-native-ads/src/bat/ads/internal/ad_events/promoted_content_ads/promoted_content_ad_unittest.cc @@ -39,12 +39,22 @@ constexpr char kInvalidCreativeInstanceId[] = ""; class BatAdsPromotedContentAdTest : public PromotedContentAdObserver, public UnitTestBase { protected: - BatAdsPromotedContentAdTest() - : promoted_content_ad_(std::make_unique()) { + BatAdsPromotedContentAdTest() = default; + + ~BatAdsPromotedContentAdTest() override = default; + + void SetUp() override { + UnitTestBase::SetUp(); + + promoted_content_ad_ = std::make_unique(); promoted_content_ad_->AddObserver(this); } - ~BatAdsPromotedContentAdTest() override = default; + void TearDown() override { + promoted_content_ad_->RemoveObserver(this); + + UnitTestBase::TearDown(); + } void OnPromotedContentAdServed(const PromotedContentAdInfo& ad) override { ad_ = ad; diff --git a/vendor/bat-native-ads/src/bat/ads/internal/ad_events/search_result_ads/search_result_ad_unittest.cc b/vendor/bat-native-ads/src/bat/ads/internal/ad_events/search_result_ads/search_result_ad_unittest.cc index afcc09674f6..1310f5eaf2c 100644 --- a/vendor/bat-native-ads/src/bat/ads/internal/ad_events/search_result_ads/search_result_ad_unittest.cc +++ b/vendor/bat-native-ads/src/bat/ads/internal/ad_events/search_result_ads/search_result_ad_unittest.cc @@ -106,12 +106,22 @@ void ExpectConversionCountEquals(const size_t expected_count) { class BatAdsSearchResultAdTest : public SearchResultAdObserver, public UnitTestBase { protected: - BatAdsSearchResultAdTest() - : search_result_ad_(std::make_unique()) { + BatAdsSearchResultAdTest() = default; + + ~BatAdsSearchResultAdTest() override = default; + + void SetUp() override { + UnitTestBase::SetUp(); + + search_result_ad_ = std::make_unique(); search_result_ad_->AddObserver(this); } - ~BatAdsSearchResultAdTest() override = default; + void TearDown() override { + search_result_ad_->RemoveObserver(this); + + UnitTestBase::TearDown(); + } void FireEvent(const mojom::SearchResultAdPtr& ad_mojom, const mojom::SearchResultAdEventType event_type) {