Side by Side Diff: test/ConsoleJsObject.cpp
Issue 10198022:
Pass application data into libadblockplus (Closed)
Patch Set: Merged upstream, addressed issues, renamed AppInfo fields
Created April 17, 2013, 2:47 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« src/AppInfoJsObject.cpp ('K')
|
« test/AppInfoJsObject.cpp ('k')
|
test/FileSystemJsObject.cpp » ('j')
|
no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| OLD | NEW |
|---|---|
| 1 #include <AdblockPlus.h> | 1 #include <AdblockPlus.h> |
| 2 #include <gtest/gtest.h> | 2 #include <gtest/gtest.h> |
| 3 | 3 |
| 4 class MockErrorCallback : public AdblockPlus::ErrorCallback | 4 class MockErrorCallback : public AdblockPlus::ErrorCallback |
| 5 { | 5 { |
| 6 public: | 6 public: |
| 7 std::string lastMessage; | 7 std::string lastMessage; |
| 8 | 8 |
| 9 void operator()(const std::string& message) | 9 void operator()(const std::string& message) |
| 10 { | 10 { |
| 11 lastMessage = message; | 11 lastMessage = message; |
| 12 } | 12 } |
| 13 }; | 13 }; |
| 14 | 14 |
| 15 TEST(ConsoleJsObjectTest, ErrorInvokesErrorCallback) | 15 TEST(ConsoleJsObjectTest, ErrorInvokesErrorCallback) |
| 16 { | 16 { |
| 17 MockErrorCallback errorCallback; | 17 MockErrorCallback errorCallback; |
| 18 AdblockPlus::JsEngine jsEngine(0, 0, &errorCallback); | 18 AdblockPlus::JsEngine jsEngine(AdblockPlus::AppInfo(), 0, 0, &errorCallback); |
| 19 jsEngine.Evaluate("console.error('foo')"); | 19 jsEngine.Evaluate("console.error('foo')"); |
| 20 ASSERT_EQ("foo", errorCallback.lastMessage); | 20 ASSERT_EQ("foo", errorCallback.lastMessage); |
| 21 } | 21 } |
| 22 | 22 |
| 23 TEST(ConsoleJsObjectTest, ErrorWithMultipleArguments) | 23 TEST(ConsoleJsObjectTest, ErrorWithMultipleArguments) |
| 24 { | 24 { |
| 25 MockErrorCallback errorCallback; | 25 MockErrorCallback errorCallback; |
| 26 AdblockPlus::JsEngine jsEngine(0, 0, &errorCallback); | 26 AdblockPlus::JsEngine jsEngine(AdblockPlus::AppInfo(), 0, 0, &errorCallback); |
| 27 jsEngine.Evaluate("console.error('foo', 'bar')"); | 27 jsEngine.Evaluate("console.error('foo', 'bar')"); |
| 28 ASSERT_EQ("foobar", errorCallback.lastMessage); | 28 ASSERT_EQ("foobar", errorCallback.lastMessage); |
| 29 } | 29 } |
| 30 | 30 |
| 31 TEST(ConsoleJsObjectTest, TraceDoesNothing) | 31 TEST(ConsoleJsObjectTest, TraceDoesNothing) |
| 32 { | 32 { |
| 33 AdblockPlus::JsEngine jsEngine(0, 0, 0); | 33 AdblockPlus::JsEngine jsEngine(AdblockPlus::AppInfo(), 0, 0, 0); |
| 34 jsEngine.Evaluate("console.trace()"); | 34 jsEngine.Evaluate("console.trace()"); |
| 35 } | 35 } |
| OLD | NEW |
« src/AppInfoJsObject.cpp ('K')
|
« test/AppInfoJsObject.cpp ('k')
|
test/FileSystemJsObject.cpp » ('j')
|
no next file with comments »
