Bug 502937. Part 1. Fix up a test. r=bzbarsky
authorTimothy Nikkel <tnikkel@gmail.com>
Mon, 18 Jan 2010 03:07:08 -0600
changeset 40933 cf20715bfc4a0ff8ec96412710d0ecfadbb87106
parent 40932 862dee8093f9a8a08ba856746e85ebd49b8431d8
child 40934 fc55069721b745ae5d47963d500380a5c79dbf18
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbzbarsky
bugs502937
milestone1.9.3a5pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
Bug 502937. Part 1. Fix up a test. r=bzbarsky
content/xbl/test/Makefile.in
content/xbl/test/test_bug398135.xhtml
content/xbl/test/test_bug398135.xul
--- a/content/xbl/test/Makefile.in
+++ b/content/xbl/test/Makefile.in
@@ -52,17 +52,17 @@ include $(topsrcdir)/config/rules.mk
 		bug310107-resource.xhtml \
 		test_bug366770.html \
 		test_bug371724.xhtml \
 		test_bug372769.xhtml \
 		test_bug378518.xul \
 		test_bug378866.xhtml \
 		test_bug397934.xhtml \
 		test_bug389322.xhtml \
-		test_bug398135.xhtml \
+		test_bug398135.xul \
 		test_bug398492.xul \
 		test_bug400705.xhtml \
 		test_bug401907.xhtml \
 		test_bug403162.xhtml \
 		test_bug379959.html \
 		file_bug379959_data.html \
 		file_bug379959_cross.html \
 		file_bug379959_xbl.xml \
rename from content/xbl/test/test_bug398135.xhtml
rename to content/xbl/test/test_bug398135.xul
--- a/content/xbl/test/test_bug398135.xhtml
+++ b/content/xbl/test/test_bug398135.xul
@@ -1,18 +1,19 @@
-<html xmlns="http://www.w3.org/1999/xhtml">
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
+<?xml-stylesheet href="/tests/SimpleTest/test.css" type="text/css"?>
 <!--
 https://bugzilla.mozilla.org/show_bug.cgi?id=398135
 -->
-<head>
-  <title>Test for Bug 398135</title>
-  <script type="text/javascript" src="/MochiKit/packed.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript">window.log = ""</script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+<window title="Mozilla Bug 398135"
+  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+  <script type="application/javascript" src="/MochiKit/packed.js"/>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"/>
+  <script type="application/javascript">window.log = ""</script>
   <bindings xmlns="http://www.mozilla.org/xbl">
     <binding id="ancestor">
       <implementation>
         <constructor>
           window.log += "ancestorConstructor:";
         </constructor>
         <destructor>
           window.log += "ancestorDestructor:";
@@ -46,25 +47,26 @@ https://bugzilla.mozilla.org/show_bug.cg
         </method>
       </implementation>
       <content>
         <span/>
         <children/>
       </content>
     </binding>
   </bindings>
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=398135">Mozilla Bug 398135</a>
-<p id="display" style="-moz-binding: url(#test)"></p>
-<div id="content" style="display: none">
-  
-</div>
-<pre id="test">
-<script class="testbody" type="text/javascript">
+
+  <!-- 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=398135"
+     target="_blank">Mozilla Bug 398135</a>
+  </body>
+
+  <hbox id="display" style="-moz-binding: url(#test)"></hbox>
+
+<script type="application/javascript">
 <![CDATA[
 /** Test for Bug 398135 **/
 SimpleTest.waitForExplicitFinish();
 addLoadEvent(function() {
   var d;
   d = $("display");
 
   function testInTree(type) {
@@ -125,12 +127,10 @@ addLoadEvent(function() {
      "Destructors did not fire a second time?");
 
   testNotInTree("after second removal");
 });
 addLoadEvent(SimpleTest.finish);
 
 ]]>
 </script>
-</pre>
-</body>
-</html>
+</window>