| OLD | NEW | 
|    1 /* |    1 /* | 
|    2  * This file is part of Adblock Plus <https://adblockplus.org/>, |    2  * This file is part of Adblock Plus <https://adblockplus.org/>, | 
|    3  * Copyright (C) 2006-2016 Eyeo GmbH |    3  * Copyright (C) 2006-2016 Eyeo GmbH | 
|    4  * |    4  * | 
|    5  * Adblock Plus is free software: you can redistribute it and/or modify |    5  * Adblock Plus is free software: you can redistribute it and/or modify | 
|    6  * it under the terms of the GNU General Public License version 3 as |    6  * it under the terms of the GNU General Public License version 3 as | 
|    7  * published by the Free Software Foundation. |    7  * published by the Free Software Foundation. | 
|    8  * |    8  * | 
|    9  * Adblock Plus is distributed in the hope that it will be useful, |    9  * Adblock Plus is distributed in the hope that it will be useful, | 
|   10  * but WITHOUT ANY WARRANTY; without even the implied warranty of |   10  * but WITHOUT ANY WARRANTY; without even the implied warranty of | 
| (...skipping 19 matching lines...) Expand all  Loading... | 
|   30   class NotificationTest : public BaseJsTest |   30   class NotificationTest : public BaseJsTest | 
|   31   { |   31   { | 
|   32   protected: |   32   protected: | 
|   33     FilterEnginePtr filterEngine; |   33     FilterEnginePtr filterEngine; | 
|   34     void SetUp() |   34     void SetUp() | 
|   35     { |   35     { | 
|   36       BaseJsTest::SetUp(); |   36       BaseJsTest::SetUp(); | 
|   37       jsEngine->SetFileSystem(FileSystemPtr(new LazyFileSystem())); |   37       jsEngine->SetFileSystem(FileSystemPtr(new LazyFileSystem())); | 
|   38       jsEngine->SetWebRequest(WebRequestPtr(new LazyWebRequest())); |   38       jsEngine->SetWebRequest(WebRequestPtr(new LazyWebRequest())); | 
|   39       jsEngine->SetLogSystem(LogSystemPtr(new DefaultLogSystem())); |   39       jsEngine->SetLogSystem(LogSystemPtr(new DefaultLogSystem())); | 
|   40       filterEngine.reset(new FilterEngine(jsEngine)); |   40       filterEngine = FilterEngine::Create(jsEngine); | 
|   41     } |   41     } | 
|   42  |   42  | 
|   43     void AddNotification(const std::string& notification) |   43     void AddNotification(const std::string& notification) | 
|   44     { |   44     { | 
|   45       jsEngine->Evaluate("(function()" |   45       jsEngine->Evaluate("(function()" | 
|   46       "{" |   46       "{" | 
|   47         "require('notification').Notification.addNotification(" + notification +
      ");" |   47         "require('notification').Notification.addNotification(" + notification +
      ");" | 
|   48       "})();"); |   48       "})();"); | 
|   49     } |   49     } | 
|   50  |   50  | 
| (...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  204 TEST_F(NotificationTest, Links) |  204 TEST_F(NotificationTest, Links) | 
|  205 { |  205 { | 
|  206   AddNotification("{ id: 'id', links: ['link1', 'link2'] }"); |  206   AddNotification("{ id: 'id', links: ['link1', 'link2'] }"); | 
|  207   NotificationPtr notification = PeekNotification(); |  207   NotificationPtr notification = PeekNotification(); | 
|  208   ASSERT_TRUE(notification); |  208   ASSERT_TRUE(notification); | 
|  209   std::vector<std::string> notificationLinks = notification->GetLinks(); |  209   std::vector<std::string> notificationLinks = notification->GetLinks(); | 
|  210   ASSERT_EQ(2, notificationLinks.size()); |  210   ASSERT_EQ(2, notificationLinks.size()); | 
|  211   EXPECT_EQ("link1", notificationLinks[0]); |  211   EXPECT_EQ("link1", notificationLinks[0]); | 
|  212   EXPECT_EQ("link2", notificationLinks[1]); |  212   EXPECT_EQ("link2", notificationLinks[1]); | 
|  213 } |  213 } | 
| OLD | NEW |