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

Side by Side Diff: chrome/browser/extensions/policy_handlers_unittest.cc

Issue 2030013003: Remove ListValue::Append(new {Fundamental,String}Value(...)) pattern in //chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
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 <utility> 5 #include <utility>
6 6
7 #include "base/json/json_reader.h" 7 #include "base/json/json_reader.h"
8 #include "chrome/browser/extensions/external_policy_loader.h" 8 #include "chrome/browser/extensions/external_policy_loader.h"
9 #include "chrome/browser/extensions/policy_handlers.h" 9 #include "chrome/browser/extensions/policy_handlers.h"
10 #include "components/policy/core/browser/policy_error_map.h" 10 #include "components/policy/core/browser/policy_error_map.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 ExtensionListPolicyHandler handler( 43 ExtensionListPolicyHandler handler(
44 policy::key::kExtensionInstallBlacklist, kTestPref, true); 44 policy::key::kExtensionInstallBlacklist, kTestPref, true);
45 45
46 policy_map.Set(policy::key::kExtensionInstallBlacklist, 46 policy_map.Set(policy::key::kExtensionInstallBlacklist,
47 policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, 47 policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER,
48 policy::POLICY_SOURCE_CLOUD, list.CreateDeepCopy(), nullptr); 48 policy::POLICY_SOURCE_CLOUD, list.CreateDeepCopy(), nullptr);
49 errors.Clear(); 49 errors.Clear();
50 EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors)); 50 EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
51 EXPECT_TRUE(errors.empty()); 51 EXPECT_TRUE(errors.empty());
52 52
53 list.Append(new base::StringValue("abcdefghijklmnopabcdefghijklmnop")); 53 list.AppendString("abcdefghijklmnopabcdefghijklmnop");
54 policy_map.Set(policy::key::kExtensionInstallBlacklist, 54 policy_map.Set(policy::key::kExtensionInstallBlacklist,
55 policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, 55 policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER,
56 policy::POLICY_SOURCE_CLOUD, list.CreateDeepCopy(), nullptr); 56 policy::POLICY_SOURCE_CLOUD, list.CreateDeepCopy(), nullptr);
57 errors.Clear(); 57 errors.Clear();
58 EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors)); 58 EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
59 EXPECT_TRUE(errors.empty()); 59 EXPECT_TRUE(errors.empty());
60 60
61 list.Append(new base::StringValue("*")); 61 list.AppendString("*");
62 policy_map.Set(policy::key::kExtensionInstallBlacklist, 62 policy_map.Set(policy::key::kExtensionInstallBlacklist,
63 policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, 63 policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER,
64 policy::POLICY_SOURCE_CLOUD, list.CreateDeepCopy(), nullptr); 64 policy::POLICY_SOURCE_CLOUD, list.CreateDeepCopy(), nullptr);
65 errors.Clear(); 65 errors.Clear();
66 EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors)); 66 EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
67 EXPECT_TRUE(errors.empty()); 67 EXPECT_TRUE(errors.empty());
68 68
69 list.Append(new base::StringValue("invalid")); 69 list.AppendString("invalid");
70 policy_map.Set(policy::key::kExtensionInstallBlacklist, 70 policy_map.Set(policy::key::kExtensionInstallBlacklist,
71 policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, 71 policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER,
72 policy::POLICY_SOURCE_CLOUD, list.CreateDeepCopy(), nullptr); 72 policy::POLICY_SOURCE_CLOUD, list.CreateDeepCopy(), nullptr);
73 errors.Clear(); 73 errors.Clear();
74 EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors)); 74 EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
75 EXPECT_FALSE(errors.empty()); 75 EXPECT_FALSE(errors.empty());
76 EXPECT_FALSE( 76 EXPECT_FALSE(
77 errors.GetErrors(policy::key::kExtensionInstallBlacklist).empty()); 77 errors.GetErrors(policy::key::kExtensionInstallBlacklist).empty());
78 } 78 }
79 79
80 TEST(ExtensionListPolicyHandlerTest, ApplyPolicySettings) { 80 TEST(ExtensionListPolicyHandlerTest, ApplyPolicySettings) {
81 base::ListValue policy; 81 base::ListValue policy;
82 base::ListValue expected; 82 base::ListValue expected;
83 policy::PolicyMap policy_map; 83 policy::PolicyMap policy_map;
84 PrefValueMap prefs; 84 PrefValueMap prefs;
85 base::Value* value = NULL; 85 base::Value* value = NULL;
86 ExtensionListPolicyHandler handler( 86 ExtensionListPolicyHandler handler(
87 policy::key::kExtensionInstallBlacklist, kTestPref, false); 87 policy::key::kExtensionInstallBlacklist, kTestPref, false);
88 88
89 policy.Append(new base::StringValue("abcdefghijklmnopabcdefghijklmnop")); 89 policy.AppendString("abcdefghijklmnopabcdefghijklmnop");
90 expected.Append(new base::StringValue("abcdefghijklmnopabcdefghijklmnop")); 90 expected.AppendString("abcdefghijklmnopabcdefghijklmnop");
91 91
92 policy_map.Set(policy::key::kExtensionInstallBlacklist, 92 policy_map.Set(policy::key::kExtensionInstallBlacklist,
93 policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, 93 policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER,
94 policy::POLICY_SOURCE_CLOUD, policy.CreateDeepCopy(), nullptr); 94 policy::POLICY_SOURCE_CLOUD, policy.CreateDeepCopy(), nullptr);
95 handler.ApplyPolicySettings(policy_map, &prefs); 95 handler.ApplyPolicySettings(policy_map, &prefs);
96 EXPECT_TRUE(prefs.GetValue(kTestPref, &value)); 96 EXPECT_TRUE(prefs.GetValue(kTestPref, &value));
97 EXPECT_TRUE(base::Value::Equals(&expected, value)); 97 EXPECT_TRUE(base::Value::Equals(&expected, value));
98 98
99 policy.Append(new base::StringValue("invalid")); 99 policy.AppendString("invalid");
100 policy_map.Set(policy::key::kExtensionInstallBlacklist, 100 policy_map.Set(policy::key::kExtensionInstallBlacklist,
101 policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, 101 policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER,
102 policy::POLICY_SOURCE_CLOUD, policy.CreateDeepCopy(), nullptr); 102 policy::POLICY_SOURCE_CLOUD, policy.CreateDeepCopy(), nullptr);
103 handler.ApplyPolicySettings(policy_map, &prefs); 103 handler.ApplyPolicySettings(policy_map, &prefs);
104 EXPECT_TRUE(prefs.GetValue(kTestPref, &value)); 104 EXPECT_TRUE(prefs.GetValue(kTestPref, &value));
105 EXPECT_TRUE(base::Value::Equals(&expected, value)); 105 EXPECT_TRUE(base::Value::Equals(&expected, value));
106 } 106 }
107 107
108 TEST(ExtensionInstallForcelistPolicyHandlerTest, CheckPolicySettings) { 108 TEST(ExtensionInstallForcelistPolicyHandlerTest, CheckPolicySettings) {
109 base::ListValue list; 109 base::ListValue list;
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 ExtensionURLPatternListPolicyHandler handler( 200 ExtensionURLPatternListPolicyHandler handler(
201 policy::key::kExtensionInstallSources, kTestPref); 201 policy::key::kExtensionInstallSources, kTestPref);
202 202
203 policy_map.Set(policy::key::kExtensionInstallSources, 203 policy_map.Set(policy::key::kExtensionInstallSources,
204 policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, 204 policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER,
205 policy::POLICY_SOURCE_CLOUD, list.CreateDeepCopy(), nullptr); 205 policy::POLICY_SOURCE_CLOUD, list.CreateDeepCopy(), nullptr);
206 errors.Clear(); 206 errors.Clear();
207 EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors)); 207 EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
208 EXPECT_TRUE(errors.empty()); 208 EXPECT_TRUE(errors.empty());
209 209
210 list.Append(new base::StringValue("http://*.google.com/*")); 210 list.AppendString("http://*.google.com/*");
211 policy_map.Set(policy::key::kExtensionInstallSources, 211 policy_map.Set(policy::key::kExtensionInstallSources,
212 policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, 212 policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER,
213 policy::POLICY_SOURCE_CLOUD, list.CreateDeepCopy(), nullptr); 213 policy::POLICY_SOURCE_CLOUD, list.CreateDeepCopy(), nullptr);
214 errors.Clear(); 214 errors.Clear();
215 EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors)); 215 EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
216 EXPECT_TRUE(errors.empty()); 216 EXPECT_TRUE(errors.empty());
217 217
218 list.Append(new base::StringValue("<all_urls>")); 218 list.AppendString("<all_urls>");
219 policy_map.Set(policy::key::kExtensionInstallSources, 219 policy_map.Set(policy::key::kExtensionInstallSources,
220 policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, 220 policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER,
221 policy::POLICY_SOURCE_CLOUD, list.CreateDeepCopy(), nullptr); 221 policy::POLICY_SOURCE_CLOUD, list.CreateDeepCopy(), nullptr);
222 errors.Clear(); 222 errors.Clear();
223 EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors)); 223 EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
224 EXPECT_TRUE(errors.empty()); 224 EXPECT_TRUE(errors.empty());
225 225
226 list.Append(new base::StringValue("invalid")); 226 list.AppendString("invalid");
227 policy_map.Set(policy::key::kExtensionInstallSources, 227 policy_map.Set(policy::key::kExtensionInstallSources,
228 policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, 228 policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER,
229 policy::POLICY_SOURCE_CLOUD, list.CreateDeepCopy(), nullptr); 229 policy::POLICY_SOURCE_CLOUD, list.CreateDeepCopy(), nullptr);
230 errors.Clear(); 230 errors.Clear();
231 EXPECT_FALSE(handler.CheckPolicySettings(policy_map, &errors)); 231 EXPECT_FALSE(handler.CheckPolicySettings(policy_map, &errors));
232 EXPECT_FALSE(errors.empty()); 232 EXPECT_FALSE(errors.empty());
233 EXPECT_FALSE(errors.GetErrors(policy::key::kExtensionInstallSources).empty()); 233 EXPECT_FALSE(errors.GetErrors(policy::key::kExtensionInstallSources).empty());
234 234
235 // URLPattern syntax has a different way to express 'all urls'. Though '*' 235 // URLPattern syntax has a different way to express 'all urls'. Though '*'
236 // would be compatible today, it would be brittle, so we disallow. 236 // would be compatible today, it would be brittle, so we disallow.
237 list.Append(new base::StringValue("*")); 237 list.AppendString("*");
238 policy_map.Set(policy::key::kExtensionInstallSources, 238 policy_map.Set(policy::key::kExtensionInstallSources,
239 policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, 239 policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER,
240 policy::POLICY_SOURCE_CLOUD, list.CreateDeepCopy(), nullptr); 240 policy::POLICY_SOURCE_CLOUD, list.CreateDeepCopy(), nullptr);
241 errors.Clear(); 241 errors.Clear();
242 EXPECT_FALSE(handler.CheckPolicySettings(policy_map, &errors)); 242 EXPECT_FALSE(handler.CheckPolicySettings(policy_map, &errors));
243 EXPECT_FALSE(errors.empty()); 243 EXPECT_FALSE(errors.empty());
244 EXPECT_FALSE(errors.GetErrors(policy::key::kExtensionInstallSources).empty()); 244 EXPECT_FALSE(errors.GetErrors(policy::key::kExtensionInstallSources).empty());
245 } 245 }
246 246
247 TEST(ExtensionURLPatternListPolicyHandlerTest, ApplyPolicySettings) { 247 TEST(ExtensionURLPatternListPolicyHandlerTest, ApplyPolicySettings) {
248 base::ListValue list; 248 base::ListValue list;
249 policy::PolicyMap policy_map; 249 policy::PolicyMap policy_map;
250 PrefValueMap prefs; 250 PrefValueMap prefs;
251 base::Value* value = NULL; 251 base::Value* value = NULL;
252 ExtensionURLPatternListPolicyHandler handler( 252 ExtensionURLPatternListPolicyHandler handler(
253 policy::key::kExtensionInstallSources, kTestPref); 253 policy::key::kExtensionInstallSources, kTestPref);
254 254
255 list.Append(new base::StringValue("https://corp.monkey.net/*")); 255 list.AppendString("https://corp.monkey.net/*");
256 policy_map.Set(policy::key::kExtensionInstallSources, 256 policy_map.Set(policy::key::kExtensionInstallSources,
257 policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER, 257 policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER,
258 policy::POLICY_SOURCE_CLOUD, list.CreateDeepCopy(), nullptr); 258 policy::POLICY_SOURCE_CLOUD, list.CreateDeepCopy(), nullptr);
259 handler.ApplyPolicySettings(policy_map, &prefs); 259 handler.ApplyPolicySettings(policy_map, &prefs);
260 ASSERT_TRUE(prefs.GetValue(kTestPref, &value)); 260 ASSERT_TRUE(prefs.GetValue(kTestPref, &value));
261 EXPECT_TRUE(base::Value::Equals(&list, value)); 261 EXPECT_TRUE(base::Value::Equals(&list, value));
262 } 262 }
263 263
264 TEST(ExtensionSettingsPolicyHandlerTest, CheckPolicySettings) { 264 TEST(ExtensionSettingsPolicyHandlerTest, CheckPolicySettings) {
265 std::string error; 265 std::string error;
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
303 policy::POLICY_SOURCE_CLOUD, policy_value->CreateDeepCopy(), 303 policy::POLICY_SOURCE_CLOUD, policy_value->CreateDeepCopy(),
304 nullptr); 304 nullptr);
305 EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors)); 305 EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
306 handler.ApplyPolicySettings(policy_map, &prefs); 306 handler.ApplyPolicySettings(policy_map, &prefs);
307 base::Value* value = NULL; 307 base::Value* value = NULL;
308 ASSERT_TRUE(prefs.GetValue(pref_names::kExtensionManagement, &value)); 308 ASSERT_TRUE(prefs.GetValue(pref_names::kExtensionManagement, &value));
309 EXPECT_TRUE(base::Value::Equals(policy_value.get(), value)); 309 EXPECT_TRUE(base::Value::Equals(policy_value.get(), value));
310 } 310 }
311 311
312 } // namespace extensions 312 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/policy_handlers.cc ('k') | chrome/browser/extensions/webstore_inline_installer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698