Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(993)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: components/subresource_filter/content/renderer/subresource_filter_agent_unittest.cc

Issue 2573093002: Simplify unit tests for SubresourceFilterAgent. (Closed)
Patch Set: Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/subresource_filter/content/renderer/subresource_filter_agent_unittest.cc
diff --git a/components/subresource_filter/content/renderer/subresource_filter_agent_unittest.cc b/components/subresource_filter/content/renderer/subresource_filter_agent_unittest.cc
index f55a97c827e89237e576d095488a5e7b8717a16b..29227c0f3042964e329676e6c2cd476ac6e0b008 100644
--- a/components/subresource_filter/content/renderer/subresource_filter_agent_unittest.cc
+++ b/components/subresource_filter/content/renderer/subresource_filter_agent_unittest.cc
@@ -174,11 +174,25 @@ class SubresourceFilterAgentTest : public ::testing::Test {
};
TEST_F(SubresourceFilterAgentTest, DisabledByDefault_NoFilterIsInjected) {
+ base::HistogramTester histogram_tester;
ASSERT_NO_FATAL_FAILURE(
SetTestRulesetToDisallowURLsWithPathSuffix(kTestBothURLsPathSuffix));
ExpectNoSubresourceFilterGetsInjected();
StartLoadWithoutSettingActivationState();
FinishLoad();
+
+ histogram_tester.ExpectUniqueSample(
+ kDocumentLoadActivationState, static_cast<int>(ActivationState::DISABLED),
+ 1);
+ histogram_tester.ExpectTotalCount(kDocumentLoadRulesetIsAvailable, 0);
+
+ histogram_tester.ExpectTotalCount(kSubresourcesTotal, 0);
+ histogram_tester.ExpectTotalCount(kSubresourcesEvaluated, 0);
+ histogram_tester.ExpectTotalCount(kSubresourcesMatchedRules, 0);
+ histogram_tester.ExpectTotalCount(kSubresourcesDisallowed, 0);
+
+ histogram_tester.ExpectTotalCount(kEvaluationTotalWallDuration, 0);
+ histogram_tester.ExpectTotalCount(kEvaluationTotalCPUDuration, 0);
}
TEST_F(SubresourceFilterAgentTest, Disabled_NoFilterIsInjected) {
@@ -191,12 +205,27 @@ TEST_F(SubresourceFilterAgentTest, Disabled_NoFilterIsInjected) {
TEST_F(SubresourceFilterAgentTest,
EnabledButRulesetUnavailable_NoFilterIsInjected) {
+ base::HistogramTester histogram_tester;
ExpectNoSubresourceFilterGetsInjected();
StartLoadAndSetActivationState(ActivationState::ENABLED);
FinishLoad();
+
+ histogram_tester.ExpectUniqueSample(
+ kDocumentLoadActivationState, static_cast<int>(ActivationState::ENABLED),
+ 1);
+ histogram_tester.ExpectUniqueSample(kDocumentLoadRulesetIsAvailable, 0, 1);
+
+ histogram_tester.ExpectTotalCount(kSubresourcesTotal, 0);
+ histogram_tester.ExpectTotalCount(kSubresourcesEvaluated, 0);
+ histogram_tester.ExpectTotalCount(kSubresourcesMatchedRules, 0);
+ histogram_tester.ExpectTotalCount(kSubresourcesDisallowed, 0);
+
+ histogram_tester.ExpectTotalCount(kEvaluationTotalWallDuration, 0);
+ histogram_tester.ExpectTotalCount(kEvaluationTotalCPUDuration, 0);
}
TEST_F(SubresourceFilterAgentTest, Enabled_FilteringIsInEffectForOneLoad) {
+ base::HistogramTester histogram_tester;
ASSERT_NO_FATAL_FAILURE(
SetTestRulesetToDisallowURLsWithPathSuffix(kTestFirstURLPathSuffix));
@@ -212,6 +241,61 @@ TEST_F(SubresourceFilterAgentTest, Enabled_FilteringIsInEffectForOneLoad) {
ExpectNoSubresourceFilterGetsInjected();
StartLoadWithoutSettingActivationState();
FinishLoad();
+
+ EXPECT_THAT(histogram_tester.GetAllSamples(kDocumentLoadActivationState),
+ ::testing::ElementsAre(
+ base::Bucket(static_cast<int>(ActivationState::DISABLED), 1),
+ base::Bucket(static_cast<int>(ActivationState::ENABLED), 1)));
+ histogram_tester.ExpectUniqueSample(kDocumentLoadRulesetIsAvailable, 1, 1);
+}
+
+TEST_F(SubresourceFilterAgentTest, Enabled_HistogramSamples) {
+ for (const bool measure_performance : {false, true}) {
+ base::HistogramTester histogram_tester;
+ ASSERT_NO_FATAL_FAILURE(
+ SetTestRulesetToDisallowURLsWithPathSuffix(kTestFirstURLPathSuffix));
+ ExpectSubresourceFilterGetsInjected();
+ StartLoadAndSetActivationState(ActivationState::ENABLED,
+ measure_performance);
+ ASSERT_TRUE(::testing::Mock::VerifyAndClearExpectations(agent()));
+
+ ExpectSignalAboutFirstSubresourceDisallowed();
+ ExpectLoadAllowed(kTestFirstURL, false);
+ ExpectLoadAllowed(kTestFirstURL, false);
+ ExpectLoadAllowed(kTestSecondURL, true);
+ FinishLoad();
+
+ ExpectSubresourceFilterGetsInjected();
+ StartLoadAndSetActivationState(ActivationState::ENABLED,
+ measure_performance);
+ ASSERT_TRUE(::testing::Mock::VerifyAndClearExpectations(agent()));
+
+ ExpectSignalAboutFirstSubresourceDisallowed();
+ ExpectLoadAllowed(kTestFirstURL, false);
+ ExpectLoadAllowed(kTestSecondURL, true);
+ FinishLoad();
+
+ histogram_tester.ExpectUniqueSample(
+ kDocumentLoadActivationState,
+ static_cast<int>(ActivationState::ENABLED), 2);
+ histogram_tester.ExpectUniqueSample(kDocumentLoadRulesetIsAvailable, 1, 2);
+
+ EXPECT_THAT(histogram_tester.GetAllSamples(kSubresourcesTotal),
+ ::testing::ElementsAre(base::Bucket(2, 1), base::Bucket(3, 1)));
+ EXPECT_THAT(histogram_tester.GetAllSamples(kSubresourcesEvaluated),
+ ::testing::ElementsAre(base::Bucket(2, 1), base::Bucket(3, 1)));
+ EXPECT_THAT(histogram_tester.GetAllSamples(kSubresourcesMatchedRules),
+ ::testing::ElementsAre(base::Bucket(1, 1), base::Bucket(2, 1)));
+ EXPECT_THAT(histogram_tester.GetAllSamples(kSubresourcesDisallowed),
+ ::testing::ElementsAre(base::Bucket(1, 1), base::Bucket(2, 1)));
+
+ const base::HistogramBase::Count expected_total_count =
+ measure_performance && base::ThreadTicks::IsSupported() ? 2 : 0;
+ histogram_tester.ExpectTotalCount(kEvaluationTotalWallDuration,
+ expected_total_count);
+ histogram_tester.ExpectTotalCount(kEvaluationTotalCPUDuration,
+ expected_total_count);
+ }
}
TEST_F(SubresourceFilterAgentTest, Enabled_NewRulesetIsPickedUpAtNextLoad) {
@@ -261,15 +345,34 @@ TEST_F(SubresourceFilterAgentTest,
}
TEST_F(SubresourceFilterAgentTest, DryRun_ResourcesAreEvaluatedButNotFiltered) {
+ base::HistogramTester histogram_tester;
ASSERT_NO_FATAL_FAILURE(
SetTestRulesetToDisallowURLsWithPathSuffix(kTestFirstURLPathSuffix));
ExpectSubresourceFilterGetsInjected();
StartLoadAndSetActivationState(ActivationState::DRYRUN);
ASSERT_TRUE(::testing::Mock::VerifyAndClearExpectations(agent()));
+ // In dry-run mode, loads to the first URL should be recorded as
+ // `MatchedRules`, but still be allowed to proceed and not recorded as
+ // `Disallowed`.
+ ExpectLoadAllowed(kTestFirstURL, true);
ExpectLoadAllowed(kTestFirstURL, true);
ExpectLoadAllowed(kTestSecondURL, true);
FinishLoad();
+
+ histogram_tester.ExpectUniqueSample(kDocumentLoadActivationState,
+ static_cast<int>(ActivationState::DRYRUN),
+ 1);
+ histogram_tester.ExpectUniqueSample(kDocumentLoadRulesetIsAvailable, 1, 1);
+
+ histogram_tester.ExpectUniqueSample(kSubresourcesTotal, 3, 1);
+ histogram_tester.ExpectUniqueSample(kSubresourcesEvaluated, 3, 1);
+ histogram_tester.ExpectUniqueSample(kSubresourcesMatchedRules, 2, 1);
+ histogram_tester.ExpectUniqueSample(kSubresourcesDisallowed, 0, 1);
+
+ // Performance measurement is switched off.
+ histogram_tester.ExpectTotalCount(kEvaluationTotalWallDuration, 0);
+ histogram_tester.ExpectTotalCount(kEvaluationTotalCPUDuration, 0);
}
TEST_F(SubresourceFilterAgentTest,
@@ -311,147 +414,4 @@ TEST_F(SubresourceFilterAgentTest,
blink::WebURLRequest::RequestContextImage));
}
-TEST_F(SubresourceFilterAgentTest, Disabled_HistogramSamples) {
- base::HistogramTester histogram_tester;
- ASSERT_NO_FATAL_FAILURE(
- SetTestRulesetToDisallowURLsWithPathSuffix(kTestBothURLsPathSuffix));
- StartLoadWithoutSettingActivationState();
- FinishLoad();
-
- histogram_tester.ExpectUniqueSample(
- kDocumentLoadActivationState, static_cast<int>(ActivationState::DISABLED),
- 1);
- histogram_tester.ExpectTotalCount(kDocumentLoadRulesetIsAvailable, 0);
-
- histogram_tester.ExpectTotalCount(kSubresourcesTotal, 0);
- histogram_tester.ExpectTotalCount(kSubresourcesEvaluated, 0);
- histogram_tester.ExpectTotalCount(kSubresourcesMatchedRules, 0);
- histogram_tester.ExpectTotalCount(kSubresourcesDisallowed, 0);
-
- histogram_tester.ExpectTotalCount(kEvaluationTotalWallDuration, 0);
- histogram_tester.ExpectTotalCount(kEvaluationTotalCPUDuration, 0);
-}
-
-TEST_F(SubresourceFilterAgentTest,
- EnabledButRulesetUnavailable_HistogramSamples) {
- base::HistogramTester histogram_tester;
- StartLoadAndSetActivationState(ActivationState::ENABLED);
- FinishLoad();
-
- histogram_tester.ExpectUniqueSample(
- kDocumentLoadActivationState, static_cast<int>(ActivationState::ENABLED),
- 1);
- histogram_tester.ExpectUniqueSample(kDocumentLoadRulesetIsAvailable, 0, 1);
-
- histogram_tester.ExpectTotalCount(kSubresourcesTotal, 0);
- histogram_tester.ExpectTotalCount(kSubresourcesEvaluated, 0);
- histogram_tester.ExpectTotalCount(kSubresourcesMatchedRules, 0);
- histogram_tester.ExpectTotalCount(kSubresourcesDisallowed, 0);
-
- histogram_tester.ExpectTotalCount(kEvaluationTotalWallDuration, 0);
- histogram_tester.ExpectTotalCount(kEvaluationTotalCPUDuration, 0);
-}
-
-TEST_F(SubresourceFilterAgentTest, Enabled_HistogramSamples) {
- base::HistogramTester histogram_tester;
- ASSERT_NO_FATAL_FAILURE(
- SetTestRulesetToDisallowURLsWithPathSuffix(kTestFirstURLPathSuffix));
- ExpectSubresourceFilterGetsInjected();
- StartLoadAndSetActivationState(ActivationState::ENABLED);
- ASSERT_TRUE(::testing::Mock::VerifyAndClearExpectations(agent()));
-
- ExpectSignalAboutFirstSubresourceDisallowed();
- ExpectLoadAllowed(kTestFirstURL, false);
- ExpectLoadAllowed(kTestFirstURL, false);
- ExpectLoadAllowed(kTestSecondURL, true);
- FinishLoad();
-
- ExpectSubresourceFilterGetsInjected();
- StartLoadAndSetActivationState(ActivationState::ENABLED);
- ASSERT_TRUE(::testing::Mock::VerifyAndClearExpectations(agent()));
-
- ExpectSignalAboutFirstSubresourceDisallowed();
- ExpectLoadAllowed(kTestFirstURL, false);
- ExpectLoadAllowed(kTestSecondURL, true);
- FinishLoad();
-
- histogram_tester.ExpectUniqueSample(
- kDocumentLoadActivationState, static_cast<int>(ActivationState::ENABLED),
- 2);
- histogram_tester.ExpectUniqueSample(kDocumentLoadRulesetIsAvailable, 1, 2);
-
- EXPECT_THAT(histogram_tester.GetAllSamples(kSubresourcesTotal),
- ::testing::ElementsAre(base::Bucket(2, 1), base::Bucket(3, 1)));
- EXPECT_THAT(histogram_tester.GetAllSamples(kSubresourcesEvaluated),
- ::testing::ElementsAre(base::Bucket(2, 1), base::Bucket(3, 1)));
- EXPECT_THAT(histogram_tester.GetAllSamples(kSubresourcesMatchedRules),
- ::testing::ElementsAre(base::Bucket(1, 1), base::Bucket(2, 1)));
- EXPECT_THAT(histogram_tester.GetAllSamples(kSubresourcesDisallowed),
- ::testing::ElementsAre(base::Bucket(1, 1), base::Bucket(2, 1)));
-
- // Performance measurement is switched off.
- histogram_tester.ExpectTotalCount(kEvaluationTotalWallDuration, 0);
- histogram_tester.ExpectTotalCount(kEvaluationTotalCPUDuration, 0);
-}
-
-TEST_F(SubresourceFilterAgentTest, Enabled_PerformanceMeasurementSamples) {
- base::HistogramTester histogram_tester;
- ASSERT_NO_FATAL_FAILURE(
- SetTestRulesetToDisallowURLsWithPathSuffix(kTestFirstURLPathSuffix));
- ExpectSubresourceFilterGetsInjected();
- StartLoadAndSetActivationState(ActivationState::ENABLED, true);
- ASSERT_TRUE(::testing::Mock::VerifyAndClearExpectations(agent()));
-
- ExpectSignalAboutFirstSubresourceDisallowed();
- ExpectLoadAllowed(kTestFirstURL, false);
- ExpectLoadAllowed(kTestFirstURL, false);
- ExpectLoadAllowed(kTestSecondURL, true);
- FinishLoad();
-
- ExpectSubresourceFilterGetsInjected();
- StartLoadAndSetActivationState(ActivationState::ENABLED, true);
- ASSERT_TRUE(::testing::Mock::VerifyAndClearExpectations(agent()));
-
- ExpectSignalAboutFirstSubresourceDisallowed();
- ExpectLoadAllowed(kTestFirstURL, false);
- ExpectLoadAllowed(kTestSecondURL, true);
- FinishLoad();
-
- const base::HistogramBase::Count total_count =
- base::ThreadTicks::IsSupported() ? 2 : 0;
- histogram_tester.ExpectTotalCount(kEvaluationTotalWallDuration, total_count);
- histogram_tester.ExpectTotalCount(kEvaluationTotalCPUDuration, total_count);
-}
-
-TEST_F(SubresourceFilterAgentTest, DryRun_HistogramSamples) {
- base::HistogramTester histogram_tester;
- ASSERT_NO_FATAL_FAILURE(
- SetTestRulesetToDisallowURLsWithPathSuffix(kTestFirstURLPathSuffix));
- ExpectSubresourceFilterGetsInjected();
- StartLoadAndSetActivationState(ActivationState::DRYRUN);
- ASSERT_TRUE(::testing::Mock::VerifyAndClearExpectations(agent()));
-
- // In dry-run mode, loads to the first URL should be recorded as
- // `MatchedRules`, but still be allowed to proceed and not recorded as
- // `Disallowed`.
- ExpectLoadAllowed(kTestFirstURL, true);
- ExpectLoadAllowed(kTestFirstURL, true);
- ExpectLoadAllowed(kTestSecondURL, true);
- FinishLoad();
-
- histogram_tester.ExpectUniqueSample(kDocumentLoadActivationState,
- static_cast<int>(ActivationState::DRYRUN),
- 1);
- histogram_tester.ExpectUniqueSample(kDocumentLoadRulesetIsAvailable, 1, 1);
-
- histogram_tester.ExpectUniqueSample(kSubresourcesTotal, 3, 1);
- histogram_tester.ExpectUniqueSample(kSubresourcesEvaluated, 3, 1);
- histogram_tester.ExpectUniqueSample(kSubresourcesMatchedRules, 2, 1);
- histogram_tester.ExpectUniqueSample(kSubresourcesDisallowed, 0, 1);
-
- // Performance measurement is switched off.
- histogram_tester.ExpectTotalCount(kEvaluationTotalWallDuration, 0);
- histogram_tester.ExpectTotalCount(kEvaluationTotalCPUDuration, 0);
-}
-
} // namespace subresource_filter
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698