Unified Diff: test/FilterEngineStubs.cpp
Issue 10310030:
Convert references to FileSystem & Co. into shared pointers (avoid use after free) (Closed)
Patch Set:
Created April 18, 2013, 11:59 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« src/JsEngine.cpp ('K')
|
« test/FileSystemJsObject.cpp ('k')
|
test/GlobalJsObject.cpp » ('j')
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: test/FilterEngineStubs.cpp |
| =================================================================== |
| --- a/test/FilterEngineStubs.cpp |
| +++ b/test/FilterEngineStubs.cpp |
| @@ -26,51 +26,38 @@ class DummyFileSystem : public AdblockPl |
| } |
| StatResult Stat(const std::string& path) const |
| { |
| throw std::runtime_error("Not implemented"); |
| } |
| }; |
| -class DummyErrorCallback : public AdblockPlus::ErrorCallback |
| -{ |
| -public: |
| - void operator()(const std::string& message) |
| - { |
| - std::cout << message << std::endl; |
| - } |
| -}; |
| - |
| TEST(FilterEngineStubsTest, FilterCreation) |
| { |
| - DummyFileSystem fileSystem; |
| - DummyErrorCallback errorCallback; |
| - AdblockPlus::JsEngine jsEngine(AdblockPlus::AppInfo(), &fileSystem, 0, |
| - &errorCallback); |
| + AdblockPlus::JsEngine jsEngine; |
| + jsEngine.SetFileSystem(AdblockPlus::FileSystemPtr(new DummyFileSystem())); |
| AdblockPlus::FilterEngine filterEngine(jsEngine); |
| AdblockPlus::FilterPtr filter1 = filterEngine.GetFilter("foo"); |
| ASSERT_EQ(AdblockPlus::Filter::TYPE_BLOCKING, filter1->GetProperty("type", -1)); |
| AdblockPlus::FilterPtr filter2 = filterEngine.GetFilter("@@foo"); |
| ASSERT_EQ(AdblockPlus::Filter::TYPE_EXCEPTION, filter2->GetProperty("type", -1)); |
| AdblockPlus::FilterPtr filter3 = filterEngine.GetFilter("example.com##foo"); |
| ASSERT_EQ(AdblockPlus::Filter::TYPE_ELEMHIDE, filter3->GetProperty("type", -1)); |
| AdblockPlus::FilterPtr filter4 = filterEngine.GetFilter("example.com#@#foo"); |
| ASSERT_EQ(AdblockPlus::Filter::TYPE_ELEMHIDE_EXCEPTION, filter4->GetProperty("type", -1)); |
| AdblockPlus::FilterPtr filter5 = filterEngine.GetFilter(" foo "); |
| ASSERT_EQ(*filter1, *filter5); |
| } |
| TEST(FilterEngineStubsTest, FilterProperties) |
| { |
| - DummyFileSystem fileSystem; |
| - DummyErrorCallback errorCallback; |
| - AdblockPlus::JsEngine jsEngine(AdblockPlus::AppInfo(), &fileSystem, 0, |
| - &errorCallback); |
| + AdblockPlus::JsEngine jsEngine; |
| + jsEngine.SetFileSystem(AdblockPlus::FileSystemPtr(new DummyFileSystem())); |
| AdblockPlus::FilterEngine filterEngine(jsEngine); |
| AdblockPlus::FilterPtr filter = filterEngine.GetFilter("foo"); |
| ASSERT_EQ("x", filter->GetProperty("stringFoo", "x")); |
| ASSERT_EQ(42, filter->GetProperty("intFoo", 42)); |
| ASSERT_FALSE(filter->GetProperty("boolFoo", false)); |
| filter->SetProperty("stringFoo", "y"); |
| @@ -78,20 +65,18 @@ TEST(FilterEngineStubsTest, FilterProper |
| filter->SetProperty("boolFoo", true); |
| ASSERT_EQ("y", filter->GetProperty("stringFoo", "x")); |
| ASSERT_EQ(24, filter->GetProperty("intFoo", 42)); |
| ASSERT_TRUE(filter->GetProperty("boolFoo", false)); |
| } |
| TEST(FilterEngineStubsTest, AddRemoveFilters) |
| { |
| - DummyFileSystem fileSystem; |
| - DummyErrorCallback errorCallback; |
| - AdblockPlus::JsEngine jsEngine(AdblockPlus::AppInfo(), &fileSystem, 0, |
| - &errorCallback); |
| + AdblockPlus::JsEngine jsEngine; |
| + jsEngine.SetFileSystem(AdblockPlus::FileSystemPtr(new DummyFileSystem())); |
| AdblockPlus::FilterEngine filterEngine(jsEngine); |
| ASSERT_EQ(0u, filterEngine.GetListedFilters().size()); |
| AdblockPlus::FilterPtr filter = filterEngine.GetFilter("foo"); |
| ASSERT_EQ(0u, filterEngine.GetListedFilters().size()); |
| filter->AddToList(); |
| ASSERT_EQ(1u, filterEngine.GetListedFilters().size()); |
| ASSERT_EQ(*filter, *filterEngine.GetListedFilters()[0]); |
| filter->AddToList(); |
| @@ -100,20 +85,18 @@ TEST(FilterEngineStubsTest, AddRemoveFil |
| filter->RemoveFromList(); |
| ASSERT_EQ(0u, filterEngine.GetListedFilters().size()); |
| filter->RemoveFromList(); |
| ASSERT_EQ(0u, filterEngine.GetListedFilters().size()); |
| } |
| TEST(FilterEngineStubsTest, SubscriptionProperties) |
| { |
| - DummyFileSystem fileSystem; |
| - DummyErrorCallback errorCallback; |
| - AdblockPlus::JsEngine jsEngine(AdblockPlus::AppInfo(), &fileSystem, 0, |
| - &errorCallback); |
| + AdblockPlus::JsEngine jsEngine; |
| + jsEngine.SetFileSystem(AdblockPlus::FileSystemPtr(new DummyFileSystem())); |
| AdblockPlus::FilterEngine filterEngine(jsEngine); |
| AdblockPlus::SubscriptionPtr subscription = filterEngine.GetSubscription("foo"); |
| ASSERT_EQ("x", subscription->GetProperty("stringFoo", "x")); |
| ASSERT_EQ(42, subscription->GetProperty("intFoo", 42)); |
| ASSERT_FALSE(subscription->GetProperty("boolFoo", false)); |
| subscription->SetProperty("stringFoo", "y"); |
| @@ -121,20 +104,18 @@ TEST(FilterEngineStubsTest, Subscription |
| subscription->SetProperty("boolFoo", true); |
| ASSERT_EQ("y", subscription->GetProperty("stringFoo", "x")); |
| ASSERT_EQ(24, subscription->GetProperty("intFoo", 42)); |
| ASSERT_TRUE(subscription->GetProperty("boolFoo", false)); |
| } |
| TEST(FilterEngineStubsTest, AddRemoveSubscriptions) |
| { |
| - DummyFileSystem fileSystem; |
| - DummyErrorCallback errorCallback; |
| - AdblockPlus::JsEngine jsEngine(AdblockPlus::AppInfo(), &fileSystem, 0, |
| - &errorCallback); |
| + AdblockPlus::JsEngine jsEngine; |
| + jsEngine.SetFileSystem(AdblockPlus::FileSystemPtr(new DummyFileSystem())); |
| AdblockPlus::FilterEngine filterEngine(jsEngine); |
| ASSERT_EQ(0u, filterEngine.GetListedSubscriptions().size()); |
| AdblockPlus::SubscriptionPtr subscription = filterEngine.GetSubscription("foo"); |
| ASSERT_EQ(0u, filterEngine.GetListedSubscriptions().size()); |
| subscription->AddToList(); |
| ASSERT_EQ(1u, filterEngine.GetListedSubscriptions().size()); |
| ASSERT_EQ(*subscription, *filterEngine.GetListedSubscriptions()[0]); |
| subscription->AddToList(); |
| @@ -143,34 +124,30 @@ TEST(FilterEngineStubsTest, AddRemoveSub |
| subscription->RemoveFromList(); |
| ASSERT_EQ(0u, filterEngine.GetListedSubscriptions().size()); |
| subscription->RemoveFromList(); |
| ASSERT_EQ(0u, filterEngine.GetListedSubscriptions().size()); |
| } |
| TEST(FilterEngineStubsTest, SubscriptionUpdates) |
| { |
| - DummyFileSystem fileSystem; |
| - DummyErrorCallback errorCallback; |
| - AdblockPlus::JsEngine jsEngine(AdblockPlus::AppInfo(), &fileSystem, 0, |
| - &errorCallback); |
| + AdblockPlus::JsEngine jsEngine; |
| + jsEngine.SetFileSystem(AdblockPlus::FileSystemPtr(new DummyFileSystem())); |
| AdblockPlus::FilterEngine filterEngine(jsEngine); |
| AdblockPlus::SubscriptionPtr subscription = filterEngine.GetSubscription("foo"); |
| ASSERT_FALSE(subscription->IsUpdating()); |
| //TODO: This currently crashes due to errors reported on a different thread |
| //subscription->UpdateFilters(); |
| } |
| TEST(FilterEngineStubsTest, Matches) |
| { |
| - DummyFileSystem fileSystem; |
| - DummyErrorCallback errorCallback; |
| - AdblockPlus::JsEngine jsEngine(AdblockPlus::AppInfo(), &fileSystem, 0, |
| - &errorCallback); |
| + AdblockPlus::JsEngine jsEngine; |
| + jsEngine.SetFileSystem(AdblockPlus::FileSystemPtr(new DummyFileSystem())); |
| AdblockPlus::FilterEngine filterEngine(jsEngine); |
| filterEngine.GetFilter("adbanner.gif")->AddToList(); |
| filterEngine.GetFilter("@@notbanner.gif")->AddToList(); |
| AdblockPlus::FilterPtr match1 = filterEngine.Matches("http://example.org/foobar.gif", "IMAGE", ""); |
| ASSERT_FALSE(match1); |
« src/JsEngine.cpp ('K')
|
« test/FileSystemJsObject.cpp ('k')
|
test/GlobalJsObject.cpp » ('j')
|
no next file with comments »
