? jsunit-1.3.2-diff
? jsunit/app/jsUnitCoreImpl.js
? jsunit/app/jsUnitTestCase.js
? jsunit/app/testConfig.html
? jsunit/tests/jsUnitTestCaseTest.html
Index: jsunit/testRunner.html
===================================================================
RCS file: /cvsroot/jsunit/jsunit/jsunit/testRunner.html,v
retrieving revision 1.4
diff -u -r1.4 testRunner.html
--- jsunit/testRunner.html	20 May 2002 12:45:31 -0000	1.4
+++ jsunit/testRunner.html	18 Jul 2002 18:19:54 -0000
@@ -24,7 +24,8 @@
    -
    - Contributor(s):
    - Edward Hieatt, edward@jsunit.net (original author)
-   - Bob Clary, bc@bclary.comn
+   - Bob Clary, bc@bclary.com
+   - Curt Arnold carnold@houston.rr.com
    -
    - Alternatively, the contents of this file may be used under the terms of
    - either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -114,6 +115,8 @@
 <script language="JavaScript" type="text/javascript" src="app/jsUnitTestManager.js"></script>
 <script language="JavaScript" type="text/javascript" src="app/jsUnitTracer.js"></script>
 <script language="JavaScript" type="text/javascript" src="app/jsUnitTestSuite.js"></script>
+<script language="JavaScript" type="text/javascript" src="app/jsUnitTestCase.js"></script>
+<script language="JavaScript" type="text/javascript" src="app/jsUnitCore.js"></script>
 <script type="text/javascript">
 
   var testManager;
Index: jsunit/app/jsUnitCore.js
===================================================================
RCS file: /cvsroot/jsunit/jsunit/jsunit/app/jsUnitCore.js,v
retrieving revision 1.7
diff -u -r1.7 jsUnitCore.js
--- jsunit/app/jsUnitCore.js	26 Jun 2002 03:32:29 -0000	1.7
+++ jsunit/app/jsUnitCore.js	18 Jul 2002 18:19:54 -0000
@@ -22,6 +22,7 @@
  * Contributor(s):
  * Edward Hieatt, edward@jsunit.net (original author)
  * Bob Clary, bc@bclary.com
+ * Curt Arnold carnold@houston.rr.com
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -200,7 +201,12 @@
 }
 
 function getFunctionName(aFunction) {
-  var name = aFunction.toString().match(/function (\w*)/)[1];
+  var name = null;
+  try {
+    name = aFunction.toString().match(/function (\w*)/)[1];
+  } 
+  catch(e1) {
+  }
 
   if ((name == null) || (name.length == 0))
     name = 'anonymous';
Index: jsunit/app/jsUnitTestManager.js
===================================================================
RCS file: /cvsroot/jsunit/jsunit/jsunit/app/jsUnitTestManager.js,v
retrieving revision 1.1
diff -u -r1.1 jsUnitTestManager.js
--- jsunit/app/jsUnitTestManager.js	20 May 2002 12:45:32 -0000	1.1
+++ jsunit/app/jsUnitTestManager.js	18 Jul 2002 18:19:54 -0000
@@ -22,6 +22,7 @@
  * Contributor(s):
  * Edward Hieatt, edward@jsunit.net (original author)
  * Bob Clary, bc@bclary.com
+ * Curt Arnold carnold@houston.rr.com
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -116,7 +117,7 @@
   else
   {
     this._testIndex   = 0;
-    this._testsInPage = this.getTestFunctionNames();
+    this._testsInPage = this.getTests();
     this._numberOfTestsInPage = this._testsInPage.length;
     this._runTest();
   }
@@ -180,11 +181,18 @@
 
   top.status = '';
   // either not first test, or no setUpPage defined, or setUpPage completed
-  this.executeTestFunction(this._testsInPage[this._testIndex]);
-  this.totalCount++;
-  this.updateProgressIndicators();
-  this._testIndex++;
-  setTimeout('top.testManager._runTest()', jsUnitTestManager.TIMEOUT_LENGTH);
+  var test = this._testsInPage[this._testIndex];
+  var deferred = this.executeTestFunction(test);
+  if (!deferred) {
+    this.onTestComplete(test);
+  }
+}
+
+jsUnitTestManager.prototype.onTestComplete = function (test) {
+    this.totalCount++;
+    this.updateProgressIndicators();
+    this._testIndex++;
+    setTimeout('top.testManager._runTest()', jsUnitTestManager.TIMEOUT_LENGTH);
 }
 
 jsUnitTestManager.prototype._done = function () 
@@ -273,23 +281,23 @@
 {
   var result = true;
   try {
-    this.containerTestFrame.suite();
-  }
+    result = this.containerTestFrame.suite().isjsUnitTestSuite;  }
   catch (e) {
     result = false;
   }
   return result;
 }
 
-jsUnitTestManager.prototype.getTestFunctionNames = function () 
+jsUnitTestManager.prototype.getTests = function () 
 {
   var testFrame         = this.containerTestFrame;
-  var testFunctionNames = new Array();
-  var i;
-  
-  if (testFrame && testFrame.exposeTestFunctionNames)
-        return testFrame.exposeTestFunctionNames();
   
+  if (testFrame && testFrame.suite) {
+        return testFrame.suite().getTests();
+  }
+
+  var i;  
+  var testFunctionNames = new Array();
   if (testFrame && testFrame.document && testFrame.document.scripts) { // IE5 and up
     var scriptsInTestFrame = testFrame.document.scripts;
     
@@ -305,7 +313,22 @@
         push(testFunctionNames, i);
     }
   }
-  return testFunctionNames;
+  if (testFunctionNames.length == 0) {
+    return testFunctionNames;
+  }
+  var tests = new Array(testFunctionNames.length);
+  for (i = 0; i < testFunctionNames.length; i++) {
+    var test = new jsUnitTestCase(testFunctionNames[i]);
+    test.runTest = eval('this.containerTestFrame.' + testFunctionNames[i]);
+    if (this.containerTestFrame.setUp != null) {
+        test.setUp = this.containerTestFrame.setUp;
+    }
+    if (this.containerTestFrame.tearDown != null) {
+        test.tearDown = this.containerTestFrame.tearDown;
+    }
+    tests[i] = test;
+  }
+  return tests;
 }
 
 jsUnitTestManager.prototype._extractTestFunctionNamesFromScript = function (aScript) 
@@ -351,8 +374,7 @@
   this.doneLoadingPage(this._testFileName);
 }
 
-jsUnitTestManager.prototype._isTestFrameLoaded = function () 
-{
+jsUnitTestManager.prototype._isTestFrameLoaded = function () {
   try {
     return this.containerController.isPageLoaded();
   } 
@@ -361,29 +383,98 @@
   return false;
 }
 
-jsUnitTestManager.prototype.executeTestFunction = function (functionName) 
-{
-  this._testFunctionName=functionName;
+//
+//  fail the test if not complete by timeout
+//
+jsUnitTestManager.prototype._testNotReadyTimeout = function() {
+	var test = this._testsInPage[this._testIndex];
+    test.completed = true;
+    this._handleTestException(new JsUnitException(null, "Test did not become ready before timeout"));
+    this.onTestComplete(test);
+}
+
+jsUnitTestManager.prototype.executeTestFunction = function (test) {
+  this._testFunctionName= test.name;
   this.setStatus('Running test "' + this._testFunctionName + '"');
   var excep=null;
+  var deferred = false;
   try {
-    this.containerTestFrame.setUp();
-    eval('this.containerTestFrame.' + this._testFunctionName + '();');
+    test.completed = false;
+    test.setUp();
+    if (!test.ignored) {
+        if(test.ready) {
+            test.runTest();
+        } else {
+            deferred = true;
+            test.addListener(this);
+            //
+            //   if test is not complete in 30 seconds, fail it
+            //
+            test.timeout = setTimeout('top.testManager._testNotReadyTimeout()',30000);
+        }
+    }
   } 
   catch (e1) {
     excep = e1;
   }
   finally {
-    try {
-      this.containerTestFrame.tearDown();
-    } 
-    catch (e2) {
-      excep = e2;
+    if (!deferred) {
+        test.completed = true;
+        try {
+          test.tearDown();
+        } 
+        catch (e2) {
+          excep = e2;
+        }
     }
   }
-  if (excep != null)
+  if (excep != null) {
     this._handleTestException(excep);
+  }
+  return deferred;
+}
+
+jsUnitTestManager.prototype.onTestReady = function (test) {
+    if (test.timeout != null) {
+        var timeout = test.timeout;
+        test.timeout = null;
+        clearTimeout(timeout);
+    }
+    var excep = null;
+    try {
+        test.runTest();
+    } catch(e1) {
+        excep = e1;
+    } finally {
+        try {
+            test.tearDown();
+        } catch(e2) {
+        }
+    }
+    if (!test.completed) {
+        if (excep != null) {
+            this._handleTestException(excep);
+        }
+        test.completed = true;
+        this.onTestComplete(test);
+    }
 }
+
+jsUnitTestManager.prototype.onTestFail = function (test, msg) {
+    if (test.timeout != null) {
+        var timeout = test.timeout;
+        test.timeout = null;
+        clearTimeout(timeout);
+    }
+    try {
+        test.tearDown();
+    } catch(e2) {
+    }
+    this._handleTestException(new jsUnitException(msg));
+    test.completed = true;
+    this.onTestComplete(test);
+}
+
 
 jsUnitTestManager.prototype._handleTestException = function (excep) 
 {
Index: jsunit/app/jsUnitTestSuite.js
===================================================================
RCS file: /cvsroot/jsunit/jsunit/jsunit/app/jsUnitTestSuite.js,v
retrieving revision 1.1
diff -u -r1.1 jsUnitTestSuite.js
--- jsunit/app/jsUnitTestSuite.js	20 May 2002 12:45:32 -0000	1.1
+++ jsunit/app/jsUnitTestSuite.js	18 Jul 2002 18:19:54 -0000
@@ -22,6 +22,7 @@
  * Contributor(s):
  * Edward Hieatt, edward@jsunit.net (original author)
  * Bob Clary, bc@bclary.com
+ * Curt Arnold carnold@houston.rr.com
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -41,11 +42,12 @@
   this.isjsUnitTestSuite = true;
   this.testPages         = Array();
   this.pageIndex         = 0;
+  this.configPage        = null;
 }
 
 jsUnitTestSuite.prototype.addTestPage = function (pageName) 
 {
-  with (this)
+  with(this)
   testPages[testPages.length] = pageName;
 }
 
@@ -77,6 +79,7 @@
   clone.testPages = this.testPages;
   return clone;
 }
+
 
 if (xbDEBUG.on)
 {
Index: jsunit/app/main-counts.html
===================================================================
RCS file: /cvsroot/jsunit/jsunit/jsunit/app/main-counts.html,v
retrieving revision 1.3
diff -u -r1.3 main-counts.html
--- jsunit/app/main-counts.html	6 Jul 2002 16:47:56 -0000	1.3
+++ jsunit/app/main-counts.html	18 Jul 2002 18:19:54 -0000
@@ -25,6 +25,7 @@
    - Contributor(s):
    - Edward Hieatt, edward@jsunit.net (original author)
    - Bob Clary, bc@bclary.com
+   - Curt Arnold carnold@houston.rr.com
    -
    - Alternatively, the contents of this file may be used under the terms of
    - either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -44,7 +45,7 @@
     <title></title>
   </head>
 
-  <frameset cols="200,190,*" frameborder="0">
+  <frameset cols="200,200,*" frameborder="0">
     <frame name="mainCountsRuns"     src="main-counts-runs.html" scrolling="no">
     <frame name="mainCountsErrors"   src="main-counts-errors.html" scrolling="no">
     <frame name="mainCountsFailures" src="main-counts-failures.html" scrolling="no">
Index: jsunit/app/main-errors.html
===================================================================
RCS file: /cvsroot/jsunit/jsunit/jsunit/app/main-errors.html,v
retrieving revision 1.3
diff -u -r1.3 main-errors.html
--- jsunit/app/main-errors.html	20 May 2002 12:45:32 -0000	1.3
+++ jsunit/app/main-errors.html	18 Jul 2002 18:19:54 -0000
@@ -25,6 +25,7 @@
    - Contributor(s):
    - Edward Hieatt, edward@jsunit.net (original author)
    - Bob Clary, bc@bclary.com
+   - Curt Arnold carnold@houston.rr.com
    -
    - Alternatively, the contents of this file may be used under the terms of
    - either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -48,13 +49,28 @@
   <body>
     <hr>
     <form name="testRunnerForm" action="">
-      <p>Errors and failures:&nbsp;</p>
-      <select size="5" ondblclick="top.testManager.showMessageForSelectedProblemTest()" name="problemsList">
-      </select>
-      <br>
-      <input type="button" value="Show selected" onclick="top.testManager.showMessageForSelectedProblemTest()">
-      &nbsp;&nbsp;&nbsp;
-      <input type="button" value="Show all" onclick="top.testManager.showMessagesForAllProblemTests()">
+      <p>Errors and failures:</p>
+      <table width="100%">
+        <tr>
+            <td width="100%">
+                <select size="5" ondblclick="top.testManager.showMessageForSelectedProblemTest()" name="problemsList">
+                </select>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <table>
+                    <tr>
+                        <td width="50%">
+                            <input type="button" value="Show selected" onclick="top.testManager.showMessageForSelectedProblemTest()" align="center">
+                        </td>
+                        <td>
+                            <input type="button" value="Show all" onclick="top.testManager.showMessagesForAllProblemTests()" align="center">
+                        </td>
+                    </tr>
+                </table>
+            </td>
+        </tr>
     </form>
   </body>
 </html>
Index: jsunit/app/main-frame.html
===================================================================
RCS file: /cvsroot/jsunit/jsunit/jsunit/app/main-frame.html,v
retrieving revision 1.4
diff -u -r1.4 main-frame.html
--- jsunit/app/main-frame.html	6 Jul 2002 16:47:56 -0000	1.4
+++ jsunit/app/main-frame.html	18 Jul 2002 18:19:54 -0000
@@ -25,6 +25,7 @@
    - Contributor(s):
    - Edward Hieatt, edward@jsunit.net (original author)
    - Bob Clary, bc@bclary.com
+   - Curt Arnold carnold@houston.rr.com
    -
    - Alternatively, the contents of this file may be used under the terms of
    - either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -44,7 +45,7 @@
     <title>jsUnit Main Frame</title>
   </head>
 
-  <frameset rows="200,30,30,30,*" frameborder="0">
+  <frameset rows="220,60,60,60,*" frameborder="0">
     <frame name="mainData"     src="main-data.html" scrolling="no">
     <frame name="mainStatus"   src="main-status.html" scrolling="no">
     <frame name="mainProgress" src="main-progress.html" scrolling="no">
Index: jsunit/app/xbDebug.js
===================================================================
RCS file: /cvsroot/jsunit/jsunit/jsunit/app/xbDebug.js,v
retrieving revision 1.1
diff -u -r1.1 xbDebug.js
--- jsunit/app/xbDebug.js	20 May 2002 12:45:32 -0000	1.1
+++ jsunit/app/xbDebug.js	18 Jul 2002 18:20:13 -0000
@@ -60,7 +60,6 @@
     
   this.debugwindow = window.open('about:blank', 'DEBUGWINDOW', 'height=400,width=600,resizable=yes,scrollbars=yes');
 
-  this.debugwindow.title = 'xbDebug Window';
   this.debugwindow.document.write('<html><head><title>xbDebug Window</title></head><body><h3>Javascript Debug Window</h3></body></html>');
   this.debugwindow.focus();
 }
@@ -198,7 +197,6 @@
 function xbDebugPersistToString(obj)
 {
   var s = '';
-  var p;
 
   if (obj == null)
      return 'null';
Index: jsunit/css/jsUnitStyle.css
===================================================================
RCS file: /cvsroot/jsunit/jsunit/jsunit/css/jsUnitStyle.css,v
retrieving revision 1.2
diff -u -r1.2 jsUnitStyle.css
--- jsunit/css/jsUnitStyle.css	6 Jul 2002 16:47:56 -0000	1.2
+++ jsunit/css/jsUnitStyle.css	18 Jul 2002 18:20:13 -0000
@@ -1,120 +1,120 @@
-/* jsUnit */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Edward Hieatt code.
- *
- * The Initial Developer of the Original Code is
- * Edward Hieatt, edward@jsunit.net.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * Edward Hieatt, edward@jsunit.net (original author)
- * Bob Clary, bc@bclary.com
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-body 
-{ 
-  margin-top: 0; 
-  margin-bottom: 0; 
-  font-family: Verdana, Arial, Helvetica, sans-serif; 
-  color: #000;
-  font-size: 0.8em; 
-  background-color: #fff;
-}
-
-td 
-{ 
-  padding: 0; 
-  margin: 0;
-}
-
-td img 
-{ 
-  padding: 0; 
-  margin: 0; 
-  vertical-align: baseline; 
-  display: block;
-}
-
-input 
-{ 
-}
-
-select 
-{ 
-}
-
-a:link, a:visited
-{
-  color : #00F;
-}
-
-a:hover 
-{
-  color : #F00;
-}
-
-.jsUnitDefault 
-{ 
-}
-
-h1, th
-{ 
-  font-size: 1.3em; 
-  font-weight: bold; 
-  color: #039;
-}
-
-h2
-{ 
-  font-weight: bold; 
-  color: #039;
-}
-
-h3
-{ 
-  font-weight: bold; 
-  color: #039; 
-  text-decoration: underline;
-}
-
-h4
-{ 
-  font-weight: bold; 
-  color: #039;
-}
-
-.jsUnitTestResultSuccess 
-{
-  color: #000;
-}
-
-.jsUnitTestResultNotSuccess 
-{
-  color: #F00;
-}
+/* jsUnit */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Edward Hieatt code.
+ *
+ * The Initial Developer of the Original Code is
+ * Edward Hieatt, edward@jsunit.net.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Edward Hieatt, edward@jsunit.net (original author)
+ * Bob Clary, bc@bclary.com
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+body 
+{ 
+  margin-top: 0; 
+  margin-bottom: 0; 
+  font-family: Verdana, Arial, Helvetica, sans-serif; 
+  color: #000;
+  font-size: 0.8em; 
+  background-color: #fff;
+}
+
+td 
+{ 
+  padding: 0; 
+  margin: 0;
+}
+
+td img 
+{ 
+  padding: 0; 
+  margin: 0; 
+  vertical-align: baseline; 
+  display: block;
+}
+
+input 
+{ 
+}
+
+select 
+{ 
+}
+
+a:link, a:visited
+{
+  color : #00F;
+}
+
+a:hover 
+{
+  color : #F00;
+}
+
+.jsUnitDefault 
+{ 
+}
+
+h1, th
+{ 
+  font-size: 1.3em; 
+  font-weight: bold; 
+  color: #039;
+}
+
+h2
+{ 
+  font-weight: bold; 
+  color: #039;
+}
+
+h3
+{ 
+  font-weight: bold; 
+  color: #039; 
+  text-decoration: underline;
+}
+
+h4
+{ 
+  font-weight: bold; 
+  color: #039;
+}
+
+.jsUnitTestResultSuccess 
+{
+  color: #000;
+}
+
+.jsUnitTestResultNotSuccess 
+{
+  color: #F00;
+}