Bug 659263 - move content/xul/*.xul tests from mochitest-plain to mochitest-chrome. r=bzbarsky, a=test-only
authorJoel Maher <jmaher@mozilla.com>
Thu, 09 Jun 2011 11:10:12 -0400
changeset 70793 38f213874df7c2173cb50f542774210f7c81a048
parent 70792 85394deb049d95bdd47048c1fad49a0ac8874490
child 70794 476ba7167bbe974dcadbea09c72a8b9bbb20b59b
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewersbzbarsky, test-only
bugs659263
milestone7.0a1
Bug 659263 - move content/xul/*.xul tests from mochitest-plain to mochitest-chrome. r=bzbarsky, a=test-only
content/xul/content/test/Makefile.in
content/xul/content/test/test_bug233643.xul
content/xul/content/test/test_bug330705-2.xul
content/xul/document/test/Makefile.in
content/xul/document/test/test_bug199692.xul
content/xul/document/test/test_bug311681.xul
content/xul/document/test/test_bug335375.xul
content/xul/document/test/test_bug391002.xul
content/xul/document/test/test_bug403868.xul
content/xul/document/test/test_bug414907.xul
content/xul/document/test/test_bug418216.xul
content/xul/document/test/test_bug445177.xul
content/xul/document/test/test_bug449457.xul
content/xul/document/test/test_bug468176.xul
content/xul/templates/tests/Makefile.in
content/xul/templates/tests/bug441785-1.rdf
content/xul/templates/tests/bug441785-2.rdf
content/xul/templates/tests/chrome/Makefile.in
content/xul/templates/tests/chrome/bug441785-1.rdf
content/xul/templates/tests/chrome/bug441785-2.rdf
content/xul/templates/tests/chrome/test_bug441785.xul
content/xul/templates/tests/chrome/test_sortservice.xul
content/xul/templates/tests/test_bug441785.xul
content/xul/templates/tests/test_sortservice.xul
--- a/content/xul/content/test/Makefile.in
+++ b/content/xul/content/test/Makefile.in
@@ -39,22 +39,23 @@ DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 relativesrcdir  = content/xul/content/test
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
-_TEST_FILES = 	test_bug330705-2.xul \
-		test_bug233643.xul \
+_TEST_FILES = 	\
 		test_bug486990.xul \
 		$(NULL)
-	
+
 _CHROME_FILES = \
+		test_bug330705-2.xul \
+		test_bug233643.xul \
  		test_bug398289.html \
  		398289-resource.xul \
  		$(NULL)
 
 libs:: $(_TEST_FILES)
 	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
 
 libs:: $(_CHROME_FILES)
--- a/content/xul/content/test/test_bug233643.xul
+++ b/content/xul/content/test/test_bug233643.xul
@@ -1,19 +1,19 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="/tests/SimpleTest/test.css" type="text/css"?>
+<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css" type="text/css"?>
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml">
         title="Test for Bug 233643">
 <!--
 https://bugzilla.mozilla.org/show_bug.cgi?id=233643
 -->
-  <script type="application/javascript" src="/MochiKit/packed.js"></script>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="chrome://mochikit/content/MochiKit/packed.js"></script>
+  <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
 
   <!-- NOTE: This testcase depends on the patch for bug 366770
        (ability to apply bindings with data: URIs). -->
 
   <!-- The data URI: below corresponds to:
     <?xml version="1.0"?>
     <bindings xmlns="http://www.mozilla.org/xbl"
               xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
--- a/content/xul/content/test/test_bug330705-2.xul
+++ b/content/xul/content/test/test_bug330705-2.xul
@@ -1,18 +1,18 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="/tests/SimpleTest/test.css" type="text/css"?>
+<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css" type="text/css"?>
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
   title="Test for Bug 330705">
 <!--
 https://bugzilla.mozilla.org/show_bug.cgi?id=330705
 -->
-  <script type="application/javascript" src="/MochiKit/packed.js"></script>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>         
+  <script type="application/javascript" src="chrome://mochikit/content/MochiKit/packed.js"></script>
+  <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>         
   <body  xmlns="http://www.w3.org/1999/xhtml">
     <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=330705">Mozilla Bug 330705</a>
     <p id="display">
       <box tabindex="1" style="-moz-user-focus:normal;" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"/>
       <box tabindex="1" style="-moz-user-focus:normal;" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"/>
     </p>
     <div id="content" style="display: none">
       <script class="testbody" type="text/javascript">
--- a/content/xul/document/test/Makefile.in
+++ b/content/xul/document/test/Makefile.in
@@ -39,35 +39,29 @@ DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 relativesrcdir  = content/xul/document/test
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
-_TEST_FILES	= \
+_CHROME_FILES	= \
 		test_bug311681.xul \
 		test_bug199692.xul \
 		test_bug391002.xul \
 		test_bug403868.xul \
 		test_bug414907.xul \
 		test_bug418216.xul \
 		test_bug445177.xul \
 		test_bug449457.xul \
 		test_bug468176.xul \
-		$(NULL)
-
-_CHROME_FILES = \
 		test_bug583948.xul \
 		window_bug583948.xul \
 		test_bug497875.xul \
-		     bug497875-iframe.xul \
+		bug497875-iframe.xul \
 		test_bug335375.xul \
 		overlay1_bug335375.xul \
 		overlay2_bug335375.xul \
 		$(NULL)
 
-libs:: $(_TEST_FILES)
-	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
-
 libs:: $(_CHROME_FILES)
 	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir)
--- a/content/xul/document/test/test_bug199692.xul
+++ b/content/xul/document/test/test_bug199692.xul
@@ -1,22 +1,22 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="/tests/SimpleTest/test.css" type="text/css"?>
+<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css" type="text/css"?>
 <!--
 https://bugzilla.mozilla.org/show_bug.cgi?id=199692
 -->
 <window title="Test for Bug 199692"
   id="test_bug199692_xul"
   xmlns:html="http://www.w3.org/1999/xhtml"
   xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script type="application/javascript" src="/MochiKit/packed.js"></script>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="chrome://mochikit/content/MochiKit/packed.js"></script>
+  <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <bindings xmlns="http://www.mozilla.org/xbl"
               xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
     <binding id="anon">
       <content>
         <xul:label id="anon-label" value="ANON"/>
       </content>
     </binding>
   </bindings>
--- a/content/xul/document/test/test_bug311681.xul
+++ b/content/xul/document/test/test_bug311681.xul
@@ -1,21 +1,21 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="/tests/SimpleTest/test.css" type="text/css"?>
+<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css" type="text/css"?>
 <!--
 https://bugzilla.mozilla.org/show_bug.cgi?id=311681
 -->
 <window title="Mozilla Bug 311681"
   xmlns:html="http://www.w3.org/1999/xhtml"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <title>Test for Bug 311681</title>
-  <script type="application/javascript" src="/MochiKit/packed.js"></script>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>      
+  <script type="application/javascript" src="chrome://mochikit/content/MochiKit/packed.js"></script>
+  <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>      
 
 <body  xmlns="http://www.w3.org/1999/xhtml">
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=311681">Mozilla Bug 311681</a>
 <script class="testbody" type="text/javascript">
 <![CDATA[
   // Setup script
   SimpleTest.waitForExplicitFinish();
 
--- a/content/xul/document/test/test_bug335375.xul
+++ b/content/xul/document/test/test_bug335375.xul
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="/tests/SimpleTest/test.css" type="text/css"?>
+<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css" type="text/css"?>
 <?xul-overlay href="overlay1_bug335375.xul"?>
 <?xul-overlay href="overlay2_bug335375.xul"?>
 <!--
 https://bugzilla.mozilla.org/show_bug.cgi?id=335375
 -->
 <window title="Mozilla Bug 335375"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onload="RunTest();">
--- a/content/xul/document/test/test_bug391002.xul
+++ b/content/xul/document/test/test_bug391002.xul
@@ -1,18 +1,18 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="/tests/SimpleTest/test.css" type="text/css"?>
+<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css" type="text/css"?>
 <!--
 https://bugzilla.mozilla.org/show_bug.cgi?id=391002
 -->
 <window title="Mozilla Bug 391002"
   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" src="chrome://mochikit/content/MochiKit/packed.js" />
+  <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=391002"
      target="_blank">Mozilla Bug 391002</a>
   </body>
 
   <button id="btn1" command="cmd1"/>
--- a/content/xul/document/test/test_bug403868.xul
+++ b/content/xul/document/test/test_bug403868.xul
@@ -1,18 +1,18 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="/tests/SimpleTest/test.css" type="text/css"?>
+<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css" type="text/css"?>
 <!--
 https://bugzilla.mozilla.org/show_bug.cgi?id=403868
 -->
 <window title="Mozilla Bug 403868"
   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" src="chrome://mochikit/content/MochiKit/packed.js" />
+  <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=403868"
      target="_blank">Mozilla Bug 403868</a>
     <div id="content" style="display: none"/>
   </body>
 
--- a/content/xul/document/test/test_bug414907.xul
+++ b/content/xul/document/test/test_bug414907.xul
@@ -1,18 +1,18 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="/tests/SimpleTest/test.css" type="text/css"?>
+<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css" type="text/css"?>
 <!--
 https://bugzilla.mozilla.org/show_bug.cgi?id=414907
 -->
 <window title="Mozilla Bug 414907"
   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" src="chrome://mochikit/content/MochiKit/packed.js" />
+  <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
 
   <bindings xmlns="http://www.mozilla.org/xbl"
               xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
     <binding id="anon">
     <implementation>
       <constructor>
         <![CDATA[
           var node = this.firstChild;
--- a/content/xul/document/test/test_bug418216.xul
+++ b/content/xul/document/test/test_bug418216.xul
@@ -1,18 +1,18 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="/tests/SimpleTest/test.css" type="text/css"?>
+<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css" type="text/css"?>
 <!--
 https://bugzilla.mozilla.org/show_bug.cgi?id=418216
 -->
 <window title="Mozilla Bug 418216"
   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" src="chrome://mochikit/content/MochiKit/packed.js" />
+  <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=418216"
      target="_blank">Mozilla Bug 418216</a>
   </body>
 
   <!-- test code goes here -->
--- a/content/xul/document/test/test_bug445177.xul
+++ b/content/xul/document/test/test_bug445177.xul
@@ -1,22 +1,22 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="/tests/SimpleTest/test.css" type="text/css"?>
+<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css" type="text/css"?>
 <!--
 https://bugzilla.mozilla.org/show_bug.cgi?id=445177
 -->
 <window title="Test for Bug 445177"
   id="test_bug445177_xul"
   xmlns:html="http://www.w3.org/1999/xhtml"
   xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script type="application/javascript" src="/MochiKit/packed.js"></script>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="chrome://mochikit/content/MochiKit/packed.js"></script>
+  <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
 
 <body id="body" xmlns="http://www.w3.org/1999/xhtml">
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=445177">Mozilla Bug 445177</a>
 
 
 <hbox id="b1" value="foo"/>
 <hbox id="o1" observes="b1"/>
 
--- a/content/xul/document/test/test_bug449457.xul
+++ b/content/xul/document/test/test_bug449457.xul
@@ -1,18 +1,18 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="/tests/SimpleTest/test.css" 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 type="application/javascript" src="/MochiKit/packed.js" />
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"/>
+  <script type="application/javascript" src="chrome://mochikit/content/MochiKit/packed.js" />
+  <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=449457"
      target="_blank">Mozilla Bug 449457</a>
   </body>
 
   <!-- test code goes here -->
--- a/content/xul/document/test/test_bug468176.xul
+++ b/content/xul/document/test/test_bug468176.xul
@@ -1,22 +1,22 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="/tests/SimpleTest/test.css" type="text/css"?>
+<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css" type="text/css"?>
 <!--
 https://bugzilla.mozilla.org/show_bug.cgi?id=468176
 -->
 <window title="Test for Bug 468176"
   id="test_bug468176_xul"
   xmlns:html="http://www.w3.org/1999/xhtml"
   xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script type="application/javascript" src="/MochiKit/packed.js"></script>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="chrome://mochikit/content/MochiKit/packed.js"></script>
+  <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
 
 <body id="body" xmlns="http://www.w3.org/1999/xhtml">
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=468176">Mozilla Bug 468176</a>
 
 <xul:hbox id="b1" value="foo"/>
 
 <xul:hbox id="o1">
   <xul:observes id="inner" element="b1" attribute="*"/>
--- a/content/xul/templates/tests/Makefile.in
+++ b/content/xul/templates/tests/Makefile.in
@@ -40,19 +40,10 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 relativesrcdir = content/xul/templates/tests
 
 include $(DEPTH)/config/autoconf.mk
 
 DIRS = chrome
 
-_TEST_FILES = \
-		test_bug441785.xul \
-		bug441785-1.rdf \
-		bug441785-2.rdf \
-		test_sortservice.xul \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
-libs:: $(_TEST_FILES)
-	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
--- a/content/xul/templates/tests/chrome/Makefile.in
+++ b/content/xul/templates/tests/chrome/Makefile.in
@@ -254,12 +254,16 @@ include $(topsrcdir)/config/rules.mk
 		test_tmpl_xmlquerywithsortotherfield.xul \
 		test_tmpl_xmlquerywithmultiplequeries.xul \
 		test_tmpl_xmlquerywithothertypes.xul \
 		test_tmpl_xmlquerywithinlinedata.xul \
 		test_tmpl_xmlquerywithinlinedatawithmultiplequeries.xul \
 		test_tmpl_invalidqp.xul \
 		test_tmpl_errors.xul \
 		test_tmpl_regenerate.xul \
+		test_bug441785.xul \
+		bug441785-1.rdf \
+		bug441785-2.rdf \
+		test_sortservice.xul \
 		$(NULL)
 
 libs:: $(_TEST_FILES)
 	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir)
rename from content/xul/templates/tests/bug441785-1.rdf
rename to content/xul/templates/tests/chrome/bug441785-1.rdf
rename from content/xul/templates/tests/bug441785-2.rdf
rename to content/xul/templates/tests/chrome/bug441785-2.rdf
rename from content/xul/templates/tests/test_bug441785.xul
rename to content/xul/templates/tests/chrome/test_bug441785.xul
--- a/content/xul/templates/tests/test_bug441785.xul
+++ b/content/xul/templates/tests/chrome/test_bug441785.xul
@@ -1,11 +1,11 @@
 <?xml version="1.0" ?>
 <?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="/tests/SimpleTest/test.css" type="text/css"?>
+<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css" type="text/css"?>
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
    <tree flex="20" id="t" ref="urn:data:row" datasources="rdf:null" seltype="single">
      <treecols> 
       <treecol flex="1" id="id" label="id" sort="rdf:http://dummy/rdf#id" />
       <splitter class="tree-splitter"/>
       <treecol flex="1" id="title" label="title" sort="rdf:http://dummy/rdf#title" sortActive="true" sortDirection="ascending" /><splitter class="tree-splitter"/>
      </treecols>
@@ -35,18 +35,18 @@
            </treerow>
          </treeitem>
        </treechildren>
      </template>
    </tree>
 
 <body xmlns="http://www.w3.org/1999/xhtml" style="height: 300px; overflow: auto;"/>
 
-<script type="application/javascript" src="/MochiKit/packed.js"></script>
-<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>      
+<script type="application/javascript" src="chrome://mochikit/content/MochiKit/packed.js"></script>
+<script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>      
 
 <script type="application/x-javascript">
 <![CDATA[
 
 var buildCount = 0;
 
 SimpleTest.waitForExplicitFinish();
 
rename from content/xul/templates/tests/test_sortservice.xul
rename to content/xul/templates/tests/chrome/test_sortservice.xul
--- a/content/xul/templates/tests/test_sortservice.xul
+++ b/content/xul/templates/tests/chrome/test_sortservice.xul
@@ -1,20 +1,20 @@
 <?xml version="1.0" ?>
 <?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="/tests/SimpleTest/test.css" type="text/css"?>
+<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css" type="text/css"?>
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <vbox id="box"/>
 
 <body xmlns="http://www.w3.org/1999/xhtml" style="height: 300px; overflow: auto;"/>
 
-<script type="application/javascript" src="/MochiKit/packed.js"></script>
-<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>      
+<script type="application/javascript" src="chrome://mochikit/content/MochiKit/packed.js"></script>
+<script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>      
 
 <script type="application/x-javascript">
 <![CDATA[
 
 var tests = [
   [["One", "Two", "Three", "Four"], "", ["Four One Three Two"]],
   [["One", "Two", "Three", "Four"], "integer", ["Four One Three Two"]],
   [["One", "Two", "Three", "Four"], "descending", ["Two Three One Four"]],