commit 053fa82aad4ce9bc99ab3dc278d4e12ab0be14c0
author Joshua Kroll <joshkroll@chromium.org> Tue Jun 05 09:50:43 2012 -0700
committer Gerrit <chrome-bot@google.com> Tue Jun 05 17:51:42 2012 -0700
tree a22b798cb5d4b5fa0bfdcc2f8c6692da293448b0
parent b96a4515c8cc4432a87c70cbae2865e1445eb86e

Remove TechnologyIs method from the Service class and its subclasses. This is step 1 in removing the method altogether.

BUG=chromium-os:29696
TEST=Ran the shill unit tests.

Change-Id: I793cddee870afbdae778b1ea0527ad2398481411
Reviewed-on: https://gerrit.chromium.org/gerrit/24524
Reviewed-by: Paul Stewart <pstew@chromium.org>
Tested-by: Joshua Kroll <joshkroll@chromium.org>
Commit-Ready: Joshua Kroll <joshkroll@chromium.org>

manager_unittest.cc

diff --git a/manager_unittest.cc b/manager_unittest.cc
index f703277..ae21e38 100644
--- a/manager_unittest.cc
+++ b/manager_unittest.cc
@@ -1463,16 +1463,10 @@
   EXPECT_TRUE(ServiceOrderIs(mock_service0, mock_service1));
 
   // Technology
-  EXPECT_CALL(*mock_service0.get(), TechnologyIs(Technology::kWifi))
-      .WillRepeatedly(Return(true));
-  EXPECT_CALL(*mock_service1.get(), TechnologyIs(Technology::kEthernet))
-      .WillRepeatedly(Return(true));
-  // NB: Redefine default (false) return values so we don't use the default rule
-  // which makes the logs noisier
-  EXPECT_CALL(*mock_service0.get(), TechnologyIs(Ne(Technology::kWifi)))
-      .WillRepeatedly(Return(false));
-  EXPECT_CALL(*mock_service1.get(), TechnologyIs(Ne(Technology::kEthernet)))
-      .WillRepeatedly(Return(false));
+  EXPECT_CALL(*mock_service0.get(), technology())
+      .WillRepeatedly(Return((Technology::kWifi)));
+  EXPECT_CALL(*mock_service1.get(), technology())
+      .WillRepeatedly(Return(Technology::kEthernet));
 
   Error error;
   // Default technology ordering should favor Ethernet over WiFi.