Make JsEngine::Evaluate() return a wrapper for v8::Value to accessdifferent variable types easily

test/WebRequest.cpp

 #include <sstream>
 #include <AdblockPlus.h>
 #include <gtest/gtest.h>
 
 #include "../src/Thread.h"
 
 #ifdef HAVE_WININET
 #include "../src/WebRequestWinInet.h"
 #endif
 
@@ skipping 29 matching lines @@
   ASSERT_ANY_THROW(jsEngine.Evaluate("_webRequest.GET('http://example.com/', null, function(){})"));
   ASSERT_ANY_THROW(jsEngine.Evaluate("_webRequest.GET('http://example.com/', {}, null)"));
   ASSERT_ANY_THROW(jsEngine.Evaluate("_webRequest.GET('http://example.com/', {}, function(){}, 0)"));
 }
 
 TEST(WebRequestTest, TestWebRequest)
 {
   TestWebRequest webRequest;
   AdblockPlus::JsEngine jsEngine(0, &webRequest, 0);
   jsEngine.Evaluate("_webRequest.GET('http://example.com/', {X: 'Y'}, function(result) {foo = result;} )");
-  ASSERT_EQ("undefined", jsEngine.Evaluate("typeof foo"));
+  ASSERT_TRUE(jsEngine.Evaluate("this.foo")->IsUndefined());
   AdblockPlus::Sleep(200);
-  ASSERT_EQ(ToString(AdblockPlus::WebRequest::NS_OK), jsEngine.Evaluate("foo.status"));
-  ASSERT_EQ("123", jsEngine.Evaluate("foo.responseStatus"));
-  ASSERT_EQ("http://example.com/\nX\nY", jsEngine.Evaluate("foo.responseText"));
-  ASSERT_EQ("{\"Foo\":\"Bar\"}", jsEngine.Evaluate("JSON.stringify(foo.responseHeaders)"));
+  ASSERT_EQ(AdblockPlus::WebRequest::NS_OK, jsEngine.Evaluate("foo.status")->AsInt());
+  ASSERT_EQ(123, jsEngine.Evaluate("foo.responseStatus")->AsInt());
+  ASSERT_EQ("http://example.com/\nX\nY", jsEngine.Evaluate("foo.responseText")->AsString());
+  ASSERT_EQ("{\"Foo\":\"Bar\"}", jsEngine.Evaluate("JSON.stringify(foo.responseHeaders)")->AsString());
 }
 
 #if defined(HAVE_CURL)
 TEST(WebRequestTest, RealWebRequest)
 {
   AdblockPlus::DefaultWebRequest webRequest;
   AdblockPlus::JsEngine jsEngine(0, &webRequest, 0);
 
   // This URL should redirect to easylist-downloads.adblockplus.org and we
   // should get the actual filter list back.
   jsEngine.Evaluate("_webRequest.GET('https://easylist.adblockplus.org/easylist.txt', {}, function(result) {foo = result;} )");
   do
   {
     AdblockPlus::Sleep(200);
-  } while (jsEngine.Evaluate("typeof foo") == "undefined");
-  ASSERT_EQ(ToString(AdblockPlus::WebRequest::NS_OK), jsEngine.Evaluate("foo.status"));
-  ASSERT_EQ("200", jsEngine.Evaluate("foo.responseStatus"));
-  ASSERT_EQ("[Adblock Plus ", jsEngine.Evaluate("foo.responseText.substr(0, 14)"));
-  ASSERT_EQ("text/plain", jsEngine.Evaluate("foo.responseHeaders['content-type'].substr(0, 10)"));
-  ASSERT_EQ("undefined", jsEngine.Evaluate("typeof foo.responseHeaders['location']"));
+  } while (jsEngine.Evaluate("this.foo")->IsUndefined());
+  ASSERT_EQ(AdblockPlus::WebRequest::NS_OK, jsEngine.Evaluate("foo.status")->AsInt());
+  ASSERT_EQ(200, jsEngine.Evaluate("foo.responseStatus")->AsInt());
+  ASSERT_EQ("[Adblock Plus ", jsEngine.Evaluate("foo.responseText.substr(0, 14)")->AsString());
+  ASSERT_EQ("text/plain", jsEngine.Evaluate("foo.responseHeaders['content-type'].substr(0, 10)")->AsString());
+  ASSERT_TRUE(jsEngine.Evaluate("foo.responseHeaders['location']")->IsUndefined());
 }
 #elif defined(HAVE_WININET)
 TEST(WebRequestTest, RealWebRequest)
 {
   AdblockPlus::WebRequestWinInet webRequest;
   AdblockPlus::JsEngine jsEngine(0, &webRequest, 0);
   jsEngine.Evaluate("_webRequest.GET('https://easylist.adblockplus.org/easylist.txt', {}, function(result) {foo = result;} )");
   do
   {
     AdblockPlus::Sleep(200);
   } while (jsEngine.Evaluate("typeof foo") == "undefined");
   ASSERT_EQ(ToString(AdblockPlus::WebRequest::NS_OK), jsEngine.Evaluate("foo.status"));
   ASSERT_EQ("200", jsEngine.Evaluate("foo.responseStatus"));
   ASSERT_EQ("[Adblock Plus ", jsEngine.Evaluate("foo.responseText.substr(0, 14)"));
   //TODO: Shall we be strict with letter casing here? Content-Type vs content-type
   ASSERT_EQ("text/plain", jsEngine.Evaluate("foo.responseHeaders['Content-Type'].substr(0, 10)"));
   ASSERT_EQ("undefined", jsEngine.Evaluate("typeof foo.responseHeaders['location']"));
 }
 #else
 TEST(WebRequestTest, DummyWebRequest)
 {
   AdblockPlus::DefaultWebRequest webRequest;
   AdblockPlus::JsEngine jsEngine(0, &webRequest, 0);
   jsEngine.Evaluate("_webRequest.GET('https://easylist.adblockplus.org/easylist.txt', {}, function(result) {foo = result;} )");
   do
   {
     AdblockPlus::Sleep(200);
-  } while (jsEngine.Evaluate("typeof foo") == "undefined");
-  ASSERT_EQ(ToString(AdblockPlus::WebRequest::NS_ERROR_FAILURE), jsEngine.Evaluate("foo.status"));
-  ASSERT_EQ("0", jsEngine.Evaluate("foo.responseStatus"));
-  ASSERT_EQ("", jsEngine.Evaluate("foo.responseText"));
-  ASSERT_EQ("{}", jsEngine.Evaluate("JSON.stringify(foo.responseHeaders)"));
+  } while (jsEngine.Evaluate("this.foo")->IsUndefined());
+  ASSERT_EQ(AdblockPlus::WebRequest::NS_ERROR_FAILURE, jsEngine.Evaluate("foo.status")->AsInt());
+  ASSERT_EQ(0, jsEngine.Evaluate("foo.responseStatus")->AsInt());
+  ASSERT_EQ("", jsEngine.Evaluate("foo.responseText")->AsString());
+  ASSERT_EQ("{}", jsEngine.Evaluate("JSON.stringify(foo.responseHeaders)")->AsString());
 }
 #endif