commit 46af1272d6eab6e6a955266c33c8fa7de161880b
author Ben Chan <benchan@chromium.org> Tue May 01 10:34:00 2012 -0700
committer Gerrit <chrome-bot@google.com> Tue May 01 14:33:16 2012 -0700
tree 46a21bdddf815748ddf755ba0e0d77dc61071159
parent d93615e9687b3473ede06a8503b6d23aacd0c603

shill: Add WiMAX technology type.

BUG=chromium-os:30308
TEST=Build and run unit tests.

Change-Id: I2cff5e2ab66473a95a47f647ed9dc6fc3fe74aac
Reviewed-on: https://gerrit.chromium.org/gerrit/21525
Reviewed-by: Paul Stewart <pstew@chromium.org>
Reviewed-by: Darin Petkov <petkov@chromium.org>
Tested-by: Ben Chan <benchan@chromium.org>
Commit-Ready: Ben Chan <benchan@chromium.org>

technology.cc

diff --git a/technology.cc b/technology.cc
index 074240b..c337264 100644
--- a/technology.cc
+++ b/technology.cc
@@ -32,6 +32,8 @@
     return kEthernet;
   } else if (name == flimflam::kTypeWifi) {
     return kWifi;
+  } else if (name == flimflam::kTypeWimax) {
+    return kWiMax;
   } else if (name == flimflam::kTypeCellular) {
     return kCellular;
   } else if (name == flimflam::kTypeVPN) {
@@ -53,6 +55,8 @@
     return flimflam::kTypeEthernet;
   } else if (id == kWifi) {
     return flimflam::kTypeWifi;
+  } else if (id == kWiMax) {
+    return flimflam::kTypeWimax;
   } else if (id == kCellular) {
     return flimflam::kTypeCellular;
   } else if (id == kVPN) {

technology.h

diff --git a/technology.h b/technology.h
index 67038bc..7c01bf9 100644
--- a/technology.h
+++ b/technology.h
@@ -20,6 +20,7 @@
     kEthernet,
     kWifi,
     kWiFiMonitor,
+    kWiMax,
     kCellular,
     kVPN,
     kTunnel,

technology_unittest.cc

diff --git a/technology_unittest.cc b/technology_unittest.cc
index 803d4dc..65d0dba 100644
--- a/technology_unittest.cc
+++ b/technology_unittest.cc
@@ -21,13 +21,13 @@
 TEST_F(TechnologyTest, IdentifierFromName) {
   EXPECT_EQ(Technology::kEthernet, Technology::IdentifierFromName("ethernet"));
   EXPECT_EQ(Technology::kWifi, Technology::IdentifierFromName("wifi"));
+  EXPECT_EQ(Technology::kWiMax, Technology::IdentifierFromName("wimax"));
   EXPECT_EQ(Technology::kCellular, Technology::IdentifierFromName("cellular"));
   EXPECT_EQ(Technology::kTunnel, Technology::IdentifierFromName("tunnel"));
   EXPECT_EQ(Technology::kLoopback, Technology::IdentifierFromName("loopback"));
   EXPECT_EQ(Technology::kVPN, Technology::IdentifierFromName("vpn"));
   EXPECT_EQ(Technology::kPPP, Technology::IdentifierFromName("ppp"));
   EXPECT_EQ(Technology::kUnknown, Technology::IdentifierFromName("bluetooth"));
-  EXPECT_EQ(Technology::kUnknown, Technology::IdentifierFromName("wimax"));
   EXPECT_EQ(Technology::kUnknown, Technology::IdentifierFromName("foo"));
   EXPECT_EQ(Technology::kUnknown, Technology::IdentifierFromName(""));
 }
@@ -35,6 +35,7 @@
 TEST_F(TechnologyTest, NameFromIdentifier) {
   EXPECT_EQ("ethernet", Technology::NameFromIdentifier(Technology::kEthernet));
   EXPECT_EQ("wifi", Technology::NameFromIdentifier(Technology::kWifi));
+  EXPECT_EQ("wimax", Technology::NameFromIdentifier(Technology::kWiMax));
   EXPECT_EQ("cellular", Technology::NameFromIdentifier(Technology::kCellular));
   EXPECT_EQ("tunnel", Technology::NameFromIdentifier(Technology::kTunnel));
   EXPECT_EQ("loopback", Technology::NameFromIdentifier(Technology::kLoopback));