Bug 860941 - Remove assertion annotations for the now-removed mArguments assertion. r=jst

This commit is contained in:
Bobby Holley 2013-05-17 10:43:20 -07:00
parent 8d9e69984f
commit 77d1e43d75
10 changed files with 5 additions and 99 deletions

View File

@ -18,11 +18,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=641821
<pre id="test">
<script type="application/javascript">
if (!navigator.platform.startsWith("Win")) {
// for non-Windows
SimpleTest.expectAssertions(1);
}
/** Test for Bug 641821 **/
var div = document.createElement("div");
@ -574,12 +569,6 @@ function testExpandos() {
if (SpecialPowers) {
// Run GC several times to see if the expando property disappears.
// Also, garbage collecting the windows created in this test can
// cause assertions, so we must GC now to blame those assertions to
// this test.
// ("mArguments wasn't cleaned up properly!" in ~nsGlobalWindow,
// bug 600703)
SpecialPowers.gc();
SpecialPowers.gc();
SpecialPowers.gc();

View File

@ -13,11 +13,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=391777
<p id="display"></p>
<script class="testbody" type="text/javascript">
if (!navigator.platform.startsWith("Win")) {
// not Windows
SimpleTest.expectAssertions(1);
}
/** Test for Bug 391777 **/
var arg = {};
arg.testVal = "foo";
@ -25,11 +20,6 @@ var result = window.showModalDialog("javascript:window.returnValue = window.dial
ok(true, "We should get here without user interaction");
is(result, "foo", "Unexpected result from showModalDialog");
// Garbage collecting the windows created in this test can cause
// assertions, so GC now to blame those assertions to this test.
// ("mArguments wasn't cleaned up properly!" in ~nsGlobalWindow,
// bug 600703)
SpecialPowers.gc();
</script>
</body>
</html>

View File

@ -28,12 +28,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=650295
* cause reentrancy in our C++ code, which we should be able to withstand.
*/
// Garbage collecting the windows created in this test can
// cause assertions (Bug 600703).
if (!navigator.platform.startsWith("Win")) {
SimpleTest.expectAssertions(2);
}
function abortAndSpinEventLoop(evt, sr) {
sr.abort();
window.showModalDialog("javascript:window.close()");
@ -42,6 +36,9 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=650295
function doneFunc() {
// Trigger gc now and wait some time to make sure this test gets the blame
// for any assertions caused by showModalDialog
//
// NB - The assertions should be gone, but this looks too scary to touch
// during batch cleanup.
var count = 0, GC_COUNT = 4;
function triggerGCOrFinish() {

View File

@ -17,10 +17,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=291653
<pre id="test">
<script type="application/javascript">
if (!navigator.platform.startsWith("Win")) {
SimpleTest.expectAssertions(1);
}
/** Test for Bug 291653 **/
SimpleTest.waitForExplicitFinish();
@ -35,13 +31,6 @@ function closeTest() {
function finish() {
ok(!secondListenerDidRun, "Shouldn't have run second listener!");
// Garbage collecting the windows created in this test can cause
// assertions, so GC now to blame those assertions to this test.
// ("mArguments wasn't cleaned up properly!" in ~nsGlobalWindow,
// bug 600703)
SpecialPowers.gc();
SimpleTest.finish();
}

View File

@ -18,9 +18,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=406375
<script type="application/javascript">
if (navigator.platform.startsWith("Mac")) {
SimpleTest.expectAssertions(3);
} else if (navigator.platform.startsWith("Linux")) {
SimpleTest.expectAssertions(1);
SimpleTest.expectAssertions(2);
}
/** Test for Bug 406375 **/
@ -32,12 +30,6 @@ function runTest() {
window.showModalDialog("file_bug406375.html");
ok(true, "This test should not hang");
// Garbage collecting the windows created in this test can cause
// assertions, so GC now to blame those assertions to this test.
// ("mArguments wasn't cleaned up properly!" in ~nsGlobalWindow,
// bug 600703)
SpecialPowers.gc();
SimpleTest.finish();
}

View File

@ -12,10 +12,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=414291
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=414291">Mozilla Bug 414291</a>
<script class="testbody" type="text/javascript">
if (!navigator.platform.startsWith("Win")) {
SimpleTest.expectAssertions(1);
}
/** Test for Bug 414291 **/
var result1 = 0;
@ -31,12 +27,6 @@ is(result2, 0, "window either opened as modal or data loaded synchronously.");
result3 = window.showModalDialog("data:text/html,<html><body onload='close(); returnValue = 3;'>");
is(result3, 3, "window didn't open as modal.");
// Garbage collecting the windows created in this test can cause
// assertions, so GC now to blame those assertions to this test.
// ("mArguments wasn't cleaned up properly!" in ~nsGlobalWindow,
// bug 600703)
SpecialPowers.gc();
</script>
</pre>
</body>

View File

@ -10,10 +10,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=437361
<script class="testbody" type="text/javascript">
if (!navigator.platform.startsWith("Win")) {
SimpleTest.expectAssertions(1);
}
/** Test for Bug 437361 **/
function testModalDialogBlockedCleanly() {
@ -58,12 +54,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=437361
test(false, true, testOtherExceptionsNotTrapped,
"Incorrectly suppressed insecure showModalDialog exception.");
// Garbage collecting the windows created in this test can cause
// assertions, so GC now to blame those assertions to this test.
// ("mArguments wasn't cleaned up properly!" in ~nsGlobalWindow,
// bug 600703)
SpecialPowers.gc();
</script>
</head>
<body>

View File

@ -16,10 +16,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=479143
<pre id="test">
<script class="testbody" type="text/javascript">
if (!navigator.platform.startsWith("Win")) {
SimpleTest.expectAssertions(1);
}
SimpleTest.waitForExplicitFinish();
setTimeout(function() {
@ -37,12 +33,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=479143
ok(true, "did not crash");
// Garbage collecting the windows created in this test can cause
// assertions, so GC now to blame those assertions to this test.
// ("mArguments wasn't cleaned up properly!" in ~nsGlobalWindow,
// bug 600703)
SpecialPowers.gc();
SimpleTest.finish();
}, 0);

View File

@ -12,10 +12,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=504862
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=504862">Mozilla Bug 504862</a>
<script class="testbody" type="text/javascript">
if (!navigator.platform.startsWith("Win")) {
SimpleTest.expectAssertions(4);
}
/** Test for Bug 504862 **/
SimpleTest.waitForExplicitFinish();
function onMsgRcv(event)
@ -36,12 +32,6 @@ function runTest() {
is(result, null, "Able to see return value from cross origin dialog.");
// Garbage collecting the windows created in this test can cause
// assertions, so GC now to blame those assertions to this test.
// ("mArguments wasn't cleaned up properly!" in ~nsGlobalWindow,
// bug 600703)
SpecialPowers.gc();
SimpleTest.finish();
}

View File

@ -21,12 +21,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=61098
<script class="testbody" type="text/javascript">
/** Test for Bug 61098 **/
if (!navigator.platform.startsWith("Win")) {
SimpleTest.expectAssertions(9);
} else {
SimpleTest.expectAssertions(8);
}
SimpleTest.expectAssertions(8);
SimpleTest.waitForExplicitFinish();
var mockPromptServiceRegisterer, mockPromptFactoryRegisterer;
@ -351,12 +346,6 @@ function runtests()
mockPromptFactoryRegisterer.unregister();
mockPromptServiceRegisterer.unregister();
// Garbage collecting the windows created in this test can cause
// assertions, so GC now to blame those assertions to this test.
// ("mArguments wasn't cleaned up properly!" in ~nsGlobalWindow,
// bug 600703)
SpecialPowers.gc();
SimpleTest.finish();
}