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

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

Issue 578823003: Add Wimax to ONC. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
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_translator.h" 5 #include "chromeos/network/onc/onc_translator.h"
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/values.h" 8 #include "base/values.h"
9 #include "chromeos/network/onc/onc_signature.h" 9 #include "chromeos/network/onc/onc_signature.h"
10 #include "chromeos/network/onc/onc_test_utils.h" 10 #include "chromeos/network/onc/onc_test_utils.h"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 std::make_pair("wifi_clientcert_with_cert_pems.onc", 49 std::make_pair("wifi_clientcert_with_cert_pems.onc",
50 "shill_wifi_clientcert.json"), 50 "shill_wifi_clientcert.json"),
51 std::make_pair("valid_wifi_clientref.onc", "shill_wifi_clientref.json"), 51 std::make_pair("valid_wifi_clientref.onc", "shill_wifi_clientref.json"),
52 std::make_pair("valid_l2tpipsec.onc", "shill_l2tpipsec.json"), 52 std::make_pair("valid_l2tpipsec.onc", "shill_l2tpipsec.json"),
53 std::make_pair("l2tpipsec_clientcert_with_cert_pems.onc", 53 std::make_pair("l2tpipsec_clientcert_with_cert_pems.onc",
54 "shill_l2tpipsec_clientcert.json"), 54 "shill_l2tpipsec_clientcert.json"),
55 std::make_pair("valid_openvpn_with_cert_pems.onc", 55 std::make_pair("valid_openvpn_with_cert_pems.onc",
56 "shill_openvpn.json"), 56 "shill_openvpn.json"),
57 std::make_pair("openvpn_clientcert_with_cert_pems.onc", 57 std::make_pair("openvpn_clientcert_with_cert_pems.onc",
58 "shill_openvpn_clientcert.json"), 58 "shill_openvpn_clientcert.json"),
59 std::make_pair("cellular.onc", 59 std::make_pair("cellular.onc", "shill_cellular.json"),
60 "shill_cellular.json"))); 60 std::make_pair("wimax.onc", "shill_wimax.json")));
61 61
62 // First parameter: Filename of source Shill json. 62 // First parameter: Filename of source Shill json.
63 // Second parameter: Filename of expected translated ONC network part. 63 // Second parameter: Filename of expected translated ONC network part.
64 // 64 //
65 // Note: This translation direction doesn't have to reconstruct all of the ONC 65 // Note: This translation direction doesn't have to reconstruct all of the ONC
66 // fields, as Chrome doesn't need all of a Service's properties. 66 // fields, as Chrome doesn't need all of a Service's properties.
67 class ONCTranslatorShillToOncTest 67 class ONCTranslatorShillToOncTest
68 : public ::testing::TestWithParam<std::pair<std::string, std::string> > { 68 : public ::testing::TestWithParam<std::pair<std::string, std::string> > {
69 }; 69 };
70 70
(...skipping 29 matching lines...) Expand all
100 "translation_of_shill_wifi_wpa1.onc"), 100 "translation_of_shill_wifi_wpa1.onc"),
101 std::make_pair("shill_output_l2tpipsec.json", 101 std::make_pair("shill_output_l2tpipsec.json",
102 "translation_of_shill_l2tpipsec.onc"), 102 "translation_of_shill_l2tpipsec.onc"),
103 std::make_pair("shill_output_openvpn.json", 103 std::make_pair("shill_output_openvpn.json",
104 "translation_of_shill_openvpn.onc"), 104 "translation_of_shill_openvpn.onc"),
105 std::make_pair("shill_output_openvpn_with_errors.json", 105 std::make_pair("shill_output_openvpn_with_errors.json",
106 "translation_of_shill_openvpn_with_errors.onc"), 106 "translation_of_shill_openvpn_with_errors.onc"),
107 std::make_pair("shill_wifi_with_state.json", 107 std::make_pair("shill_wifi_with_state.json",
108 "translation_of_shill_wifi_with_state.onc"), 108 "translation_of_shill_wifi_with_state.onc"),
109 std::make_pair("shill_cellular_with_state.json", 109 std::make_pair("shill_cellular_with_state.json",
110 "translation_of_shill_cellular_with_state.onc"))); 110 "translation_of_shill_cellular_with_state.onc"),
111 std::make_pair("shill_wimax_with_state.json",
112 "translation_of_shill_wimax_with_state.onc")));
111 113
112 } // namespace onc 114 } // namespace onc
113 } // namespace chromeos 115 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698