Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: test/GlobalJsObject.cpp

Issue 10274013: Simplified JsEngine API, Call() and GetVariable() aren`t reallynecessary if Evaluate() returns a v… (Closed)
Patch Set: Created April 11, 2013, 4:13 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/JsEngine.cpp ('k') | test/JsEngine.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: test/GlobalJsObject.cpp
===================================================================
--- a/test/GlobalJsObject.cpp
+++ b/test/GlobalJsObject.cpp
@@ -2,28 +2,28 @@
#include <gtest/gtest.h>
#include "../src/Thread.h"
TEST(GlobalJsObjectTest, SetTimeout)
{
AdblockPlus::JsEngine jsEngine(0, 0, 0);
jsEngine.Evaluate("setTimeout(function() {foo = 'bar';}, 100)");
- ASSERT_EQ("", jsEngine.GetVariable("foo"));
+ ASSERT_EQ("undefined", jsEngine.Evaluate("typeof foo"));
AdblockPlus::Sleep(200);
- ASSERT_EQ("bar", jsEngine.GetVariable("foo"));
+ ASSERT_EQ("bar", jsEngine.Evaluate("foo"));
}
TEST(GlobalJsObjectTest, SetTimeoutWithArgs)
{
AdblockPlus::JsEngine jsEngine(0, 0, 0);
jsEngine.Evaluate("setTimeout(function(s) {foo = s;}, 100, 'foobar')");
- ASSERT_EQ("", jsEngine.GetVariable("foo"));
+ ASSERT_EQ("undefined", jsEngine.Evaluate("typeof foo"));
AdblockPlus::Sleep(200);
- ASSERT_EQ("foobar", jsEngine.GetVariable("foo"));
+ ASSERT_EQ("foobar", jsEngine.Evaluate("foo"));
}
TEST(GlobalJsObjectTest, SetTimeoutWithInvalidArgs)
{
AdblockPlus::JsEngine jsEngine(0, 0, 0);
ASSERT_ANY_THROW(jsEngine.Evaluate("setTimeout()"));
ASSERT_ANY_THROW(jsEngine.Evaluate("setTimeout('', 1)"));
ASSERT_ANY_THROW(jsEngine.Evaluate("setTimeout(function(){}, '')"));
@@ -31,10 +31,10 @@ TEST(GlobalJsObjectTest, SetTimeoutWithI
TEST(GlobalJsObjectTest, SetMultipleTimeouts)
{
AdblockPlus::JsEngine jsEngine(0, 0, 0);
jsEngine.Evaluate("foo = []");
jsEngine.Evaluate("setTimeout(function(s) {foo.push('1');}, 100)");
jsEngine.Evaluate("setTimeout(function(s) {foo.push('2');}, 150)");
AdblockPlus::Sleep(200);
- ASSERT_EQ("1,2", jsEngine.GetVariable("foo"));
+ ASSERT_EQ("1,2", jsEngine.Evaluate("foo"));
}
« no previous file with comments | « src/JsEngine.cpp ('k') | test/JsEngine.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld