OLD | NEW |
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_constants.h" | 9 #include "chromeos/network/onc/onc_constants.h" |
10 #include "chromeos/network/onc/onc_signature.h" | 10 #include "chromeos/network/onc/onc_signature.h" |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
78 *shill_network, &kNetworkWithStateSignature)); | 78 *shill_network, &kNetworkWithStateSignature)); |
79 | 79 |
80 EXPECT_TRUE(test_utils::Equals(expected_onc_network.get(), | 80 EXPECT_TRUE(test_utils::Equals(expected_onc_network.get(), |
81 translation.get())); | 81 translation.get())); |
82 } | 82 } |
83 | 83 |
84 INSTANTIATE_TEST_CASE_P( | 84 INSTANTIATE_TEST_CASE_P( |
85 ONCTranslatorShillToOncTest, | 85 ONCTranslatorShillToOncTest, |
86 ONCTranslatorShillToOncTest, | 86 ONCTranslatorShillToOncTest, |
87 ::testing::Values( | 87 ::testing::Values( |
88 std::make_pair("shill_l2tpipsec.json", | 88 std::make_pair("shill_wifi_clientcert.json", |
89 "translation_of_shill_l2tpipsec.onc"), | 89 "translation_of_shill_wifi_clientcert.onc"), |
90 std::make_pair("shill_openvpn.json", | 90 std::make_pair("shill_l2tpipsec.json", |
91 "translation_of_shill_openvpn.onc"), | 91 "translation_of_shill_l2tpipsec.onc"), |
92 std::make_pair("shill_openvpn_with_errors.json", | 92 std::make_pair("shill_openvpn.json", |
93 "translation_of_shill_openvpn_with_errors.onc"), | 93 "translation_of_shill_openvpn.onc"), |
94 std::make_pair("shill_wifi_with_state.json", | 94 std::make_pair("shill_openvpn_with_errors.json", |
95 "translation_of_shill_wifi_with_state.onc"))); | 95 "translation_of_shill_openvpn_with_errors.onc"), |
| 96 std::make_pair("shill_wifi_with_state.json", |
| 97 "translation_of_shill_wifi_with_state.onc"))); |
96 | 98 |
97 } // namespace onc | 99 } // namespace onc |
98 } // namespace chromeos | 100 } // namespace chromeos |
OLD | NEW |