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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/reporting/reporting_cache_unittest.cc

Issue 2751103002: Reporting: Wrap existing classes in context. (Closed)
Patch Set: rebase Created 3 years, 8 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
« no previous file with comments | « net/reporting/reporting_cache.cc ('k') | net/reporting/reporting_context.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/reporting/reporting_cache_unittest.cc
diff --git a/net/reporting/reporting_cache_unittest.cc b/net/reporting/reporting_cache_unittest.cc
index be55cbbd80886cf8e980605e8ff664bc384dc6b7..b6a6816c0d4cead149e692bc495ab21d2a2bb9e4 100644
--- a/net/reporting/reporting_cache_unittest.cc
+++ b/net/reporting/reporting_cache_unittest.cc
@@ -19,7 +19,7 @@
namespace net {
namespace {
-class ReportingCacheTest : public ::testing::Test {
+class ReportingCacheTest : public ReportingTestBase {
protected:
const GURL kUrl1_ = GURL("https://origin1/path");
const url::Origin kOrigin1_ = url::Origin(GURL("https://origin1/"));
@@ -27,24 +27,22 @@ class ReportingCacheTest : public ::testing::Test {
const GURL kEndpoint1_ = GURL("https://endpoint1/");
const GURL kEndpoint2_ = GURL("https://endpoint2/");
const std::string kGroup1_ = "group1";
- const std::string kGroup2_ = "group2";
+ const std::string kGroup2 = "group2";
const std::string kType_ = "default";
const base::TimeTicks kNow_ = base::TimeTicks::Now();
const base::TimeTicks kExpires1_ = kNow_ + base::TimeDelta::FromDays(7);
const base::TimeTicks kExpires2_ = kExpires1_ + base::TimeDelta::FromDays(7);
-
- ReportingCache cache_;
};
TEST_F(ReportingCacheTest, Reports) {
std::vector<const ReportingReport*> reports;
- cache_.GetReports(&reports);
+ cache()->GetReports(&reports);
EXPECT_TRUE(reports.empty());
- cache_.AddReport(kUrl1_, kGroup1_, kType_,
- base::MakeUnique<base::DictionaryValue>(), kNow_, 0);
+ cache()->AddReport(kUrl1_, kGroup1_, kType_,
+ base::MakeUnique<base::DictionaryValue>(), kNow_, 0);
- cache_.GetReports(&reports);
+ cache()->GetReports(&reports);
ASSERT_EQ(1u, reports.size());
const ReportingReport* report = reports[0];
ASSERT_TRUE(report);
@@ -54,103 +52,104 @@ TEST_F(ReportingCacheTest, Reports) {
// TODO(juliatuttle): Check body?
EXPECT_EQ(kNow_, report->queued);
EXPECT_EQ(0, report->attempts);
- EXPECT_FALSE(cache_.IsReportPendingForTesting(report));
- EXPECT_FALSE(cache_.IsReportDoomedForTesting(report));
+ EXPECT_FALSE(cache()->IsReportPendingForTesting(report));
+ EXPECT_FALSE(cache()->IsReportDoomedForTesting(report));
- cache_.IncrementReportsAttempts(reports);
+ cache()->IncrementReportsAttempts(reports);
- cache_.GetReports(&reports);
+ cache()->GetReports(&reports);
ASSERT_EQ(1u, reports.size());
report = reports[0];
ASSERT_TRUE(report);
EXPECT_EQ(1, report->attempts);
- cache_.RemoveReports(reports);
+ cache()->RemoveReports(reports);
- cache_.GetReports(&reports);
+ cache()->GetReports(&reports);
EXPECT_TRUE(reports.empty());
}
TEST_F(ReportingCacheTest, RemoveAllReports) {
- cache_.AddReport(kUrl1_, kGroup1_, kType_,
- base::MakeUnique<base::DictionaryValue>(), kNow_, 0);
- cache_.AddReport(kUrl1_, kGroup1_, kType_,
- base::MakeUnique<base::DictionaryValue>(), kNow_, 0);
+ cache()->AddReport(kUrl1_, kGroup1_, kType_,
+ base::MakeUnique<base::DictionaryValue>(), kNow_, 0);
+ cache()->AddReport(kUrl1_, kGroup1_, kType_,
+ base::MakeUnique<base::DictionaryValue>(), kNow_, 0);
std::vector<const ReportingReport*> reports;
- cache_.GetReports(&reports);
+ cache()->GetReports(&reports);
EXPECT_EQ(2u, reports.size());
- cache_.RemoveAllReports();
+ cache()->RemoveAllReports();
- cache_.GetReports(&reports);
+ cache()->GetReports(&reports);
EXPECT_TRUE(reports.empty());
}
TEST_F(ReportingCacheTest, RemovePendingReports) {
- cache_.AddReport(kUrl1_, kGroup1_, kType_,
- base::MakeUnique<base::DictionaryValue>(), kNow_, 0);
+ cache()->AddReport(kUrl1_, kGroup1_, kType_,
+ base::MakeUnique<base::DictionaryValue>(), kNow_, 0);
std::vector<const ReportingReport*> reports;
- cache_.GetReports(&reports);
+ cache()->GetReports(&reports);
ASSERT_EQ(1u, reports.size());
- EXPECT_FALSE(cache_.IsReportPendingForTesting(reports[0]));
- EXPECT_FALSE(cache_.IsReportDoomedForTesting(reports[0]));
+ EXPECT_FALSE(cache()->IsReportPendingForTesting(reports[0]));
+ EXPECT_FALSE(cache()->IsReportDoomedForTesting(reports[0]));
- cache_.SetReportsPending(reports);
- EXPECT_TRUE(cache_.IsReportPendingForTesting(reports[0]));
- EXPECT_FALSE(cache_.IsReportDoomedForTesting(reports[0]));
+ cache()->SetReportsPending(reports);
+ EXPECT_TRUE(cache()->IsReportPendingForTesting(reports[0]));
+ EXPECT_FALSE(cache()->IsReportDoomedForTesting(reports[0]));
- cache_.RemoveReports(reports);
- EXPECT_TRUE(cache_.IsReportPendingForTesting(reports[0]));
- EXPECT_TRUE(cache_.IsReportDoomedForTesting(reports[0]));
+ cache()->RemoveReports(reports);
+ EXPECT_TRUE(cache()->IsReportPendingForTesting(reports[0]));
+ EXPECT_TRUE(cache()->IsReportDoomedForTesting(reports[0]));
// After removing report, future calls to GetReports should not return it.
std::vector<const ReportingReport*> visible_reports;
- cache_.GetReports(&visible_reports);
+ cache()->GetReports(&visible_reports);
EXPECT_TRUE(visible_reports.empty());
- EXPECT_EQ(1u, cache_.GetFullReportCountForTesting());
+ EXPECT_EQ(1u, cache()->GetFullReportCountForTesting());
// After clearing pending flag, report should be deleted.
- cache_.ClearReportsPending(reports);
- EXPECT_EQ(0u, cache_.GetFullReportCountForTesting());
+ cache()->ClearReportsPending(reports);
+ EXPECT_EQ(0u, cache()->GetFullReportCountForTesting());
}
TEST_F(ReportingCacheTest, RemoveAllPendingReports) {
- cache_.AddReport(kUrl1_, kGroup1_, kType_,
- base::MakeUnique<base::DictionaryValue>(), kNow_, 0);
+ cache()->AddReport(kUrl1_, kGroup1_, kType_,
+ base::MakeUnique<base::DictionaryValue>(), kNow_, 0);
std::vector<const ReportingReport*> reports;
- cache_.GetReports(&reports);
+ cache()->GetReports(&reports);
ASSERT_EQ(1u, reports.size());
- EXPECT_FALSE(cache_.IsReportPendingForTesting(reports[0]));
- EXPECT_FALSE(cache_.IsReportDoomedForTesting(reports[0]));
+ EXPECT_FALSE(cache()->IsReportPendingForTesting(reports[0]));
+ EXPECT_FALSE(cache()->IsReportDoomedForTesting(reports[0]));
- cache_.SetReportsPending(reports);
- EXPECT_TRUE(cache_.IsReportPendingForTesting(reports[0]));
- EXPECT_FALSE(cache_.IsReportDoomedForTesting(reports[0]));
+ cache()->SetReportsPending(reports);
+ EXPECT_TRUE(cache()->IsReportPendingForTesting(reports[0]));
+ EXPECT_FALSE(cache()->IsReportDoomedForTesting(reports[0]));
- cache_.RemoveAllReports();
- EXPECT_TRUE(cache_.IsReportPendingForTesting(reports[0]));
- EXPECT_TRUE(cache_.IsReportDoomedForTesting(reports[0]));
+ cache()->RemoveAllReports();
+ EXPECT_TRUE(cache()->IsReportPendingForTesting(reports[0]));
+ EXPECT_TRUE(cache()->IsReportDoomedForTesting(reports[0]));
// After removing report, future calls to GetReports should not return it.
std::vector<const ReportingReport*> visible_reports;
- cache_.GetReports(&visible_reports);
+ cache()->GetReports(&visible_reports);
EXPECT_TRUE(visible_reports.empty());
- EXPECT_EQ(1u, cache_.GetFullReportCountForTesting());
+ EXPECT_EQ(1u, cache()->GetFullReportCountForTesting());
// After clearing pending flag, report should be deleted.
- cache_.ClearReportsPending(reports);
- EXPECT_EQ(0u, cache_.GetFullReportCountForTesting());
+ cache()->ClearReportsPending(reports);
+ EXPECT_EQ(0u, cache()->GetFullReportCountForTesting());
}
TEST_F(ReportingCacheTest, Endpoints) {
- cache_.SetClient(kOrigin1_, kEndpoint1_, ReportingClient::Subdomains::EXCLUDE,
- kGroup1_, kExpires1_);
+ cache()->SetClient(kOrigin1_, kEndpoint1_,
+ ReportingClient::Subdomains::EXCLUDE, kGroup1_,
+ kExpires1_);
const ReportingClient* client =
- FindClientInCache(&cache_, kOrigin1_, kEndpoint1_);
+ FindClientInCache(cache(), kOrigin1_, kEndpoint1_);
ASSERT_TRUE(client);
EXPECT_EQ(kOrigin1_, client->origin);
EXPECT_EQ(kEndpoint1_, client->endpoint);
@@ -158,35 +157,35 @@ TEST_F(ReportingCacheTest, Endpoints) {
EXPECT_EQ(kGroup1_, client->group);
EXPECT_EQ(kExpires1_, client->expires);
- // Replaces original configuration with new Subdomains, group, and expires
- // values.
- cache_.SetClient(kOrigin1_, kEndpoint1_, ReportingClient::Subdomains::INCLUDE,
- kGroup2_, kExpires2_);
+ cache()->SetClient(kOrigin1_, kEndpoint1_,
+ ReportingClient::Subdomains::INCLUDE, kGroup2, kExpires2_);
- client = FindClientInCache(&cache_, kOrigin1_, kEndpoint1_);
+ client = FindClientInCache(cache(), kOrigin1_, kEndpoint1_);
ASSERT_TRUE(client);
EXPECT_EQ(kOrigin1_, client->origin);
EXPECT_EQ(kEndpoint1_, client->endpoint);
EXPECT_EQ(ReportingClient::Subdomains::INCLUDE, client->subdomains);
- EXPECT_EQ(kGroup2_, client->group);
+ EXPECT_EQ(kGroup2, client->group);
EXPECT_EQ(kExpires2_, client->expires);
- cache_.RemoveClients(std::vector<const ReportingClient*>{client});
+ cache()->RemoveClients(std::vector<const ReportingClient*>{client});
- client = FindClientInCache(&cache_, kOrigin1_, kEndpoint1_);
+ client = FindClientInCache(cache(), kOrigin1_, kEndpoint1_);
EXPECT_FALSE(client);
}
TEST_F(ReportingCacheTest, GetClientsForOriginAndGroup) {
- cache_.SetClient(kOrigin1_, kEndpoint1_, ReportingClient::Subdomains::EXCLUDE,
- kGroup1_, kExpires1_);
- cache_.SetClient(kOrigin1_, kEndpoint2_, ReportingClient::Subdomains::EXCLUDE,
- kGroup2_, kExpires1_);
- cache_.SetClient(kOrigin2_, kEndpoint1_, ReportingClient::Subdomains::EXCLUDE,
- kGroup1_, kExpires1_);
+ cache()->SetClient(kOrigin1_, kEndpoint1_,
+ ReportingClient::Subdomains::EXCLUDE, kGroup1_,
+ kExpires1_);
+ cache()->SetClient(kOrigin1_, kEndpoint2_,
+ ReportingClient::Subdomains::EXCLUDE, kGroup2, kExpires1_);
+ cache()->SetClient(kOrigin2_, kEndpoint1_,
+ ReportingClient::Subdomains::EXCLUDE, kGroup1_,
+ kExpires1_);
std::vector<const ReportingClient*> clients;
- cache_.GetClientsForOriginAndGroup(kOrigin1_, kGroup1_, &clients);
+ cache()->GetClientsForOriginAndGroup(kOrigin1_, kGroup1_, &clients);
ASSERT_EQ(1u, clients.size());
const ReportingClient* client = clients[0];
ASSERT_TRUE(client);
@@ -195,57 +194,63 @@ TEST_F(ReportingCacheTest, GetClientsForOriginAndGroup) {
}
TEST_F(ReportingCacheTest, RemoveClientForOriginAndEndpoint) {
- cache_.SetClient(kOrigin1_, kEndpoint1_, ReportingClient::Subdomains::EXCLUDE,
- kGroup1_, kExpires1_);
- cache_.SetClient(kOrigin1_, kEndpoint2_, ReportingClient::Subdomains::EXCLUDE,
- kGroup2_, kExpires1_);
- cache_.SetClient(kOrigin2_, kEndpoint1_, ReportingClient::Subdomains::EXCLUDE,
- kGroup1_, kExpires1_);
+ cache()->SetClient(kOrigin1_, kEndpoint1_,
+ ReportingClient::Subdomains::EXCLUDE, kGroup1_,
+ kExpires1_);
+ cache()->SetClient(kOrigin1_, kEndpoint2_,
+ ReportingClient::Subdomains::EXCLUDE, kGroup2, kExpires1_);
+ cache()->SetClient(kOrigin2_, kEndpoint1_,
+ ReportingClient::Subdomains::EXCLUDE, kGroup1_,
+ kExpires1_);
- cache_.RemoveClientForOriginAndEndpoint(kOrigin1_, kEndpoint1_);
+ cache()->RemoveClientForOriginAndEndpoint(kOrigin1_, kEndpoint1_);
std::vector<const ReportingClient*> clients;
- cache_.GetClientsForOriginAndGroup(kOrigin1_, kGroup1_, &clients);
+ cache()->GetClientsForOriginAndGroup(kOrigin1_, kGroup1_, &clients);
EXPECT_TRUE(clients.empty());
- cache_.GetClientsForOriginAndGroup(kOrigin1_, kGroup2_, &clients);
+ cache()->GetClientsForOriginAndGroup(kOrigin1_, kGroup2, &clients);
EXPECT_EQ(1u, clients.size());
- cache_.GetClientsForOriginAndGroup(kOrigin2_, kGroup1_, &clients);
+ cache()->GetClientsForOriginAndGroup(kOrigin2_, kGroup1_, &clients);
EXPECT_EQ(1u, clients.size());
}
TEST_F(ReportingCacheTest, RemoveClientsForEndpoint) {
- cache_.SetClient(kOrigin1_, kEndpoint1_, ReportingClient::Subdomains::EXCLUDE,
- kGroup1_, kExpires1_);
- cache_.SetClient(kOrigin1_, kEndpoint2_, ReportingClient::Subdomains::EXCLUDE,
- kGroup2_, kExpires1_);
- cache_.SetClient(kOrigin2_, kEndpoint1_, ReportingClient::Subdomains::EXCLUDE,
- kGroup1_, kExpires1_);
+ cache()->SetClient(kOrigin1_, kEndpoint1_,
+ ReportingClient::Subdomains::EXCLUDE, kGroup1_,
+ kExpires1_);
+ cache()->SetClient(kOrigin1_, kEndpoint2_,
+ ReportingClient::Subdomains::EXCLUDE, kGroup2, kExpires1_);
+ cache()->SetClient(kOrigin2_, kEndpoint1_,
+ ReportingClient::Subdomains::EXCLUDE, kGroup1_,
+ kExpires1_);
- cache_.RemoveClientsForEndpoint(kEndpoint1_);
+ cache()->RemoveClientsForEndpoint(kEndpoint1_);
std::vector<const ReportingClient*> clients;
- cache_.GetClientsForOriginAndGroup(kOrigin1_, kGroup1_, &clients);
+ cache()->GetClientsForOriginAndGroup(kOrigin1_, kGroup1_, &clients);
EXPECT_TRUE(clients.empty());
- cache_.GetClientsForOriginAndGroup(kOrigin1_, kGroup2_, &clients);
+ cache()->GetClientsForOriginAndGroup(kOrigin1_, kGroup2, &clients);
EXPECT_EQ(1u, clients.size());
- cache_.GetClientsForOriginAndGroup(kOrigin2_, kGroup1_, &clients);
+ cache()->GetClientsForOriginAndGroup(kOrigin2_, kGroup1_, &clients);
EXPECT_TRUE(clients.empty());
}
TEST_F(ReportingCacheTest, RemoveAllClients) {
- cache_.SetClient(kOrigin1_, kEndpoint1_, ReportingClient::Subdomains::EXCLUDE,
- kGroup1_, kExpires1_);
- cache_.SetClient(kOrigin2_, kEndpoint2_, ReportingClient::Subdomains::EXCLUDE,
- kGroup1_, kExpires1_);
+ cache()->SetClient(kOrigin1_, kEndpoint1_,
+ ReportingClient::Subdomains::EXCLUDE, kGroup1_,
+ kExpires1_);
+ cache()->SetClient(kOrigin2_, kEndpoint2_,
+ ReportingClient::Subdomains::EXCLUDE, kGroup1_,
+ kExpires1_);
- cache_.RemoveAllClients();
+ cache()->RemoveAllClients();
std::vector<const ReportingClient*> clients;
- cache_.GetClients(&clients);
+ cache()->GetClients(&clients);
EXPECT_TRUE(clients.empty());
}
« no previous file with comments | « net/reporting/reporting_cache.cc ('k') | net/reporting/reporting_context.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698