Add test for closing native notifications

chrome/browser/notifications/notification_platform_bridge_mac_unittest.mm

 // Copyright 2016 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.
 
 #import <AppKit/AppKit.h>
 #import <objc/runtime.h>
 
 #include "base/mac/scoped_nsobject.h"
 #import "base/mac/scoped_objc_class_swizzler.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/browser/notifications/notification_platform_bridge_mac.h"
 #include "chrome/browser/notifications/notification_test_util.h"
 #include "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #include "chrome/browser/ui/cocoa/notifications/notification_builder_mac.h"
 #include "chrome/browser/ui/cocoa/notifications/notification_constants_mac.h"
 #include "chrome/browser/ui/cocoa/notifications/notification_response_builder_mac.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/gtest_mac.h"
 #include "url/gurl.h"
 
+namespace {
+
+NSUserNotification* BuildNotification() {

[Robert Sesek, 2016/10/19 18:22:49]

This could be on NotificationPlatformBridgeMacTest as well.

[Miguel Garcia, 2016/10/20 10:24:45]

Acknowledged.

+  base::scoped_nsobject<NotificationBuilder> builder(
+      [[NotificationBuilder alloc] initWithCloseLabel:@"Close"
+                                         optionsLabel:@"Options"
+                                        settingsLabel:@"Settings"]);
+  [builder setTitle:@"Title"];
+  [builder setSubTitle:@"https://www.miguel.com"];
+  [builder setOrigin:@"https://www.miguel.com/"];
+  [builder setContextMessage:@""];
+  [builder setButtons:@"Button1" secondaryButton:@"Button2"];
+  [builder setTag:@"tag1"];
+  [builder setIcon:[NSImage imageNamed:@"NSApplicationIcon"]];
+  [builder setNotificationId:@"notificationId"];
+  [builder setProfileId:@"profileId"];
+  [builder setIncognito:false];
+  [builder
+      setNotificationType:[NSNumber
+                              numberWithInt:NotificationCommon::PERSISTENT]];

[Robert Sesek, 2016/10/19 18:22:49]

Does @() work ?

[Miguel Garcia, 2016/10/20 10:24:45]

Done.

+
+  return [builder buildUserNotification];
+}
+
+}  // namespace
+
 class NotificationPlatformBridgeMacTest : public CocoaTest {
  protected:
   std::unique_ptr<Notification> CreateNotification(const char* title,
                                                    const char* subtitle,
                                                    const char* origin,
                                                    const char* button1,
                                                    const char* button2) {
     message_center::RichNotificationData optional_fields;
     optional_fields.context_message = base::UTF8ToUTF16(origin);
     if (button1) {
@@ skipping 10 matching lines @@
     std::unique_ptr<Notification> notification(new Notification(
         message_center::NOTIFICATION_TYPE_SIMPLE, base::UTF8ToUTF16(title),
         base::UTF8ToUTF16(subtitle), gfx::Image(),
         message_center::NotifierId(url), base::UTF8ToUTF16("Notifier's Name"),
         url, "id1", optional_fields, new MockNotificationDelegate("id1")));
 
     return notification;
   }
 
   NSMutableDictionary* BuildDefaultNotificationResponse() {
-    base::scoped_nsobject<NotificationBuilder> builder(
-        [[NotificationBuilder alloc] initWithCloseLabel:@"Close"
-                                           optionsLabel:@"Options"
-                                          settingsLabel:@"Settings"]);
-    [builder setTitle:@"Title"];
-    [builder setSubTitle:@"https://www.miguel.com"];
-    [builder setOrigin:@"https://www.miguel.com/"];
-    [builder setContextMessage:@""];
-    [builder setButtons:@"Button1" secondaryButton:@"Button2"];
-    [builder setTag:@"tag1"];
-    [builder setIcon:[NSImage imageNamed:@"NSApplicationIcon"]];
-    [builder setNotificationId:@"notificationId"];
-    [builder setProfileId:@"profileId"];
-    [builder setIncognito:false];
-    [builder
-        setNotificationType:[NSNumber
-                                numberWithInt:NotificationCommon::PERSISTENT]];
-
-    NSUserNotification* notification = [builder buildUserNotification];
     return [NSMutableDictionary
         dictionaryWithDictionary:[NotificationResponseBuilder
-                                     buildDictionary:notification]];
+                                     buildDictionary:BuildNotification()]];
   }
 };
 
 TEST_F(NotificationPlatformBridgeMacTest, TestNotificationVerifyValidResponse) {
   NSDictionary* response = BuildDefaultNotificationResponse();
   EXPECT_TRUE(NotificationPlatformBridgeMac::VerifyNotificationData(response));
 }
 
 TEST_F(NotificationPlatformBridgeMacTest, TestNotificationUnknownType) {
   NSMutableDictionary* response = BuildDefaultNotificationResponse();
@@ skipping 86 matching lines @@
 
 // Expectations for notifications with one button.
 - (void)expectationsOneButton:(NSUserNotification*)notification {
   EXPECT_NSEQ(@"Title", [notification title]);
   EXPECT_NSEQ(@"Context", [notification informativeText]);
   EXPECT_NSEQ(@"https://gmail.com", [notification subtitle]);
   EXPECT_NSEQ(@"Close", [notification otherButtonTitle]);
   EXPECT_NSEQ(@"Options", [notification actionButtonTitle]);
 }
 
+- (NSArray<NSUserNotification*>*)expectationsDeliveredNotification {
+  return @[ BuildNotification() ];
+}
+
+- (void)expectationsRemoveDeliveredNotification:
+    (NSUserNotification*)notification {
+  EXPECT_NSEQ(@"Title", [notification title]);
+  EXPECT_NSEQ(@"notificationId",
+              [notification.userInfo
+                  objectForKey:notification_constants::kNotificationId]);
+  EXPECT_NSEQ(@"profileId",
+              [notification.userInfo
+                  objectForKey:notification_constants::kNotificationProfileId]);
+}
+
 @end
 
 TEST_F(NotificationPlatformBridgeMacTest, TestDisplayNoButtons) {
   base::scoped_nsobject<NSUserNotificationCenter> notification_center(
       [NSUserNotificationCenter _centerForIdentifier:@"" type:0x0]);
   base::mac::ScopedObjCClassSwizzler swizzler(
       [notification_center class], @selector(deliverNotification:),
       @selector(expectationsNoButtons:));
 
   std::unique_ptr<Notification> notification = CreateNotification(
@@ skipping 10 matching lines @@
   base::scoped_nsobject<NSUserNotificationCenter> notification_center(
       [NSUserNotificationCenter _centerForIdentifier:@"" type:0x0]);
   base::mac::ScopedObjCClassSwizzler swizzler(
       [notification_center class], @selector(deliverNotification:),
       @selector(expectationsOneButton:));
   std::unique_ptr<NotificationPlatformBridgeMac> bridge(
       new NotificationPlatformBridgeMac(notification_center));
   bridge->Display(NotificationCommon::PERSISTENT, "notification_id",
                   "profile_id", false, *notification);
 }
+
+TEST_F(NotificationPlatformBridgeMacTest, TestCloseNotification) {
+  base::scoped_nsobject<NSUserNotificationCenter> notification_center(
+      [NSUserNotificationCenter _centerForIdentifier:@"" type:0x0]);
+  base::mac::ScopedObjCClassSwizzler swizzler1(
+      [notification_center class], @selector(deliveredNotifications),
+      @selector(expectationsDeliveredNotification));
+  base::mac::ScopedObjCClassSwizzler swizzler2(

[Miguel Garcia, 2016/10/17 14:17:43]

This is needed because base::mac::ScopedObjCClassSwizzler  does not offer a way
to swizzle more than one method at once. It works but it's a bit quirky.
Suggestions welcome (including switching back to doing my own swizzling if
needed).

[Peter Beverloo, 2016/10/17 14:27:14]

My only comment is that they could have more descriptive names -

  delivered_notifications_swizzler
  remove_delivered_notification_swizzler

(Neither requires additional wrapping.)

[Robert Sesek, 2016/10/19 18:22:49]

I think this is fine, since hopefully it'll be temporary once OCMock gets
rolled.

[Miguel Garcia, 2016/10/20 10:24:45]

SG going with that then

[Miguel Garcia, 2016/10/20 10:24:45]

renamed

On 2016/10/17 14:27:14, Peter Beverloo wrote:

+      [notification_center class], @selector(removeDeliveredNotification:),
+      @selector(expectationsRemoveDeliveredNotification:));
+
+  std::unique_ptr<NotificationPlatformBridgeMac> bridge(
+      new NotificationPlatformBridgeMac(notification_center));

[Peter Beverloo, 2016/10/17 14:27:14]

  auto bridge = base::MakeUnique<NotificationPlatformBridgeMac>(
      notification_center);

[Miguel Garcia, 2016/10/20 10:24:45]

Acknowledged.

+  bridge->Close("profileId", "notificationId");

[Peter Beverloo, 2016/10/17 14:27:14]

You're using profile_id and notification_id elsewhere in this file.

[Miguel Garcia, 2016/10/20 10:24:45]

Done.

+}