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

Side by Side Diff: chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_unittest.cc

Issue 959913002: Create fluent Builder for DataReductionProxyTestContext. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: sclittle CR comments + 1 unittest cleanup Created 5 years, 10 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 unified diff | Download patch
« no previous file with comments | « no previous file | components/data_reduction_proxy/content/browser/data_reduction_proxy_debug_resource_throttle_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <string> 5 #include <string>
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/prefs/pref_registry_simple.h" 8 #include "base/prefs/pref_registry_simple.h"
9 #include "base/prefs/testing_pref_service.h" 9 #include "base/prefs/testing_pref_service.h"
10 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h" 10 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h"
11 #include "chrome/common/pref_names.h" 11 #include "chrome/common/pref_names.h"
12 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_conf ig_test_utils.h" 12 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_conf ig_test_utils.h"
13 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_test _utils.h" 13 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_test _utils.h"
14 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_param s.h" 14 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_param s.h"
15 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_param s_test_utils.h" 15 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_param s_test_utils.h"
16 #include "testing/gtest/include/gtest/gtest.h" 16 #include "testing/gtest/include/gtest/gtest.h"
17 17
18 using testing::_; 18 using testing::_;
19 using testing::Return; 19 using testing::Return;
20 20
21 class DataReductionProxyChromeSettingsTest : public testing::Test { 21 class DataReductionProxyChromeSettingsTest : public testing::Test {
22 public: 22 public:
23 void SetUp() override { 23 void SetUp() override {
24 drp_chrome_settings_ = 24 drp_chrome_settings_ =
25 make_scoped_ptr(new DataReductionProxyChromeSettings()); 25 make_scoped_ptr(new DataReductionProxyChromeSettings());
26 test_context_.reset(new data_reduction_proxy::DataReductionProxyTestContext( 26 test_context_ =
27 data_reduction_proxy::DataReductionProxyParams::kAllowed | 27 data_reduction_proxy::DataReductionProxyTestContext::Builder()
28 data_reduction_proxy::DataReductionProxyParams::kFallbackAllowed | 28 .WithParamsFlags(
29 data_reduction_proxy::DataReductionProxyParams::kPromoAllowed, 29 data_reduction_proxy::DataReductionProxyParams::kAllowed |
30 data_reduction_proxy::TestDataReductionProxyParams::HAS_EVERYTHING & 30 data_reduction_proxy::DataReductionProxyParams::
31 ~data_reduction_proxy::TestDataReductionProxyParams:: 31 kFallbackAllowed |
32 HAS_DEV_ORIGIN & 32 data_reduction_proxy::DataReductionProxyParams::kPromoAllowed)
33 ~data_reduction_proxy::TestDataReductionProxyParams:: 33 .WithParamsDefinitions(
34 HAS_DEV_FALLBACK_ORIGIN, 34 data_reduction_proxy::TestDataReductionProxyParams::
35 data_reduction_proxy::DataReductionProxyTestContext::USE_MOCK_CONFIG | 35 HAS_EVERYTHING &
36 data_reduction_proxy::DataReductionProxyTestContext:: 36 ~data_reduction_proxy::TestDataReductionProxyParams::
37 SKIP_SETTINGS_INITIALIZATION)); 37 HAS_DEV_ORIGIN &
38 ~data_reduction_proxy::TestDataReductionProxyParams::
39 HAS_DEV_FALLBACK_ORIGIN)
40 .WithMockConfig()
41 .SkipSettingsInitialization()
42 .Build();
38 config_ = test_context_->mock_config(); 43 config_ = test_context_->mock_config();
39 drp_chrome_settings_->ResetConfigForTest(config_); 44 drp_chrome_settings_->ResetConfigForTest(config_);
40 dict_ = make_scoped_ptr(new base::DictionaryValue()); 45 dict_ = make_scoped_ptr(new base::DictionaryValue());
41 mock_pref_service_ = make_scoped_ptr(new TestingPrefServiceSimple());
42 46
43 PrefRegistrySimple* registry = mock_pref_service_->registry(); 47 PrefRegistrySimple* registry = test_context_->pref_service()->registry();
44 registry->RegisterDictionaryPref(prefs::kProxy); 48 registry->RegisterDictionaryPref(prefs::kProxy);
45 } 49 }
46 50
47 scoped_ptr<DataReductionProxyChromeSettings> drp_chrome_settings_; 51 scoped_ptr<DataReductionProxyChromeSettings> drp_chrome_settings_;
48 scoped_ptr<base::DictionaryValue> dict_; 52 scoped_ptr<base::DictionaryValue> dict_;
49 scoped_ptr<TestingPrefServiceSimple> mock_pref_service_;
50 scoped_ptr<data_reduction_proxy::DataReductionProxyTestContext> test_context_; 53 scoped_ptr<data_reduction_proxy::DataReductionProxyTestContext> test_context_;
51 data_reduction_proxy::MockDataReductionProxyConfig* config_; 54 data_reduction_proxy::MockDataReductionProxyConfig* config_;
52 }; 55 };
53 56
54 TEST_F(DataReductionProxyChromeSettingsTest, MigrateEmptyProxy) { 57 TEST_F(DataReductionProxyChromeSettingsTest, MigrateEmptyProxy) {
55 EXPECT_CALL(*config_, ContainsDataReductionProxy(_)).Times(0); 58 EXPECT_CALL(*config_, ContainsDataReductionProxy(_)).Times(0);
56 drp_chrome_settings_->MigrateDataReductionProxyOffProxyPrefs( 59 drp_chrome_settings_->MigrateDataReductionProxyOffProxyPrefs(
57 mock_pref_service_.get()); 60 test_context_->pref_service());
58 61
59 EXPECT_EQ(NULL, mock_pref_service_->GetUserPref(prefs::kProxy)); 62 EXPECT_EQ(NULL, test_context_->pref_service()->GetUserPref(prefs::kProxy));
60 } 63 }
61 64
62 TEST_F(DataReductionProxyChromeSettingsTest, MigrateSystemProxy) { 65 TEST_F(DataReductionProxyChromeSettingsTest, MigrateSystemProxy) {
63 dict_->SetString("mode", "system"); 66 dict_->SetString("mode", "system");
64 mock_pref_service_->Set(prefs::kProxy, *dict_.get()); 67 test_context_->pref_service()->Set(prefs::kProxy, *dict_.get());
65 EXPECT_CALL(*config_, ContainsDataReductionProxy(_)).Times(0); 68 EXPECT_CALL(*config_, ContainsDataReductionProxy(_)).Times(0);
66 69
67 drp_chrome_settings_->MigrateDataReductionProxyOffProxyPrefs( 70 drp_chrome_settings_->MigrateDataReductionProxyOffProxyPrefs(
68 mock_pref_service_.get()); 71 test_context_->pref_service());
69 72
70 EXPECT_EQ(NULL, mock_pref_service_->GetUserPref(prefs::kProxy)); 73 EXPECT_EQ(NULL, test_context_->pref_service()->GetUserPref(prefs::kProxy));
71 } 74 }
72 75
73 TEST_F(DataReductionProxyChromeSettingsTest, MigrateDataReductionProxy) { 76 TEST_F(DataReductionProxyChromeSettingsTest, MigrateDataReductionProxy) {
74 dict_->SetString("mode", "fixed_servers"); 77 dict_->SetString("mode", "fixed_servers");
75 dict_->SetString("server", "http=https://proxy.googlezip.net"); 78 dict_->SetString("server", "http=https://proxy.googlezip.net");
76 mock_pref_service_->Set(prefs::kProxy, *dict_.get()); 79 test_context_->pref_service()->Set(prefs::kProxy, *dict_.get());
77 EXPECT_CALL(*config_, ContainsDataReductionProxy(_)).Times(1) 80 EXPECT_CALL(*config_, ContainsDataReductionProxy(_)).Times(1)
78 .WillOnce(Return(true)); 81 .WillOnce(Return(true));
79 82
80 drp_chrome_settings_->MigrateDataReductionProxyOffProxyPrefs( 83 drp_chrome_settings_->MigrateDataReductionProxyOffProxyPrefs(
81 mock_pref_service_.get()); 84 test_context_->pref_service());
82 85
83 EXPECT_EQ(NULL, mock_pref_service_->GetUserPref(prefs::kProxy)); 86 EXPECT_EQ(NULL, test_context_->pref_service()->GetUserPref(prefs::kProxy));
84 } 87 }
85 88
86 TEST_F(DataReductionProxyChromeSettingsTest, MigrateIgnoreOtherProxy) { 89 TEST_F(DataReductionProxyChromeSettingsTest, MigrateIgnoreOtherProxy) {
87 dict_->SetString("mode", "fixed_servers"); 90 dict_->SetString("mode", "fixed_servers");
88 dict_->SetString("server", "http=https://youtube.com"); 91 dict_->SetString("server", "http=https://youtube.com");
89 mock_pref_service_->Set(prefs::kProxy, *dict_.get()); 92 test_context_->pref_service()->Set(prefs::kProxy, *dict_.get());
90 EXPECT_CALL(*config_, ContainsDataReductionProxy(_)).Times(1) 93 EXPECT_CALL(*config_, ContainsDataReductionProxy(_)).Times(1)
91 .WillOnce(Return(false)); 94 .WillOnce(Return(false));
92 95
93 drp_chrome_settings_->MigrateDataReductionProxyOffProxyPrefs( 96 drp_chrome_settings_->MigrateDataReductionProxyOffProxyPrefs(
94 mock_pref_service_.get()); 97 test_context_->pref_service());
95 98
96 base::DictionaryValue* value = 99 base::DictionaryValue* value =
97 (base::DictionaryValue*)mock_pref_service_->GetUserPref(prefs::kProxy); 100 (base::DictionaryValue*)test_context_->pref_service()->GetUserPref(
101 prefs::kProxy);
98 std::string mode; 102 std::string mode;
99 EXPECT_TRUE(value->GetString("mode", &mode)); 103 EXPECT_TRUE(value->GetString("mode", &mode));
100 EXPECT_EQ("fixed_servers", mode); 104 EXPECT_EQ("fixed_servers", mode);
101 std::string server; 105 std::string server;
102 EXPECT_TRUE(value->GetString("server", &server)); 106 EXPECT_TRUE(value->GetString("server", &server));
103 EXPECT_EQ("http=https://youtube.com", server); 107 EXPECT_EQ("http=https://youtube.com", server);
104 } 108 }
OLDNEW
« no previous file with comments | « no previous file | components/data_reduction_proxy/content/browser/data_reduction_proxy_debug_resource_throttle_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698