Simplified test & test runner filenames.

atesgoral · Apr 4, 2009 · 9ec4552 · 9ec4552
1 parent 8014a34
commit 9ec4552
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 22 deletions.
diff --git a/jsunity/test/assertionTestSuite.js → jsunity/test/assertion.js b/jsunity/test/assertionTestSuite.js → jsunity/test/assertion.js
diff --git a/jsunity/test/coreTestSuite.js → jsunity/test/core.js b/jsunity/test/coreTestSuite.js → jsunity/test/core.js
diff --git a/jsunity/test/runAllTestSuites.asp → jsunity/test/run.asp b/jsunity/test/runAllTestSuites.asp → jsunity/test/run.asp
@@ -1,8 +1,8 @@
 <%@LANGUAGE="JavaScript"%>
 <% Response.Buffer = true; %>
 <!--#include file="../jsunity.js"-->
-<!--#include file="assertionTestSuite.js"-->
+<!--#include file="assertion.js"-->
-<!--#include file="coreTestSuite.js"-->
+<!--#include file="core.js"-->
 <% Response.Clear(); %>
 <html>
 <head>

diff --git a/jsunity/test/runAllTestSuites.html → jsunity/test/run.html b/jsunity/test/runAllTestSuites.html → jsunity/test/run.html
@@ -2,8 +2,8 @@
 <head>
     <title>Core + Assertion Test Suite Runner</title>
     <script type="text/javascript" src="../jsunity.js"></script>
-    <script type="text/javascript" src="assertionTestSuite.js"></script>
+    <script type="text/javascript" src="assertion.js"></script>
-    <script type="text/javascript" src="coreTestSuite.js"></script>
+    <script type="text/javascript" src="core.js"></script>
 </head>
 <body>
     <script type="text/javascript">

diff --git a/jsunity/test/runAllTestSuites.shell.js → jsunity/test/run.shell.js b/jsunity/test/runAllTestSuites.shell.js → jsunity/test/run.shell.js
@@ -1,6 +1,6 @@
 load("../jsunity.js");
-load("assertionTestSuite.js");
+load("assertion.js");
-load("coreTestSuite.js");
+load("core.js");
 
 jsUnity.log = function (s) { print(s); };
 jsUnity.run(AssertionTestSuite, CoreTestSuite);
diff --git a/jsunity/test/run.wsf b/jsunity/test/run.wsf
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<package>
+    <job>
+        <script language="JavaScript" src="../jsunity.js"/>
+        <script language="JavaScript" src="assertion.js"/>
+        <script language="JavaScript" src="core.js"/>
+        <script language="JavaScript">
+        var output = [];
+
+        jsUnity.log = function (s) { output.push(s); }
+        jsUnity.run(AssertionTestSuite, CoreTestSuite);
+
+        WScript.Echo(output.join("\r\n"));
+        </script>
+    </job>
+</package> 
diff --git a/jsunity/test/runAllTestSuites.wsf b/jsunity/test/runAllTestSuites.wsf