Index: test/inspector/runtime/evaluate-async.js |
diff --git a/test/inspector/runtime/evaluate-async.js b/test/inspector/runtime/evaluate-async.js |
index a6cd1c3379e96511f07b29b3226fc8fe2028278c..ed4b6e30e2350519f35fd04947bce2c3fe2f093e 100644 |
--- a/test/inspector/runtime/evaluate-async.js |
+++ b/test/inspector/runtime/evaluate-async.js |
@@ -4,7 +4,7 @@ |
print("Tests that Runtime.evaluate works with awaitPromise flag."); |
-InspectorTest.evaluateInPage(` |
+InspectorTest.addScript(` |
function createPromiseAndScheduleResolve() |
{ |
var resolveCallback; |
@@ -13,56 +13,46 @@ function createPromiseAndScheduleResolve() |
return promise; |
}`); |
-function dumpResult(result) |
-{ |
- if (result.exceptionDetails) { |
- result.exceptionDetails.scriptId = "(scriptId)"; |
- result.exceptionDetails.exceptionId = 0; |
- result.exceptionDetails.exception.objectId = 0; |
- } |
- InspectorTest.logObject(result); |
-} |
- |
InspectorTest.runTestSuite([ |
function testResolvedPromise(next) |
{ |
- InspectorTest.sendCommandPromise("Runtime.evaluate", { expression: "Promise.resolve(239)", awaitPromise: true, generatePreview: true }) |
- .then((result) => dumpResult(result.result)) |
+ Protocol.Runtime.evaluate({ expression: "Promise.resolve(239)", awaitPromise: true, generatePreview: true }) |
+ .then(result => InspectorTest.logMessage(result)) |
.then(() => next()); |
}, |
function testRejectedPromise(next) |
{ |
- InspectorTest.sendCommandPromise("Runtime.evaluate", { expression: "Promise.reject(239)", awaitPromise: true }) |
- .then((result) => dumpResult(result.result)) |
+ Protocol.Runtime.evaluate({ expression: "Promise.reject(239)", awaitPromise: true }) |
+ .then(result => InspectorTest.logMessage(result)) |
.then(() => next()); |
}, |
function testPrimitiveValueInsteadOfPromise(next) |
{ |
- InspectorTest.sendCommandPromise("Runtime.evaluate", { expression: "true", awaitPromise: true }) |
- .then((result) => InspectorTest.logObject(result.error)) |
+ Protocol.Runtime.evaluate({ expression: "true", awaitPromise: true }) |
+ .then(result => InspectorTest.logMessage(result)) |
.then(() => next()); |
}, |
function testObjectInsteadOfPromise(next) |
{ |
- InspectorTest.sendCommandPromise("Runtime.evaluate", { expression: "({})", awaitPromise: true }) |
- .then((result) => InspectorTest.logObject(result.error)) |
+ Protocol.Runtime.evaluate({ expression: "({})", awaitPromise: true }) |
+ .then(result => InspectorTest.logMessage(result)) |
.then(() => next()); |
}, |
function testPendingPromise(next) |
{ |
- InspectorTest.sendCommandPromise("Runtime.evaluate", { expression: "createPromiseAndScheduleResolve()", awaitPromise: true, returnByValue: true }) |
- .then((result) => dumpResult(result.result)) |
+ Protocol.Runtime.evaluate({ expression: "createPromiseAndScheduleResolve()", awaitPromise: true, returnByValue: true }) |
+ .then(result => InspectorTest.logMessage(result)) |
.then(() => next()); |
}, |
function testExceptionInEvaluate(next) |
{ |
- InspectorTest.sendCommandPromise("Runtime.evaluate", { expression: "throw 239", awaitPromise: true }) |
- .then((result) => dumpResult(result.result)) |
+ Protocol.Runtime.evaluate({ expression: "throw 239", awaitPromise: true }) |
+ .then(result => InspectorTest.logMessage(result)) |
.then(() => next()); |
} |
]); |