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

Unified Diff: chromeos/network/managed_network_configuration_handler_unittest.cc

Issue 788633003: chromeos networking: move from security to securityclass property (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@local-master
Patch Set: rebase, resolve conflicts, update new test data (shill_wifi_dhcp.json) Created 5 years, 11 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
« no previous file with comments | « chromeos/dbus/shill_client_unittest_base.cc ('k') | chromeos/network/network_cert_migrator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/network/managed_network_configuration_handler_unittest.cc
diff --git a/chromeos/network/managed_network_configuration_handler_unittest.cc b/chromeos/network/managed_network_configuration_handler_unittest.cc
index 44ac4a3400a2e81ddfb4b024a9d563c73561d586..d40abda441aaee9a1bafd57221f247561e6146b1 100644
--- a/chromeos/network/managed_network_configuration_handler_unittest.cc
+++ b/chromeos/network/managed_network_configuration_handler_unittest.cc
@@ -725,42 +725,6 @@ TEST_F(ManagedNetworkConfigurationHandlerTest, SetPolicyUpdateManagedVPN) {
VerifyAndClearExpectations();
}
-TEST_F(ManagedNetworkConfigurationHandlerTest,
- SetPolicyUpdateManagedEquivalentSecurity) {
- InitializeStandardProfiles();
- SetUpEntry("policy/shill_managed_wifi1_rsn.json",
- kUser1ProfilePath,
- "old_entry_path");
-
- scoped_ptr<base::DictionaryValue> expected_shill_properties =
- test_utils::ReadTestDictionary(
- "policy/shill_policy_on_unmanaged_wifi1.json");
-
- // The passphrase isn't sent again, because it's configured by the user and
- // Shill doesn't send it on GetProperties calls.
- expected_shill_properties->RemoveWithoutPathExpansion(
- shill::kPassphraseProperty, NULL);
-
- EXPECT_CALL(*mock_profile_client_,
- GetProperties(dbus::ObjectPath(kUser1ProfilePath), _, _));
-
- EXPECT_CALL(
- *mock_profile_client_,
- GetEntry(dbus::ObjectPath(kUser1ProfilePath), "old_entry_path", _, _));
-
- // The existing entry must not be deleted because the Security type 'rsa' is
- // equivalent to 'psk' when identifying networks.
-
- EXPECT_CALL(
- *mock_manager_client_,
- ConfigureServiceForProfile(dbus::ObjectPath(kUser1ProfilePath),
- IsEqualTo(expected_shill_properties.get()),
- _, _));
-
- SetPolicy(::onc::ONC_SOURCE_USER_POLICY, kUser1, "policy/policy_wifi1.onc");
- message_loop_.RunUntilIdle();
-}
-
TEST_F(ManagedNetworkConfigurationHandlerTest, SetPolicyReapplyToManaged) {
InitializeStandardProfiles();
SetUpEntry("policy/shill_policy_on_unmanaged_wifi1.json",
« no previous file with comments | « chromeos/dbus/shill_client_unittest_base.cc ('k') | chromeos/network/network_cert_migrator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698