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

Unified Diff: components/domain_reliability/monitor_unittest.cc

Issue 404363003: Domain Reliability: Add wildcard domain support. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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/domain_reliability/monitor_unittest.cc
diff --git a/components/domain_reliability/monitor_unittest.cc b/components/domain_reliability/monitor_unittest.cc
index 46926850319e3049a4d007749aa73fbaa098f6eb..9542776f66e669d8c2ca25e4c6e569f947b3159b 100644
--- a/components/domain_reliability/monitor_unittest.cc
+++ b/components/domain_reliability/monitor_unittest.cc
@@ -87,13 +87,27 @@ class DomainReliabilityMonitorTest : public testing::Test {
bool CheckRequestCounts(size_t index,
uint32 expected_successful,
uint32 expected_failed) {
+ return CheckRequestCounts(context_,
+ index,
+ expected_successful,
+ expected_failed);
+ }
+
+ bool CheckRequestCounts(DomainReliabilityContext* context,
+ size_t index,
+ uint32 expected_successful,
+ uint32 expected_failed) {
uint32 successful, failed;
- context_->GetQueuedDataForTesting(index, NULL, &successful, &failed);
+ context->GetQueuedDataForTesting(index, NULL, &successful, &failed);
EXPECT_EQ(expected_successful, successful);
EXPECT_EQ(expected_failed, failed);
return expected_successful == successful && expected_failed == failed;
}
+ DomainReliabilityContext* CreateAndAddContext(const std::string& domain) {
+ return monitor_.AddContextForTesting(MakeTestConfigWithDomain(domain));
+ }
+
scoped_refptr<base::TestSimpleTaskRunner> network_task_runner_;
scoped_refptr<net::URLRequestContextGetter> url_request_context_getter_;
MockTime* time_;
@@ -305,6 +319,70 @@ TEST_F(DomainReliabilityMonitorTest, IgnoreSuccessError) {
EXPECT_EQ(net::OK, beacons[0].chrome_error);
}
+TEST_F(DomainReliabilityMonitorTest, WildcardMatchesSelf) {
+ DomainReliabilityContext* context = CreateAndAddContext("*.wildcard");
+
+ RequestInfo request = MakeRequestInfo();
+ request.url = GURL("http://wildcard/always_report");
+ OnRequestLegComplete(request);
+ EXPECT_TRUE(CheckRequestCounts(context, kAlwaysReportIndex, 1u, 0u));
+}
+
+TEST_F(DomainReliabilityMonitorTest, WildcardMatchesSubdomain) {
+ DomainReliabilityContext* context = CreateAndAddContext("*.wildcard");
+
+ RequestInfo request = MakeRequestInfo();
+ request.url = GURL("http://test.wildcard/always_report");
+ OnRequestLegComplete(request);
+ EXPECT_TRUE(CheckRequestCounts(context, kAlwaysReportIndex, 1u, 0u));
+}
+
+TEST_F(DomainReliabilityMonitorTest, WildcardDoesntMatchSubsubdomain) {
+ DomainReliabilityContext* context = CreateAndAddContext("*.wildcard");
+
+ RequestInfo request = MakeRequestInfo();
+ request.url = GURL("http://test.test.wildcard/always_report");
+ OnRequestLegComplete(request);
+ EXPECT_TRUE(CheckRequestCounts(context, kAlwaysReportIndex, 0u, 0u));
+}
+
+TEST_F(DomainReliabilityMonitorTest, WildcardPrefersSelfToSelfWildcard) {
+ DomainReliabilityContext* context1 = CreateAndAddContext("wildcard");
+ DomainReliabilityContext* context2 = CreateAndAddContext("*.wildcard");
+
+ RequestInfo request = MakeRequestInfo();
+ request.url = GURL("http://wildcard/always_report");
+ OnRequestLegComplete(request);
+
+ EXPECT_TRUE(CheckRequestCounts(context1, kAlwaysReportIndex, 1u, 0u));
+ EXPECT_TRUE(CheckRequestCounts(context2, kAlwaysReportIndex, 0u, 0u));
+}
+
+TEST_F(DomainReliabilityMonitorTest, WildcardPrefersSelfToParentWildcard) {
+ DomainReliabilityContext* context1 = CreateAndAddContext("test.wildcard");
+ DomainReliabilityContext* context2 = CreateAndAddContext("*.wildcard");
+
+ RequestInfo request = MakeRequestInfo();
+ request.url = GURL("http://test.wildcard/always_report");
+ OnRequestLegComplete(request);
+
+ EXPECT_TRUE(CheckRequestCounts(context1, kAlwaysReportIndex, 1u, 0u));
+ EXPECT_TRUE(CheckRequestCounts(context2, kAlwaysReportIndex, 0u, 0u));
+}
+
+TEST_F(DomainReliabilityMonitorTest,
+ WildcardPrefersSelfWildcardToParentWildcard) {
+ DomainReliabilityContext* context1 = CreateAndAddContext("*.test.wildcard");
+ DomainReliabilityContext* context2 = CreateAndAddContext("*.wildcard");
+
+ RequestInfo request = MakeRequestInfo();
+ request.url = GURL("http://test.wildcard/always_report");
+ OnRequestLegComplete(request);
+
+ EXPECT_TRUE(CheckRequestCounts(context1, kAlwaysReportIndex, 1u, 0u));
+ EXPECT_TRUE(CheckRequestCounts(context2, kAlwaysReportIndex, 0u, 0u));
+}
+
} // namespace
} // namespace domain_reliability

Powered by Google App Engine
This is Rietveld 408576698