Changeset 7887

Timestamp:

04/01/07 01:22:59 (16 months ago)

Author:

alex

Message:

adding sounds so that success and failure sound like...well...success or failure. Refs #2550

Location:

dojo/trunk/tests

Files:

• runner.html (modified) (2 diffs)
• runner.js (modified) (6 diffs)
• _browserRunner.js (modified) (5 diffs)
• _sounds (added)
• _sounds/doh.wav (added)
• _sounds/dohaaa.wav (added)
• _sounds/LICENSE (added)
• _sounds/woohoo.wav (added)

dojo/trunk/tests/runner.html

@@ -13 +13 @@
                         }catch(e){
                                 document.write("<scr"+"ipt type='text/javascript' src='runner.js'></scr"+"ipt>");
+                                document.write("<scr"+"ipt type='text/javascript'>tests.selfTest = true;</scr"+"ipt>");
                                 document.write("<scr"+"ipt type='text/javascript' src='_browserRunner.js'></scr"+"ipt>");
                         }
@@ -237 +238 @@
                         </tr>
                 </table>
+                <span id="hiddenAudio"></span>
         </body>
 </html>

dojo/trunk/tests/runner.js

@@ -610 +610 @@
                         // gonna wait for an async result. It's up to the test code to trap
                         // errors and give us an errback or callback.
-                        if(ret instanceof this.Deferred){
+                        if(ret instanceof tests.Deferred){
 
                                 tg.inFlight++;
@@ -627 +627 @@
                                         }
                                         tests._testFinished(groupName, fixture, ret.results[0]);
+                                        if(tests._paused){
+                                                // console.debug("finished deferred test group:", groupName, tests);
+                                                tests.run();
+                                        }
                                 }
 
@@ -638 +642 @@
                                         retEnd();
                                 });
+                                tests.pause();
                                 return ret;
                         }
@@ -654 +659 @@
         //              runs the specified test group
 
-        // FIXME: we need group status and individual tests to be async-able. Would
-        // preferr, perhaps, avoiding use of the full Deferred system, but we'll
-        // see what we can get away w/.
         var tg = this._groups[groupName];
         if(tg.skip === true){ return; }
         if(this._isArray(tg)){
+                if(idx<=tg.length){
+                        if(!tg.inFlight){
+                                tests._groupFinished(groupName, (!tg.failures));
+                        }
+                        return;
+                }
                 tg.inFlight = 0;
                 tg.iterated = false;
@@ -672 +680 @@
                         }
                         tests._runFixture(groupName, tg[y]);
+                        if(this._paused){
+                                this._currentTest = y+1;
+                                if(this._currentTest == tg.length){
+                                        tg.iterated = true;
+                                }
+                                this.debug("PAUSED at", this._currentGroup, this._currentTest);
+                                return;
+                        }
                 }
                 tg.iterated = true;
@@ -724 +740 @@
                         if(!found){
                                 found = true;
+                                // console.debug("starting from:", x, ct);
                                 this.runGroup(x, ct);
                         }else{
                                 this.runGroup(x);
                         }
+                        if(this._paused){ return; }
                 }
         }
         this._currentGroup = null;
         this._currentTest = null;
-        this._paused = true;
+        this._paused = false;
         this._onEnd();
         this._report();

dojo/trunk/tests/_browserRunner.js

@@ -213 +213 @@
                 }
 
+                var _playSound = function(name){
+                        byId("hiddenAudio").innerHTML = '<embed src="_sounds/'+name+'.wav" autostart="true" loop="false" hidden="true" width="1" height="1"></embed>';
+                }
+
                 tests._testFinished = function(group, fixture, success){
                         var fn = getFixtureNode(group, fixture);
@@ -218 +222 @@
                                 fn.getElementsByTagName("td")[2].innerHTML = ((new Date())-fixture.startTime)+"ms";
                                 fn.className = (success) ? "success" : "failure";
+
+                                if(!success){
+                                        _playSound("doh");
+                                }
                         }
                         this.debug(((success) ? "PASSED" : "FAILED"), "test:", fixture.name);
@@ -344 +352 @@
                                         }
                                 }
-                                tests._onEnd = toggleRunning;
+                                tests._onEnd = function(){
+                                        toggleRunning();
+                                        if(tests._failureCount == 0){
+                                                alert("WOOHOO!!");
+                                                tests.debug("WOOHOO!!");
+                                                _playSound("woohoo");
+                                        }
+                                }
                                 tests.run = (function(oldRun){
                                         return function(){
@@ -369 +384 @@
                         }
                         tests._onEnd = function(){
+                                _tests._errorCount += tests._errorCount;
+                                _tests._failureCount += tests._failureCount;
+                                _tests._testCount += tests._testCount;
+                                // should we be really adding raw group counts?
+                                _tests._groupCount += tests._groupCount;
                                 _tests.currentTestDeferred.callback(true);
                         }
@@ -385 +405 @@
                                 _tests._testFinished(_thisGroup, f, s);
                         }
+                        tests._report = function(){};
                 }
         }