Index: test/mjsunit/debug-evaluate-with-context.js |
diff --git a/test/mjsunit/debug-evaluate-with-context.js b/test/mjsunit/debug-evaluate-with-context.js |
index fa615ada20b34ac9196745b0aaf21716e61c644e..4fae8990f32c8b0acf8559c5efe7ff135e35d1f5 100644 |
--- a/test/mjsunit/debug-evaluate-with-context.js |
+++ b/test/mjsunit/debug-evaluate-with-context.js |
@@ -29,8 +29,6 @@ |
// Get the Debug object exposed from the debug context global object. |
Debug = debug.Debug |
-var evaluate_callback; |
- |
function listener(event, exec_state, event_data, data) { |
if (event !== Debug.DebugEvent.Break) return; |
try { |
@@ -39,37 +37,45 @@ function listener(event, exec_state, event_data, data) { |
// Try in frame's scope. |
var local_expression = |
- "(what_is_capybara ? what_is_capybara : 'a beast') + '/' + what_is_parrot"; |
- var result = evaluate_callback.in_top_frame(exec_state, local_expression, context); |
+ "(what_is_capybara ? what_is_capybara : 'a beast')" + |
+ " + '/' + what_is_parrot"; |
+ var result = evaluate_callback.in_top_frame( |
+ exec_state, local_expression, context); |
assertEquals('a fish/a bird', result); |
// Try in frame's scope with overrididen local variables. |
- var result = evaluate_callback.in_top_frame(exec_state, local_expression, context2); |
+ var result = evaluate_callback.in_top_frame( |
+ exec_state, local_expression, context2); |
assertEquals('a fish/a beard', result); |
// Try in frame's scope, without context. |
var local_expression2 = "what_is_parrot"; |
- var result = evaluate_callback.in_top_frame(exec_state, local_expression2, void 0); |
+ var result = evaluate_callback.in_top_frame( |
+ exec_state, local_expression2, void 0); |
assertEquals('a bird', result); |
// Try in global additional scope. |
var global_expression = "what_is_capybara ? what_is_capybara : 'a beast'"; |
- var result = evaluate_callback.globally(exec_state, global_expression, context); |
+ var result = evaluate_callback.globally( |
+ exec_state, global_expression, context); |
assertEquals('a fish', result); |
// Try in global scope with overridden global variables. |
var context_with_undefined = { undefined: 'kitten' }; |
var global_expression2 = "'cat' + '/' + undefined"; |
- var result = evaluate_callback.globally(exec_state, global_expression2, context_with_undefined); |
+ var result = evaluate_callback.globally( |
+ exec_state, global_expression2, context_with_undefined); |
assertEquals('cat/kitten', result); |
// Try in global scope with no overridden global variables. |
- var result = evaluate_callback.globally(exec_state, global_expression2, void 0); |
+ var result = evaluate_callback.globally( |
+ exec_state, global_expression2, void 0); |
assertEquals('cat/undefined', result); |
// Try in global scope without additional context. |
var global_expression3 = "'cat' + '/' + 'dog'"; |
- var result = evaluate_callback.globally(exec_state, global_expression3, void 0); |
+ var result = evaluate_callback.globally( |
+ exec_state, global_expression3, void 0); |
assertEquals('cat/dog', result); |
listenerComplete = true; |
@@ -101,45 +107,14 @@ function runF() { |
evaluate_callback = { |
in_top_frame: function(exec_state, expression, additional_context) { |
- return exec_state.frame(0).evaluate(expression, void 0, additional_context).value(); |
+ return exec_state.frame(0).evaluate( |
+ expression, void 0, additional_context).value(); |
}, |
globally: function(exec_state, expression, additional_context) { |
- return exec_state.evaluateGlobal(expression, void 0, additional_context).value(); |
+ return exec_state.evaluateGlobal( |
+ expression, void 0, additional_context).value(); |
}, |
}; |
runF(); |
- |
-// Now try all the same, but via debug protocol. |
- |
-function evaluateViaProtocol(exec_state, expression, additional_context, frame_argument_adder) { |
- var dcp = exec_state.debugCommandProcessor("unspecified_running_state"); |
- request_json = {"seq":17,"type":"request","command":"evaluate", arguments: { "expression": expression } }; |
- frame_argument_adder(request_json.arguments); |
- if (additional_context) { |
- var context_json = []; |
- for (var key in additional_context) { |
- context_json.push({ name: key, handle: Debug.MakeMirror(additional_context[key]).handle() }); |
- } |
- request_json.arguments.additional_context = context_json; |
- } |
- var request = JSON.stringify(request_json); |
- var response_json = dcp.processDebugJSONRequest(request); |
- var response = JSON.parse(response_json); |
- |
- assertTrue(response.success); |
- var str_result = response.body.value; |
- return str_result; |
-} |
- |
-evaluate_callback = { |
- in_top_frame: function(exec_state, expression, additional_context) { |
- return evaluateViaProtocol(exec_state, expression, additional_context, function(args) { args.frame = 0; }); |
- }, |
- globally: function(exec_state, expression, additional_context) { |
- return evaluateViaProtocol(exec_state, expression, additional_context, function(args) { args.global = true; }); |
- }, |
-}; |
- |
-runF(); |