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

Side by Side Diff: chrome/browser/supervised_user/supervised_user_pref_store_unittest.cc

Issue 335833003: Rename "managed (mode|user)" to "supervised user" (part 2) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review comments (+ a few other cleanups) Created 6 years, 6 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 <set> 5 #include <set>
6 #include <string> 6 #include <string>
7 7
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "base/prefs/testing_pref_store.h" 9 #include "base/prefs/testing_pref_store.h"
10 #include "base/values.h" 10 #include "base/values.h"
11 #include "chrome/browser/managed_mode/managed_user_constants.h" 11 #include "chrome/browser/supervised_user/supervised_user_constants.h"
12 #include "chrome/browser/managed_mode/managed_user_settings_service.h" 12 #include "chrome/browser/supervised_user/supervised_user_pref_store.h"
13 #include "chrome/browser/managed_mode/supervised_user_pref_store.h" 13 #include "chrome/browser/supervised_user/supervised_user_settings_service.h"
14 #include "chrome/common/pref_names.h" 14 #include "chrome/common/pref_names.h"
15 #include "testing/gtest/include/gtest/gtest.h" 15 #include "testing/gtest/include/gtest/gtest.h"
16 16
17 using base::DictionaryValue; 17 using base::DictionaryValue;
18 using base::Value; 18 using base::Value;
19 19
20 namespace { 20 namespace {
21 21
22 class SupervisedUserPrefStoreFixture : public PrefStore::Observer { 22 class SupervisedUserPrefStoreFixture : public PrefStore::Observer {
23 public: 23 public:
24 explicit SupervisedUserPrefStoreFixture( 24 explicit SupervisedUserPrefStoreFixture(
25 ManagedUserSettingsService* settings_service); 25 SupervisedUserSettingsService* settings_service);
26 virtual ~SupervisedUserPrefStoreFixture(); 26 virtual ~SupervisedUserPrefStoreFixture();
27 27
28 base::DictionaryValue* changed_prefs() { 28 base::DictionaryValue* changed_prefs() {
29 return &changed_prefs_; 29 return &changed_prefs_;
30 } 30 }
31 31
32 bool initialization_completed() const { 32 bool initialization_completed() const {
33 return initialization_completed_; 33 return initialization_completed_;
34 } 34 }
35 35
36 // PrefStore::Observer implementation: 36 // PrefStore::Observer implementation:
37 virtual void OnPrefValueChanged(const std::string& key) OVERRIDE; 37 virtual void OnPrefValueChanged(const std::string& key) OVERRIDE;
38 virtual void OnInitializationCompleted(bool succeeded) OVERRIDE; 38 virtual void OnInitializationCompleted(bool succeeded) OVERRIDE;
39 39
40 private: 40 private:
41 scoped_refptr<SupervisedUserPrefStore> pref_store_; 41 scoped_refptr<SupervisedUserPrefStore> pref_store_;
42 base::DictionaryValue changed_prefs_; 42 base::DictionaryValue changed_prefs_;
43 bool initialization_completed_; 43 bool initialization_completed_;
44 }; 44 };
45 45
46 SupervisedUserPrefStoreFixture::SupervisedUserPrefStoreFixture( 46 SupervisedUserPrefStoreFixture::SupervisedUserPrefStoreFixture(
47 ManagedUserSettingsService* settings_service) 47 SupervisedUserSettingsService* settings_service)
48 : pref_store_(new SupervisedUserPrefStore(settings_service)), 48 : pref_store_(new SupervisedUserPrefStore(settings_service)),
49 initialization_completed_(pref_store_->IsInitializationComplete()) { 49 initialization_completed_(pref_store_->IsInitializationComplete()) {
50 pref_store_->AddObserver(this); 50 pref_store_->AddObserver(this);
51 } 51 }
52 52
53 SupervisedUserPrefStoreFixture::~SupervisedUserPrefStoreFixture() { 53 SupervisedUserPrefStoreFixture::~SupervisedUserPrefStoreFixture() {
54 pref_store_->RemoveObserver(this); 54 pref_store_->RemoveObserver(this);
55 } 55 }
56 56
57 void SupervisedUserPrefStoreFixture::OnPrefValueChanged( 57 void SupervisedUserPrefStoreFixture::OnPrefValueChanged(
(...skipping 11 matching lines...) Expand all
69 } 69 }
70 70
71 } // namespace 71 } // namespace
72 72
73 class SupervisedUserPrefStoreTest : public ::testing::Test { 73 class SupervisedUserPrefStoreTest : public ::testing::Test {
74 public: 74 public:
75 virtual void SetUp() OVERRIDE; 75 virtual void SetUp() OVERRIDE;
76 virtual void TearDown() OVERRIDE; 76 virtual void TearDown() OVERRIDE;
77 77
78 protected: 78 protected:
79 ManagedUserSettingsService service_; 79 SupervisedUserSettingsService service_;
80 scoped_refptr<TestingPrefStore> pref_store_; 80 scoped_refptr<TestingPrefStore> pref_store_;
81 }; 81 };
82 82
83 void SupervisedUserPrefStoreTest::SetUp() { 83 void SupervisedUserPrefStoreTest::SetUp() {
84 pref_store_ = new TestingPrefStore(); 84 pref_store_ = new TestingPrefStore();
85 service_.Init(pref_store_); 85 service_.Init(pref_store_);
86 } 86 }
87 87
88 void SupervisedUserPrefStoreTest::TearDown() { 88 void SupervisedUserPrefStoreTest::TearDown() {
89 service_.Shutdown(); 89 service_.Shutdown();
90 } 90 }
91 91
92 TEST_F(SupervisedUserPrefStoreTest, ConfigureSettings) { 92 TEST_F(SupervisedUserPrefStoreTest, ConfigureSettings) {
93 SupervisedUserPrefStoreFixture fixture(&service_); 93 SupervisedUserPrefStoreFixture fixture(&service_);
94 EXPECT_FALSE(fixture.initialization_completed()); 94 EXPECT_FALSE(fixture.initialization_completed());
95 95
96 // Prefs should not change yet when the service is ready, but not 96 // Prefs should not change yet when the service is ready, but not
97 // activated yet. 97 // activated yet.
98 pref_store_->SetInitializationCompleted(); 98 pref_store_->SetInitializationCompleted();
99 EXPECT_TRUE(fixture.initialization_completed()); 99 EXPECT_TRUE(fixture.initialization_completed());
100 EXPECT_EQ(0u, fixture.changed_prefs()->size()); 100 EXPECT_EQ(0u, fixture.changed_prefs()->size());
101 101
102 service_.SetActive(true); 102 service_.SetActive(true);
103 103
104 // kAllowDeletingBrowserHistory is hardcoded to false for managed users. 104 // kAllowDeletingBrowserHistory is hardcoded to false for supervised users.
105 bool allow_deleting_browser_history = true; 105 bool allow_deleting_browser_history = true;
106 EXPECT_TRUE(fixture.changed_prefs()->GetBoolean( 106 EXPECT_TRUE(fixture.changed_prefs()->GetBoolean(
107 prefs::kAllowDeletingBrowserHistory, &allow_deleting_browser_history)); 107 prefs::kAllowDeletingBrowserHistory, &allow_deleting_browser_history));
108 EXPECT_FALSE(allow_deleting_browser_history); 108 EXPECT_FALSE(allow_deleting_browser_history);
109 109
110 // kManagedModeManualHosts does not have a hardcoded value. 110 // kSupervisedModeManualHosts does not have a hardcoded value.
111 base::DictionaryValue* manual_hosts = NULL; 111 base::DictionaryValue* manual_hosts = NULL;
112 EXPECT_FALSE(fixture.changed_prefs()->GetDictionary( 112 EXPECT_FALSE(fixture.changed_prefs()->GetDictionary(
113 prefs::kSupervisedUserManualHosts, &manual_hosts)); 113 prefs::kSupervisedUserManualHosts, &manual_hosts));
114 114
115 // kForceSafeSearch defaults to true for managed users. 115 // kForceSafeSearch defaults to true for supervised users.
116 bool force_safesearch = false; 116 bool force_safesearch = false;
117 EXPECT_TRUE(fixture.changed_prefs()->GetBoolean(prefs::kForceSafeSearch, 117 EXPECT_TRUE(fixture.changed_prefs()->GetBoolean(prefs::kForceSafeSearch,
118 &force_safesearch)); 118 &force_safesearch));
119 EXPECT_TRUE(force_safesearch); 119 EXPECT_TRUE(force_safesearch);
120 120
121 // Activating the service again should not change anything. 121 // Activating the service again should not change anything.
122 fixture.changed_prefs()->Clear(); 122 fixture.changed_prefs()->Clear();
123 service_.SetActive(true); 123 service_.SetActive(true);
124 EXPECT_EQ(0u, fixture.changed_prefs()->size()); 124 EXPECT_EQ(0u, fixture.changed_prefs()->size());
125 125
126 // kManagedModeManualHosts can be configured by the custodian. 126 // kSupervisedModeManualHosts can be configured by the custodian.
127 scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue); 127 scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue);
128 dict->SetBoolean("example.com", true); 128 dict->SetBoolean("example.com", true);
129 dict->SetBoolean("moose.org", false); 129 dict->SetBoolean("moose.org", false);
130 service_.SetLocalSettingForTesting( 130 service_.SetLocalSettingForTesting(
131 managed_users::kContentPackManualBehaviorHosts, 131 supervised_users::kContentPackManualBehaviorHosts,
132 scoped_ptr<base::Value>(dict->DeepCopy())); 132 scoped_ptr<base::Value>(dict->DeepCopy()));
133 EXPECT_EQ(1u, fixture.changed_prefs()->size()); 133 EXPECT_EQ(1u, fixture.changed_prefs()->size());
134 ASSERT_TRUE(fixture.changed_prefs()->GetDictionary( 134 ASSERT_TRUE(fixture.changed_prefs()->GetDictionary(
135 prefs::kSupervisedUserManualHosts, &manual_hosts)); 135 prefs::kSupervisedUserManualHosts, &manual_hosts));
136 EXPECT_TRUE(manual_hosts->Equals(dict.get())); 136 EXPECT_TRUE(manual_hosts->Equals(dict.get()));
137 137
138 // kForceSafeSearch can be configured by the custodian, overriding the 138 // kForceSafeSearch can be configured by the custodian, overriding the
139 // hardcoded default. 139 // hardcoded default.
140 fixture.changed_prefs()->Clear(); 140 fixture.changed_prefs()->Clear();
141 service_.SetLocalSettingForTesting( 141 service_.SetLocalSettingForTesting(
142 managed_users::kForceSafeSearch, 142 supervised_users::kForceSafeSearch,
143 scoped_ptr<base::Value>(new base::FundamentalValue(false))); 143 scoped_ptr<base::Value>(new base::FundamentalValue(false)));
144 EXPECT_EQ(1u, fixture.changed_prefs()->size()); 144 EXPECT_EQ(1u, fixture.changed_prefs()->size());
145 EXPECT_TRUE(fixture.changed_prefs()->GetBoolean(prefs::kForceSafeSearch, 145 EXPECT_TRUE(fixture.changed_prefs()->GetBoolean(prefs::kForceSafeSearch,
146 &force_safesearch)); 146 &force_safesearch));
147 EXPECT_FALSE(force_safesearch); 147 EXPECT_FALSE(force_safesearch);
148 } 148 }
149 149
150 TEST_F(SupervisedUserPrefStoreTest, ActivateSettingsBeforeInitialization) { 150 TEST_F(SupervisedUserPrefStoreTest, ActivateSettingsBeforeInitialization) {
151 SupervisedUserPrefStoreFixture fixture(&service_); 151 SupervisedUserPrefStoreFixture fixture(&service_);
152 EXPECT_FALSE(fixture.initialization_completed()); 152 EXPECT_FALSE(fixture.initialization_completed());
153 153
154 service_.SetActive(true); 154 service_.SetActive(true);
155 EXPECT_FALSE(fixture.initialization_completed()); 155 EXPECT_FALSE(fixture.initialization_completed());
156 EXPECT_EQ(0u, fixture.changed_prefs()->size()); 156 EXPECT_EQ(0u, fixture.changed_prefs()->size());
157 157
158 pref_store_->SetInitializationCompleted(); 158 pref_store_->SetInitializationCompleted();
159 EXPECT_TRUE(fixture.initialization_completed()); 159 EXPECT_TRUE(fixture.initialization_completed());
160 EXPECT_EQ(0u, fixture.changed_prefs()->size()); 160 EXPECT_EQ(0u, fixture.changed_prefs()->size());
161 } 161 }
162 162
163 TEST_F(SupervisedUserPrefStoreTest, CreatePrefStoreAfterInitialization) { 163 TEST_F(SupervisedUserPrefStoreTest, CreatePrefStoreAfterInitialization) {
164 pref_store_->SetInitializationCompleted(); 164 pref_store_->SetInitializationCompleted();
165 service_.SetActive(true); 165 service_.SetActive(true);
166 166
167 SupervisedUserPrefStoreFixture fixture(&service_); 167 SupervisedUserPrefStoreFixture fixture(&service_);
168 EXPECT_TRUE(fixture.initialization_completed()); 168 EXPECT_TRUE(fixture.initialization_completed());
169 EXPECT_EQ(0u, fixture.changed_prefs()->size()); 169 EXPECT_EQ(0u, fixture.changed_prefs()->size());
170 } 170 }
171 171
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698