Add an Ethernet EAP policy.

chromeos/network/managed_network_configuration_handler_unittest.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <iostream>
 #include <sstream>
 
 #include "base/message_loop/message_loop.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/mock_dbus_thread_manager.h"
@@ skipping 292 matching lines @@
   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();
 }
 
+// Ensure that EAP settings for ethernet are matched with the right profile
+// entry and written to the dedicated EthernetEAP service.
+TEST_F(ManagedNetworkConfigurationHandlerTest,
+       SetPolicyManageUnmanagedEthernetEAP) {
+  InitializeStandardProfiles();
+  scoped_ptr<base::DictionaryValue> expected_shill_properties =

[bartfab (slow), 2013/09/17 08:45:54]

Nit: #include "base/memory/scoped_ptr.h"

[pneubeck (no reviews), 2013/09/17 12:48:36]

Done.

+      test_utils::ReadTestDictionary(
+          "policy/"
+          "shill_policy_on_unmanaged_ethernet_eap.json");
+
+  SetUpEntry("policy/shill_unmanaged_ethernet_eap.json",
+             kUser1ProfilePath,
+             "eth_entry");
+
+  // Also setup an unrelated WiFi configuration to verify that the right entry
+  // is matched.
+  SetUpEntry("policy/shill_unmanaged_user_wifi1.json",
+             kUser1ProfilePath,
+             "wifi_entry");
+
+  EXPECT_CALL(mock_profile_client_,
+              GetProperties(dbus::ObjectPath(kUser1ProfilePath), _, _));
+
+  EXPECT_CALL(mock_profile_client_,
+              GetEntry(dbus::ObjectPath(kUser1ProfilePath), _, _, _)).Times(2);
+
+  EXPECT_CALL(
+      mock_profile_client_,
+      DeleteEntry(dbus::ObjectPath(kUser1ProfilePath), "eth_entry", _, _));
+
+  EXPECT_CALL(
+      mock_manager_client_,
+      ConfigureServiceForProfile(dbus::ObjectPath(kUser1ProfilePath),
+                                 IsEqualTo(expected_shill_properties.get()),
+                                 _, _));
+
+  SetPolicy(
+      onc::ONC_SOURCE_USER_POLICY, kUser1, "policy/policy_ethernet_eap.onc");
+  message_loop_.RunUntilIdle();
+}
+
 TEST_F(ManagedNetworkConfigurationHandlerTest, SetPolicyIgnoreUnmodified) {
   InitializeStandardProfiles();
   EXPECT_CALL(mock_profile_client_, GetProperties(_, _, _));
 
   EXPECT_CALL(mock_manager_client_, ConfigureServiceForProfile(_, _, _, _));
 
   SetPolicy(onc::ONC_SOURCE_USER_POLICY, kUser1, "policy/policy_wifi1.onc");
   message_loop_.RunUntilIdle();
   VerifyAndClearExpectations();
 
   SetUpEntry("policy/shill_policy_on_unmanaged_user_wifi1.json",
              kUser1ProfilePath,
              "some_entry_path");
 
   EXPECT_CALL(mock_profile_client_, GetProperties(_, _, _));
 
-  EXPECT_CALL(mock_profile_client_,
-              GetEntry(dbus::ObjectPath(kUser1ProfilePath),
-                       "some_entry_path",
-                       _, _));
+  EXPECT_CALL(
+      mock_profile_client_,
+      GetEntry(dbus::ObjectPath(kUser1ProfilePath), "some_entry_path", _, _));
 
   SetPolicy(onc::ONC_SOURCE_USER_POLICY, kUser1, "policy/policy_wifi1.onc");
   message_loop_.RunUntilIdle();
 }
 
 TEST_F(ManagedNetworkConfigurationHandlerTest, SetPolicyManageUnmanaged) {
   InitializeStandardProfiles();
   SetUpEntry("policy/shill_unmanaged_user_wifi1.json",
              kUser1ProfilePath,
              "old_entry_path");
@@ skipping 222 matching lines @@
               ConfigureServiceForProfile(
                   dbus::ObjectPath(kUser1ProfilePath),
                   IsEqualTo(expected_shill_properties.get()),
                   _, _));
 
   InitializeStandardProfiles();
   message_loop_.RunUntilIdle();
 }
 
 }  // namespace chromeos