Issue 5164 - Remove NotificationPtr

test/Notification.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2017 eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 34 matching lines @@
       jsEngine->Evaluate("(function()"
       "{"
         "require('notification').Notification.addNotification(" + notification + ");"
       "})();");
     }
 
     std::unique_ptr<Notification> PeekNotification(const std::string& url = std::string())
     {
       std::unique_ptr<Notification> retValue;
       filterEngine->SetShowNotificationCallback(
-        [&retValue](const Notification& notification) {
-          retValue.reset(new Notification(notification));
+        [&retValue](Notification& notification) {
+          retValue.reset(new Notification(std::move(notification)));
         });
       filterEngine->ShowNextNotification(url);
       filterEngine->RemoveShowNotificationCallback();
       return retValue;
     }
   };
 
   class MockWebRequest : public WebRequest
   {
   public:
@@ skipping 95 matching lines @@
 
   auto notification = PeekNotification();
   ASSERT_TRUE(notification);
   EXPECT_EQ(NotificationType::NOTIFICATION_TYPE_CRITICAL, notification->GetType());
 
   notification = PeekNotification("http://www.de");
   ASSERT_TRUE(notification);
   EXPECT_EQ(NotificationType::NOTIFICATION_TYPE_QUESTION, notification->GetType());
 
   notification = PeekNotification("http://www.com");
-  EXPECT_TRUE(notification);

[sergei, 2017/04/24 08:20:28]

Here should be assert.

[hub, 2017/04/24 13:55:00]

Acknowledged.

+  ASSERT_TRUE(notification);
   EXPECT_EQ(NotificationType::NOTIFICATION_TYPE_INFORMATION, notification->GetType());
 }
 
 TEST_F(NotificationTest, MarkAsShown)
 {
   AddNotification("{ id: 'id', type: 'question' }");
   EXPECT_TRUE(PeekNotification());
   auto notification = PeekNotification();
+  ASSERT_TRUE(notification);
   notification->MarkAsShown();
   EXPECT_FALSE(PeekNotification());
 }
 
 TEST_F(NotificationTest, NoLinks)
 {
   AddNotification("{ id: 'id'}");
   auto notification = PeekNotification();
   ASSERT_TRUE(notification);
   EXPECT_EQ(0u, notification->GetLinks().size());
 }
 
 TEST_F(NotificationTest, Links)
 {
   AddNotification("{ id: 'id', links: ['link1', 'link2'] }");
   auto notification = PeekNotification();
   ASSERT_TRUE(notification);
   std::vector<std::string> notificationLinks = notification->GetLinks();
   ASSERT_EQ(2u, notificationLinks.size());
   EXPECT_EQ("link1", notificationLinks[0]);
   EXPECT_EQ("link2", notificationLinks[1]);
 }