Issue 2693 - Update adblockplus dependency

test/Notification.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 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 76 matching lines @@
       serverResponse.responseText = responseText;
       return serverResponse;
     }
   };
 
 #ifdef NotificationMockWebRequestTest_ENABLED
   class NotificationMockWebRequestTest : public BaseJsTest
   {
   protected:
     FilterEnginePtr filterEngine;
+    bool isNotificationCallbackCalled;
     void SetUp()
     {
       BaseJsTest::SetUp();
+      isNotificationCallbackCalled = false;
       jsEngine->SetFileSystem(
         std::tr1::shared_ptr<LazyFileSystem>(new LazyFileSystem()));
       const char* responseJsonText = "{"
         "\"notifications\": [{"
           "\"id\": \"some id\","
           "\"type\": \"information\","
           "\"message\": {"
              "\"en-US\": \"message\""
           "},"
           "\"title\": \"Title\""
         "}]"
         "}";
       jsEngine->SetWebRequest(std::tr1::shared_ptr<MockWebRequest>(
         new MockWebRequest(responseJsonText)));
       jsEngine->SetLogSystem(LogSystemPtr(new DefaultLogSystem()));
       filterEngine.reset(new FilterEngine(jsEngine));
+      filterEngine->SetShowNotificationCallback(
+        std::bind(&NotificationMockWebRequestTest::OnNotification,
+        this, std::tr1::placeholders::_1));
+    }
+
+    void OnNotification(const NotificationPtr& notification)
+    {
+      isNotificationCallbackCalled = true;
+      ASSERT_TRUE(notification);
+      EXPECT_EQ(NotificationType::NOTIFICATION_TYPE_INFORMATION, notification->GetType());
+      EXPECT_EQ("Title", notification->GetTitle());
+      EXPECT_EQ("message", notification->GetMessageString());
+      notification->MarkAsShown();
     }
   };
 #endif
 }
 
 TEST_F(NotificationTest, NoNotifications)
 {
   EXPECT_FALSE(PeekNotification());
 }
 
 #ifdef NotificationMockWebRequestTest_ENABLED
 TEST_F(NotificationMockWebRequestTest, SingleNotification)
 {
-  bool isNotificationCallbackCalled = false;
-  filterEngine->SetNotificationAvailableCallback([&isNotificationCallbackCalled](const NotificationPtr& notification)

[Felix Dahlke, 2015/06/30 19:45:32]

Still C++03 here :)

[sergei, 2015/07/01 11:46:09]

Done.

-  {
-    isNotificationCallbackCalled = true;
-    ASSERT_TRUE(notification);
-    EXPECT_EQ(NotificationType::NOTIFICATION_TYPE_INFORMATION, notification->GetType());
-    EXPECT_EQ("Title", notification->GetTitle());
-    EXPECT_EQ("message", notification->GetMessageString());
-    notification->MarkAsShown();
-  });
   AdblockPlus::Sleep(5000/*msec*/); // it's a hack
   EXPECT_TRUE(isNotificationCallbackCalled);
 }
 #endif
 
 TEST_F(NotificationTest, AddNotification)
 {
   AddNotification("{"
       "type: 'critical',"
       "title: 'testTitle',"
@@ skipping 49 matching lines @@
 
 TEST_F(NotificationTest, Links)
 {
   AddNotification("{ id: 'id', links: ['link1', 'link2'] }");
   NotificationPtr notification = PeekNotification();
   ASSERT_TRUE(notification);
   std::vector<std::string> notificationLinks = notification->GetLinks();
   ASSERT_EQ(2, notificationLinks.size());
   EXPECT_EQ("link1", notificationLinks[0]);
   EXPECT_EQ("link2", notificationLinks[1]);
-}

[Felix Dahlke, 2015/06/30 19:45:32]

Nit: Was a newline at EOF added here, or removed? If it was added, fine, but it
shouldn't be removed.

[sergei, 2015/07/01 11:46:09]

I guess it was removed, so I've added '\n' here.

+}