| 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_normalizer.h" | 5 #include "chromeos/network/onc/onc_normalizer.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" |
| 11 #include "testing/gtest/include/gtest/gtest.h" | 11 #include "testing/gtest/include/gtest/gtest.h" |
| 12 | 12 |
| 13 namespace chromeos { | 13 namespace chromeos { |
| 14 namespace onc { | 14 namespace onc { |
| 15 | 15 |
| 16 // This test case is about validating valid ONC objects. | 16 // This test case is about validating valid ONC objects. |
| 17 TEST(ONCNormalizerTest, NormalizeNetworkConfiguration) { | 17 TEST(ONCNormalizerTest, NormalizeNetworkConfigurationEthernetAndVPN) { |
| 18 Normalizer normalizer(true); | 18 Normalizer normalizer(true); |
| 19 scoped_ptr<const base::DictionaryValue> data( | 19 scoped_ptr<const base::DictionaryValue> data( |
| 20 test_utils::ReadTestDictionary("settings_with_normalization.json")); | 20 test_utils::ReadTestDictionary("settings_with_normalization.json")); |
| 21 | 21 |
| 22 const base::DictionaryValue* original = NULL; | 22 const base::DictionaryValue* original = NULL; |
| 23 const base::DictionaryValue* expected_normalized = NULL; | 23 const base::DictionaryValue* expected_normalized = NULL; |
| 24 data->GetDictionary("ethernet-and-vpn", &original); | 24 data->GetDictionary("ethernet-and-vpn", &original); |
| 25 data->GetDictionary("ethernet-and-vpn-normalized", &expected_normalized); | 25 data->GetDictionary("ethernet-and-vpn-normalized", &expected_normalized); |
| 26 | 26 |
| 27 scoped_ptr<base::DictionaryValue> actual_normalized = | 27 scoped_ptr<base::DictionaryValue> actual_normalized = |
| 28 normalizer.NormalizeObject(&kNetworkConfigurationSignature, *original); | 28 normalizer.NormalizeObject(&kNetworkConfigurationSignature, *original); |
| 29 EXPECT_TRUE(test_utils::Equals(expected_normalized, actual_normalized.get())); | 29 EXPECT_TRUE(test_utils::Equals(expected_normalized, actual_normalized.get())); |
| 30 } | 30 } |
| 31 | 31 |
| 32 // This test case is about validating valid ONC objects. |
| 33 TEST(ONCNormalizerTest, NormalizeNetworkConfigurationWifi) { |
| 34 Normalizer normalizer(true); |
| 35 scoped_ptr<const base::DictionaryValue> data( |
| 36 test_utils::ReadTestDictionary("settings_with_normalization.json")); |
| 37 |
| 38 const base::DictionaryValue* original = NULL; |
| 39 const base::DictionaryValue* expected_normalized = NULL; |
| 40 data->GetDictionary("wifi", &original); |
| 41 data->GetDictionary("wifi-normalized", &expected_normalized); |
| 42 |
| 43 scoped_ptr<base::DictionaryValue> actual_normalized = |
| 44 normalizer.NormalizeObject(&kNetworkConfigurationSignature, *original); |
| 45 EXPECT_TRUE(test_utils::Equals(expected_normalized, actual_normalized.get())); |
| 46 } |
| 47 |
| 32 } // namespace onc | 48 } // namespace onc |
| 33 } // namespace chromeos | 49 } // namespace chromeos |
| OLD | NEW |