Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-17 23:35:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1717680, remove places where document.popupNode and document.tooltipNode are checked within tests, as these checks are no longer needed, r=Gijs

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D118518
This commit is contained in:
Neil Deakin 2021-07-09 11:51:12 +00:00
parent bc59d71b79
commit 29ef20bdea
15 changed files with 1 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
dom/base/test/chrome/test_bug473284.xhtml
View File

@ -50,27 +50,6 @@ try {
result += '.';
}
try {
document.popupNode = {};
result += '7';
} catch (ex) {
result += '.';
}
try {
document.popupNode = document.documentElement;
result += '8';
} catch (ex) {
result += '.';
}
try {
document.popupNode = null;
result += '9';
} catch (ex) {
result += '.';
}
try {
document.commandDispatcher.focusedWindow = {};
result += 'a';
@ -92,7 +71,7 @@ try {
result += '.';
}
is(result, '.23.56.89.bc', 'The correct assignments throw.');
is(result, '.23.56.bc', 'The correct assignments throw.');
">
<script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>

1
dom/xul/test/chrome.ini
View File

@ -11,7 +11,6 @@ support-files =
[test_bug403868.xhtml]
[test_bug418216.xhtml]
[test_bug445177.xhtml]
[test_bug449457.xhtml]
[test_bug468176.xhtml]
[test_bug583948.xhtml]
[test_bug757137.xhtml]

25
dom/xul/test/test_bug449457.xhtml
View File

@ -1,25 +0,0 @@
<?xml version="1.0"?>
<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css" type="text/css"?>
<!--
https://bugzilla.mozilla.org/show_bug.cgi?id=449457
-->
<window title="Mozilla Bug 449457"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
<!-- test results are displayed in the html:body -->
<body xmlns="http://www.w3.org/1999/xhtml">
<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=449457"
target="_blank">Mozilla Bug 449457</a>
</body>
<!-- test code goes here -->
<script type="application/javascript"><![CDATA[
/** Test for Bug 449457 **/
document.popupNode = document;
ok(true, "This is just a leak test");
]]></script>
</window>

2
testing/mochitest/tests/browser/browser.ini
View File

@ -38,8 +38,6 @@ support-files =
[browser_head.js]
[browser_pass.js]
[browser_parameters.js]
[browser_popupNode.js]
[browser_popupNode_check.js]
[browser_privileges.js]
[browser_requestLongerTimeout.js]
skip-if = true # Disabled beacuse it takes too long (bug 1178959)

4
testing/mochitest/tests/browser/browser_popupNode.js
View File

@ -1,4 +0,0 @@
function test() {
document.popupNode = document.documentElement;
isnot(document.popupNode, null, "document.popupNode has been correctly set");
}

3
testing/mochitest/tests/browser/browser_popupNode_check.js
View File

@ -1,3 +0,0 @@
function test() {
is(document.popupNode, null, "document.popupNode has been correctly cleared");
}

1
toolkit/content/tests/chrome/chrome.ini
View File

@ -26,7 +26,6 @@ support-files =
frame_popupremoving_frame.xhtml
frame_subframe_origin_subframe1.xhtml
frame_subframe_origin_subframe2.xhtml
popup_childframe_node.xhtml
popup_trigger.js
sample_entireword_latin1.html
window_browser_drop.xhtml

2
toolkit/content/tests/chrome/popup_childframe_node.xhtml
View File

@ -1,2 +0,0 @@
<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" width="80" height="80"
onclick="document.documentElement.setAttribute('data', 'x' + document.popupNode)"/>

45
toolkit/content/tests/chrome/popup_trigger.js
View File

@ -75,20 +75,6 @@ var popupTests = [
gIsMenu ? null : gTrigger,
testname + " triggerNode"
);
is(
document.popupNode,
gIsMenu ? null : gTrigger,
testname + " document.popupNode"
);
is(document.tooltipNode, null, testname + " document.tooltipNode");
// check to ensure the popup node for a different document isn't used
if (window.opener) {
is(
window.opener.document.popupNode,
null,
testname + " opener.document.popupNode"
);
}
// Popup may have wrong initial size in non e10s mode tests, because
// layout is not yet ready for popup content lazy population on
@ -255,7 +241,6 @@ var popupTests = [
result(testname, step) {
is(gMenuPopup.anchorNode, null, testname + " anchorNode");
is(gMenuPopup.triggerNode, null, testname + " triggerNode");
is(document.popupNode, null, testname + " document.popupNode");
checkClosed("trigger", testname);
},
},
@ -297,7 +282,6 @@ var popupTests = [
gExpectedTriggerNode = null;
is(gMenuPopup.anchorNode, gTrigger, testname + " anchorNode");
is(gMenuPopup.triggerNode, null, testname + " triggerNode");
is(document.popupNode, null, testname + " document.popupNode");
compareEdge(gTrigger, gMenuPopup, step, 0, 0, testname);
},
},
@ -568,11 +552,6 @@ var popupTests = [
gCachedEvent.target,
testname + " triggerNode"
);
is(
document.popupNode,
gCachedEvent.target,
testname + " document.popupNode"
);
compareEdge(gTrigger, gMenuPopup, "end_after", 0, 0, testname);
},
},
@ -660,7 +639,6 @@ var popupTests = [
gExpectedTriggerNode = null;
is(gMenuPopup.anchorNode, null, testname + " anchorNode");
is(gMenuPopup.triggerNode, null, testname + " triggerNode");
is(document.popupNode, null, testname + " document.popupNode");
var rect = gMenuPopup.getBoundingClientRect();
is(rect.left, 24, testname + " left");
is(rect.top, 20, testname + " top");
@ -709,29 +687,6 @@ var popupTests = [
gCachedEvent.target,
testname + " triggerNode"
);
is(
document.popupNode,
gCachedEvent.target,
testname + " document.popupNode"
);
var childframe = document.getElementById("childframe");
if (childframe) {
for (var t = 0; t < 2; t++) {
var child = childframe.contentDocument;
var evt = child.createEvent("Event");
evt.initEvent("click", true, true);
child.documentElement.dispatchEvent(evt);
is(
child.documentElement.getAttribute("data"),
"xundefined",
"cannot get popupNode from other document"
);
child.documentElement.setAttribute("data", "none");
// now try again with document.popupNode set explicitly
document.popupNode = gCachedEvent.target;
}
}
var openX = 8;
var openY = 16;

1
toolkit/content/tests/chrome/test_notificationbox.xhtml
View File

@ -549,7 +549,6 @@ function checkPopupTest(nb, ntf)
function checkPopupClosed()
{
is(document.popupNode, null, "popupNode null after popup is closed");
SimpleTest.finish();
}

4
toolkit/content/tests/chrome/window_popup_attribute.xhtml
View File

@ -15,10 +15,6 @@ window.opener.SimpleTest.waitForFocus(runTests, window);
<hbox style="margin-left: 200px; margin-top: 340px;">
<label id="trigger" popup="thepopup" value="Popup" height="60"/>
</hbox>
<!-- this frame is used to check that document.popupNode
is inaccessible from different sources -->
<iframe id="childframe" type="content" width="10" height="10"
src="http://sectest2.example.org:80/chrome/toolkit/content/tests/chrome/popup_childframe_node.xhtml"/>
<menupopup id="thepopup">
<menuitem id="item1" label="First"/>

5
toolkit/content/tests/chrome/window_popup_button.xhtml
View File

@ -33,9 +33,4 @@ window.opener.SimpleTest.waitForFocus(runTests, window);
</button>
</hbox>
<!-- this frame is used to check that document.popupNode
is inaccessible from different sources -->
<iframe id="childframe" type="content" width="10" height="10"
src="http://sectest2.example.org:80/chrome/toolkit/content/tests/chrome/popup_childframe_node.xhtml"/>
</window>

13
toolkit/content/tests/chrome/window_tooltip.xhtml
View File

@ -21,8 +21,6 @@
specific sizing differences -->
<button id="withtooltip" label="Tooltip Element" tooltip="thetooltip"
class="plain" style="-moz-appearance: none; padding: 0;"/>
<iframe id="childframe" type="content" width="10" height="10"
src="http://sectest2.example.org:80/chrome/toolkit/content/tests/chrome/popup_childframe_node.xhtml"/>
</box>
<script class="testbody" type="application/javascript">
@ -105,15 +103,6 @@ var popupTests = [
var tooltip = document.getElementById("thetooltip");
gExpectedTriggerNode = null;
is(tooltip.triggerNode, gButton, testname + " triggerNode");
is(document.popupNode, null, testname + " document.popupNode");
is(document.tooltipNode, gButton, testname + " document.tooltipNode");
var child = $("childframe").contentDocument;
var evt = child.createEvent("Event");
evt.initEvent("click", true, true);
child.documentElement.dispatchEvent(evt);
is(child.documentElement.getAttribute("data"), "xundefined",
"cannot get tooltipNode from other document");
var buttonrect = document.getElementById("withtooltip").getBoundingClientRect();
var rect = tooltip.getBoundingClientRect();
@ -145,8 +134,6 @@ var popupTests = [
result(testname) {
var tooltip = document.getElementById("thetooltip");
is(tooltip.triggerNode, null, testname + " triggerNode");
is(document.popupNode, null, testname + " document.popupNode");
is(document.tooltipNode, null, testname + " document.tooltipNode");
}
},
{

11
toolkit/content/tests/widgets/popup_shared.js
View File

@ -190,17 +190,6 @@ function eventOccurred(event) {
gExpectedTriggerNode,
test.testname + " popupshowing triggerNode"
);
var isTooltip = event.target.localName == "tooltip";
is(
document.popupNode,
isTooltip ? null : gExpectedTriggerNode,
test.testname + " popupshowing document.popupNode"
);
is(
document.tooltipNode,
isTooltip ? gExpectedTriggerNode : null,
test.testname + " popupshowing document.tooltipNode"
);
}
if (expectedState) {

6
toolkit/content/tests/widgets/test_contextmenu_nested.xhtml
View File

@ -43,7 +43,6 @@ var popupTests = [
test: () => synthesizeMouse($("popuparea"), 4, 4, {}),
result (testname) {
is($("outermain").triggerNode, $("popuparea"), testname);
is(document.popupNode, $("popuparea"), testname + " document.popupNode");
}
},
{
@ -57,7 +56,6 @@ var popupTests = [
is($("outermain").triggerNode, $("popuparea"), testname + " outer");
is($("innermain").triggerNode, $("popuparea"), testname + " inner");
is($("outercontext").triggerNode, null, testname + " outer context");
is(document.popupNode, $("popuparea"), testname + " document.popupNode");
}
},
{
@ -69,7 +67,6 @@ var popupTests = [
is($("outermain").triggerNode, $("popuparea"), testname + " outer");
is($("innermain").triggerNode, $("popuparea"), testname + " inner");
is($("outercontext").triggerNode, $("innermenu"), testname + " outer context");
is(document.popupNode, $("innermenu"), testname + " document.popupNode");
}
},
{
@ -87,7 +84,6 @@ var popupTests = [
is($("innermain").triggerNode, $("popuparea"), testname + " inner");
is($("outercontext").triggerNode, $("innermenu"), testname + " outer context");
is($("innercontext").triggerNode, $("innermenu"), testname + " inner context");
is(document.popupNode, $("innermenu"), testname + " document.popupNode");
}
},
{
@ -104,7 +100,6 @@ var popupTests = [
is($("innermain").triggerNode, $("popuparea"), testname + " inner");
is($("outercontext").triggerNode, null, testname + " outer context");
is($("innercontext").triggerNode, null, testname + " inner context");
is(document.popupNode, $("popuparea"), testname + " document.popupNode");
}
},
{
@ -121,7 +116,6 @@ var popupTests = [
is($("innermain").triggerNode, null, testname + " inner");
is($("outercontext").triggerNode, null, testname + " outer context");
is($("innercontext").triggerNode, null, testname + " inner context");
is(document.popupNode, null, testname + " document.popupNode");
}
}
];