Implement Non-Closable Notification

ui/message_center/views/notification_view_unittest.cc

 // Copyright 2014 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 "ui/message_center/views/notification_view.h"
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 13 matching lines @@
 #include "ui/message_center/views/constants.h"
 #include "ui/message_center/views/message_center_controller.h"
 #include "ui/message_center/views/notification_button.h"
 #include "ui/message_center/views/proportional_image_view.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/test/widget_test.h"
 #include "ui/views/widget/widget_delegate.h"
 
+namespace {
+
+scoped_ptr<ui::GestureEvent> GenerateGestureEvent(ui::EventType type) {
+  ui::GestureEventDetails detail(type);
+  scoped_ptr<ui::GestureEvent> event(
+      new ui::GestureEvent(0, 0, 0, base::TimeDelta(), detail));
+  return event;
+}
+
+scoped_ptr<ui::GestureEvent> GenerateGestureVerticalScrollUpdateEvent(int dx) {
+  ui::GestureEventDetails detail(ui::ET_GESTURE_SCROLL_UPDATE, dx, 0);
+  scoped_ptr<ui::GestureEvent> event(
+      new ui::GestureEvent(0, 0, 0, base::TimeDelta(), detail));
+  return event;
+}
+
+}  // anonymouse namespace
+
 namespace message_center {
 
 // A test delegate used for tests that deal with the notification settings
 // button.
 class NotificationSettingsDelegate : public NotificationDelegate {
   bool ShouldDisplaySettingsButton() override { return true; }
 
  private:
   ~NotificationSettingsDelegate() override {}
 };
 
 /* Test fixture ***************************************************************/
 
 class NotificationViewTest : public views::ViewsTestBase,
                              public MessageCenterController {
  public:
   NotificationViewTest();
   ~NotificationViewTest() override;
 
   void SetUp() override;
   void TearDown() override;
 
   views::Widget* widget() { return notification_view_->GetWidget(); }
-  NotificationView* notification_view() { return notification_view_.get(); }
+  NotificationView* notification_view() const {
+    return notification_view_.get();
+  }
   Notification* notification() { return notification_.get(); }
   RichNotificationData* data() { return data_.get(); }
 
   // Overridden from MessageCenterController:
   void ClickOnNotification(const std::string& notification_id) override;
   void RemoveNotification(const std::string& notification_id,
                           bool by_user) override;
   scoped_ptr<ui::MenuModel> CreateMenuModel(
       const NotifierId& notifier_id,
       const base::string16& display_source) override;
@@ skipping 80 matching lines @@
 
       gfx::Point current_point = (*current)->bounds().origin();
       views::View::ConvertPointToTarget(
           (*current), notification_view(), &current_point);
 
       EXPECT_LT(last_point.y(), current_point.y());
       last = current++;
     }
   }
 
+  views::ImageButton* GetCloseButton() {
+    return notification_view()->close_button_.get();
+  }
+
   void UpdateNotificationViews() {
     notification_view()->CreateOrUpdateViews(*notification());
     notification_view()->Layout();
   }
 
+  float GetNotificationScrollAmount() const {
+    return notification_view()->GetTransform().To2dTranslation().x();
+  }
+
+  bool IsRemoved(const std::string& notification_id) const {
+    return (removed_ids_.find(notification_id) != removed_ids_.end());
+  }
+
+  void RemoveNotificationView() { notification_view_.reset(); }
+
  private:
+  std::set<std::string> removed_ids_;
+
   scoped_ptr<RichNotificationData> data_;
   scoped_ptr<Notification> notification_;
   scoped_ptr<NotificationView> notification_view_;
 
   DISALLOW_COPY_AND_ASSIGN(NotificationViewTest);
 };
 
 NotificationViewTest::NotificationViewTest() {
 }
 
@@ skipping 35 matching lines @@
 
 void NotificationViewTest::ClickOnNotification(
     const std::string& notification_id) {
   // For this test, this method should not be invoked.
   NOTREACHED();
 }
 
 void NotificationViewTest::RemoveNotification(
     const std::string& notification_id,
     bool by_user) {
-  // For this test, this method should not be invoked.
-  NOTREACHED();
+  removed_ids_.insert(notification_id);
 }
 
 scoped_ptr<ui::MenuModel> NotificationViewTest::CreateMenuModel(
     const NotifierId& notifier_id,
     const base::string16& display_source) {
   // For this test, this method should not be invoked.
   NOTREACHED();
   return nullptr;
 }
 
@@ skipping 20 matching lines @@
 TEST_F(NotificationViewTest, CreateOrUpdateTest) {
   EXPECT_TRUE(NULL != notification_view()->title_view_);
   EXPECT_TRUE(NULL != notification_view()->message_view_);
   EXPECT_TRUE(NULL != notification_view()->icon_view_);
   EXPECT_TRUE(NULL != notification_view()->image_view_);
 
   notification()->set_image(gfx::Image());
   notification()->set_title(base::ASCIIToUTF16(""));
   notification()->set_message(base::ASCIIToUTF16(""));
   notification()->set_icon(gfx::Image());
+  notification()->set_icon(gfx::Image());
 
   notification_view()->CreateOrUpdateViews(*notification());
   EXPECT_TRUE(NULL == notification_view()->title_view_);
   EXPECT_TRUE(NULL == notification_view()->message_view_);
   EXPECT_TRUE(NULL == notification_view()->image_view_);
   EXPECT_TRUE(NULL == notification_view()->settings_button_view_);
   // We still expect an icon view for all layouts.
   EXPECT_TRUE(NULL != notification_view()->icon_view_);
 }
 
@@ skipping 340 matching lines @@
   // some generic checking here.
   // The url has been elided (it starts with an ellipsis)
   // The end of the domainsuffix is shown
   // the url piece is not shown
   EXPECT_TRUE(base::UTF16ToUTF8(result).find(
                   ".veryveryveyrylong.chromium.org") != std::string::npos);
   EXPECT_TRUE(base::UTF16ToUTF8(result).find("\xE2\x80\xA6") == 0);
   EXPECT_TRUE(base::UTF16ToUTF8(result).find("hello") == std::string::npos);
 }
 
+TEST_F(NotificationViewTest, SlideOut) {
+  views::SlideOutView::DisableAnimationsForTesting();
+
+  UpdateNotificationViews();
+  std::string notification_id = notification()->id();
+
+  auto event_begin = GenerateGestureEvent(ui::ET_GESTURE_SCROLL_BEGIN);
+  auto event_scroll10 = GenerateGestureVerticalScrollUpdateEvent(-10);
+  auto event_scroll500 = GenerateGestureVerticalScrollUpdateEvent(-500);
+  auto event_end = GenerateGestureEvent(ui::ET_GESTURE_SCROLL_END);
+
+  notification_view()->OnGestureEvent(event_begin.get());
+  notification_view()->OnGestureEvent(event_scroll10.get());
+  EXPECT_FALSE(IsRemoved(notification_id));
+  EXPECT_EQ(-10.f, GetNotificationScrollAmount());
+  notification_view()->OnGestureEvent(event_end.get());
+  EXPECT_FALSE(IsRemoved(notification_id));
+  EXPECT_EQ(0.f, GetNotificationScrollAmount());
+
+  notification_view()->OnGestureEvent(event_begin.get());
+  notification_view()->OnGestureEvent(event_scroll500.get());
+  EXPECT_FALSE(IsRemoved(notification_id));
+  EXPECT_EQ(-500.f, GetNotificationScrollAmount());
+  notification_view()->OnGestureEvent(event_end.get());
+  EXPECT_TRUE(IsRemoved(notification_id));
+}
+
+TEST_F(NotificationViewTest, SlideOutNonClosable) {
+  views::SlideOutView::DisableAnimationsForTesting();
+
+  notification()->set_closable(false);
+  UpdateNotificationViews();
+  std::string notification_id = notification()->id();
+
+  auto event_begin = GenerateGestureEvent(ui::ET_GESTURE_SCROLL_BEGIN);
+  auto event_scroll500 = GenerateGestureVerticalScrollUpdateEvent(-500);
+  auto event_end = GenerateGestureEvent(ui::ET_GESTURE_SCROLL_END);
+
+  notification_view()->OnGestureEvent(event_begin.get());
+  notification_view()->OnGestureEvent(event_scroll500.get());
+  EXPECT_FALSE(IsRemoved(notification_id));
+  EXPECT_LT(-500.f, GetNotificationScrollAmount());
+  notification_view()->OnGestureEvent(event_end.get());
+  EXPECT_FALSE(IsRemoved(notification_id));
+}
+
+TEST_F(NotificationViewTest, NonClosable) {
+  notification()->set_closable(false);
+
+  UpdateNotificationViews();
+  EXPECT_EQ(NULL, GetCloseButton());
+}
+
 }  // namespace message_center