Issue 5506 - Fix notification test

test/Notification.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present 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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "BaseJsTest.h"
 
 using namespace AdblockPlus;
 
 // This define enables NotificationMockWebRequestTest but to run it
 // one need to set INITIAL_DELAY to about 2000 msec in notification.js.
 //#define NotificationMockWebRequestTest_ENABLED

[sergei, 2017/08/23 18:00:12]

Could you please also remove this define and move the comment next to the test
body.

[hub, 2017/08/23 19:21:56]

Done.

 
 namespace
 {
   class NotificationTest : public BaseJsTest
   {
   protected:
     void SetUp()
     {
       LazyFileSystem* fileSystem;
       ThrowingPlatformCreationParameters platformParams;
@@ skipping 42 matching lines @@
         return;
       }
       ServerResponse serverResponse;
       serverResponse.status = IWebRequest::NS_OK;
       serverResponse.responseStatus = 200;
       serverResponse.responseText = responseText;
       getCallback(serverResponse);
     }
   };
 
-#ifdef NotificationMockWebRequestTest_ENABLED
   class NotificationMockWebRequestTest : public BaseJsTest
   {
   protected:
     bool isNotificationCallbackCalled;
     void SetUp()
     {
       BaseJsTest::SetUp();

[sergei, 2017/08/23 18:00:12]

Since platform is created below could you please remove this call.

[hub, 2017/08/23 19:21:56]

Done.

       isNotificationCallbackCalled = false;
-      jsEngine->SetFileSystem(
-        std::shared_ptr<LazyFileSystem>(new LazyFileSystem()));
       const char* responseJsonText = "{"
         "\"notifications\": [{"
           "\"id\": \"some id\","
           "\"type\": \"information\","
           "\"message\": {"
              "\"en-US\": \"message\""
           "},"
           "\"title\": \"Title\""
         "}]"
         "}";
-      jsEngine->SetWebRequest(std::shared_ptr<MockWebRequest>(
-        new MockWebRequest(responseJsonText)));
-      jsEngine->SetLogSystem(LogSystemPtr(new DefaultLogSystem()));
-      filterEngine = FilterEngine::Create(jsEngine);
-      filterEngine->SetShowNotificationCallback(
+
+      ThrowingPlatformCreationParameters platformParams;
+      platformParams.fileSystem.reset(new LazyFileSystem());
+      platformParams.webRequest.reset(new MockWebRequest(responseJsonText));
+      platform.reset(new Platform(std::move(platformParams)));
+
+      auto& filterEngine = platform->GetFilterEngine();
+      filterEngine.SetShowNotificationCallback(
         [this](Notification&& notification) {
           isNotificationCallbackCalled = true;
           EXPECT_EQ(NotificationType::NOTIFICATION_TYPE_INFORMATION, notification.GetType());
           EXPECT_EQ("Title", notification.GetTexts().title);
           EXPECT_EQ("message", notification.GetTexts().message);
           notification.MarkAsShown();
         });
     }
   };
-#endif
 }
 
 TEST_F(NotificationTest, NoNotifications)
 {
   EXPECT_FALSE(PeekNotification());
 }
 
-#ifdef NotificationMockWebRequestTest_ENABLED
-TEST_F(NotificationMockWebRequestTest, SingleNotification)
+TEST_F(NotificationMockWebRequestTest, DISABLED_SingleNotification)
 {
   AdblockPlus::Sleep(5000/*msec*/); // it's a hack
   EXPECT_TRUE(isNotificationCallbackCalled);
 }
-#endif
 
 TEST_F(NotificationTest, AddNotification)
 {
   AddNotification("{"
       "type: 'critical',"
       "title: 'testTitle',"
       "message: 'testMessage',"
     "}");
   auto notification = PeekNotification();
   ASSERT_TRUE(notification);
@@ skipping 46 matching lines @@
 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]);
 }