Changeset 7635

Timestamp:

03/17/07 23:13:39 (22 months ago)

Author:

alex

Message:

ensuring that logging output shows up in the log tab. Refs #2550

Location:

dojo/trunk/tests

Files:

• runner.html (modified) (1 diff)
• runner.js (modified) (2 diffs)
• _browserRunner.js (modified) (3 diffs)

dojo/trunk/tests/runner.html

@@ -218 +218 @@
                                 <td>
                                         <div style="position: relative; width: 99%; height: 100%; top: 0px; left: 0px;">
-                                                <div id="logBody" class="tabBody"
-                                                        style="z-index: 1;">thinger blah blah
+                                                <div class="tabBody"
+                                                        style="z-index: 1;">
+<pre id="logBody"></pre>
                                                 </div>
                                                 <iframe id="testBody" class="tabBody"

dojo/trunk/tests/runner.js

@@ -497 +497 @@
 tests._setupGroupForRun = function(/*String*/ groupName, /*Integer*/ idx){
         var tg = this._groups[groupName];
-        this.debug(this._line, "\nGROUP", "\""+groupName+"\"", "has", tg.length, "test"+((tg.length > 1) ? "s" : "")+" to run");
+        this.debug(this._line);
+        this.debug("GROUP", "\""+groupName+"\"", "has", tg.length, "test"+((tg.length > 1) ? "s" : "")+" to run");
 }
 
@@ -517 +518 @@
                 var ss = fixture.runTest.toSource();
                 this.debug("\tERROR IN:\n\t\t", ss);
+        }else{
+                this.debug("\tERROR IN:\n\t\t", fixture.runTest);
         }
 }

dojo/trunk/tests/_browserRunner.js

@@ -43 +43 @@
                 // Over-ride or implement base runner.js-provided methods
                 //
+                var _logBacklog = [];
+                var sendToLogPane = function(args, skip){
+                        var msg = "";
+                        for(var x=0; x<args.length; x++){
+                                msg += " "+args[x];
+                        }
+                        // workarounds for IE. Wheeee!!!
+                        msg = msg.replace("\t", "&nbsp;&nbsp;&nbsp;&nbsp;");
+                        msg = msg.replace(" ", "&nbsp;");
+                        msg = msg.replace("\n", "<br>&nbsp;");
+                        if(!byId("logBody")){
+                                _logBacklog.push(msg);
+                                return;
+                        }else if((_logBacklog.length)&&(!skip)){
+                                var tm;
+                                while(tm=_logBacklog.shift()){
+                                        sendToLogPane(tm, true);
+                                }
+                        }
+                        var tn = document.createElement("div");
+                        tn.innerHTML = msg;
+                        byId("logBody").appendChild(tn);
+                }
+
                 if(window["console"]){
                         if(console.info){
-                                tests.debug = console.debug;
+                                tests.debug = function(){
+                                        sendToLogPane.call(window, arguments);
+                                        console.debug.apply(console, arguments);
+                                }
                         }else{
                                 tests.debug = function(){
+                                        sendToLogPane.apply(window, arguments);
                                         var msg = "";
                                         for(var x=0; x<arguments.length; x++){
@@ -54 +82 @@
                                         console.log("DEBUG:"+msg);
                                 }
+                        }
+                }else{
+                        tests.debug = function(){
+                                sendToLogPane.call(window, arguments);
                         }
                 }
@@ -160 +192 @@
                 // Utility code for runner.html
                 //
+                // var isSafari = navigator.appVersion.indexOf("Safari") >= 0;
                 var tabzidx = 1;
+                var _showTab = function(toShow, toHide){
+                        // FIXME: I don't like hiding things this way.
+                        byId(toHide).style.display = "none";
+                        with(byId(toShow).style){
+                                display = "";
+                                zIndex = ++tabzidx;
+                        }
+                }
+
                 showTestPage = function(){
-                        byId("testBody").style.zIndex = ++tabzidx;
+                        _showTab("testBody", "logBody");
                 }
 
                 showLogPage = function(){
-                        byId("logBody").style.zIndex = ++tabzidx;
+                        _showTab("logBody", "testBody");
                 }