Changeset 8155

Timestamp:

04/18/07 17:09:19 (21 months ago)

Author:

alex

Message:

now that we've got lots of test groups, roll them up but make them expandable. Refs #2550

Location:

dojo/trunk/tests

Files:

• runner.html (modified) (3 diffs)
• _browserRunner.js (modified) (5 diffs)

dojo/trunk/tests/runner.html

@@ -208 +208 @@
                                                         <thead>
                                                                 <tr id="testListHeader" style="border: 0; padding: 0; margin: 0;" >
+                                                                        <th>&nbsp;</th>
                                                                         <th width="20">
                                                                                 <input type="checkbox" checked 
@@ -218 +219 @@
                                                         <tbody valign="top">
                                                                 <tr id="groupTemplate" style="display: none;">
+                                                                        <td style="font-family: Webdings; width: 15px;">&#052;</td>
                                                                         <td>
                                                                                 <input type="checkbox" checked>
@@ -225 +227 @@
                                                                 </tr>
                                                                 <tr id="testTemplate" style="display: none;">
+                                                                        <td>&nbsp;</td>
                                                                         <td>&nbsp;</td>
                                                                         <td style="padding-left: 20px;">test name</td>

dojo/trunk/tests/_browserRunner.js

@@ -3 +3 @@
 }
 
-// FIXME: need to "look up" to see what we should define/redefine if we're
-// loaded in the child iframe for testing.
 // FIXME: need to add prompting for monkey-do testing
 // FIXME: need to implement progress bar
 // FIXME: need to implement errors in progress bar
-// FIXME: need to implement run/log tabs
 
 (function(){
@@ -126 +123 @@
                         var tg = groupTemplate.cloneNode(true);
                         var tds = tg.getElementsByTagName("td");
-                        var cb = tds[0].getElementsByTagName("input")[0];
+                        var rolledUp = true;
+                        var toggle = tds[0];
+                        toggle.onclick = function(){
+                                var nodes = groupNodes[group].__items;
+                                if(rolledUp){
+                                        rolledUp = false;
+                                        for(var x=0; x<nodes.length; x++){
+                                                nodes[x].style.display = "";
+                                        }
+                                        toggle.innerHTML = "&#054;";
+                                }else{
+                                        rolledUp = true;
+                                        for(var x=0; x<nodes.length; x++){
+                                                nodes[x].style.display = "none";
+                                        }
+                                        toggle.innerHTML = "&#052;";
+                                }
+                        }
+                        var cb = tds[1].getElementsByTagName("input")[0];
                         cb.group = group;
                         cb.onclick = function(evt){
                                 tests._groups[group].skip = (!this.checked);
                         }
-                        tds[1].innerHTML = group;
-                        tds[2].innerHTML = "";
+                        tds[2].innerHTML = group;
+                        tds[3].innerHTML = "";
 
                         tb.appendChild(tg);
@@ -141 +156 @@
                         if(!testTemplate){ return; }
                         var cgn = groupNodes[group];
+                        if(!cgn["__items"]){ cgn.__items = []; }
                         var tn = testTemplate.cloneNode(true);
                         var tds = tn.getElementsByTagName("td");
 
-                        tds[1].innerHTML = fixture.name;
-                        tds[2].innerHTML = "";
+                        tds[2].innerHTML = fixture.name;
+                        tds[3].innerHTML = "";
 
                         var nn = (cgn.__lastFixture||cgn.__groupNode).nextSibling;
@@ -153 +169 @@
                                 cgn.__groupNode.parentNode.appendChild(tn);
                         }
+                        // FIXME: need to make group display toggleable!!
+                        tn.style.display = "none";
+                        cgn.__items.push(tn);
                         return cgn.__lastFixture = tn;
                 }
@@ -238 +257 @@
                         var fn = getFixtureNode(group, fixture);
                         if(fn){
-                                fn.getElementsByTagName("td")[2].innerHTML = ((new Date())-fixture.startTime)+"ms";
+                                fn.getElementsByTagName("td")[3].innerHTML = ((new Date())-fixture.startTime)+"ms";
                                 fn.className = (success) ? "success" : "failure";