зеркало из https://github.com/mozilla/gecko-dev.git
Bug 911864 - Convert toolkit widget xul tests to chrome tests. r=smaug
We also remove test_menubar_gtk.xul, which is unreferenced by the build system and references a file that doesn't exist in the tree.
This commit is contained in:
Bobby Holley
Родитель
1ef0c0471f
Коммит
4828e1811f
|
|
@ -4,10 +4,8 @@
|
|||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
MOCHITEST_FILES = \
|
||||
test_contextmenu_nested.xul \
|
||||
tree_shared.js \
|
||||
test_mousecapture_area.html \
|
||||
popup_shared.js \
|
||||
test_videocontrols.html \
|
||||
test_videocontrols_audio.html \
|
||||
test_videocontrols_video_direction.html \
|
||||
|
|
@ -32,15 +30,3 @@ MOCHITEST_FILES = \
|
|||
videomask.css \
|
||||
test_bug898940.html \
|
||||
$(NULL)
|
||||
|
||||
ifneq (cocoa,$(MOZ_WIDGET_TOOLKIT))
|
||||
MOCHITEST_FILES += test_menubar.xul \
|
||||
window_menubar.xul
|
||||
endif
|
||||
|
||||
# popup anchor tests don't work on android.
|
||||
ifneq (android,$(MOZ_WIDGET_TOOLKIT))
|
||||
MOCHITEST_FILES += \
|
||||
test_popupanchor.xul \
|
||||
$(NULL)
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -1,6 +1,14 @@
|
|||
[DEFAULT]
|
||||
support-files = tree_shared.js
|
||||
support-files =
|
||||
tree_shared.js
|
||||
popup_shared.js
|
||||
window_menubar.xul
|
||||
|
||||
[test_contextmenu_nested.xul]
|
||||
[test_editor_currentURI.xul]
|
||||
[test_menubar.xul]
|
||||
skip-if = os == 'mac'
|
||||
[test_popupanchor.xul]
|
||||
skip-if = os == 'android'
|
||||
[test_popupreflows.xul]
|
||||
[test_tree_column_reorder.xul]
|
||||
|
|
|
|||
|
|
@ -5,9 +5,9 @@
|
|||
<window title="Nested Context Menu Tests"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
|
||||
|
||||
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
|
||||
<script type="application/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
|
||||
<script type="application/javascript" src="popup_shared.js"></script>
|
||||
<script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
|
||||
<script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"></script>
|
||||
<script type="application/javascript" src="popup_shared.js"></script>
|
||||
|
||||
<menupopup id="outercontext">
|
||||
<menuitem label="Context One"/>
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
|
||||
|
||||
<title>Menubar Popup Tests</title>
|
||||
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
|
||||
<script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
|
||||
|
||||
<script>
|
||||
SimpleTest.waitForExplicitFinish();
|
||||
|
|
|
|||
|
|
@ -1,30 +0,0 @@
|
|||
<?xml version="1.0"?>
|
||||
<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
|
||||
<?xml-stylesheet href="/tests/SimpleTest/test.css" type="text/css"?>
|
||||
|
||||
<window title="Menubar Popup Tests"
|
||||
onload="setTimeout(runTest, 0);"
|
||||
xmlns:html="http://www.w3.org/1999/xhtml"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
|
||||
|
||||
<title>Menubar Popup Tests</title>
|
||||
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
|
||||
|
||||
<script>
|
||||
SimpleTest.waitForExplicitFinish();
|
||||
function runTest()
|
||||
{
|
||||
window.open("window_menubar_gtk.xul", "_blank", "width=600,height=600");
|
||||
}
|
||||
</script>
|
||||
|
||||
<body xmlns="http://www.w3.org/1999/xhtml">
|
||||
<p id="display">
|
||||
</p>
|
||||
<div id="content" style="display: none">
|
||||
</div>
|
||||
<pre id="test">
|
||||
</pre>
|
||||
</body>
|
||||
|
||||
</window>
|
||||
|
|
@ -13,7 +13,7 @@
|
|||
noautohide="true">
|
||||
</panel>
|
||||
|
||||
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
|
||||
<script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
|
||||
|
||||
<script>
|
||||
<![CDATA[
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@
|
|||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
|
||||
|
||||
<title>Popup Tests</title>
|
||||
<script type="application/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
|
||||
<script type="application/javascript" src="popup_shared.js"></script>
|
||||
<script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"></script>
|
||||
<script type="application/javascript" src="popup_shared.js"></script>
|
||||
|
||||
<!--
|
||||
Need to investigate these tests a bit more. Some of the accessibility events
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче