Changeset 7995

Timestamp:

04/07/07 21:53:58 (20 months ago)

Author:

jburke

Message:

Refs #2608. Get the unit tests in rhino to work, except for json tests. Rhino does not serialize object properties in the same order as they appeared in the source string. Probably something to do with for/in loops not guaranteed to happen in any particular order. We just get lucky in the browser. Need to possibly rethink the tests for it.

Location:

dojo/trunk

Files:

• tests.js (modified) (1 diff)
• tests/_base/_loader/hostenv_browser.js (modified) (1 diff)
• tests/_base/_loader/hostenv_rhino.js (modified) (1 diff)
• tests/_base/_loader/hostenv_spidermonkey.js (modified) (1 diff)
• tests/_base/_loader/loader.js (modified) (1 diff)

dojo/trunk/tests.js

@@ +1 @@
+//This file is the command-line entry point for running the tests in
+//Rhino and Spidermonkey.
+
 load("dojo.js");
 load("tests/runner.js");

dojo/trunk/tests/_base/_loader/hostenv_browser.js

@@ -4 +4 @@
         [
                 function getText(t){
-                        var symbols = dojo._getModuleSymbols("tests._base._loader");
-                        var filePath = symbols.slice(1, symbols.length).join("/") + "/getText.txt";
+                        var filePath = dojo.moduleUrl("tests._base._loader", "getText.txt");
                         var text = dojo._getText(filePath);
                         t.assertEqual("dojo._getText() test data", text);

dojo/trunk/tests/_base/_loader/hostenv_rhino.js

@@ -4 +4 @@
         [
                 function getText(t){
-                        var symbols = dojo._getModuleSymbols("tests._base._loader");
-                        var filePath = symbols.slice(1, symbols.length).join("/") + "/getText.txt";
-                        var text = readText(filePath);
+                        var filePath = dojo.moduleUrl("tests._base._loader", "getText.txt");
+                        var text = (new String(readText(filePath)));
+                        //The Java file read seems to add a line return.
+                        text = text.replace(/[\r\n]+$/, "");
                         t.assertEqual("dojo._getText() test data", text);
                 }

dojo/trunk/tests/_base/_loader/hostenv_spidermonkey.js

@@ -4 +4 @@
         [
                 function getText(t){
-                        var symbols = dojo._getModuleSymbols("tests._base._loader");
-                        var filePath = symbols.slice(1, symbols.length).join("/") + "/getText.txt";
+                        var filePath = dojo.moduleUrl("tests._base._loader", "getText.txt");
                         var text = readText(filePath);
                         t.assertEqual("dojo._getText() test data", text);

dojo/trunk/tests/_base/_loader/loader.js

@@ -23 +23 @@
                         dojo.registerModulePath("mycoolmod.widget", "http://some.domain.com/another/path/mycoolpath/widget");
 
-                        t.assertEqual(dojo.baseUrl + "some/path/mycoolpath/my/favorite.html",
+
+                        var basePrefix = dojo.baseUrl;
+                        //dojo._Uri will strip off "./" characters, so do the same here
+                        if(basePrefix == "./"){
+                                basePrefix = "";
+                        }
+                        
+                        t.assertEqual(basePrefix + "some/path/mycoolpath/my/favorite.html",
                                 dojo.moduleUrl("mycoolmod", "my/favorite.html").toString());
-                        t.assertEqual(dojo.baseUrl + "some/path/mycoolpath/my/favorite.html",
+                        t.assertEqual(basePrefix + "some/path/mycoolpath/my/favorite.html",
                                 dojo.moduleUrl("mycoolmod.my", "favorite.html").toString());