Simplified JsEngine API, Call() and GetVariable() aren`t reallynecessary if Evaluate() returns a v…

test/JsEngine.cpp

 #include <AdblockPlus.h>
 #include <fstream>
 #include <gtest/gtest.h>
 #include <sstream>
 
 class ThrowingFileReader : public AdblockPlus::FileReader
 {
 public:
   std::auto_ptr<std::istream> Read(const std::string& path) const
   {
@@ skipping 32 matching lines @@
   }
 };
 
 TEST(JsEngineTest, EvaluateAndCall)
 {
   ThrowingFileReader fileReader;
   ThrowingErrorCallback errorCallback;
   AdblockPlus::JsEngine jsEngine(&fileReader, 0, &errorCallback);
   const std::string source = "function hello() { return 'Hello'; }";
   jsEngine.Evaluate(source);
-  const std::string result = jsEngine.Call("hello");
+  const std::string result = jsEngine.Evaluate("hello()");
   ASSERT_EQ("Hello", result);
 }
 
 TEST(JsEngineTest, LoadAndCall)
 {
   StubFileReader fileReader;
   ThrowingErrorCallback errorCallback;
   AdblockPlus::JsEngine jsEngine(&fileReader, 0, &errorCallback);
   jsEngine.Load("hello.js");
-  const std::string result = jsEngine.Call("hello");
+  const std::string result = jsEngine.Evaluate("hello()");
   ASSERT_EQ("Hello", result);
 }
 
 TEST(JsEngineTest, LoadBadStreamFails)
 {
   BadFileReader fileReader;
   ThrowingErrorCallback errorCallback;
   AdblockPlus::JsEngine jsEngine(&fileReader, 0, &errorCallback);
   ASSERT_ANY_THROW(jsEngine.Load("hello.js"));
 }
 
 TEST(JsEngineTest, RuntimeExceptionIsThrown)
 {
   ThrowingFileReader fileReader;
   ThrowingErrorCallback errorCallback;
   AdblockPlus::JsEngine jsEngine(&fileReader, 0, &errorCallback);
   ASSERT_THROW(jsEngine.Evaluate("doesnotexist()"), AdblockPlus::JsError);
 }
 
 TEST(JsEngineTest, CompileTimeExceptionIsThrown)
 {
   ThrowingFileReader fileReader;
   ThrowingErrorCallback errorCallback;
   AdblockPlus::JsEngine jsEngine(&fileReader, 0, &errorCallback);
   ASSERT_THROW(jsEngine.Evaluate("'foo'bar'"), AdblockPlus::JsError);
 }