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-2017 eyeo GmbH | 3 * Copyright (C) 2006-2017 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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
42 return StatResult(); | 42 return StatResult(); |
43 } | 43 } |
44 }; | 44 }; |
45 | 45 |
46 template<class FileSystem, class LogSystem> | 46 template<class FileSystem, class LogSystem> |
47 class FilterEngineTestGeneric : public BaseJsTest | 47 class FilterEngineTestGeneric : public BaseJsTest |
48 { | 48 { |
49 protected: | 49 protected: |
50 FilterEnginePtr filterEngine; | 50 FilterEnginePtr filterEngine; |
51 | 51 |
52 void SetUp() | 52 void SetUp() override |
53 { | 53 { |
54 BaseJsTest::SetUp(); | 54 BaseJsTest::SetUp(); |
55 jsEngine->SetFileSystem(AdblockPlus::FileSystemPtr(new FileSystem)); | 55 jsEngine->SetFileSystem(AdblockPlus::FileSystemPtr(new FileSystem)); |
56 jsEngine->SetWebRequest(AdblockPlus::WebRequestPtr(new LazyWebRequest)); | 56 jsEngine->SetWebRequest(AdblockPlus::WebRequestPtr(new LazyWebRequest)); |
57 jsEngine->SetLogSystem(AdblockPlus::LogSystemPtr(new LogSystem)); | 57 jsEngine->SetLogSystem(AdblockPlus::LogSystemPtr(new LogSystem)); |
58 filterEngine = AdblockPlus::FilterEngine::Create(jsEngine); | 58 filterEngine = AdblockPlus::FilterEngine::Create(jsEngine); |
59 } | 59 } |
60 void TearDown() override | 60 void TearDown() override |
61 { | 61 { |
62 // Workaround for issue 5198 | 62 // Workaround for issue 5198 |
(...skipping 1060 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1123 filterEngine->SetAllowedConnectionType(&testConnection); | 1123 filterEngine->SetAllowedConnectionType(&testConnection); |
1124 auto subscription = EnsureExampleSubscriptionAndForceUpdate("subB"); | 1124 auto subscription = EnsureExampleSubscriptionAndForceUpdate("subB"); |
1125 EXPECT_EQ("synchronize_ok", subscription.GetProperty("downloadStatus").AsStr
ing()); | 1125 EXPECT_EQ("synchronize_ok", subscription.GetProperty("downloadStatus").AsStr
ing()); |
1126 EXPECT_EQ(1u, subscription.GetProperty("filters").AsList().size()); | 1126 EXPECT_EQ(1u, subscription.GetProperty("filters").AsList().size()); |
1127 auto capturedConnectionTypes = this->capturedConnectionTypes.GetStrings(); | 1127 auto capturedConnectionTypes = this->capturedConnectionTypes.GetStrings(); |
1128 ASSERT_EQ(1u, capturedConnectionTypes.size()); | 1128 ASSERT_EQ(1u, capturedConnectionTypes.size()); |
1129 EXPECT_TRUE(capturedConnectionTypes[0].first); | 1129 EXPECT_TRUE(capturedConnectionTypes[0].first); |
1130 EXPECT_EQ(testConnection, capturedConnectionTypes[0].second); | 1130 EXPECT_EQ(testConnection, capturedConnectionTypes[0].second); |
1131 } | 1131 } |
1132 } | 1132 } |
OLD | NEW |