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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chromeos/network/onc/onc_validator_unittest.cc

Issue 540333002: ONC: Fix Static-/Saved-/IPConfig. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed another unit test. Created 6 years, 3 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 | « chromeos/network/onc/onc_validator.cc ('k') | chromeos/test/data/network/augmented_merge.json » ('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 (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 "chromeos/network/onc/onc_validator.h" 5 #include "chromeos/network/onc/onc_validator.h"
6 6
7 #include <string> 7 #include <string>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 OncParams("toplevel_only_global_config.onc", 179 OncParams("toplevel_only_global_config.onc",
180 &kToplevelConfigurationSignature, 180 &kToplevelConfigurationSignature,
181 true), 181 true),
182 OncParams("encrypted.onc", &kToplevelConfigurationSignature, true), 182 OncParams("encrypted.onc", &kToplevelConfigurationSignature, true),
183 OncParams("managed_vpn.onc", &kNetworkConfigurationSignature, true), 183 OncParams("managed_vpn.onc", &kNetworkConfigurationSignature, true),
184 OncParams("ethernet.onc", &kNetworkConfigurationSignature, true), 184 OncParams("ethernet.onc", &kNetworkConfigurationSignature, true),
185 OncParams("ethernet_with_eap.onc", 185 OncParams("ethernet_with_eap.onc",
186 &kNetworkConfigurationSignature, 186 &kNetworkConfigurationSignature,
187 true), 187 true),
188 OncParams("translation_of_shill_ethernet_with_ipconfig.onc", 188 OncParams("translation_of_shill_ethernet_with_ipconfig.onc",
189 &kNetworkConfigurationSignature, 189 &kNetworkWithStateSignature,
190 true), 190 true),
191 OncParams("translation_of_shill_wifi_with_state.onc", 191 OncParams("translation_of_shill_wifi_with_state.onc",
192 &kNetworkWithStateSignature, 192 &kNetworkWithStateSignature,
193 false), 193 false),
194 OncParams("valid_openvpn_with_cert_pems.onc", 194 OncParams("valid_openvpn_with_cert_pems.onc",
195 &kNetworkConfigurationSignature, 195 &kNetworkConfigurationSignature,
196 false))); 196 false)));
197 197
198 namespace { 198 namespace {
199 199
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
312 // Ensure that state values from Shill aren't accepted as 312 // Ensure that state values from Shill aren't accepted as
313 // configuration. 313 // configuration.
314 std::make_pair(OncParams("network-state-field", 314 std::make_pair(OncParams("network-state-field",
315 &kNetworkConfigurationSignature, 315 &kNetworkConfigurationSignature,
316 false), 316 false),
317 RepairParams("", "network-repaired")), 317 RepairParams("", "network-repaired")),
318 std::make_pair(OncParams("network-nested-state-field", 318 std::make_pair(OncParams("network-nested-state-field",
319 &kNetworkConfigurationSignature, 319 &kNetworkConfigurationSignature,
320 false), 320 false),
321 RepairParams("", "network-nested-state-field-repaired")), 321 RepairParams("", "network-nested-state-field-repaired")),
322 std::make_pair(OncParams("network-with-ipconfigs",
323 &kNetworkConfigurationSignature,
324 false),
325 RepairParams("", "network-repaired")),
322 std::make_pair(OncParams("openvpn-missing-verify-x509-name", 326 std::make_pair(OncParams("openvpn-missing-verify-x509-name",
323 &kNetworkConfigurationSignature, false), 327 &kNetworkConfigurationSignature, false),
324 RepairParams("", "openvpn-missing-verify-x509-name")), 328 RepairParams("", "openvpn-missing-verify-x509-name")),
325 std::make_pair(OncParams("ipsec-with-client-cert-missing-cacert", 329 std::make_pair(OncParams("ipsec-with-client-cert-missing-cacert",
326 &kIPsecSignature, 330 &kIPsecSignature,
327 false), 331 false),
328 RepairParams("", 332 RepairParams("",
329 "ipsec-with-client-cert-missing-cacert")), 333 "ipsec-with-client-cert-missing-cacert")),
330 std::make_pair(OncParams("toplevel-with-repairable-networks", 334 std::make_pair(OncParams("toplevel-with-repairable-networks",
331 &kToplevelConfigurationSignature, 335 &kToplevelConfigurationSignature,
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
427 &kNetworkConfigurationSignature, true, 431 &kNetworkConfigurationSignature, true,
428 ::onc::ONC_SOURCE_DEVICE_POLICY), 432 ::onc::ONC_SOURCE_DEVICE_POLICY),
429 RepairParams("", "")), 433 RepairParams("", "")),
430 std::make_pair(OncParams("openvpn-invalid-verify-x509-type", 434 std::make_pair(OncParams("openvpn-invalid-verify-x509-type",
431 &kNetworkConfigurationSignature, false), 435 &kNetworkConfigurationSignature, false),
432 RepairParams("", "")) 436 RepairParams("", ""))
433 )); 437 ));
434 438
435 } // namespace onc 439 } // namespace onc
436 } // namespace chromeos 440 } // namespace chromeos
OLDNEW
« no previous file with comments | « chromeos/network/onc/onc_validator.cc ('k') | chromeos/test/data/network/augmented_merge.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698