Changeset 16684

Timestamp:

02/15/09 01:38:56 (12 months ago)

Author:

liucougar

Message:

fixes #8378: probably set the global progress bar for nested doh test cases (such as dojo._base test)
also fixed a problem where failure groups are not marked properly
!strict

Files:

• util/trunk/doh/_browserRunner.js (modified) (7 diffs)

util/trunk/doh/_browserRunner.js

@@ -246 +246 @@
                                 this._suiteCount = this._testCount;
                         }
-                        this._runedSuite++;
                         // console.debug("_groupStarted", group);
                         if(doh._inGroup != group){
@@ -252 +251 @@
                                 doh._runed = 0;
                                 doh._inGroup = group;
+                                this._runedSuite++;
                         }
                         var gn = getGroupNode(group);
@@ -263 +263 @@
                         var gn = getGroupNode(group);
                         if(gn && doh._inGroup == group){
-                                gn.className = (success) ? "success" : "failure";
                                 gn.getElementsByTagName("td")[3].innerHTML = doh._totalTime+"ms";
                                 gn.getElementsByTagName("td")[2].lastChild.className = "";
                                 doh._inGroup = null;
                                 //doh._runedSuite++;
-                                doh._updateGlobalProgressBar(this._runedSuite/this._suiteCount,success);
+                                var failure = doh._updateGlobalProgressBar(this._runedSuite/this._groupCount,success,group);
+                                gn.className = failure ? "failure" : "success";
                                 //doh._runedSuite--;
-                                doh._currentGlobalProgressBarWidth = parseInt(this._runedSuite/this._suiteCount*10000)/100;
+                                doh._currentGlobalProgressBarWidth = parseInt(this._runedSuite/this._groupCount*10000)/100;
                                 //byId("progressOuter").style.width = parseInt(this._runedSuite/this._suiteCount*100)+"%";
                         }
@@ -301 +301 @@
                 }
 
-                doh._updateGlobalProgressBar = function(p,success){
+                doh._updateGlobalProgressBar = function(p,success,group){
                         var outerContainer=byId("progressOuter");
                                         
@@ -310 +310 @@
                                 gdiv.className='success';
                         }
-                        if(!success){
+                        if(!success && !gdiv._failure){
                                 gdiv._failure=true;
                                 gdiv.className='failure';
+                                if(group){
+                                        gdiv.setAttribute('title','failed group '+group);
+                                }
                         }
                         var tp=parseInt(p*10000)/100;
@@ -339 +342 @@
                                 if(gn && doh._curTestCount){
                                         var p = doh._runed/doh._curTestCount;
-                                        var groupfail = this._updateGlobalProgressBar((doh._runedSuite+p-1)/doh._suiteCount,success);
+                                        var groupfail = this._updateGlobalProgressBar((doh._runedSuite+p-1)/doh._groupCount,success,group);
                                         
                                         var pbar = gn.getElementsByTagName("td")[2].lastChild;
@@ -516 +519 @@
                                 _doh._testCount += doh._testCount;
                                 // should we be really adding raw group counts?
-                                _doh._groupCount += doh._groupCount;
+                                //_doh._groupCount += doh._groupCount;
                                 _doh.currentTestDeferred.callback(true);
                         }