Serialize Notification.direction == "auto" in the database (2/3)

content/child/notifications/notification_data_conversions_unittest.cc

Index: content/child/notifications/notification_data_conversions_unittest.cc
diff --git a/content/child/notifications/notification_data_conversions_unittest.cc b/content/child/notifications/notification_data_conversions_unittest.cc
index c124e4f0e3e346ea2e9dd04d6fb278eff4ead57d..6d5c00957d61f6eb2a1e416ef293ee6909a9400f 100644
--- a/content/child/notifications/notification_data_conversions_unittest.cc
+++ b/content/child/notifications/notification_data_conversions_unittest.cc
@@ -45,7 +45,7 @@ TEST(NotificationDataConversionsTest, ToPlatformNotificationData) {
 
   PlatformNotificationData platform_data = ToPlatformNotificationData(web_data);
   EXPECT_EQ(base::ASCIIToUTF16(kNotificationTitle), platform_data.title);
-  EXPECT_EQ(PlatformNotificationData::NotificationDirectionLeftToRight,
+  EXPECT_EQ(PlatformNotificationData::DIRECTION_LEFT_TO_RIGHT,
             platform_data.direction);
   EXPECT_EQ(kNotificationLang, platform_data.lang);
   EXPECT_EQ(base::ASCIIToUTF16(kNotificationBody), platform_data.body);
@@ -61,22 +61,6 @@ TEST(NotificationDataConversionsTest, ToPlatformNotificationData) {
     EXPECT_EQ(developer_data[i], platform_data.data[i]);
 }
 
-TEST(NotificationDataConversionsTest,
-     ToPlatformNotificationDataDirectionality) {
-  blink::WebNotificationData web_data;
-  web_data.direction = blink::WebNotificationData::DirectionLeftToRight;
-
-  PlatformNotificationData platform_data = ToPlatformNotificationData(web_data);
-  EXPECT_EQ(PlatformNotificationData::NotificationDirectionLeftToRight,
-            platform_data.direction);
-
-  web_data.direction = blink::WebNotificationData::DirectionRightToLeft;
-
-  platform_data = ToPlatformNotificationData(web_data);
-  EXPECT_EQ(PlatformNotificationData::NotificationDirectionRightToLeft,
-            platform_data.direction);
-}
-
 TEST(NotificationDataConversionsTest, ToWebNotificationData) {
   std::vector<int> vibration_pattern(
       kNotificationVibrationPattern,
@@ -88,7 +72,7 @@ TEST(NotificationDataConversionsTest, ToWebNotificationData) {
   PlatformNotificationData platform_data;
   platform_data.title = base::ASCIIToUTF16(kNotificationTitle);
   platform_data.direction =
-      PlatformNotificationData::NotificationDirectionLeftToRight;
+      PlatformNotificationData::DIRECTION_LEFT_TO_RIGHT;
   platform_data.lang = kNotificationLang;
   platform_data.body = base::ASCIIToUTF16(kNotificationBody);
   platform_data.tag = kNotificationTag;
@@ -117,21 +101,35 @@ TEST(NotificationDataConversionsTest, ToWebNotificationData) {
     EXPECT_EQ(developer_data[i], web_data.data[i]);
 }
 
-TEST(NotificationDataConversionsTest, ToWebNotificationDataDirectionality) {
-  PlatformNotificationData platform_data;
-  platform_data.direction =
-      PlatformNotificationData::NotificationDirectionLeftToRight;
-
-  blink::WebNotificationData web_data = ToWebNotificationData(platform_data);
-  EXPECT_EQ(blink::WebNotificationData::DirectionLeftToRight,
-            web_data.direction);
-
-  platform_data.direction =
-      PlatformNotificationData::NotificationDirectionRightToLeft;
-
-  web_data = ToWebNotificationData(platform_data);
-  EXPECT_EQ(blink::WebNotificationData::DirectionRightToLeft,
-            web_data.direction);
+TEST(NotificationDataConversionsTest, NotificationDataDirectionality) {
+  std::map<blink::WebNotificationData::Direction,
+           PlatformNotificationData::Direction> mappings;
+
+  mappings[blink::WebNotificationData::DirectionLeftToRight] =
+      PlatformNotificationData::DIRECTION_LEFT_TO_RIGHT;
+  mappings[blink::WebNotificationData::DirectionRightToLeft] =
+      PlatformNotificationData::DIRECTION_RIGHT_TO_LEFT;
+  mappings[blink::WebNotificationData::DirectionAuto] =
+      PlatformNotificationData::DIRECTION_AUTO;

[palmer, 2015/08/03 20:42:46]

Maybe a negative test case.

+
+  for (const auto& pair : mappings) {
+    {
+      blink::WebNotificationData web_data;
+      web_data.direction = pair.first;
+
+      PlatformNotificationData platform_data =
+          ToPlatformNotificationData(web_data);
+      EXPECT_EQ(pair.second, platform_data.direction);
+    }
+    {
+      PlatformNotificationData platform_data;
+      platform_data.direction = pair.second;
+
+      blink::WebNotificationData web_data =
+          ToWebNotificationData(platform_data);
+      EXPECT_EQ(pair.first, web_data.direction);
+    }
+  }
 }
 
 }  // namespace content