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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: components/data_reduction_proxy/core/browser/data_reduction_proxy_statistics_prefs_unittest.cc

Issue 989663002: HistoricNetworkStatsInfoToValue should use statistics prefs values (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressing comments Created 5 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
« no previous file with comments | « components/data_reduction_proxy/core/browser/data_reduction_proxy_statistics_prefs.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/data_reduction_proxy/core/browser/data_reduction_proxy_statistics_prefs_unittest.cc
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_statistics_prefs_unittest.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_statistics_prefs_unittest.cc
index 369c2ab6c8567e4de44d9253495e061ca3726150..ba72593e4fe008ee1d5b15faf364dc1dd484b759 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_statistics_prefs_unittest.cc
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_statistics_prefs_unittest.cc
@@ -8,6 +8,7 @@
#include "base/strings/string_number_conversions.h"
#include "base/test/test_simple_task_runner.h"
#include "base/time/time.h"
+#include "base/values.h"
#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_prefs.h"
#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_statistics_prefs.h"
#include "components/data_reduction_proxy/core/common/data_reduction_proxy_pref_names.h"
@@ -41,6 +42,35 @@ class DataReductionProxyStatisticsPrefsTest : public testing::Test {
void SetUp() override { RegisterPrefs(simple_pref_service_.registry()); }
+ void SetUpPrefs() {
+ CreatePrefList(prefs::kDailyHttpOriginalContentLength);
+ CreatePrefList(prefs::kDailyHttpReceivedContentLength);
+
+ const int64 kOriginalLength = 150;
+ const int64 kReceivedLength = 100;
+
+ statistics_prefs_->SetInt64(
+ prefs::kHttpOriginalContentLength, kOriginalLength);
+ statistics_prefs_->SetInt64(
+ prefs::kHttpReceivedContentLength, kReceivedLength);
+
+ base::ListValue* original_daily_content_length_list =
+ statistics_prefs_->GetList(prefs::kDailyHttpOriginalContentLength);
+ base::ListValue* received_daily_content_length_list =
+ statistics_prefs_->GetList(prefs::kDailyHttpReceivedContentLength);
+
+ for (size_t i = 0; i < kNumDaysInHistory; ++i) {
+ original_daily_content_length_list->Set(
+ i, new base::StringValue(base::Int64ToString(i)));
+ }
+
+ received_daily_content_length_list->Clear();
+ for (size_t i = 0; i < kNumDaysInHistory/2; ++i) {
+ received_daily_content_length_list->Set(
+ i, new base::StringValue(base::Int64ToString(i)));
+ }
+ }
+
// Create daily pref list of |kNumDaysInHistory| zero values.
void CreatePrefList(const char* pref) {
base::ListValue* update = statistics_prefs_->GetList(pref);
@@ -72,6 +102,25 @@ class DataReductionProxyStatisticsPrefsTest : public testing::Test {
EXPECT_EQ(delayed_pref, written_pref);
}
+ // Verify the pref values in |dict| are equal to that in |statistics_prefs_|.
+ void VerifyPrefs(base::DictionaryValue* dict) {
+ base::string16 dict_pref_string;
+ int64 dict_pref;
+ int64 service_pref;
+
+ dict->GetString("historic_original_content_length", &dict_pref_string);
+ base::StringToInt64(dict_pref_string, &dict_pref);
+ service_pref = statistics_prefs_->GetInt64(
+ prefs::kHttpOriginalContentLength);
+ EXPECT_EQ(service_pref, dict_pref);
+
+ dict->GetString("historic_received_content_length", &dict_pref_string);
+ base::StringToInt64(dict_pref_string, &dict_pref);
+ service_pref = statistics_prefs_->GetInt64(
+ prefs::kHttpReceivedContentLength);
+ EXPECT_EQ(service_pref, dict_pref);
+ }
+
scoped_refptr<base::TestSimpleTaskRunner> task_runner_;
TestingPrefServiceSimple simple_pref_service_;
scoped_ptr<DataReductionProxyStatisticsPrefs> statistics_prefs_;
@@ -82,43 +131,12 @@ TEST_F(DataReductionProxyStatisticsPrefsTest, WritePrefsDirect) {
&simple_pref_service_,
task_runner_,
base::TimeDelta()));
- const int64 kOriginalLength = 150;
- const int64 kReceivedLength = 100;
-
- CreatePrefList(
- data_reduction_proxy::prefs::kDailyHttpOriginalContentLength);
- CreatePrefList(
- data_reduction_proxy::prefs::kDailyHttpReceivedContentLength);
-
- statistics_prefs_->SetInt64(
- data_reduction_proxy::prefs::kHttpOriginalContentLength, kOriginalLength);
- statistics_prefs_->SetInt64(
- data_reduction_proxy::prefs::kHttpReceivedContentLength, kReceivedLength);
-
- base::ListValue* original_daily_content_length_list =
- statistics_prefs_->GetList(data_reduction_proxy::prefs::
- kDailyHttpOriginalContentLength);
- base::ListValue* received_daily_content_length_list =
- statistics_prefs_->GetList(data_reduction_proxy::prefs::
- kDailyHttpReceivedContentLength);
-
- for (size_t i = 0; i < kNumDaysInHistory; ++i) {
- original_daily_content_length_list->Set(
- i, new base::StringValue(base::Int64ToString(i)));
- }
-
- received_daily_content_length_list->Clear();
- for (size_t i = 0; i < kNumDaysInHistory/2; ++i) {
- received_daily_content_length_list->Set(
- i, new base::StringValue(base::Int64ToString(i)));
- }
+ SetUpPrefs();
- VerifyPrefWasWritten(data_reduction_proxy::prefs::kHttpOriginalContentLength);
- VerifyPrefWasWritten(data_reduction_proxy::prefs::kHttpReceivedContentLength);
- VerifyPrefListWasWritten(
- data_reduction_proxy::prefs::kDailyHttpOriginalContentLength);
- VerifyPrefListWasWritten(
- data_reduction_proxy::prefs::kDailyHttpReceivedContentLength);
+ VerifyPrefWasWritten(prefs::kHttpOriginalContentLength);
+ VerifyPrefWasWritten(prefs::kHttpReceivedContentLength);
+ VerifyPrefListWasWritten(prefs::kDailyHttpOriginalContentLength);
+ VerifyPrefListWasWritten(prefs::kDailyHttpReceivedContentLength);
}
TEST_F(DataReductionProxyStatisticsPrefsTest, WritePrefsDelayed) {
@@ -126,95 +144,81 @@ TEST_F(DataReductionProxyStatisticsPrefsTest, WritePrefsDelayed) {
&simple_pref_service_,
task_runner_,
base::TimeDelta::FromMinutes(kWriteDelayMinutes)));
+ SetUpPrefs();
- CreatePrefList(
- data_reduction_proxy::prefs::kDailyHttpOriginalContentLength);
- CreatePrefList(
- data_reduction_proxy::prefs::kDailyHttpReceivedContentLength);
-
- const int64 kOriginalLength = 150;
- const int64 kReceivedLength = 100;
+ task_runner_->RunPendingTasks();
- statistics_prefs_->SetInt64(
- data_reduction_proxy::prefs::kHttpOriginalContentLength, kOriginalLength);
- statistics_prefs_->SetInt64(
- data_reduction_proxy::prefs::kHttpReceivedContentLength, kReceivedLength);
-
- base::ListValue* original_daily_content_length_list =
- statistics_prefs_->GetList(data_reduction_proxy::prefs::
- kDailyHttpOriginalContentLength);
- base::ListValue* received_daily_content_length_list =
- statistics_prefs_->GetList(data_reduction_proxy::prefs::
- kDailyHttpReceivedContentLength);
-
- for (size_t i = 0; i < kNumDaysInHistory; ++i) {
- original_daily_content_length_list->Set(
- i, new base::StringValue(base::Int64ToString(i)));
- }
+ VerifyPrefWasWritten(prefs::kHttpOriginalContentLength);
+ VerifyPrefWasWritten(prefs::kHttpReceivedContentLength);
+ VerifyPrefListWasWritten(prefs::kDailyHttpOriginalContentLength);
+ VerifyPrefListWasWritten(prefs::kDailyHttpReceivedContentLength);
+}
- received_daily_content_length_list->Clear();
- for (size_t i = 0; i < kNumDaysInHistory/2; ++i) {
- received_daily_content_length_list->Set(
- i, new base::StringValue(base::Int64ToString(i)));
- }
+TEST_F(DataReductionProxyStatisticsPrefsTest,
+ WritePrefsOnUpdateDailyReceivedContentLengths) {
+ statistics_prefs_.reset(new DataReductionProxyStatisticsPrefs(
+ &simple_pref_service_,
+ task_runner_,
+ base::TimeDelta::FromMinutes(kWriteDelayMinutes)));
+ SetUpPrefs();
- task_runner_->RunPendingTasks();
+ simple_pref_service_.SetBoolean(
+ prefs::kUpdateDailyReceivedContentLengths, true);
- VerifyPrefWasWritten(data_reduction_proxy::prefs::kHttpOriginalContentLength);
- VerifyPrefWasWritten(data_reduction_proxy::prefs::kHttpReceivedContentLength);
- VerifyPrefListWasWritten(
- data_reduction_proxy::prefs::kDailyHttpOriginalContentLength);
- VerifyPrefListWasWritten(
- data_reduction_proxy::prefs::kDailyHttpReceivedContentLength);
+ VerifyPrefWasWritten(prefs::kHttpOriginalContentLength);
+ VerifyPrefWasWritten(prefs::kHttpReceivedContentLength);
+ VerifyPrefListWasWritten(prefs::kDailyHttpOriginalContentLength);
+ VerifyPrefListWasWritten(prefs::kDailyHttpReceivedContentLength);
}
TEST_F(DataReductionProxyStatisticsPrefsTest,
- WritePrefsOnUpdateDailyReceivedContentLengths) {
+ HistoricNetworkStatsInfoToValue) {
+ const int64 kOriginalLength = 150;
+ const int64 kReceivedLength = 100;
statistics_prefs_.reset(new DataReductionProxyStatisticsPrefs(
&simple_pref_service_,
task_runner_,
base::TimeDelta::FromMinutes(kWriteDelayMinutes)));
- CreatePrefList(
- data_reduction_proxy::prefs::kDailyHttpOriginalContentLength);
- CreatePrefList(
- data_reduction_proxy::prefs::kDailyHttpReceivedContentLength);
+ base::DictionaryValue* dict = nullptr;
+ scoped_ptr<base::Value> stats_value(
+ statistics_prefs_->HistoricNetworkStatsInfoToValue());
+ EXPECT_TRUE(stats_value->GetAsDictionary(&dict));
+ VerifyPrefs(dict);
+ statistics_prefs_->SetInt64(prefs::kHttpOriginalContentLength,
+ kOriginalLength);
+ statistics_prefs_->SetInt64(prefs::kHttpReceivedContentLength,
+ kReceivedLength);
+
+ stats_value.reset(statistics_prefs_->HistoricNetworkStatsInfoToValue());
+ EXPECT_TRUE(stats_value->GetAsDictionary(&dict));
+ VerifyPrefs(dict);
+}
+
+TEST_F(DataReductionProxyStatisticsPrefsTest,
+ HistoricNetworkStatsInfoToValueDirect) {
const int64 kOriginalLength = 150;
const int64 kReceivedLength = 100;
+ statistics_prefs_.reset(new DataReductionProxyStatisticsPrefs(
+ &simple_pref_service_,
+ task_runner_,
+ base::TimeDelta()));
- statistics_prefs_->SetInt64(
- data_reduction_proxy::prefs::kHttpOriginalContentLength, kOriginalLength);
- statistics_prefs_->SetInt64(
- data_reduction_proxy::prefs::kHttpReceivedContentLength, kReceivedLength);
-
- base::ListValue* original_daily_content_length_list =
- statistics_prefs_->GetList(data_reduction_proxy::prefs::
- kDailyHttpOriginalContentLength);
- base::ListValue* received_daily_content_length_list =
- statistics_prefs_->GetList(data_reduction_proxy::prefs::
- kDailyHttpReceivedContentLength);
-
- for (size_t i = 0; i < kNumDaysInHistory; ++i) {
- original_daily_content_length_list->Set(
- i, new base::StringValue(base::Int64ToString(i)));
- }
+ base::DictionaryValue* dict = nullptr;
+ scoped_ptr<base::Value> stats_value(
+ statistics_prefs_->HistoricNetworkStatsInfoToValue());
+ EXPECT_TRUE(stats_value->GetAsDictionary(&dict));
+ VerifyPrefs(dict);
- received_daily_content_length_list->Clear();
- for (size_t i = 0; i < kNumDaysInHistory/2; ++i) {
- received_daily_content_length_list->Set(
- i, new base::StringValue(base::Int64ToString(i)));
- }
+ statistics_prefs_->SetInt64(prefs::kHttpOriginalContentLength,
+ kOriginalLength);
+ statistics_prefs_->SetInt64(prefs::kHttpReceivedContentLength,
+ kReceivedLength);
- simple_pref_service_.SetBoolean(
- data_reduction_proxy::prefs::kUpdateDailyReceivedContentLengths, true);
-
- VerifyPrefWasWritten(data_reduction_proxy::prefs::kHttpOriginalContentLength);
- VerifyPrefWasWritten(data_reduction_proxy::prefs::kHttpReceivedContentLength);
- VerifyPrefListWasWritten(
- data_reduction_proxy::prefs::kDailyHttpOriginalContentLength);
- VerifyPrefListWasWritten(
- data_reduction_proxy::prefs::kDailyHttpReceivedContentLength);
+ stats_value.reset(statistics_prefs_->HistoricNetworkStatsInfoToValue());
+ EXPECT_TRUE(stats_value->GetAsDictionary(&dict));
+ VerifyPrefs(dict);
}
} // namespace data_reduction_proxy
« no previous file with comments | « components/data_reduction_proxy/core/browser/data_reduction_proxy_statistics_prefs.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698