chromeos/network/onc/onc_translator_unittest.cc - Issue 708563005: Use setProperties for IP Config.

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

Issue 708563005: Use setProperties for IP Config. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@issue_430113_internet_options_1

Patch Set: Fix mock expectation Created 6 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

« chromeos/network/network_configuration_handler.cc ('K') | « chromeos/network/onc/onc_translator_onc_to_shill.cc ('k') | chromeos/test/data/network/ethernet_automatic_ip.onc » ('j') | components/onc/docs/onc_spec.html » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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_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 25 matching lines...) Expand all Loading...
36 translation.get()));	36 translation.get()));

37 }	37 }

38	38

39 // Test different network types, such that each ONC object type is tested at	39 // Test different network types, such that each ONC object type is tested at

40 // least once.	40 // least once.

41 INSTANTIATE_TEST_CASE_P(	41 INSTANTIATE_TEST_CASE_P(

42 ONCTranslatorOncToShillTest,	42 ONCTranslatorOncToShillTest,

43 ONCTranslatorOncToShillTest,	43 ONCTranslatorOncToShillTest,

44 ::testing::Values(	44 ::testing::Values(

45 std::make_pair("ethernet.onc", "shill_ethernet.json"),	45 std::make_pair("ethernet.onc", "shill_ethernet.json"),

	46 std::make_pair("ethernet_automatic_ip.onc",

	47 "shill_ethernet_automatic_ip.json"),

46 std::make_pair("ethernet_with_eap_and_cert_pems.onc",	48 std::make_pair("ethernet_with_eap_and_cert_pems.onc",

47 "shill_ethernet_with_eap.json"),	49 "shill_ethernet_with_eap.json"),

48 std::make_pair("valid_wifi_psk.onc", "shill_wifi_psk.json"),	50 std::make_pair("valid_wifi_psk.onc", "shill_wifi_psk.json"),

49 std::make_pair("wifi_clientcert_with_cert_pems.onc",	51 std::make_pair("wifi_clientcert_with_cert_pems.onc",

50 "shill_wifi_clientcert.json"),	52 "shill_wifi_clientcert.json"),

51 std::make_pair("valid_wifi_clientref.onc", "shill_wifi_clientref.json"),	53 std::make_pair("valid_wifi_clientref.onc", "shill_wifi_clientref.json"),

52 std::make_pair("valid_l2tpipsec.onc", "shill_l2tpipsec.json"),	54 std::make_pair("valid_l2tpipsec.onc", "shill_l2tpipsec.json"),

53 std::make_pair("l2tpipsec_clientcert_with_cert_pems.onc",	55 std::make_pair("l2tpipsec_clientcert_with_cert_pems.onc",

54 "shill_l2tpipsec_clientcert.json"),	56 "shill_l2tpipsec_clientcert.json"),

55 std::make_pair("valid_openvpn_with_cert_pems.onc",	57 std::make_pair("valid_openvpn_with_cert_pems.onc",

(...skipping 50 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
106 "translation_of_shill_openvpn_with_errors.onc"),	108 "translation_of_shill_openvpn_with_errors.onc"),

107 std::make_pair("shill_wifi_with_state.json",	109 std::make_pair("shill_wifi_with_state.json",

108 "translation_of_shill_wifi_with_state.onc"),	110 "translation_of_shill_wifi_with_state.onc"),

109 std::make_pair("shill_cellular_with_state.json",	111 std::make_pair("shill_cellular_with_state.json",

110 "translation_of_shill_cellular_with_state.onc"),	112 "translation_of_shill_cellular_with_state.onc"),

111 std::make_pair("shill_wimax_with_state.json",	113 std::make_pair("shill_wimax_with_state.json",

112 "translation_of_shill_wimax_with_state.onc")));	114 "translation_of_shill_wimax_with_state.onc")));

113	115

114 } // namespace onc	116 } // namespace onc

115 } // namespace chromeos	117 } // namespace chromeos

OLD	NEW