Allow callbackDone while test is executed by runTest.

client/testing/unittest/unittestsuite.dart

 // Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 // TODO(rnystrom): This code is gradually moving from a Java/JUnit style to
 // something closer to JS/Jasmine. Eventually, the UnitTestSuite class can go
 // away completely (or become private to this library) and the only exposed API
 // will be group()/test()/expect(). Until then, both ways are supported, which
 // is why things look a bit weird in here.
 
@@ skipping 23 matching lines @@
   /**
    * Whether an undetected error occurred while running the last test.  This
    * errors are commonly caused by DOM callbacks that were not guarded in a
    * try-catch block.
    */
   bool _uncaughtError;
   EventListener _onErrorClosure;
 
   bool _queuedToRun = false;
 
+  /** Whether a test is currently being executed by [runTest]. */
+  bool _testIsRunning = false;
+
   // TODO(sigmund): remove isLayoutTest argument after converting all DOM tests
   // to use the named constructor below.
   // TODO(vsm): remove the ignoredWindow parameter once all tests are fixed.
   UnitTestSuite([var ignoredWindow = null, bool isLayoutTest = false])
     : _isLayoutTest = isLayoutTest,
       _tests = new List<TestCase>(),
       _currentTest = 0,
       _callbacksCalled = 0 {
     _onErrorClosure = (e) { _onError(e); };
     if (_currentSuite != null) {
@@ skipping 97 matching lines @@
       testCase.recordError(
           "Can't call callbackDone() on a synchronous test", '');
       _uncaughtError = true;
     } else if (_callbacksCalled > testCase.callbacks) {
       final expected = testCase.callbacks;
       testCase.recordError(
           'More calls to callbackDone() than expected. '
           + 'Actual: ${_callbacksCalled}, expected: ${expected}', '');
       _uncaughtError = true;
     } else if (_callbacksCalled == testCase.callbacks) {
       testCase.recordSuccess();

[Siggi Cherem (dart-lang), 2011/10/19 18:42:41]

shouldn't this be inside the conditional too?

[Anton Muhin, 2011/10/19 18:51:58]

I don't think so, but, please, double check: if test called callbackDone
expected number of times, the test has successfully finished which should be
recorded, but we just shouldn't start next test.  Does that sound reasonable?

[Siggi Cherem (dart-lang), 2011/10/19 19:56:21]

I think that might be covered in [runTests] also (in line 201).

-      _currentTest++;
-      _nextBatch();
+      if (!_testIsRunning) {
+        _currentTest++;
+        _nextBatch();
+      }
     }
   }
 
   /**
    * Runs a batch of tests, yielding whenever an asynchronous test starts
    * running. Tests will resume executing when such asynchronous test calls
    * [done] or if it fails with an exception.
    */
   void _nextBatch() {
     while (_currentTest < _tests.length) {
       final testCase = _tests[_currentTest];
       runTest(testCase);
       if (!testCase.isComplete() && testCase.callbacks > 0) {
         return;
       }
       _currentTest++;
     }
     _completeTests();
   }
 
   /** Runs a single test. */
   void runTest(TestCase testCase) {
     // TODO(sigmund): remove this declaration once dartc supports trapping error
     // traces.
     var trace = '';
     _uncaughtError = false;
     _callbacksCalled = 0;
     try {
+      _testIsRunning = true;
       (testCase.test)();
       if (!_uncaughtError) {
         if (testCase.callbacks == _callbacksCalled) {
           testCase.recordSuccess();
         }
       }
     } catch (ExpectException e, var trace) {
       if (!_uncaughtError) {
         testCase.recordFail(e.message, trace.toString());
       }
     } catch (var e, var trace) {
       if (!_uncaughtError) {
         testCase.recordError('Caught ${e}', trace.toString());
       }
+    } finally {
+      _testIsRunning = false;
     }
   }
 
   /** Publish results on the page and notify controller. */
   void _completeTests() {
     try {
       window.dynamic.on.error.remove(_onErrorClosure);
     } catch (var e) {
       // TODO(jacobr): remove this horrible hack to work around dartc bugs.
       window.dynamic.onerror = null;
@@ skipping 302 matching lines @@
         </tr>""";
     if (stackTrace != null) {
       message +=
           "<tr><td></td><td colspan='2'><pre>${stackTrace}</pre></td></tr>";
     }
     fail = true;
   }
 }
 
 typedef void TestFunction();