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

Side by Side Diff: chrome/browser/chromeos/cros/network_ui_data_unittest.cc

Issue 11299236: This moves the ONC parsing code into chromeos/network/onc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix unit tests Created 8 years 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "chrome/browser/chromeos/cros/network_ui_data.h" 5 #include "chrome/browser/chromeos/cros/network_ui_data.h"
6 #include "testing/gtest/include/gtest/gtest.h" 6 #include "testing/gtest/include/gtest/gtest.h"
7 7
8 namespace chromeos { 8 namespace chromeos {
9 9
10 class NetworkUIDataTest : public testing::Test { 10 class NetworkUIDataTest : public testing::Test {
(...skipping 17 matching lines...) Expand all
28 EXPECT_EQ(expected_editable, property.editable()); 28 EXPECT_EQ(expected_editable, property.editable());
29 } 29 }
30 }; 30 };
31 31
32 TEST_F(NetworkUIDataTest, ONCSource) { 32 TEST_F(NetworkUIDataTest, ONCSource) {
33 base::DictionaryValue ui_data_dict; 33 base::DictionaryValue ui_data_dict;
34 34
35 ui_data_dict.SetString(NetworkUIData::kKeyONCSource, "user_import"); 35 ui_data_dict.SetString(NetworkUIData::kKeyONCSource, "user_import");
36 { 36 {
37 NetworkUIData ui_data(ui_data_dict); 37 NetworkUIData ui_data(ui_data_dict);
38 EXPECT_EQ(NetworkUIData::ONC_SOURCE_USER_IMPORT, 38 EXPECT_EQ(onc::ONC_SOURCE_USER_IMPORT, ui_data.onc_source());
39 ui_data.onc_source());
40 EXPECT_FALSE(ui_data.is_managed()); 39 EXPECT_FALSE(ui_data.is_managed());
41 } 40 }
42 41
43 ui_data_dict.SetString(NetworkUIData::kKeyONCSource, "device_policy"); 42 ui_data_dict.SetString(NetworkUIData::kKeyONCSource, "device_policy");
44 { 43 {
45 NetworkUIData ui_data(ui_data_dict); 44 NetworkUIData ui_data(ui_data_dict);
46 EXPECT_EQ(NetworkUIData::ONC_SOURCE_DEVICE_POLICY, ui_data.onc_source()); 45 EXPECT_EQ(onc::ONC_SOURCE_DEVICE_POLICY, ui_data.onc_source());
47 EXPECT_TRUE(ui_data.is_managed()); 46 EXPECT_TRUE(ui_data.is_managed());
48 } 47 }
49 ui_data_dict.SetString(NetworkUIData::kKeyONCSource, "user_policy"); 48 ui_data_dict.SetString(NetworkUIData::kKeyONCSource, "user_policy");
50 { 49 {
51 NetworkUIData ui_data(ui_data_dict); 50 NetworkUIData ui_data(ui_data_dict);
52 EXPECT_EQ(NetworkUIData::ONC_SOURCE_USER_POLICY, ui_data.onc_source()); 51 EXPECT_EQ(onc::ONC_SOURCE_USER_POLICY, ui_data.onc_source());
53 EXPECT_TRUE(ui_data.is_managed()); 52 EXPECT_TRUE(ui_data.is_managed());
54 } 53 }
55 } 54 }
56 55
57 TEST_F(NetworkUIDataTest, CertificateType) { 56 TEST_F(NetworkUIDataTest, CertificateType) {
58 { 57 {
59 base::DictionaryValue ui_data_dict; 58 base::DictionaryValue ui_data_dict;
60 ui_data_dict.SetString(NetworkUIData::kKeyCertificateType, "none"); 59 ui_data_dict.SetString(NetworkUIData::kKeyCertificateType, "none");
61 NetworkUIData ui_data(ui_data_dict); 60 NetworkUIData ui_data(ui_data_dict);
62 EXPECT_EQ(CLIENT_CERT_TYPE_NONE, ui_data.certificate_type()); 61 EXPECT_EQ(CLIENT_CERT_TYPE_NONE, ui_data.certificate_type());
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 onc.Set("a.b", val_a_b.DeepCopy()); 127 onc.Set("a.b", val_a_b.DeepCopy());
129 base::ListValue recommended; 128 base::ListValue recommended;
130 recommended.Append(new base::StringValue("b")); 129 recommended.Append(new base::StringValue("b"));
131 recommended.Append(new base::StringValue("c")); 130 recommended.Append(new base::StringValue("c"));
132 recommended.Append(new base::StringValue("a.a")); 131 recommended.Append(new base::StringValue("a.a"));
133 onc.Set("Recommended", recommended.DeepCopy()); 132 onc.Set("Recommended", recommended.DeepCopy());
134 onc.Set("a.Recommended", recommended.DeepCopy()); 133 onc.Set("a.Recommended", recommended.DeepCopy());
135 134
136 NetworkPropertyUIData prop; 135 NetworkPropertyUIData prop;
137 136
138 ui_data.set_onc_source(NetworkUIData::ONC_SOURCE_USER_IMPORT); 137 ui_data.set_onc_source(onc::ONC_SOURCE_USER_IMPORT);
139 ui_data.FillDictionary(&ui_data_dict); 138 ui_data.FillDictionary(&ui_data_dict);
140 139
141 NetworkUIData empty_data; 140 NetworkUIData empty_data;
142 prop.ParseOncProperty(empty_data, &onc, "a"); 141 prop.ParseOncProperty(empty_data, &onc, "a");
143 CheckProperty(prop, NULL, false, false, true); 142 CheckProperty(prop, NULL, false, false, true);
144 143
145 prop.ParseOncProperty(ui_data, &onc, "a"); 144 prop.ParseOncProperty(ui_data, &onc, "a");
146 CheckProperty(prop, NULL, false, false, true); 145 CheckProperty(prop, NULL, false, false, true);
147 146
148 prop.ParseOncProperty(ui_data, &onc, "a.b"); 147 prop.ParseOncProperty(ui_data, &onc, "a.b");
149 CheckProperty(prop, NULL, false, false, true); 148 CheckProperty(prop, NULL, false, false, true);
150 149
151 prop.ParseOncProperty(ui_data, &onc, "c"); 150 prop.ParseOncProperty(ui_data, &onc, "c");
152 CheckProperty(prop, NULL, false, false, true); 151 CheckProperty(prop, NULL, false, false, true);
153 152
154 ui_data.set_onc_source(NetworkUIData::ONC_SOURCE_USER_POLICY); 153 ui_data.set_onc_source(onc::ONC_SOURCE_USER_POLICY);
155 ui_data.FillDictionary(&ui_data_dict); 154 ui_data.FillDictionary(&ui_data_dict);
156 155
157 prop.ParseOncProperty(ui_data, &onc, "a"); 156 prop.ParseOncProperty(ui_data, &onc, "a");
158 CheckProperty(prop, NULL, true, false, false); 157 CheckProperty(prop, NULL, true, false, false);
159 158
160 prop.ParseOncProperty(ui_data, &onc, "b"); 159 prop.ParseOncProperty(ui_data, &onc, "b");
161 CheckProperty(prop, &val_b, false, true, true); 160 CheckProperty(prop, &val_b, false, true, true);
162 161
163 prop.ParseOncProperty(ui_data, &onc, "c"); 162 prop.ParseOncProperty(ui_data, &onc, "c");
164 CheckProperty(prop, NULL, false, false, true); 163 CheckProperty(prop, NULL, false, false, true);
(...skipping 11 matching lines...) Expand all
176 CheckProperty(prop, NULL, false, false, true); 175 CheckProperty(prop, NULL, false, false, true);
177 176
178 prop.ParseOncProperty(ui_data, &onc, "a.d"); 177 prop.ParseOncProperty(ui_data, &onc, "a.d");
179 CheckProperty(prop, NULL, true, false, false); 178 CheckProperty(prop, NULL, true, false, false);
180 179
181 prop.ParseOncProperty(ui_data, NULL, "a.e"); 180 prop.ParseOncProperty(ui_data, NULL, "a.e");
182 CheckProperty(prop, NULL, true, false, false); 181 CheckProperty(prop, NULL, true, false, false);
183 } 182 }
184 183
185 } // namespace chromeos 184 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/cros/network_ui_data.cc ('k') | chrome/browser/chromeos/cros/onc_constants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698