Changeset 7405

Timestamp:

02/22/07 15:07:41 (21 months ago)

Author:

jburke

Message:

(merge from 0.4 branch) References #2366. Change some tests to work with xdomain.

Location:

trunk/tests

Files:

• flash/unit_tests_comm.html (modified) (1 diff)
• io/test_BrowserIO.html (modified) (1 diff)
• rpc/test_YahooService.html (modified) (1 diff)
• widget/acme/__package__.js (modified) (1 diff)
• widget/test_createWidget.html (modified) (2 diffs)

trunk/tests/flash/unit_tests_comm.html

@@ -100 +100 @@
                 /** Find out when the page is finished loading */
                 var pageReady = false;
-                var pageLoaded = function(){
+
+                dojo.addOnLoad(function(){
+                        /** 
+                                        Load our test data files used to test saving XML and for testing
+                                        the performance of serializing large data sets 
+                        */
+                        testXML = null;
+                        testBook = null;
+        
+                        dojo.io.bind({
+                                        url: "resources/test.xml",
+                                        load: function(type, data, evt){ 
+                                                dojo.debug("Test XML data loaded");
+                                                testXML = data;
+                                        },
+                                        error: function(type, error){ 
+                                                Test.assertFailed("Unable to load test.xml");
+                                                Test.finished();
+                                        },
+                                        mimetype: "text/plain"
+                        });
+        
+                        dojo.io.bind({
+                                        url: "resources/testBook.txt",
+                                        load: function(type, data, evt){ 
+                                                dojo.debug("Test large data file loaded");
+                                                testBook = data;
+                                        },
+                                        error: function(type, error){ 
+                                                Test.assertFailed("Unable to load testBook.txt");
+                                                Test.finished();
+                                        },
+                                        mimetype: "text/plain"
+                        });
+
                         pageReady = true;
-                }
-                dojo.event.connect(dojo, "loaded", "pageLoaded");
-                
-                /** 
-                                Load our test data files used to test saving XML and for testing
-                                the performance of serializing large data sets 
-                */
-                var testXML = null;
-                var testBook = null;
-
-                dojo.io.bind({
-                                url: "resources/test.xml",
-                                load: function(type, data, evt){ 
-                                        dojo.debug("Test XML data loaded");
-                                        testXML = data;
-                                },
-                                error: function(type, error){ 
-                                        Test.assertFailed("Unable to load test.xml");
-                                        Test.finished();
-                                },
-                                mimetype: "text/plain"
                 });
-
-                dojo.io.bind({
-                                url: "resources/testBook.txt",
-                                load: function(type, data, evt){ 
-                                        dojo.debug("Test large data file loaded");
-                                        testBook = data;
-                                },
-                                error: function(type, error){ 
-                                        Test.assertFailed("Unable to load testBook.txt");
-                                        Test.finished();
-                                },
-                                mimetype: "text/plain"
-                });
-
-
+                
                 // setup an interval that keeps checking to see if our resources are
                 // all ready for testing; once they are, we can run the unit tests

trunk/tests/io/test_BrowserIO.html

@@ -8 +8 @@
                         djConfig = { 
                                 preventBackButtonFix: false,
+                                dojoIframeHistoryUrl: "../../iframe_history.html", //for xdomain
                                 isDebug: true
                         };

trunk/tests/rpc/test_YahooService.html

@@ -3 +3 @@
         <title>Dojo Testing Script</title>
         <script type="text/javascript">
-                        var djConfig = {isDebug: true,debugContainerId: "dojoDebug"};
+                        var djConfig = {
+                                isDebug: true,
+                                yahooServiceSmdUrl: "../../src/rpc/yahoo.smd", //for xdomain
+                                debugContainerId: "dojoDebug"};
                         //djConfig.debugAtAllCosts = true;
         </script>

trunk/tests/widget/acme/__package__.js

@@ -1 @@
-alert("in acme/__package__.js");
+//alert("in acme/__package__.js");
 dojo.provide("foo.*");

trunk/tests/widget/test_createWidget.html

@@ -10 +10 @@
                         dojo.require("dojo.string.*");
                         dojo.require("dojo.widget.Button");
-
+                        dojo.registerModulePath("acme", "tests/widget/acme");
+                        dojo.require("acme.widget.Button");
                         //
                         // Normal tests
@@ -28 +29 @@
                         // Test auto-load
                         //      
-                        dojo.registerModulePath("acme", "tests/widget/acme");
+                        /* Commented out to support xdomain loading.
                         dojo.registerNamespace("acme", "acme.widget", 
                                 function(name){ 
                                                 return "acme."+dojo.string.capitalize(name);
                         });
-                        
+                        */
                         dojo.addOnLoad(function() {
                                 var w = dojo.widget.createWidget("acme:Button", { caption: "Created with auto-require as acme:Button" });