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

Unified Diff: components/subresource_filter/core/common/document_subresource_filter_unittest.cc

Issue 2714573002: Enable websocket filtering via SubresourceFilter (Closed)
Patch Set: sync to #455176 Created 3 years, 9 months 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
Index: components/subresource_filter/core/common/document_subresource_filter_unittest.cc
diff --git a/components/subresource_filter/core/common/document_subresource_filter_unittest.cc b/components/subresource_filter/core/common/document_subresource_filter_unittest.cc
index b7ea78249e1501b4a0226f002f7499c7903bb179..0030cbd105a14ce1032ef66eb79259c9f495bb1f 100644
--- a/components/subresource_filter/core/common/document_subresource_filter_unittest.cc
+++ b/components/subresource_filter/core/common/document_subresource_filter_unittest.cc
@@ -25,6 +25,7 @@ constexpr auto kSubdocumentType = proto::ELEMENT_TYPE_SUBDOCUMENT;
constexpr const char kTestAlphaURL[] = "http://example.com/alpha";
constexpr const char kTestAlphaDataURI[] = "data:text/plain,alpha";
+constexpr const char kTestAlphaWSURI[] = "ws://example.com/alpha";
constexpr const char kTestBetaURL[] = "http://example.com/beta";
constexpr const char kTestAlphaURLPathSuffix[] = "alpha";
@@ -70,6 +71,9 @@ TEST_F(DocumentSubresourceFilterTest, DryRun) {
filter.GetLoadPolicy(GURL(kTestAlphaURL), kImageType));
EXPECT_EQ(LoadPolicy::ALLOW,
filter.GetLoadPolicy(GURL(kTestAlphaDataURI), kImageType));
+ EXPECT_EQ(
+ LoadPolicy::WOULD_DISALLOW,
+ filter.GetLoadPolicy(GURL(kTestAlphaWSURI), proto::ELEMENT_TYPE_OTHER));
EXPECT_EQ(LoadPolicy::ALLOW,
filter.GetLoadPolicy(GURL(kTestBetaURL), kImageType));
EXPECT_EQ(LoadPolicy::WOULD_DISALLOW,
@@ -78,9 +82,9 @@ TEST_F(DocumentSubresourceFilterTest, DryRun) {
filter.GetLoadPolicy(GURL(kTestBetaURL), kSubdocumentType));
const auto& statistics = filter.statistics();
- EXPECT_EQ(5, statistics.num_loads_total);
- EXPECT_EQ(4, statistics.num_loads_evaluated);
- EXPECT_EQ(2, statistics.num_loads_matching_rules);
+ EXPECT_EQ(6, statistics.num_loads_total);
+ EXPECT_EQ(5, statistics.num_loads_evaluated);
+ EXPECT_EQ(3, statistics.num_loads_matching_rules);
EXPECT_EQ(0, statistics.num_loads_disallowed);
}
@@ -95,6 +99,9 @@ TEST_F(DocumentSubresourceFilterTest, Enabled) {
filter.GetLoadPolicy(GURL(kTestAlphaURL), kImageType));
EXPECT_EQ(LoadPolicy::ALLOW,
filter.GetLoadPolicy(GURL(kTestAlphaDataURI), kImageType));
+ EXPECT_EQ(
+ LoadPolicy::DISALLOW,
+ filter.GetLoadPolicy(GURL(kTestAlphaWSURI), proto::ELEMENT_TYPE_OTHER));
EXPECT_EQ(LoadPolicy::ALLOW,
filter.GetLoadPolicy(GURL(kTestBetaURL), kImageType));
EXPECT_EQ(LoadPolicy::DISALLOW,
@@ -103,10 +110,10 @@ TEST_F(DocumentSubresourceFilterTest, Enabled) {
filter.GetLoadPolicy(GURL(kTestBetaURL), kSubdocumentType));
const auto& statistics = filter.statistics();
- EXPECT_EQ(5, statistics.num_loads_total);
- EXPECT_EQ(4, statistics.num_loads_evaluated);
- EXPECT_EQ(2, statistics.num_loads_matching_rules);
- EXPECT_EQ(2, statistics.num_loads_disallowed);
+ EXPECT_EQ(6, statistics.num_loads_total);
+ EXPECT_EQ(5, statistics.num_loads_evaluated);
+ EXPECT_EQ(3, statistics.num_loads_matching_rules);
+ EXPECT_EQ(3, statistics.num_loads_disallowed);
if (!measure_performance) {
EXPECT_TRUE(statistics.evaluation_total_cpu_duration.is_zero());
« no previous file with comments | « chrome/test/data/subresource_filter/websocket_worker.js ('k') | third_party/WebKit/Source/core/loader/SubresourceFilter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698