From 312cb7bb3f7f7ed2a8c3752c6f28d615c98b9cec Mon Sep 17 00:00:00 2001 From: Wojciech Knapik Date: Mon, 12 Apr 2021 14:47:49 +0200 Subject: [PATCH 01/37] Testing gtest reporting in Jenkins. --- browser/ephemeral_storage/ephemeral_storage_browsertest.cc | 2 +- .../browser/view_counter_model_unittest.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/ephemeral_storage/ephemeral_storage_browsertest.cc b/browser/ephemeral_storage/ephemeral_storage_browsertest.cc index 5fe3056ea96d..62949a24adfa 100644 --- a/browser/ephemeral_storage/ephemeral_storage_browsertest.cc +++ b/browser/ephemeral_storage/ephemeral_storage_browsertest.cc @@ -523,7 +523,7 @@ IN_PROC_BROWSER_TEST_F(EphemeralStorageBrowserTest, ValuesFromFrame first_party_values = GetValuesFromFrame(first_party_nested_acom); - EXPECT_EQ("first-party-a.com", first_party_values.local_storage); + EXPECT_EQ("thirty-first-party-a.com", first_party_values.local_storage); EXPECT_EQ("first-party-a.com", first_party_values.session_storage); EXPECT_EQ("name=first-party-a.com", first_party_values.cookies); diff --git a/components/ntp_background_images/browser/view_counter_model_unittest.cc b/components/ntp_background_images/browser/view_counter_model_unittest.cc index 9075346cf1ab..44dbfa4a1b34 100644 --- a/components/ntp_background_images/browser/view_counter_model_unittest.cc +++ b/components/ntp_background_images/browser/view_counter_model_unittest.cc @@ -37,7 +37,7 @@ TEST(ViewCounterModelTest, NTPSponsoredImagesTest) { } // Image at index 1 should be displayed now because - EXPECT_TRUE(model.ShouldShowBrandedWallpaper()); + EXPECT_FALSE(model.ShouldShowBrandedWallpaper()); EXPECT_EQ(1, model.current_wallpaper_image_index()); model.RegisterPageView(); From 1ba0e4497155195fe5f06421b84515ef2ee9403e Mon Sep 17 00:00:00 2001 From: Wojciech Knapik Date: Mon, 12 Apr 2021 17:15:30 +0200 Subject: [PATCH 02/37] Test #1. --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1d47d5713ebf..415ccbdf8f4c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -96,7 +96,7 @@ pipeline { credentials('brave-builds-github-token-for-pr-builder') github('brave/devops', 'https') } - branch('master') + branch('wknapik-gtest-improvements') } } scriptPath("jenkins/jobs/browser/pr-brave-browser-${PLATFORM}.Jenkinsfile") From 4e2076a7d9e587a7a292724a60b2a56e453f5d70 Mon Sep 17 00:00:00 2001 From: Wojciech Knapik Date: Mon, 12 Apr 2021 18:45:56 +0200 Subject: [PATCH 03/37] WIP. --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 415ccbdf8f4c..d6d5a3355841 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -96,6 +96,7 @@ pipeline { credentials('brave-builds-github-token-for-pr-builder') github('brave/devops', 'https') } + branch('wknapik-gtest-improvements') } } From 203e62dfb6c0c99b9e94c9cd33a16d51e8973523 Mon Sep 17 00:00:00 2001 From: Wojciech Knapik Date: Mon, 12 Apr 2021 20:30:21 +0200 Subject: [PATCH 04/37] WIP. --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index d6d5a3355841..415ccbdf8f4c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -96,7 +96,6 @@ pipeline { credentials('brave-builds-github-token-for-pr-builder') github('brave/devops', 'https') } - branch('wknapik-gtest-improvements') } } From 958d20228cac694c7b06c0a8bd7928f7d3f75d36 Mon Sep 17 00:00:00 2001 From: Wojciech Knapik Date: Tue, 13 Apr 2021 13:05:49 +0200 Subject: [PATCH 05/37] WIP. --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 415ccbdf8f4c..d6d5a3355841 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -96,6 +96,7 @@ pipeline { credentials('brave-builds-github-token-for-pr-builder') github('brave/devops', 'https') } + branch('wknapik-gtest-improvements') } } From c26455fca081199d781f9276518a0f10e009e9ee Mon Sep 17 00:00:00 2001 From: Wojciech Knapik Date: Tue, 13 Apr 2021 13:20:44 +0200 Subject: [PATCH 06/37] WIP. --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index d6d5a3355841..415ccbdf8f4c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -96,7 +96,6 @@ pipeline { credentials('brave-builds-github-token-for-pr-builder') github('brave/devops', 'https') } - branch('wknapik-gtest-improvements') } } From 7808c1d3ef132a14fd15f24972bc0783d9221fe7 Mon Sep 17 00:00:00 2001 From: Wojciech Knapik Date: Tue, 13 Apr 2021 14:13:22 +0200 Subject: [PATCH 07/37] WIP. --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 415ccbdf8f4c..d6d5a3355841 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -96,6 +96,7 @@ pipeline { credentials('brave-builds-github-token-for-pr-builder') github('brave/devops', 'https') } + branch('wknapik-gtest-improvements') } } From ba603396fcf3ed4bba5082ba9354c88a9dbc4351 Mon Sep 17 00:00:00 2001 From: Wojciech Knapik Date: Tue, 13 Apr 2021 14:20:24 +0200 Subject: [PATCH 08/37] WIP. --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index d6d5a3355841..415ccbdf8f4c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -96,7 +96,6 @@ pipeline { credentials('brave-builds-github-token-for-pr-builder') github('brave/devops', 'https') } - branch('wknapik-gtest-improvements') } } From 5184307ef0f36ed98b463e18a247e41ad40bf495 Mon Sep 17 00:00:00 2001 From: Wojciech Knapik Date: Tue, 13 Apr 2021 15:45:09 +0200 Subject: [PATCH 09/37] WIP. --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 415ccbdf8f4c..d6d5a3355841 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -96,6 +96,7 @@ pipeline { credentials('brave-builds-github-token-for-pr-builder') github('brave/devops', 'https') } + branch('wknapik-gtest-improvements') } } From 73f3a048f44fc5eaaec0b27e6466a1780f5db3bf Mon Sep 17 00:00:00 2001 From: Wojciech Knapik Date: Tue, 13 Apr 2021 17:56:32 +0200 Subject: [PATCH 10/37] WIP. --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index d6d5a3355841..415ccbdf8f4c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -96,7 +96,6 @@ pipeline { credentials('brave-builds-github-token-for-pr-builder') github('brave/devops', 'https') } - branch('wknapik-gtest-improvements') } } From de44fe57265ce4eac7cc6ad19187a2c86f153376 Mon Sep 17 00:00:00 2001 From: Wojciech Knapik Date: Tue, 13 Apr 2021 18:18:51 +0200 Subject: [PATCH 11/37] WIP. --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 415ccbdf8f4c..d6d5a3355841 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -96,6 +96,7 @@ pipeline { credentials('brave-builds-github-token-for-pr-builder') github('brave/devops', 'https') } + branch('wknapik-gtest-improvements') } } From b37f01bba799f67fcb70484988abd858696d46da Mon Sep 17 00:00:00 2001 From: Wojciech Knapik Date: Tue, 13 Apr 2021 21:07:22 +0200 Subject: [PATCH 12/37] WIP. --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index d6d5a3355841..415ccbdf8f4c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -96,7 +96,6 @@ pipeline { credentials('brave-builds-github-token-for-pr-builder') github('brave/devops', 'https') } - branch('wknapik-gtest-improvements') } } From 913901f9339403d4419fc3fd650c4479b9a2dcad Mon Sep 17 00:00:00 2001 From: Wojciech Knapik Date: Tue, 13 Apr 2021 21:59:53 +0200 Subject: [PATCH 13/37] WIP. --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 415ccbdf8f4c..d6d5a3355841 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -96,6 +96,7 @@ pipeline { credentials('brave-builds-github-token-for-pr-builder') github('brave/devops', 'https') } + branch('wknapik-gtest-improvements') } } From a8c80207975e64ae21b960f9749388a6a87075cf Mon Sep 17 00:00:00 2001 From: Wojciech Knapik Date: Tue, 13 Apr 2021 22:05:18 +0200 Subject: [PATCH 14/37] WIP. --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index d6d5a3355841..415ccbdf8f4c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -96,7 +96,6 @@ pipeline { credentials('brave-builds-github-token-for-pr-builder') github('brave/devops', 'https') } - branch('wknapik-gtest-improvements') } } From f20adfad9b2cc1b6feae77b397d66cca4e2b6ea3 Mon Sep 17 00:00:00 2001 From: Wojciech Knapik Date: Tue, 13 Apr 2021 22:39:32 +0200 Subject: [PATCH 15/37] WIP. --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 415ccbdf8f4c..d6d5a3355841 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -96,6 +96,7 @@ pipeline { credentials('brave-builds-github-token-for-pr-builder') github('brave/devops', 'https') } + branch('wknapik-gtest-improvements') } } From 27d05510f4373adafc77828c82f08084c233898c Mon Sep 17 00:00:00 2001 From: Wojciech Knapik Date: Tue, 13 Apr 2021 23:03:56 +0200 Subject: [PATCH 16/37] WIP. --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index d6d5a3355841..415ccbdf8f4c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -96,7 +96,6 @@ pipeline { credentials('brave-builds-github-token-for-pr-builder') github('brave/devops', 'https') } - branch('wknapik-gtest-improvements') } } From 3b2e9f5d18f3b7482208e94671c0d229b7d1bb41 Mon Sep 17 00:00:00 2001 From: Wojciech Knapik Date: Wed, 14 Apr 2021 11:44:58 +0200 Subject: [PATCH 17/37] WIP. --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 415ccbdf8f4c..d6d5a3355841 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -96,6 +96,7 @@ pipeline { credentials('brave-builds-github-token-for-pr-builder') github('brave/devops', 'https') } + branch('wknapik-gtest-improvements') } } From facc7ba699145e842dbb440f251e86fb10927ff0 Mon Sep 17 00:00:00 2001 From: Wojciech Knapik Date: Wed, 14 Apr 2021 12:52:21 +0200 Subject: [PATCH 18/37] WIP. --- Jenkinsfile | 1 - browser/ephemeral_storage/ephemeral_storage_browsertest.cc | 2 +- .../browser/view_counter_model_unittest.cc | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index d6d5a3355841..415ccbdf8f4c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -96,7 +96,6 @@ pipeline { credentials('brave-builds-github-token-for-pr-builder') github('brave/devops', 'https') } - branch('wknapik-gtest-improvements') } } diff --git a/browser/ephemeral_storage/ephemeral_storage_browsertest.cc b/browser/ephemeral_storage/ephemeral_storage_browsertest.cc index 62949a24adfa..5fe3056ea96d 100644 --- a/browser/ephemeral_storage/ephemeral_storage_browsertest.cc +++ b/browser/ephemeral_storage/ephemeral_storage_browsertest.cc @@ -523,7 +523,7 @@ IN_PROC_BROWSER_TEST_F(EphemeralStorageBrowserTest, ValuesFromFrame first_party_values = GetValuesFromFrame(first_party_nested_acom); - EXPECT_EQ("thirty-first-party-a.com", first_party_values.local_storage); + EXPECT_EQ("first-party-a.com", first_party_values.local_storage); EXPECT_EQ("first-party-a.com", first_party_values.session_storage); EXPECT_EQ("name=first-party-a.com", first_party_values.cookies); diff --git a/components/ntp_background_images/browser/view_counter_model_unittest.cc b/components/ntp_background_images/browser/view_counter_model_unittest.cc index 44dbfa4a1b34..9075346cf1ab 100644 --- a/components/ntp_background_images/browser/view_counter_model_unittest.cc +++ b/components/ntp_background_images/browser/view_counter_model_unittest.cc @@ -37,7 +37,7 @@ TEST(ViewCounterModelTest, NTPSponsoredImagesTest) { } // Image at index 1 should be displayed now because - EXPECT_FALSE(model.ShouldShowBrandedWallpaper()); + EXPECT_TRUE(model.ShouldShowBrandedWallpaper()); EXPECT_EQ(1, model.current_wallpaper_image_index()); model.RegisterPageView(); From a1b6ff9f546e41e4ebb1c615e4fe4b857056f36d Mon Sep 17 00:00:00 2001 From: Wojciech Knapik Date: Wed, 14 Apr 2021 16:00:52 +0200 Subject: [PATCH 19/37] WIP. --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 415ccbdf8f4c..d6d5a3355841 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -96,6 +96,7 @@ pipeline { credentials('brave-builds-github-token-for-pr-builder') github('brave/devops', 'https') } + branch('wknapik-gtest-improvements') } } From fae3637b5f290381ef99d5dabe7028534908912e Mon Sep 17 00:00:00 2001 From: Wojciech Knapik Date: Wed, 14 Apr 2021 19:38:48 +0200 Subject: [PATCH 20/37] WIP. --- browser/tor/tor_navigation_throttle_unittest.cc | 2 +- .../brave_rewards/browser/test/rewards_promotion_browsertest.cc | 2 +- .../browser/tracking_protection_service_browsertest.cc | 2 +- net/dns/brave_resolve_context_unittest.cc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/browser/tor/tor_navigation_throttle_unittest.cc b/browser/tor/tor_navigation_throttle_unittest.cc index 6d8c88a5993f..253adc363b88 100644 --- a/browser/tor/tor_navigation_throttle_unittest.cc +++ b/browser/tor/tor_navigation_throttle_unittest.cc @@ -81,7 +81,7 @@ TEST_F(TorNavigationThrottleUnitTest, Instantiation) { std::unique_ptr throttle = TorNavigationThrottle::MaybeCreateThrottleFor( &test_handle, tor_web_contents()->GetBrowserContext()->IsTor()); - EXPECT_TRUE(throttle != nullptr); + EXPECT_FALSE(throttle != nullptr); content::MockNavigationHandle test_handle2(web_contents()); std::unique_ptr throttle2 = diff --git a/components/brave_rewards/browser/test/rewards_promotion_browsertest.cc b/components/brave_rewards/browser/test/rewards_promotion_browsertest.cc index 7130bb086639..10d522c55849 100644 --- a/components/brave_rewards/browser/test/rewards_promotion_browsertest.cc +++ b/components/brave_rewards/browser/test/rewards_promotion_browsertest.cc @@ -135,7 +135,7 @@ class RewardsPromotionBrowserTest : public InProcessBrowserTest { auto promotion = promotion_->GetPromotion(); EXPECT_STREQ( std::to_string(promotion->approximate_value).c_str(), - "30.000000"); + "1337.000000"); EXPECT_STREQ( promotion->id.c_str(), promotion_->GetPromotionId().c_str()); diff --git a/components/brave_shields/browser/tracking_protection_service_browsertest.cc b/components/brave_shields/browser/tracking_protection_service_browsertest.cc index f6eeaf562dad..35d7c42f0c88 100644 --- a/components/brave_shields/browser/tracking_protection_service_browsertest.cc +++ b/components/brave_shields/browser/tracking_protection_service_browsertest.cc @@ -75,7 +75,7 @@ IN_PROC_BROWSER_TEST_F(TrackingProtectionServiceTest, StorageTrackingBlocked) { content::WebContents* contents = browser()->tab_strip_model()->GetActiveWebContents(); - EXPECT_EQ("tracker.com", contents->GetURL().host()); + EXPECT_EQ("bugtracker.com", contents->GetURL().host()); bool cookie_blocked; ASSERT_TRUE(ExecuteScriptAndExtractBool( diff --git a/net/dns/brave_resolve_context_unittest.cc b/net/dns/brave_resolve_context_unittest.cc index 369315893ff6..c472227501f1 100644 --- a/net/dns/brave_resolve_context_unittest.cc +++ b/net/dns/brave_resolve_context_unittest.cc @@ -63,7 +63,7 @@ TEST_F(BraveResolveContextTest, DohServerAvailability_InitialAvailability) { false /* network_change */); EXPECT_EQ(context.NumAvailableDohServers(session.get()), 2u); - EXPECT_TRUE(context.GetDohServerAvailability(0u, session.get())); + EXPECT_FALSE(context.GetDohServerAvailability(0u, session.get())); EXPECT_TRUE(context.GetDohServerAvailability(1u, session.get())); std::unique_ptr doh_itr = context.GetDohIterator( From 9c88f682abd1cb3b3ce021a37347c29c3cff9f32 Mon Sep 17 00:00:00 2001 From: Wojciech Knapik Date: Wed, 14 Apr 2021 20:05:05 +0200 Subject: [PATCH 21/37] WIP. --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index d6d5a3355841..415ccbdf8f4c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -96,7 +96,6 @@ pipeline { credentials('brave-builds-github-token-for-pr-builder') github('brave/devops', 'https') } - branch('wknapik-gtest-improvements') } } From 81b8a250f3ad7a9430d642776734dd82f4b34a8a Mon Sep 17 00:00:00 2001 From: Wojciech Knapik Date: Thu, 15 Apr 2021 13:31:12 +0200 Subject: [PATCH 22/37] WIP. --- browser/brave_shields/ad_block_service_browsertest.cc | 6 +++--- .../browser/test/rewards_promotion_browsertest.cc | 2 +- .../browser/tracking_protection_service_browsertest.cc | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/browser/brave_shields/ad_block_service_browsertest.cc b/browser/brave_shields/ad_block_service_browsertest.cc index a6a7db41bb0f..443059ef6aef 100644 --- a/browser/brave_shields/ad_block_service_browsertest.cc +++ b/browser/brave_shields/ad_block_service_browsertest.cc @@ -447,7 +447,7 @@ IN_PROC_BROWSER_TEST_F(AdBlockServiceTest, TwoSameAdsGetCountedAsOne) { ASSERT_EQ(true, EvalJs(contents, "setExpectations(0, 0, 1, 1);" "xhr('normal.js')")); - ASSERT_EQ(true, EvalJs(contents, + ASSERT_EQ(false, EvalJs(contents, "setExpectations(0, 0, 1, 2);" "xhr('adbanner.js')")); EXPECT_EQ(browser()->profile()->GetPrefs()->GetUint64(kAdsBlocked), 1ULL); @@ -619,7 +619,7 @@ IN_PROC_BROWSER_TEST_F(AdBlockServiceTest, BlockNYP) { ui_test_utils::NavigateToURL(browser(), tab_url); content::WebContents* contents = browser()->tab_strip_model()->GetActiveWebContents(); - ASSERT_EQ(true, + ASSERT_EQ(false, EvalJs(contents, base::StringPrintf("setExpectations(0, 1, 0, 0);" "addImage('%s')", resource_url.spec().c_str()))); @@ -1147,5 +1147,5 @@ IN_PROC_BROWSER_TEST_F(AdBlockServiceTest, CosmeticFilteringIframeScriptlet) { content::WebContents* contents = browser()->tab_strip_model()->GetActiveWebContents(); - ASSERT_EQ(true, EvalJs(contents, "show_ad")); + ASSERT_EQ(false, EvalJs(contents, "show_ad")); } diff --git a/components/brave_rewards/browser/test/rewards_promotion_browsertest.cc b/components/brave_rewards/browser/test/rewards_promotion_browsertest.cc index 10d522c55849..7130bb086639 100644 --- a/components/brave_rewards/browser/test/rewards_promotion_browsertest.cc +++ b/components/brave_rewards/browser/test/rewards_promotion_browsertest.cc @@ -135,7 +135,7 @@ class RewardsPromotionBrowserTest : public InProcessBrowserTest { auto promotion = promotion_->GetPromotion(); EXPECT_STREQ( std::to_string(promotion->approximate_value).c_str(), - "1337.000000"); + "30.000000"); EXPECT_STREQ( promotion->id.c_str(), promotion_->GetPromotionId().c_str()); diff --git a/components/brave_shields/browser/tracking_protection_service_browsertest.cc b/components/brave_shields/browser/tracking_protection_service_browsertest.cc index 35d7c42f0c88..f6eeaf562dad 100644 --- a/components/brave_shields/browser/tracking_protection_service_browsertest.cc +++ b/components/brave_shields/browser/tracking_protection_service_browsertest.cc @@ -75,7 +75,7 @@ IN_PROC_BROWSER_TEST_F(TrackingProtectionServiceTest, StorageTrackingBlocked) { content::WebContents* contents = browser()->tab_strip_model()->GetActiveWebContents(); - EXPECT_EQ("bugtracker.com", contents->GetURL().host()); + EXPECT_EQ("tracker.com", contents->GetURL().host()); bool cookie_blocked; ASSERT_TRUE(ExecuteScriptAndExtractBool( From aabe2e47432bd44378aaef04015a2c6d48ead51a Mon Sep 17 00:00:00 2001 From: Wojciech Knapik Date: Thu, 15 Apr 2021 13:33:49 +0200 Subject: [PATCH 23/37] WIP. --- browser/ui/toolbar/brave_app_menu_model_browsertest.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/ui/toolbar/brave_app_menu_model_browsertest.cc b/browser/ui/toolbar/brave_app_menu_model_browsertest.cc index 494185897e44..fbbca20f5002 100644 --- a/browser/ui/toolbar/brave_app_menu_model_browsertest.cc +++ b/browser/ui/toolbar/brave_app_menu_model_browsertest.cc @@ -39,7 +39,7 @@ void CheckCommandsAreDisabledInMenuModel( BraveAppMenuModel model(browser_view->toolbar(), browser); model.Init(); for (int id : disabled_commands) - EXPECT_EQ(-1, model.GetIndexOfCommandId(id)); + EXPECT_EQ(-2, model.GetIndexOfCommandId(id)); } void CheckCommandsAreInOrderInMenuModel( From 6415a17b843bd7b3f03b41001252c8d0fba15759 Mon Sep 17 00:00:00 2001 From: Wojciech Knapik Date: Thu, 15 Apr 2021 13:35:15 +0200 Subject: [PATCH 24/37] WIP. --- browser/brave_shields/ad_block_service_browsertest.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/brave_shields/ad_block_service_browsertest.cc b/browser/brave_shields/ad_block_service_browsertest.cc index c2c65518e01b..eccb1f0d8174 100644 --- a/browser/brave_shields/ad_block_service_browsertest.cc +++ b/browser/brave_shields/ad_block_service_browsertest.cc @@ -619,7 +619,7 @@ IN_PROC_BROWSER_TEST_F(AdBlockServiceTest, BlockNYP) { ui_test_utils::NavigateToURL(browser(), tab_url); content::WebContents* contents = browser()->tab_strip_model()->GetActiveWebContents(); - ASSERT_EQ(false, + ASSERT_EQ(true, EvalJs(contents, base::StringPrintf("setExpectations(0, 1, 0, 0);" "addImage('%s')", resource_url.spec().c_str()))); @@ -1205,5 +1205,5 @@ IN_PROC_BROWSER_TEST_F(AdBlockServiceTest, CosmeticFilteringIframeScriptlet) { content::WebContents* contents = browser()->tab_strip_model()->GetActiveWebContents(); - ASSERT_EQ(false, EvalJs(contents, "show_ad")); + ASSERT_EQ(true, EvalJs(contents, "show_ad")); } From 55aac630978b3949ed57d4bccdea289e79a9f811 Mon Sep 17 00:00:00 2001 From: Wojciech Knapik Date: Fri, 16 Apr 2021 12:17:33 +0200 Subject: [PATCH 25/37] WIP. --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 415ccbdf8f4c..d6d5a3355841 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -96,6 +96,7 @@ pipeline { credentials('brave-builds-github-token-for-pr-builder') github('brave/devops', 'https') } + branch('wknapik-gtest-improvements') } } From 0d4f84a2ee9fbf4b4ee6ea26acb611144618c3ce Mon Sep 17 00:00:00 2001 From: Wojciech Knapik Date: Fri, 16 Apr 2021 17:37:42 +0200 Subject: [PATCH 26/37] WIP. --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index d6d5a3355841..415ccbdf8f4c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -96,7 +96,6 @@ pipeline { credentials('brave-builds-github-token-for-pr-builder') github('brave/devops', 'https') } - branch('wknapik-gtest-improvements') } } From 3dc32377a879161d44e17a3a2295021c597369e5 Mon Sep 17 00:00:00 2001 From: Wojciech Knapik Date: Fri, 16 Apr 2021 20:29:11 +0200 Subject: [PATCH 27/37] WIP. --- browser/brave_shields/ad_block_service_browsertest.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/brave_shields/ad_block_service_browsertest.cc b/browser/brave_shields/ad_block_service_browsertest.cc index eccb1f0d8174..7bd1e18f92bf 100644 --- a/browser/brave_shields/ad_block_service_browsertest.cc +++ b/browser/brave_shields/ad_block_service_browsertest.cc @@ -448,8 +448,8 @@ IN_PROC_BROWSER_TEST_F(AdBlockServiceTest, TwoSameAdsGetCountedAsOne) { "setExpectations(0, 0, 1, 1);" "xhr('normal.js')")); ASSERT_EQ(false, EvalJs(contents, - "setExpectations(0, 0, 1, 2);" - "xhr('adbanner.js')")); + "setExpectations(0, 0, 1, 2);" + "xhr('adbanner.js')")); EXPECT_EQ(browser()->profile()->GetPrefs()->GetUint64(kAdsBlocked), 1ULL); } From 00acdfcee0b9360b56f5b48e48f3c4e4bbaa2fab Mon Sep 17 00:00:00 2001 From: Wojciech Knapik Date: Fri, 16 Apr 2021 21:44:27 +0200 Subject: [PATCH 28/37] WIP. --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 415ccbdf8f4c..d6d5a3355841 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -96,6 +96,7 @@ pipeline { credentials('brave-builds-github-token-for-pr-builder') github('brave/devops', 'https') } + branch('wknapik-gtest-improvements') } } From 21c95774da75fe00c36323eb512a06994f299728 Mon Sep 17 00:00:00 2001 From: Wojciech Knapik Date: Mon, 19 Apr 2021 13:05:08 +0200 Subject: [PATCH 29/37] WIP. --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index d6d5a3355841..415ccbdf8f4c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -96,7 +96,6 @@ pipeline { credentials('brave-builds-github-token-for-pr-builder') github('brave/devops', 'https') } - branch('wknapik-gtest-improvements') } } From 67aa65d599675b074f948e20df5ea3af7942128d Mon Sep 17 00:00:00 2001 From: Wojciech Knapik Date: Mon, 19 Apr 2021 14:59:56 +0200 Subject: [PATCH 30/37] WIP. --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 415ccbdf8f4c..d6d5a3355841 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -96,6 +96,7 @@ pipeline { credentials('brave-builds-github-token-for-pr-builder') github('brave/devops', 'https') } + branch('wknapik-gtest-improvements') } } From c5f2ad6858c61f81cf2053e55032985c410b13a5 Mon Sep 17 00:00:00 2001 From: Wojciech Knapik Date: Mon, 19 Apr 2021 15:11:55 +0200 Subject: [PATCH 31/37] WIP. --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index d6d5a3355841..415ccbdf8f4c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -96,7 +96,6 @@ pipeline { credentials('brave-builds-github-token-for-pr-builder') github('brave/devops', 'https') } - branch('wknapik-gtest-improvements') } } From 28e22fcf315858cc0601051d3198a6e30c16f8a7 Mon Sep 17 00:00:00 2001 From: Wojciech Knapik Date: Mon, 19 Apr 2021 16:14:13 +0200 Subject: [PATCH 32/37] WIP. --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 415ccbdf8f4c..d6d5a3355841 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -96,6 +96,7 @@ pipeline { credentials('brave-builds-github-token-for-pr-builder') github('brave/devops', 'https') } + branch('wknapik-gtest-improvements') } } From f1b6c6617eb72b8c221fd84913d834ebabe2d190 Mon Sep 17 00:00:00 2001 From: Wojciech Knapik Date: Tue, 20 Apr 2021 13:43:33 +0200 Subject: [PATCH 33/37] WIP. --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index d6d5a3355841..415ccbdf8f4c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -96,7 +96,6 @@ pipeline { credentials('brave-builds-github-token-for-pr-builder') github('brave/devops', 'https') } - branch('wknapik-gtest-improvements') } } From 01fb5f2561ef5325e25c0b2e0a850d7dde4c3cd7 Mon Sep 17 00:00:00 2001 From: Wojciech Knapik Date: Tue, 20 Apr 2021 17:31:51 +0200 Subject: [PATCH 34/37] WIP. --- browser/brave_shields/ad_block_service_browsertest.cc | 6 +++--- browser/tor/tor_navigation_throttle_unittest.cc | 2 +- browser/ui/toolbar/brave_app_menu_model_browsertest.cc | 2 +- net/dns/brave_resolve_context_unittest.cc | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/browser/brave_shields/ad_block_service_browsertest.cc b/browser/brave_shields/ad_block_service_browsertest.cc index 7bd1e18f92bf..75ef953cc6fc 100644 --- a/browser/brave_shields/ad_block_service_browsertest.cc +++ b/browser/brave_shields/ad_block_service_browsertest.cc @@ -447,9 +447,9 @@ IN_PROC_BROWSER_TEST_F(AdBlockServiceTest, TwoSameAdsGetCountedAsOne) { ASSERT_EQ(true, EvalJs(contents, "setExpectations(0, 0, 1, 1);" "xhr('normal.js')")); - ASSERT_EQ(false, EvalJs(contents, - "setExpectations(0, 0, 1, 2);" - "xhr('adbanner.js')")); + ASSERT_EQ(true, EvalJs(contents, + "setExpectations(0, 0, 1, 2);" + "xhr('adbanner.js')")); EXPECT_EQ(browser()->profile()->GetPrefs()->GetUint64(kAdsBlocked), 1ULL); } diff --git a/browser/tor/tor_navigation_throttle_unittest.cc b/browser/tor/tor_navigation_throttle_unittest.cc index 253adc363b88..6d8c88a5993f 100644 --- a/browser/tor/tor_navigation_throttle_unittest.cc +++ b/browser/tor/tor_navigation_throttle_unittest.cc @@ -81,7 +81,7 @@ TEST_F(TorNavigationThrottleUnitTest, Instantiation) { std::unique_ptr throttle = TorNavigationThrottle::MaybeCreateThrottleFor( &test_handle, tor_web_contents()->GetBrowserContext()->IsTor()); - EXPECT_FALSE(throttle != nullptr); + EXPECT_TRUE(throttle != nullptr); content::MockNavigationHandle test_handle2(web_contents()); std::unique_ptr throttle2 = diff --git a/browser/ui/toolbar/brave_app_menu_model_browsertest.cc b/browser/ui/toolbar/brave_app_menu_model_browsertest.cc index fbbca20f5002..494185897e44 100644 --- a/browser/ui/toolbar/brave_app_menu_model_browsertest.cc +++ b/browser/ui/toolbar/brave_app_menu_model_browsertest.cc @@ -39,7 +39,7 @@ void CheckCommandsAreDisabledInMenuModel( BraveAppMenuModel model(browser_view->toolbar(), browser); model.Init(); for (int id : disabled_commands) - EXPECT_EQ(-2, model.GetIndexOfCommandId(id)); + EXPECT_EQ(-1, model.GetIndexOfCommandId(id)); } void CheckCommandsAreInOrderInMenuModel( diff --git a/net/dns/brave_resolve_context_unittest.cc b/net/dns/brave_resolve_context_unittest.cc index c472227501f1..369315893ff6 100644 --- a/net/dns/brave_resolve_context_unittest.cc +++ b/net/dns/brave_resolve_context_unittest.cc @@ -63,7 +63,7 @@ TEST_F(BraveResolveContextTest, DohServerAvailability_InitialAvailability) { false /* network_change */); EXPECT_EQ(context.NumAvailableDohServers(session.get()), 2u); - EXPECT_FALSE(context.GetDohServerAvailability(0u, session.get())); + EXPECT_TRUE(context.GetDohServerAvailability(0u, session.get())); EXPECT_TRUE(context.GetDohServerAvailability(1u, session.get())); std::unique_ptr doh_itr = context.GetDohIterator( From 8bb2c1081e4af1b5c1a666f8bbeef5edfe5fdf77 Mon Sep 17 00:00:00 2001 From: Wojciech Knapik Date: Tue, 20 Apr 2021 18:02:37 +0200 Subject: [PATCH 35/37] WIP. --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 415ccbdf8f4c..d6d5a3355841 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -96,6 +96,7 @@ pipeline { credentials('brave-builds-github-token-for-pr-builder') github('brave/devops', 'https') } + branch('wknapik-gtest-improvements') } } From 4d4a19a82b6817002cb185e622fce0f5ab4e1680 Mon Sep 17 00:00:00 2001 From: Wojciech Knapik Date: Tue, 20 Apr 2021 18:15:49 +0200 Subject: [PATCH 36/37] WIP. --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index d6d5a3355841..415ccbdf8f4c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -96,7 +96,6 @@ pipeline { credentials('brave-builds-github-token-for-pr-builder') github('brave/devops', 'https') } - branch('wknapik-gtest-improvements') } } From cdc2fd4b3581d97a04420e8f9d6362467bf7d59a Mon Sep 17 00:00:00 2001 From: Wojciech Knapik Date: Wed, 21 Apr 2021 08:32:58 +0200 Subject: [PATCH 37/37] WIP. --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 415ccbdf8f4c..d6d5a3355841 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -96,6 +96,7 @@ pipeline { credentials('brave-builds-github-token-for-pr-builder') github('brave/devops', 'https') } + branch('wknapik-gtest-improvements') } }