Bug 1425356 - remove some tests that only make sense when XUL templates are supported, r=mrbkap
authorGijs Kruitbosch <gijskruitbosch@gmail.com>
Wed, 20 Dec 2017 14:28:28 +0000
changeset 449449 4b4a36a57d94304a5ba0818f8e835669002fd7d3
parent 449448 0c89956f724ed760077b392b67706ffb12e0684c
child 449450 490e100ac2e55214f41728c5e5d3dbb8ba7eb4f5
push id8527
push userCallek@gmail.com
push dateThu, 11 Jan 2018 21:05:50 +0000
treeherdermozilla-beta@95342d212a7a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmrbkap
bugs1425356
milestone59.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1425356 - remove some tests that only make sense when XUL templates are supported, r=mrbkap MozReview-Commit-ID: 6mhHJ6bBkHz
dom/xul/crashtests/583230.xul
dom/xul/crashtests/crashtests.list
dom/xul/test/chrome.ini
dom/xul/test/test_bug236853.xul
layout/base/tests/chrome/chrome.ini
layout/base/tests/chrome/test_bug495648.xul
toolkit/content/tests/chrome/chrome.ini
toolkit/content/tests/chrome/test_sorttemplate.xul
deleted file mode 100644
--- a/dom/xul/crashtests/583230.xul
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-<richlistbox id="a" datasources="" template="d"/>
-<script><![CDATA[    
-function doe() {
-var node = document.getElementById('a');
-var b = node.builder;
-document.removeChild(document.documentElement);
-b.addResult({}, node);
-b.removeResult({});
-b.replaceResult({}, {}, node);
-b.resultBindingChanged({});
-try { b.addResult(null, null); } catch(ex) { }
-try { b.removeResult(null); } catch(ex) { }
-try { b.replaceResult(null, null, null); } catch(ex) { }
-try { b.resultBindingChanged(null); } catch(ex) { }
-try { b.getResultForId("empty"); } catch(ex) { }
-try { b.getResultForContent(node); } catch(ex) { }
-try { b.hasGeneratedContent(null, null); } catch(ex) { }
-}
-window.addEventListener("load", doe, false);
-]]></script>
-</window>
--- a/dom/xul/crashtests/crashtests.list
+++ b/dom/xul/crashtests/crashtests.list
@@ -25,9 +25,8 @@ load 431906-1.html
 load 451311-1.xul
 load 461917-1.xhtml
 load 468211-1.xul
 load 468211-2.xul
 load 468211-3.xul
 load 495635-1.xul
 load 509719-1.xul
 asserts(3) load 509719-2.xul # bug 909819
-load 583230.xul
--- a/dom/xul/test/chrome.ini
+++ b/dom/xul/test/chrome.ini
@@ -1,24 +1,22 @@
 [DEFAULT]
 support-files =
   398289-resource.xul
   bug497875-iframe.xul
-  file_bug236853.rdf
   overlay1_bug335375.xul
   overlay2_bug335375.xul
   window_bug583948.xul
   window_bug757137.xul
   1061864.html
   file_bug1271240.xul
   file_bug1069772.xul
 
 [test_bug199692.xul]
 [test_bug233643.xul]
-[test_bug236853.xul]
 [test_bug311681.xul]
 [test_bug335375.xul]
 [test_bug391002.xul]
 [test_bug398289.html]
 [test_bug403868.xul]
 [test_bug414907.xul]
 [test_bug418216.xul]
 [test_bug445177.xul]
deleted file mode 100644
--- a/dom/xul/test/test_bug236853.xul
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"?>
-<window
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-  xmlns:svg="http://www.w3.org/2000/svg">
-  <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
-  <script type="application/javascript">
-  <![CDATA[
-    SimpleTest.waitForExplicitFinish();
-    window.onload = function() {
-      ok(true, "Didn't crash");
-      SimpleTest.finish();
-    }
-  ]]>
-  </script>
-  <vbox flex="1">
-    <svg:svg datasources="file_bug236853.rdf" ref="urn:root">
-      <template>
-        <rule>
-          <conditions>
-            <content uri="?root"/>
-            <triple subject="?root"
-                predicate="http://www.ex.org/ex-rdf#nodes"
-                object="?nodes"/>
-            <member container="?nodes" child="?node"/>
-          </conditions>
-          <action>
-            <!-- The line below causes Mozilla to crash -->
-            <svg:text uri="?node" x="64" y="64">Text</svg:text>
-          </action>
-        </rule>
-      </template>
-      <!--<svg:text x="64" y="64">Text</svg:text>-->
-    </svg:svg>
-  </vbox>
-</window>
--- a/layout/base/tests/chrome/chrome.ini
+++ b/layout/base/tests/chrome/chrome.ini
@@ -1,31 +1,29 @@
 [DEFAULT]
 skip-if = os == 'android'
 support-files =
   animated.gif
   blue-32x32.png
-  bug495648.rdf
   bug551434_childframe.html
   chrome_content_integration_window.xul
   default_background_window.xul
   dialog_with_positioning_window.xul
   file_bug458898.html
   no_clip_iframe_subdoc.html
   no_clip_iframe_window.xul
   printpreview_bug396024_helper.xul
   printpreview_bug482976_helper.xul
   printpreview_helper.xul
   file_bug1018265.xul
 
 [test_bug396367-1.html]
 [test_bug396367-2.html]
 [test_bug420499.xul]
 [test_bug458898.html]
-[test_bug495648.xul]
 [test_bug504311.xul]
 [test_bug514660.xul]
 [test_bug533845.xul]
 skip-if = os == 'linux' && !debug # Bug 1208197
 [test_bug551434.html]
 [test_bug708062.html]
 [test_bug812817.xul]
 [test_bug847890_paintFlashing.html]
deleted file mode 100644
--- a/layout/base/tests/chrome/test_bug495648.xul
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/css" href="chrome://global/skin"?>
-<?xml-stylesheet type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"?>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=495648
--->
-<window title="Mozilla Bug 495648"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <script type="application/javascript" 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=495648"
-     target="_blank">Mozilla Bug 495648</a>
-  </body>
-
-  <!-- test code goes here -->
-  <script type="application/javascript">
-  <![CDATA[
-  SimpleTest.expectAssertions(15, 24);
-
-  /** Test for Bug 495648 **/
-  var uri = window.location.href.replace(/test_bug495648.xul/, "bug495648.rdf");
-
-  function doTest() {
-    var list = document.getElementById('l');
-    var ios = Components.classes["@mozilla.org/network/io-service;1"].getService(Components.interfaces.nsIIOService);
-    var rdfService = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService);
-    var rdf = rdfService.GetDataSourceBlocking(uri);
-    list.database.AddDataSource(rdf);
-    list.builder.rebuild();
-    is(list.itemCount, 40, "Unexpected item count");
-    SimpleTest.finish();
-  }
-
-  SimpleTest.waitForExplicitFinish();
-  addLoadEvent(doTest);
-
-  ]]>
-  </script>
-<listbox flex="1" id="l" seltype="multiple" datasources="rdf:null" ref="urn:root" sortResource="http://home.netscape.com/NC-rdf#name" sortDirection="ascending">
-<template>
-<rule><conditions><content uri="?uri" /><triple subject="?uri" predicate="http://home.netscape.com/NC-rdf#links" object="?links" /><member container="?links" child="?child" /><triple subject="?child" predicate="http://home.netscape.com/NC-rdf#name" object="?name" /></conditions><bindings><binding subject="?child" predicate="http://sitedelta.schierla.de/SD-rdf#status" object="?status" /></bindings><action><listitem label="?name" class="listitem-iconic" status="?status" uri="?child" /></action></rule>
-</template>
-</listbox>
-</window>
--- a/toolkit/content/tests/chrome/chrome.ini
+++ b/toolkit/content/tests/chrome/chrome.ini
@@ -165,17 +165,16 @@ support-files = window_preferences_onsyn
 [test_radio.xul]
 [test_richlist_direction.xul]
 [test_righttoleft.xul]
 [test_scale.xul]
 [test_scaledrag.xul]
 [test_screenPersistence.xul]
 [test_scrollbar.xul]
 [test_showcaret.xul]
-[test_sorttemplate.xul]
 [test_subframe_origin.xul]
 [test_tabbox.xul]
 [test_tabindex.xul]
 [test_textbox_dictionary.xul]
 [test_textbox_emptytext.xul]
 [test_textbox_number.xul]
 [test_textbox_search.xul]
 [test_timepicker.xul]
deleted file mode 100644
--- a/toolkit/content/tests/chrome/test_sorttemplate.xul
+++ /dev/null
@@ -1,89 +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"?>
-<?xml-stylesheet href="data:text/css,window > |people { display: none }" type="text/css"?>
-<!--
-  XUL Widget Test for tabindex
-  -->
-<window title="tabindex" width="500" height="600"
-        onfocus="runTest()"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <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>  
-
-<people id="famouspeople" xmlns="">
-    <person name="Napoleon Bonaparte" gender="male"/>
-    <person name="Cleopatra" gender="female"/>
-    <person name="Julius Caesar" gender="male"/>
-    <person name="Ferdinand Magellan" gender="male"/>
-    <person name="Laura Secord" gender="female"/>
-</people>
-
-<tree id="tree" datasources="#famouspeople" ref="*" querytype="xml" flex="1">
-  <treecols>
-    <treecol label="Name" flex="1" sort="?name"/>
-    <treecol label="Gender" flex="1" sort="?gender"/>
-  </treecols>
-  <template>
-    <query/>
-    <rule>
-      <action>
-        <treechildren id="treechildren-strings">
-          <treeitem uri="?">
-            <treerow>
-              <treecell label="?name"/>
-              <treecell label="?gender"/>
-            </treerow>
-          </treeitem>
-        </treechildren>
-      </action>
-    </rule>
-  </template>
-</tree>
-
-<body xmlns="http://www.w3.org/1999/xhtml">
-<p id="display"></p>
-<div id="content" style="display: none">
-</div>
-<pre id="test">
-</pre>
-</body>
-
-<script>
-<![CDATA[
-
-SimpleTest.waitForExplicitFinish();
-
-function runTest()
-{
-  var tree = $("tree");
-  var col = tree.columns[0].element;
-  synthesizeMouse(col, 12, 2, { });
-  checkRowOrder(tree, ["Cleopatra", "Ferdinand Magellan", "Julius Caesar", "Laura Secord", "Napoleon Bonaparte"], "acsending");
-
-  synthesizeMouse(col, 12, 2, { });
-  checkRowOrder(tree, ["Napoleon Bonaparte", "Laura Secord", "Julius Caesar", "Ferdinand Magellan", "Cleopatra"], "descending");
-
-  synthesizeMouse(col, 12, 2, { });
-  checkRowOrder(tree, ["Napoleon Bonaparte", "Laura Secord", "Julius Caesar", "Ferdinand Magellan", "Cleopatra"], "natural");
-
-  SimpleTest.finish();
-}
-
-function checkRowOrder(tree, expected, testid)
-{
-  var index = 0;
-  var item = tree.firstChild.nextSibling.nextSibling.firstChild;
-  while (item && index < expected.length) {
-    if (item.firstChild.firstChild.getAttribute("label") != expected[index++])
-      break;
-    item = item.nextSibling;
-  }
-  ok(index == expected.length && !item, testid + " row order");
-}
-
-]]>
-
-</script>
-
-</window>