comparison tests/libclient/js-rectangle/main.cpp @ 27:0a1adf7dcca0

Common: update libjs and adapt code
author David Demelier <markand@malikania.fr>
date Tue, 12 Apr 2016 13:53:11 +0200
parents a8aabea64f17
children a1e80d991968
comparison
equal deleted inserted replaced
26:56cc058200b5 27:0a1adf7dcca0
50 "w = r.width;" 50 "w = r.width;"
51 "h = r.height;" 51 "h = r.height;"
52 ); 52 );
53 53
54 if (ret != 0) { 54 if (ret != 0) {
55 throw duk::error(m_ctx, -1); 55 throw duk::exception(m_ctx, -1);
56 } 56 }
57 57
58 ASSERT_EQ(0, duk::getGlobal<int>(m_ctx, "x")); 58 ASSERT_EQ(0, duk::getGlobal<int>(m_ctx, "x"));
59 ASSERT_EQ(0, duk::getGlobal<int>(m_ctx, "y")); 59 ASSERT_EQ(0, duk::getGlobal<int>(m_ctx, "y"));
60 ASSERT_EQ(0, duk::getGlobal<int>(m_ctx, "w")); 60 ASSERT_EQ(0, duk::getGlobal<int>(m_ctx, "w"));
74 "w = r.width;" 74 "w = r.width;"
75 "h = r.height;" 75 "h = r.height;"
76 ); 76 );
77 77
78 if (ret != 0) { 78 if (ret != 0) {
79 throw duk::error(m_ctx, -1); 79 throw duk::exception(m_ctx, -1);
80 } 80 }
81 81
82 ASSERT_EQ(10, duk::getGlobal<int>(m_ctx, "x")); 82 ASSERT_EQ(10, duk::getGlobal<int>(m_ctx, "x"));
83 ASSERT_EQ(20, duk::getGlobal<int>(m_ctx, "y")); 83 ASSERT_EQ(20, duk::getGlobal<int>(m_ctx, "y"));
84 ASSERT_EQ(30, duk::getGlobal<int>(m_ctx, "w")); 84 ASSERT_EQ(30, duk::getGlobal<int>(m_ctx, "w"));
98 "w = r.width;" 98 "w = r.width;"
99 "h = r.height;" 99 "h = r.height;"
100 ); 100 );
101 101
102 if (ret != 0) { 102 if (ret != 0) {
103 throw duk::error(m_ctx, -1); 103 throw duk::exception(m_ctx, -1);
104 } 104 }
105 105
106 ASSERT_EQ(10, duk::getGlobal<int>(m_ctx, "x")); 106 ASSERT_EQ(10, duk::getGlobal<int>(m_ctx, "x"));
107 ASSERT_EQ(20, duk::getGlobal<int>(m_ctx, "y")); 107 ASSERT_EQ(20, duk::getGlobal<int>(m_ctx, "y"));
108 ASSERT_EQ(30, duk::getGlobal<int>(m_ctx, "w")); 108 ASSERT_EQ(30, duk::getGlobal<int>(m_ctx, "w"));
122 "w = r.width;" 122 "w = r.width;"
123 "h = r.height;" 123 "h = r.height;"
124 ); 124 );
125 125
126 if (ret != 0) { 126 if (ret != 0) {
127 throw duk::error(m_ctx, -1); 127 throw duk::exception(m_ctx, -1);
128 } 128 }
129 129
130 ASSERT_EQ(10, duk::getGlobal<int>(m_ctx, "x")); 130 ASSERT_EQ(10, duk::getGlobal<int>(m_ctx, "x"));
131 ASSERT_EQ(20, duk::getGlobal<int>(m_ctx, "y")); 131 ASSERT_EQ(20, duk::getGlobal<int>(m_ctx, "y"));
132 ASSERT_EQ(30, duk::getGlobal<int>(m_ctx, "w")); 132 ASSERT_EQ(30, duk::getGlobal<int>(m_ctx, "w"));
152 " correct = (e instanceof TypeError);" 152 " correct = (e instanceof TypeError);"
153 "}" 153 "}"
154 ); 154 );
155 155
156 if (ret != 0) { 156 if (ret != 0) {
157 throw duk::error(m_ctx, -1); 157 throw duk::exception(m_ctx, -1);
158 } 158 }
159 159
160 ASSERT_EQ("TypeError", duk::getGlobal<std::string>(m_ctx, "name")); 160 ASSERT_EQ("TypeError", duk::getGlobal<std::string>(m_ctx, "name"));
161 ASSERT_TRUE(duk::getGlobal<bool>(m_ctx, "correct")); 161 ASSERT_TRUE(duk::getGlobal<bool>(m_ctx, "correct"));
162 } catch (const std::exception &ex) { 162 } catch (const std::exception &ex) {
175 " correct = (e instanceof RangeError);" 175 " correct = (e instanceof RangeError);"
176 "}" 176 "}"
177 ); 177 );
178 178
179 if (ret != 0) { 179 if (ret != 0) {
180 throw duk::error(m_ctx, -1); 180 throw duk::exception(m_ctx, -1);
181 } 181 }
182 182
183 ASSERT_EQ("RangeError", duk::getGlobal<std::string>(m_ctx, "name")); 183 ASSERT_EQ("RangeError", duk::getGlobal<std::string>(m_ctx, "name"));
184 ASSERT_TRUE(duk::getGlobal<bool>(m_ctx, "correct")); 184 ASSERT_TRUE(duk::getGlobal<bool>(m_ctx, "correct"));
185 } catch (const std::exception &ex) { 185 } catch (const std::exception &ex) {
207 }, 1}); 207 }, 1});
208 208
209 auto ret = duk::pevalString(m_ctx, "build({ x: 50, y: 80, width: 100, height: 200 });"); 209 auto ret = duk::pevalString(m_ctx, "build({ x: 50, y: 80, width: 100, height: 200 });");
210 210
211 if (ret != 0) { 211 if (ret != 0) {
212 throw duk::error(m_ctx, -1); 212 throw duk::exception(m_ctx, -1);
213 } 213 }
214 214
215 ASSERT_EQ(50, duk::getGlobal<int>(m_ctx, "x")); 215 ASSERT_EQ(50, duk::getGlobal<int>(m_ctx, "x"));
216 ASSERT_EQ(80, duk::getGlobal<int>(m_ctx, "y")); 216 ASSERT_EQ(80, duk::getGlobal<int>(m_ctx, "y"));
217 ASSERT_EQ(100, duk::getGlobal<int>(m_ctx, "w")); 217 ASSERT_EQ(100, duk::getGlobal<int>(m_ctx, "w"));
238 " correct = (e instanceof Error);" 238 " correct = (e instanceof Error);"
239 "}" 239 "}"
240 ); 240 );
241 241
242 if (ret != 0) { 242 if (ret != 0) {
243 throw duk::error(m_ctx, -1); 243 throw duk::exception(m_ctx, -1);
244 } 244 }
245 245
246 ASSERT_EQ("Error", duk::getGlobal<std::string>(m_ctx, "name")); 246 ASSERT_EQ("Error", duk::getGlobal<std::string>(m_ctx, "name"));
247 ASSERT_TRUE(duk::getGlobal<bool>(m_ctx, "correct")); 247 ASSERT_TRUE(duk::getGlobal<bool>(m_ctx, "correct"));
248 } catch (const std::exception &ex) { 248 } catch (const std::exception &ex) {
270 }, 1}); 270 }, 1});
271 271
272 auto ret = duk::pevalString(m_ctx, "build({});"); 272 auto ret = duk::pevalString(m_ctx, "build({});");
273 273
274 if (ret != 0) { 274 if (ret != 0) {
275 throw duk::error(m_ctx, -1); 275 throw duk::exception(m_ctx, -1);
276 } 276 }
277 277
278 ASSERT_EQ(0, duk::getGlobal<int>(m_ctx, "x")); 278 ASSERT_EQ(0, duk::getGlobal<int>(m_ctx, "x"));
279 ASSERT_EQ(0, duk::getGlobal<int>(m_ctx, "y")); 279 ASSERT_EQ(0, duk::getGlobal<int>(m_ctx, "y"));
280 ASSERT_EQ(0, duk::getGlobal<int>(m_ctx, "w")); 280 ASSERT_EQ(0, duk::getGlobal<int>(m_ctx, "w"));