diff options
| -rw-r--r-- | rlz/lib/lib_values.cc | 5 | ||||
| -rw-r--r-- | rlz/lib/lib_values_unittest.cc | 7 | ||||
| -rw-r--r-- | rlz/lib/rlz_lib.cc | 1 |
3 files changed, 11 insertions, 2 deletions
diff --git a/rlz/lib/lib_values.cc b/rlz/lib/lib_values.cc index 06113a8..80e987a 100644 --- a/rlz/lib/lib_values.cc +++ b/rlz/lib/lib_values.cc @@ -99,7 +99,10 @@ const char* GetAccessPointName(AccessPoint point) { case CHROMEOS_HOME_PAGE: return "CB"; case CHROMEOS_APP_LIST: return "CC"; case CHROME_IOS_OMNIBOX: return "C9"; - case CHROME_IOS_RESERVED: return "C0"; + // Returns an invalid access point value here as this value does not + // correspond to a defined access point, but need to be defined for + // code that iterates over all values of rlz_lib::AccessPoint. + case CHROME_IOS_RESERVED: return "__"; case CHROME_APP_LIST: return "C7"; case CHROME_MAC_APP_LIST: return "C8"; case UNDEFINED_AP_Q: return "RQ"; diff --git a/rlz/lib/lib_values_unittest.cc b/rlz/lib/lib_values_unittest.cc index 7e8fa83..3fcda4f 100644 --- a/rlz/lib/lib_values_unittest.cc +++ b/rlz/lib/lib_values_unittest.cc @@ -32,8 +32,13 @@ TEST(LibValuesUnittest, GetAccessPointFromName) { EXPECT_FALSE(rlz_lib::GetAccessPointFromName("T4 ", &point)); EXPECT_EQ(rlz_lib::NO_ACCESS_POINT, point); -} + for (int ap = rlz_lib::NO_ACCESS_POINT + 1; + ap < rlz_lib::LAST_ACCESS_POINT; ++ap) { + rlz_lib::AccessPoint point = static_cast<rlz_lib::AccessPoint>(ap); + EXPECT_TRUE(GetAccessPointName(point) != NULL); + } +} TEST(LibValuesUnittest, GetEventFromName) { rlz_lib::SetExpectedAssertion("GetEventFromName: event is NULL"); diff --git a/rlz/lib/rlz_lib.cc b/rlz/lib/rlz_lib.cc index 39bec27..95e3e09 100644 --- a/rlz/lib/rlz_lib.cc +++ b/rlz/lib/rlz_lib.cc @@ -30,6 +30,7 @@ bool IsAccessPointSupported(rlz_lib::AccessPoint point) { switch (point) { case rlz_lib::NO_ACCESS_POINT: case rlz_lib::LAST_ACCESS_POINT: + case rlz_lib::CHROME_IOS_RESERVED: case rlz_lib::MOBILE_IDLE_SCREEN_BLACKBERRY: case rlz_lib::MOBILE_IDLE_SCREEN_WINMOB: |