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

Unified Diff: chrome/browser/chromeos/cros/network_property_ui_data_unittest.cc

Issue 13454006: Moving ManagedNetworkConfigurationHandler to chromeos/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Cleaned up parsing of NetworkUIData. Created 7 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/cros/network_property_ui_data_unittest.cc
diff --git a/chrome/browser/chromeos/cros/network_ui_data_unittest.cc b/chrome/browser/chromeos/cros/network_property_ui_data_unittest.cc
similarity index 59%
copy from chrome/browser/chromeos/cros/network_ui_data_unittest.cc
copy to chrome/browser/chromeos/cros/network_property_ui_data_unittest.cc
index b019db0d67523813c9aad673f1b22ffab29f031e..3cadc2aaa99098f6a964cec8c35e558f12fea081 100644
--- a/chrome/browser/chromeos/cros/network_ui_data_unittest.cc
+++ b/chrome/browser/chromeos/cros/network_property_ui_data_unittest.cc
@@ -2,7 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/chromeos/cros/network_ui_data.h"
+#include "chrome/browser/chromeos/cros/network_property_ui_data.h"
+
+#include "base/values.h"
+#include "chromeos/network/network_ui_data.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace chromeos {
@@ -29,72 +32,6 @@ class NetworkUIDataTest : public testing::Test {
}
};
-TEST_F(NetworkUIDataTest, ONCSource) {
- base::DictionaryValue ui_data_dict;
-
- ui_data_dict.SetString(NetworkUIData::kKeyONCSource, "user_import");
- {
- NetworkUIData ui_data(ui_data_dict);
- EXPECT_EQ(onc::ONC_SOURCE_USER_IMPORT, ui_data.onc_source());
- EXPECT_FALSE(ui_data.is_managed());
- }
-
- ui_data_dict.SetString(NetworkUIData::kKeyONCSource, "device_policy");
- {
- NetworkUIData ui_data(ui_data_dict);
- EXPECT_EQ(onc::ONC_SOURCE_DEVICE_POLICY, ui_data.onc_source());
- EXPECT_TRUE(ui_data.is_managed());
- }
- ui_data_dict.SetString(NetworkUIData::kKeyONCSource, "user_policy");
- {
- NetworkUIData ui_data(ui_data_dict);
- EXPECT_EQ(onc::ONC_SOURCE_USER_POLICY, ui_data.onc_source());
- EXPECT_TRUE(ui_data.is_managed());
- }
-}
-
-TEST_F(NetworkUIDataTest, CertificateType) {
- {
- base::DictionaryValue ui_data_dict;
- ui_data_dict.SetString(NetworkUIData::kKeyCertificateType, "none");
- NetworkUIData ui_data(ui_data_dict);
- EXPECT_EQ(CLIENT_CERT_TYPE_NONE, ui_data.certificate_type());
- }
- {
- base::DictionaryValue ui_data_dict;
- ui_data_dict.SetString(NetworkUIData::kKeyCertificateType, "ref");
- NetworkUIData ui_data(ui_data_dict);
- EXPECT_EQ(CLIENT_CERT_TYPE_REF, ui_data.certificate_type());
- }
- {
- // for type pattern we need to have some kind of pattern
- std::string organization("Little If Any, Inc.");
- base::DictionaryValue ui_data_dict;
- base::DictionaryValue* pattern_dict = new base::DictionaryValue;
- base::DictionaryValue* issuer_dict = new base::DictionaryValue;
- issuer_dict->SetString("Organization", organization);
- pattern_dict->Set("Issuer", issuer_dict);
- ui_data_dict.Set("certificate_pattern", pattern_dict);
- ui_data_dict.SetString(NetworkUIData::kKeyCertificateType, "pattern");
- NetworkUIData ui_data(ui_data_dict);
- EXPECT_EQ(CLIENT_CERT_TYPE_PATTERN, ui_data.certificate_type());
- }
-}
-
-TEST_F(NetworkUIDataTest, CertificatePattern) {
- std::string organization("Little If Any, Inc.");
- base::DictionaryValue ui_data_dict;
- base::DictionaryValue* pattern_dict = new base::DictionaryValue;
- base::DictionaryValue* issuer_dict = new base::DictionaryValue;
- issuer_dict->SetString("Organization", organization);
- pattern_dict->Set("Issuer", issuer_dict);
- ui_data_dict.Set("certificate_pattern", pattern_dict);
- NetworkUIData ui_data(ui_data_dict);
- EXPECT_FALSE(ui_data.certificate_pattern().Empty());
- EXPECT_EQ(organization,
- ui_data.certificate_pattern().issuer().organization());
-}
-
TEST_F(NetworkUIDataTest, PropertyInit) {
NetworkPropertyUIData empty_prop;
CheckProperty(empty_prop, NULL, false, false, true);
« no previous file with comments | « chrome/browser/chromeos/cros/network_property_ui_data.cc ('k') | chrome/browser/chromeos/cros/network_ui_data.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698