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

Side by Side Diff: components/policy/core/common/schema_map_unittest.cc

Issue 397793002: Eliminate CreateBooleanValue from test files (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix bad merge Created 6 years, 5 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 "components/policy/core/common/schema_map.h" 5 #include "components/policy/core/common/schema_map.h"
6 6
7 #include "base/memory/weak_ptr.h" 7 #include "base/memory/weak_ptr.h"
8 #include "base/values.h" 8 #include "base/values.h"
9 #include "components/policy/core/common/external_data_fetcher.h" 9 #include "components/policy/core/common/external_data_fetcher.h"
10 #include "components/policy/core/common/external_data_manager.h" 10 #include "components/policy/core/common/external_data_manager.h"
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 schema_map->FilterBundle(&bundle); 156 schema_map->FilterBundle(&bundle);
157 EXPECT_TRUE(bundle.Equals(expected_bundle)); 157 EXPECT_TRUE(bundle.Equals(expected_bundle));
158 158
159 PolicyNamespace extension_ns(POLICY_DOMAIN_EXTENSIONS, "abc"); 159 PolicyNamespace extension_ns(POLICY_DOMAIN_EXTENSIONS, "abc");
160 PolicyMap& map = expected_bundle.Get(extension_ns); 160 PolicyMap& map = expected_bundle.Get(extension_ns);
161 base::ListValue list; 161 base::ListValue list;
162 list.AppendString("a"); 162 list.AppendString("a");
163 list.AppendString("b"); 163 list.AppendString("b");
164 map.Set("list", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, 164 map.Set("list", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
165 list.DeepCopy(), NULL); 165 list.DeepCopy(), NULL);
166 map.Set("boolean", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, 166 map.Set("boolean",
167 base::Value::CreateBooleanValue(true), NULL); 167 POLICY_LEVEL_MANDATORY,
168 POLICY_SCOPE_USER,
169 new base::FundamentalValue(true),
170 NULL);
168 map.Set("integer", 171 map.Set("integer",
169 POLICY_LEVEL_MANDATORY, 172 POLICY_LEVEL_MANDATORY,
170 POLICY_SCOPE_USER, 173 POLICY_SCOPE_USER,
171 new base::FundamentalValue(1), 174 new base::FundamentalValue(1),
172 NULL); 175 NULL);
173 map.Set("null", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, 176 map.Set("null", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
174 base::Value::CreateNullValue(), NULL); 177 base::Value::CreateNullValue(), NULL);
175 map.Set("double", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, 178 map.Set("double", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
176 base::Value::CreateDoubleValue(1.2), NULL); 179 base::Value::CreateDoubleValue(1.2), NULL);
177 base::DictionaryValue dict; 180 base::DictionaryValue dict;
(...skipping 10 matching lines...) Expand all
188 POLICY_SCOPE_USER, 191 POLICY_SCOPE_USER,
189 base::Value::CreateStringValue("to-be-removed"), 192 base::Value::CreateStringValue("to-be-removed"),
190 NULL); 193 NULL);
191 194
192 schema_map->FilterBundle(&bundle); 195 schema_map->FilterBundle(&bundle);
193 EXPECT_TRUE(bundle.Equals(expected_bundle)); 196 EXPECT_TRUE(bundle.Equals(expected_bundle));
194 197
195 // Mismatched types are also removed. 198 // Mismatched types are also removed.
196 bundle.Clear(); 199 bundle.Clear();
197 PolicyMap& badmap = bundle.Get(extension_ns); 200 PolicyMap& badmap = bundle.Get(extension_ns);
198 badmap.Set("list", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, 201 badmap.Set("list",
199 base::Value::CreateBooleanValue(false), NULL); 202 POLICY_LEVEL_MANDATORY,
203 POLICY_SCOPE_USER,
204 new base::FundamentalValue(false),
205 NULL);
200 badmap.Set("boolean", 206 badmap.Set("boolean",
201 POLICY_LEVEL_MANDATORY, 207 POLICY_LEVEL_MANDATORY,
202 POLICY_SCOPE_USER, 208 POLICY_SCOPE_USER,
203 new base::FundamentalValue(0), 209 new base::FundamentalValue(0),
204 NULL); 210 NULL);
205 badmap.Set("integer", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, 211 badmap.Set("integer",
206 base::Value::CreateBooleanValue(false), NULL); 212 POLICY_LEVEL_MANDATORY,
207 badmap.Set("null", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, 213 POLICY_SCOPE_USER,
208 base::Value::CreateBooleanValue(false), NULL); 214 new base::FundamentalValue(false),
209 badmap.Set("double", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, 215 NULL);
210 base::Value::CreateBooleanValue(false), NULL); 216 badmap.Set("null",
211 badmap.Set("object", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, 217 POLICY_LEVEL_MANDATORY,
212 base::Value::CreateBooleanValue(false), NULL); 218 POLICY_SCOPE_USER,
219 new base::FundamentalValue(false),
220 NULL);
221 badmap.Set("double",
222 POLICY_LEVEL_MANDATORY,
223 POLICY_SCOPE_USER,
224 new base::FundamentalValue(false),
225 NULL);
226 badmap.Set("object",
227 POLICY_LEVEL_MANDATORY,
228 POLICY_SCOPE_USER,
229 new base::FundamentalValue(false),
230 NULL);
213 badmap.Set("string", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, 231 badmap.Set("string", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
214 NULL, 232 NULL,
215 new ExternalDataFetcher(base::WeakPtr<ExternalDataManager>(), 233 new ExternalDataFetcher(base::WeakPtr<ExternalDataManager>(),
216 std::string())); 234 std::string()));
217 235
218 schema_map->FilterBundle(&bundle); 236 schema_map->FilterBundle(&bundle);
219 EXPECT_TRUE(bundle.Equals(empty_bundle)); 237 EXPECT_TRUE(bundle.Equals(empty_bundle));
220 } 238 }
221 239
222 TEST_F(SchemaMapTest, LegacyComponents) { 240 TEST_F(SchemaMapTest, LegacyComponents) {
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
310 newer = new SchemaMap(map); 328 newer = new SchemaMap(map);
311 newer->GetChanges(older, &removed, &added); 329 newer->GetChanges(older, &removed, &added);
312 ASSERT_EQ(2u, removed.size()); 330 ASSERT_EQ(2u, removed.size());
313 EXPECT_EQ(PolicyNamespace(POLICY_DOMAIN_CHROME, ""), removed[0]); 331 EXPECT_EQ(PolicyNamespace(POLICY_DOMAIN_CHROME, ""), removed[0]);
314 EXPECT_EQ(PolicyNamespace(POLICY_DOMAIN_EXTENSIONS, "xyz"), removed[1]); 332 EXPECT_EQ(PolicyNamespace(POLICY_DOMAIN_EXTENSIONS, "xyz"), removed[1]);
315 ASSERT_EQ(1u, added.size()); 333 ASSERT_EQ(1u, added.size());
316 EXPECT_EQ(PolicyNamespace(POLICY_DOMAIN_EXTENSIONS, "abc"), added[0]); 334 EXPECT_EQ(PolicyNamespace(POLICY_DOMAIN_EXTENSIONS, "abc"), added[0]);
317 } 335 }
318 336
319 } // namespace policy 337 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698