From 0c32d8c5cb793be1b6317578791594ef69470a1c Mon Sep 17 00:00:00 2001 From: "yangguo@chromium.org" Date: Fri, 8 Aug 2014 11:57:51 +0000 Subject: [PATCH] Fix debug-promises tests. Using assertEquals on two Promises always passes. Use assertSame instead. R=rossberg@chromium.org Review URL: https://codereview.chromium.org/455683002 git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@22995 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- test/mjsunit/es6/debug-promises/reject-caught-all.js | 2 +- test/mjsunit/es6/debug-promises/reject-uncaught-all.js | 2 +- test/mjsunit/es6/debug-promises/reject-uncaught-late.js | 2 +- test/mjsunit/es6/debug-promises/reject-uncaught-uncaught.js | 2 +- test/mjsunit/es6/debug-promises/reject-with-invalid-reject.js | 1 - test/mjsunit/es6/debug-promises/reject-with-undefined-reject.js | 1 - test/mjsunit/es6/debug-promises/throw-caught-all.js | 2 +- test/mjsunit/es6/debug-promises/throw-uncaught-all.js | 2 +- test/mjsunit/es6/debug-promises/throw-uncaught-uncaught.js | 2 +- test/mjsunit/es6/debug-promises/throw-with-throw-in-reject.js | 2 +- test/mjsunit/es6/debug-promises/throw-with-undefined-reject.js | 2 +- 11 files changed, 9 insertions(+), 11 deletions(-) diff --git a/test/mjsunit/es6/debug-promises/reject-caught-all.js b/test/mjsunit/es6/debug-promises/reject-caught-all.js index 5a42516..0fca577 100644 --- a/test/mjsunit/es6/debug-promises/reject-caught-all.js +++ b/test/mjsunit/es6/debug-promises/reject-caught-all.js @@ -36,7 +36,7 @@ function listener(event, exec_state, event_data, data) { expected_events--; assertTrue(expected_events >= 0); assertEquals("reject", event_data.exception().message); - assertEquals(q, event_data.promise()); + assertSame(q, event_data.promise()); assertFalse(event_data.uncaught()); } } catch (e) { diff --git a/test/mjsunit/es6/debug-promises/reject-uncaught-all.js b/test/mjsunit/es6/debug-promises/reject-uncaught-all.js index 16bc2ce..beaf187 100644 --- a/test/mjsunit/es6/debug-promises/reject-uncaught-all.js +++ b/test/mjsunit/es6/debug-promises/reject-uncaught-all.js @@ -31,7 +31,7 @@ function listener(event, exec_state, event_data, data) { assertTrue(expected_events >= 0); assertEquals("uncaught reject", event_data.exception().message); assertTrue(event_data.promise() instanceof Promise); - assertEquals(q, event_data.promise()); + assertSame(q, event_data.promise()); assertTrue(event_data.uncaught()); // All of the frames on the stack are from native Javascript. assertEquals(0, exec_state.frameCount()); diff --git a/test/mjsunit/es6/debug-promises/reject-uncaught-late.js b/test/mjsunit/es6/debug-promises/reject-uncaught-late.js index b46fa06..4a883da 100644 --- a/test/mjsunit/es6/debug-promises/reject-uncaught-late.js +++ b/test/mjsunit/es6/debug-promises/reject-uncaught-late.js @@ -38,7 +38,7 @@ function listener(event, exec_state, event_data, data) { assertTrue(expected_events >= 0); assertEquals("uncaught reject p", event_data.exception().message); assertTrue(event_data.promise() instanceof Promise); - assertEquals(p, event_data.promise()); + assertSame(p, event_data.promise()); assertTrue(event_data.uncaught()); // Assert that the debug event is triggered at the throw site. assertTrue(exec_state.frame(0).sourceLineText().indexOf("// event") > 0); diff --git a/test/mjsunit/es6/debug-promises/reject-uncaught-uncaught.js b/test/mjsunit/es6/debug-promises/reject-uncaught-uncaught.js index 364217c..86e2a81 100644 --- a/test/mjsunit/es6/debug-promises/reject-uncaught-uncaught.js +++ b/test/mjsunit/es6/debug-promises/reject-uncaught-uncaught.js @@ -31,7 +31,7 @@ function listener(event, exec_state, event_data, data) { assertTrue(expected_events >= 0); assertEquals("uncaught reject", event_data.exception().message); assertTrue(event_data.promise() instanceof Promise); - assertEquals(q, event_data.promise()); + assertSame(q, event_data.promise()); assertTrue(event_data.uncaught()); // All of the frames on the stack are from native Javascript. assertEquals(0, exec_state.frameCount()); diff --git a/test/mjsunit/es6/debug-promises/reject-with-invalid-reject.js b/test/mjsunit/es6/debug-promises/reject-with-invalid-reject.js index 40f32ef..fc6233d 100644 --- a/test/mjsunit/es6/debug-promises/reject-with-invalid-reject.js +++ b/test/mjsunit/es6/debug-promises/reject-with-invalid-reject.js @@ -42,7 +42,6 @@ function listener(event, exec_state, event_data, data) { assertEquals("number is not a function", event_data.exception().message); // All of the frames on the stack are from native Javascript. assertEquals(0, exec_state.frameCount()); - assertEquals(q, event_data.promise()); } } catch (e) { %AbortJS(e + "\n" + e.stack); diff --git a/test/mjsunit/es6/debug-promises/reject-with-undefined-reject.js b/test/mjsunit/es6/debug-promises/reject-with-undefined-reject.js index 39dabcf..d11c01f 100644 --- a/test/mjsunit/es6/debug-promises/reject-with-undefined-reject.js +++ b/test/mjsunit/es6/debug-promises/reject-with-undefined-reject.js @@ -42,7 +42,6 @@ function listener(event, exec_state, event_data, data) { assertEquals("caught", event_data.exception().message); // All of the frames on the stack are from native Javascript. assertEquals(0, exec_state.frameCount()); - assertEquals(q, event_data.promise()); } } catch (e) { %AbortJS(e + "\n" + e.stack); diff --git a/test/mjsunit/es6/debug-promises/throw-caught-all.js b/test/mjsunit/es6/debug-promises/throw-caught-all.js index 053c0c2..2fbf051 100644 --- a/test/mjsunit/es6/debug-promises/throw-caught-all.js +++ b/test/mjsunit/es6/debug-promises/throw-caught-all.js @@ -35,7 +35,7 @@ function listener(event, exec_state, event_data, data) { expected_events--; assertTrue(expected_events >= 0); assertEquals("caught", event_data.exception().message); - assertEquals(q, event_data.promise()); + assertSame(q, event_data.promise()); assertFalse(event_data.uncaught()); } } catch (e) { diff --git a/test/mjsunit/es6/debug-promises/throw-uncaught-all.js b/test/mjsunit/es6/debug-promises/throw-uncaught-all.js index 7552589..72f800b 100644 --- a/test/mjsunit/es6/debug-promises/throw-uncaught-all.js +++ b/test/mjsunit/es6/debug-promises/throw-uncaught-all.js @@ -32,7 +32,7 @@ function listener(event, exec_state, event_data, data) { assertTrue(expected_events >= 0); assertEquals("uncaught", event_data.exception().message); assertTrue(event_data.promise() instanceof Promise); - assertEquals(q, event_data.promise()); + assertSame(q, event_data.promise()); assertTrue(event_data.uncaught()); // Assert that the debug event is triggered at the throw site. assertTrue(exec_state.frame(0).sourceLineText().indexOf("// event") > 0); diff --git a/test/mjsunit/es6/debug-promises/throw-uncaught-uncaught.js b/test/mjsunit/es6/debug-promises/throw-uncaught-uncaught.js index 45e7e0d..69aa8eb 100644 --- a/test/mjsunit/es6/debug-promises/throw-uncaught-uncaught.js +++ b/test/mjsunit/es6/debug-promises/throw-uncaught-uncaught.js @@ -32,7 +32,7 @@ function listener(event, exec_state, event_data, data) { assertTrue(expected_events >= 0); assertEquals("uncaught", event_data.exception().message); assertTrue(event_data.promise() instanceof Promise); - assertEquals(q, event_data.promise()); + assertSame(q, event_data.promise()); assertTrue(event_data.uncaught()); // Assert that the debug event is triggered at the throw site. assertTrue(exec_state.frame(0).sourceLineText().indexOf("// event") > 0); diff --git a/test/mjsunit/es6/debug-promises/throw-with-throw-in-reject.js b/test/mjsunit/es6/debug-promises/throw-with-throw-in-reject.js index b57afd4..1ea1c7f 100644 --- a/test/mjsunit/es6/debug-promises/throw-with-throw-in-reject.js +++ b/test/mjsunit/es6/debug-promises/throw-with-throw-in-reject.js @@ -53,7 +53,7 @@ function listener(event, exec_state, event_data, data) { } else { assertUnreachable(); } - assertEquals(q, event_data.promise()); + assertSame(q, event_data.promise()); assertTrue(exec_state.frame(0).sourceLineText().indexOf('// event') > 0); } } catch (e) { diff --git a/test/mjsunit/es6/debug-promises/throw-with-undefined-reject.js b/test/mjsunit/es6/debug-promises/throw-with-undefined-reject.js index 0162fe1..94dcdff 100644 --- a/test/mjsunit/es6/debug-promises/throw-with-undefined-reject.js +++ b/test/mjsunit/es6/debug-promises/throw-with-undefined-reject.js @@ -53,7 +53,7 @@ function listener(event, exec_state, event_data, data) { } else { assertUnreachable(); } - assertEquals(q, event_data.promise()); + assertSame(q, event_data.promise()); } } catch (e) { %AbortJS(e + "\n" + e.stack); -- 2.7.4