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/network_ui_data.h" | 5 #include "chromeos/network/network_ui_data.h" |
6 | 6 |
7 #include "base/values.h" | 7 #include "base/values.h" |
8 #include "chromeos/network/onc/onc_test_utils.h" | 8 #include "chromeos/network/onc/onc_test_utils.h" |
9 #include "testing/gtest/include/gtest/gtest.h" | 9 #include "testing/gtest/include/gtest/gtest.h" |
10 | 10 |
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
83 | 83 |
84 TEST_P(CreateUIDataTest, CreateUIDataFromONC) { | 84 TEST_P(CreateUIDataTest, CreateUIDataFromONC) { |
85 namespace test_utils = onc::test_utils; | 85 namespace test_utils = onc::test_utils; |
86 scoped_ptr<base::DictionaryValue> onc_network = | 86 scoped_ptr<base::DictionaryValue> onc_network = |
87 test_utils::ReadTestDictionary(GetParam().first); | 87 test_utils::ReadTestDictionary(GetParam().first); |
88 | 88 |
89 scoped_ptr<base::DictionaryValue> expected_uidata = | 89 scoped_ptr<base::DictionaryValue> expected_uidata = |
90 test_utils::ReadTestDictionary(GetParam().second); | 90 test_utils::ReadTestDictionary(GetParam().second); |
91 | 91 |
92 scoped_ptr<NetworkUIData> actual_uidata = | 92 scoped_ptr<NetworkUIData> actual_uidata = |
93 CreateUIDataFromONC(onc::ONC_SOURCE_USER_POLICY, *onc_network); | 93 NetworkUIData::CreateFromONC( |
| 94 onc::ONC_SOURCE_USER_POLICY, *onc_network); |
94 EXPECT_TRUE(actual_uidata != NULL); | 95 EXPECT_TRUE(actual_uidata != NULL); |
95 | 96 |
96 base::DictionaryValue actual_uidata_dict; | 97 base::DictionaryValue actual_uidata_dict; |
97 actual_uidata->FillDictionary(&actual_uidata_dict); | 98 actual_uidata->FillDictionary(&actual_uidata_dict); |
98 EXPECT_TRUE(test_utils::Equals(&actual_uidata_dict, expected_uidata.get())); | 99 EXPECT_TRUE(test_utils::Equals(&actual_uidata_dict, expected_uidata.get())); |
99 } | 100 } |
100 | 101 |
101 INSTANTIATE_TEST_CASE_P( | 102 INSTANTIATE_TEST_CASE_P( |
102 CreateUIDataTest, | 103 CreateUIDataTest, |
103 CreateUIDataTest, | 104 CreateUIDataTest, |
104 ::testing::Values( | 105 ::testing::Values( |
105 std::make_pair("valid_wifi_clientcert.onc", | 106 std::make_pair("valid_wifi_clientcert.onc", |
106 "uidata_for_wifi_clientcert.json"), | 107 "uidata_for_wifi_clientcert.json"), |
107 std::make_pair("valid_wifi_clientref.onc", | 108 std::make_pair("valid_wifi_clientref.onc", |
108 "uidata_for_wifi_clientref.json"), | 109 "uidata_for_wifi_clientref.json"), |
109 std::make_pair("valid_wifi_psk.onc", | 110 std::make_pair("valid_wifi_psk.onc", |
110 "uidata_for_wifi_psk.json"), | 111 "uidata_for_wifi_psk.json"), |
111 std::make_pair("valid_openvpn_clientcert.onc", | 112 std::make_pair("valid_openvpn_clientcert.onc", |
112 "uidata_for_openvpn_clientcert.json"), | 113 "uidata_for_openvpn_clientcert.json"), |
113 std::make_pair("valid_l2tpipsec_clientcert.onc", | 114 std::make_pair("valid_l2tpipsec_clientcert.onc", |
114 "uidata_for_l2tpipsec_clientcert.json"))); | 115 "uidata_for_l2tpipsec_clientcert.json"))); |
115 | 116 |
116 } // namespace chromeos | 117 } // namespace chromeos |
OLD | NEW |