Add Notification images (Blink + desktop implementation)

third_party/WebKit/Source/modules/notifications/NotificationDataTest.cpp

 // Copyright 2015 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 "modules/notifications/NotificationData.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/testing/NullExecutionContext.h"
 #include "modules/notifications/Notification.h"
 #include "modules/notifications/NotificationOptions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "wtf/CurrentTime.h"
 #include "wtf/HashMap.h"
 #include "wtf/Vector.h"
 
 namespace blink {
 namespace {
 
 const char kNotificationTitle[] = "My Notification";
 
 const char kNotificationDir[] = "rtl";
 const char kNotificationLang[] = "nl";
 const char kNotificationBody[] = "Hello, world";
 const char kNotificationTag[] = "my_tag";
 const char kNotificationEmptyTag[] = "";
+const char kNotificationImage[] = "https://example.com/image.jpg";
 const char kNotificationIcon[] = "https://example.com/icon.png";
 const char kNotificationIconInvalid[] = "https://invalid:icon:url";
 const char kNotificationBadge[] = "https://example.com/badge.png";
 const unsigned kNotificationVibration[] = { 42, 10, 20, 30, 40 };
 const unsigned long long kNotificationTimestamp = 621046800ull;
 const bool kNotificationRenotify = true;
 const bool kNotificationSilent = false;
 const bool kNotificationRequireInteraction = true;
 
 const WebNotificationAction::Type kWebNotificationActionType = WebNotificationAction::Text;
@@ skipping 38 matching lines @@
         action.setPlaceholder(kNotificationActionPlaceholder);
 
         actions.append(action);
     }
 
     NotificationOptions options;
     options.setDir(kNotificationDir);
     options.setLang(kNotificationLang);
     options.setBody(kNotificationBody);
     options.setTag(kNotificationTag);
+    options.setImage(kNotificationImage);
     options.setIcon(kNotificationIcon);
     options.setBadge(kNotificationBadge);
     options.setVibrate(vibrationSequence);
     options.setTimestamp(kNotificationTimestamp);
     options.setRenotify(kNotificationRenotify);
     options.setSilent(kNotificationSilent);
     options.setRequireInteraction(kNotificationRequireInteraction);
     options.setActions(actions);
 
     // TODO(peter): Test |options.data| and |notificationData.data|.
@@ skipping 10 matching lines @@
     EXPECT_EQ(kNotificationTag, notificationData.tag);
 
     // TODO(peter): Test the various icon properties when ExecutionContext::completeURL() works in this test.
 
     ASSERT_EQ(vibrationPattern.size(), notificationData.vibrate.size());
     for (size_t i = 0; i < vibrationPattern.size(); ++i)
         EXPECT_EQ(vibrationPattern[i], static_cast<unsigned>(notificationData.vibrate[i]));
 
     EXPECT_EQ(kNotificationTimestamp, notificationData.timestamp);
     EXPECT_EQ(kNotificationRenotify, notificationData.renotify);
     EXPECT_EQ(kNotificationSilent, notificationData.silent);

[Peter Beverloo, 2016/08/22 20:11:07]

+EXPECT_EQ for the image

[johnme, 2016/08/23 14:59:49]

I matched the TODO above: "// TODO(peter): Test the various icon properties when
ExecutionContext::completeURL() works in this test." :)

     EXPECT_EQ(kNotificationRequireInteraction, notificationData.requireInteraction);
     EXPECT_EQ(actions.size(), notificationData.actions.size());
     for (const auto& action : notificationData.actions) {
         EXPECT_EQ(kWebNotificationActionType, action.type);
         EXPECT_EQ(kNotificationActionAction, action.action);
         EXPECT_EQ(kNotificationActionTitle, action.title);
         EXPECT_EQ(kNotificationActionPlaceholder, action.placeholder);
     }
 }
 
@@ skipping 53 matching lines @@
     HeapVector<NotificationAction> actions;
     for (size_t i = 0; i < Notification::maxActions(); ++i) {
         NotificationAction action;
         action.setAction(kNotificationActionAction);
         action.setTitle(kNotificationActionTitle);
         action.setIcon(kNotificationIconInvalid);
         actions.append(action);
     }
 
     NotificationOptions options;
+    options.setImage(kNotificationIconInvalid);
     options.setIcon(kNotificationIconInvalid);
     options.setBadge(kNotificationIconInvalid);
     options.setActions(actions);
 
     TrackExceptionState exceptionState;
     WebNotificationData notificationData = createWebNotificationData(getExecutionContext(), kNotificationTitle, options, exceptionState);
     ASSERT_FALSE(exceptionState.hadException());
 
+    EXPECT_TRUE(notificationData.image.isEmpty());
     EXPECT_TRUE(notificationData.icon.isEmpty());
     EXPECT_TRUE(notificationData.badge.isEmpty());
     for (const auto& action : notificationData.actions)
         EXPECT_TRUE(action.icon.isEmpty());
 }
 
 TEST_F(NotificationDataTest, VibrationNormalization)
 {
     Vector<unsigned> unnormalizedPattern;
     for (size_t i = 0; i < WTF_ARRAY_LENGTH(kNotificationVibrationUnnormalized); ++i)
@@ skipping 75 matching lines @@
     ASSERT_EQ(Notification::maxActions(), notificationData.actions.size());
 
     for (size_t i = 0; i < Notification::maxActions(); ++i) {
         WebString expectedAction = String::number(i);
         EXPECT_EQ(expectedAction, notificationData.actions[i].action);
     }
 }
 
 } // namespace
 } // namespace blink