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

Side by Side Diff: test/JsEngine.cpp

Issue 10274013: Simplified JsEngine API, Call() and GetVariable() aren`t reallynecessary if Evaluate() returns a v… (Closed)
Patch Set: Slight improvement Created April 11, 2013, 5:44 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « test/GlobalJsObject.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #include <AdblockPlus.h> 1 #include <AdblockPlus.h>
2 #include <fstream> 2 #include <fstream>
3 #include <gtest/gtest.h> 3 #include <gtest/gtest.h>
4 #include <sstream> 4 #include <sstream>
5 5
6 class ThrowingFileReader : public AdblockPlus::FileReader 6 class ThrowingFileReader : public AdblockPlus::FileReader
7 { 7 {
8 public: 8 public:
9 std::auto_ptr<std::istream> Read(const std::string& path) const 9 std::auto_ptr<std::istream> Read(const std::string& path) const
10 { 10 {
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 } 43 }
44 }; 44 };
45 45
46 TEST(JsEngineTest, EvaluateAndCall) 46 TEST(JsEngineTest, EvaluateAndCall)
47 { 47 {
48 ThrowingFileReader fileReader; 48 ThrowingFileReader fileReader;
49 ThrowingErrorCallback errorCallback; 49 ThrowingErrorCallback errorCallback;
50 AdblockPlus::JsEngine jsEngine(&fileReader, 0, &errorCallback); 50 AdblockPlus::JsEngine jsEngine(&fileReader, 0, &errorCallback);
51 const std::string source = "function hello() { return 'Hello'; }"; 51 const std::string source = "function hello() { return 'Hello'; }";
52 jsEngine.Evaluate(source); 52 jsEngine.Evaluate(source);
53 const std::string result = jsEngine.Call("hello"); 53 const std::string result = jsEngine.Evaluate("hello()");
54 ASSERT_EQ("Hello", result); 54 ASSERT_EQ("Hello", result);
55 } 55 }
56 56
57 TEST(JsEngineTest, LoadAndCall) 57 TEST(JsEngineTest, LoadAndCall)
58 { 58 {
59 StubFileReader fileReader; 59 StubFileReader fileReader;
60 ThrowingErrorCallback errorCallback; 60 ThrowingErrorCallback errorCallback;
61 AdblockPlus::JsEngine jsEngine(&fileReader, 0, &errorCallback); 61 AdblockPlus::JsEngine jsEngine(&fileReader, 0, &errorCallback);
62 jsEngine.Load("hello.js"); 62 jsEngine.Load("hello.js");
63 const std::string result = jsEngine.Call("hello"); 63 const std::string result = jsEngine.Evaluate("hello()");
64 ASSERT_EQ("Hello", result); 64 ASSERT_EQ("Hello", result);
65 } 65 }
66 66
67 TEST(JsEngineTest, LoadBadStreamFails) 67 TEST(JsEngineTest, LoadBadStreamFails)
68 { 68 {
69 BadFileReader fileReader; 69 BadFileReader fileReader;
70 ThrowingErrorCallback errorCallback; 70 ThrowingErrorCallback errorCallback;
71 AdblockPlus::JsEngine jsEngine(&fileReader, 0, &errorCallback); 71 AdblockPlus::JsEngine jsEngine(&fileReader, 0, &errorCallback);
72 ASSERT_ANY_THROW(jsEngine.Load("hello.js")); 72 ASSERT_ANY_THROW(jsEngine.Load("hello.js"));
73 } 73 }
74 74
75 TEST(JsEngineTest, RuntimeExceptionIsThrown) 75 TEST(JsEngineTest, RuntimeExceptionIsThrown)
76 { 76 {
77 ThrowingFileReader fileReader; 77 ThrowingFileReader fileReader;
78 ThrowingErrorCallback errorCallback; 78 ThrowingErrorCallback errorCallback;
79 AdblockPlus::JsEngine jsEngine(&fileReader, 0, &errorCallback); 79 AdblockPlus::JsEngine jsEngine(&fileReader, 0, &errorCallback);
80 ASSERT_THROW(jsEngine.Evaluate("doesnotexist()"), AdblockPlus::JsError); 80 ASSERT_THROW(jsEngine.Evaluate("doesnotexist()"), AdblockPlus::JsError);
81 } 81 }
82 82
83 TEST(JsEngineTest, CompileTimeExceptionIsThrown) 83 TEST(JsEngineTest, CompileTimeExceptionIsThrown)
84 { 84 {
85 ThrowingFileReader fileReader; 85 ThrowingFileReader fileReader;
86 ThrowingErrorCallback errorCallback; 86 ThrowingErrorCallback errorCallback;
87 AdblockPlus::JsEngine jsEngine(&fileReader, 0, &errorCallback); 87 AdblockPlus::JsEngine jsEngine(&fileReader, 0, &errorCallback);
88 ASSERT_THROW(jsEngine.Evaluate("'foo'bar'"), AdblockPlus::JsError); 88 ASSERT_THROW(jsEngine.Evaluate("'foo'bar'"), AdblockPlus::JsError);
89 } 89 }
OLDNEW
« no previous file with comments | « test/GlobalJsObject.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld