test/GlobalJsObject.cpp - Issue 10198022: Pass application data into libadblockplus

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Unified Diff: test/GlobalJsObject.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.

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

Index: test/GlobalJsObject.cpp

===================================================================

--- a/test/GlobalJsObject.cpp

+++ b/test/GlobalJsObject.cpp

@@ -5,7 +5,7 @@

TEST(GlobalJsObjectTest, SetTimeout)

{

- AdblockPlus::JsEngine jsEngine(0, 0, 0);

+ AdblockPlus::JsEngine jsEngine(AdblockPlus::AppInfo(), 0, 0, 0);

jsEngine.Evaluate("setTimeout(function() {foo = 'bar';}, 100)");

ASSERT_TRUE(jsEngine.Evaluate("this.foo")->IsUndefined());

AdblockPlus::Sleep(200);

@@ -14,7 +14,7 @@

TEST(GlobalJsObjectTest, SetTimeoutWithArgs)

{

- AdblockPlus::JsEngine jsEngine(0, 0, 0);

+ AdblockPlus::JsEngine jsEngine(AdblockPlus::AppInfo(), 0, 0, 0);

jsEngine.Evaluate("setTimeout(function(s) {foo = s;}, 100, 'foobar')");

ASSERT_TRUE(jsEngine.Evaluate("this.foo")->IsUndefined());

AdblockPlus::Sleep(200);

@@ -23,14 +23,14 @@

TEST(GlobalJsObjectTest, SetTimeoutWithInvalidArgs)

{

- AdblockPlus::JsEngine jsEngine(0, 0, 0);

+ AdblockPlus::JsEngine jsEngine(AdblockPlus::AppInfo(), 0, 0, 0);

ASSERT_ANY_THROW(jsEngine.Evaluate("setTimeout()"));

ASSERT_ANY_THROW(jsEngine.Evaluate("setTimeout('', 1)"));

}

TEST(GlobalJsObjectTest, SetMultipleTimeouts)

{

- AdblockPlus::JsEngine jsEngine(0, 0, 0);

+ AdblockPlus::JsEngine jsEngine(AdblockPlus::AppInfo(), 0, 0, 0);

jsEngine.Evaluate("foo = []");

jsEngine.Evaluate("setTimeout(function(s) {foo.push('1');}, 100)");

jsEngine.Evaluate("setTimeout(function(s) {foo.push('2');}, 150)");