Added TestSuite.as for running many testcases in a row.

Author: dbackeus

TODO.rdoc

@@ -1,7 +1,7 @@
 == TODO
 
-.TestSuite
-- Combining testcases into testsuites
+.TestCase
+- Should TestCase still be able to do reporting through run or should we force tests to run through a suite to avoid duplication?
 
 .Output
 - Add a scrollbar to deal with long test reports

example/MtascMain.as

@@ -1,4 +1,5 @@
 import test.*
+import leanUnit.*
 
 // Example usage:
 // mtasc -cp .. -swf example.swf -header 550:400:10:080808 -main MtascMain.as
@@ -7,7 +8,9 @@ class MtascMain
 {
 	static function main(root)
 	{
-		var st = new StringTest()
-		st.run()
+		var testSuite = new TestSuite()
+		testSuite.addCase( new StringTest() )
+		testSuite.addCase( new ArrayTest() )
+		testSuite.run()
 	}
 }

example/example.fla

@@ -0,0 +1,21 @@
+class test.ArrayTest extends leanUnit.TestCase
+{
+	var array
+	
+	function setup()
+	{
+		array = ['asdf', 'qwer', 'hjkl']
+	}
+	
+	function testLength()
+	{
+		assertEqual( 3, array.length )
+	}
+	
+	function testJoin()
+	{
+		assertEqual( 'asdf_qwer_hjkl', array.join('_') )
+		assertEqual( 'asdf qwer hjkl', array.join(' ') )
+		assertEqual( 'asdf,qwer,hjkl', array.join() )
+	}
+}

example/test/ArrayTest.as

@@ -2,7 +2,7 @@ import leanUnit.*
 
 class leanUnit.Assertions
 {
-	var currentClass:String
+	var className:String
 	var currentMethod:String
 
 	var assertionCount:Number
@@ -23,7 +23,7 @@ class leanUnit.Assertions
 		else
 		{
 			Output.addFail()
-			failures.push(new Failure(currentClass, currentMethod, message))
+			failures.push(new Failure(className, currentMethod, message))
 		}
 	}
 

leanUnit/Assertions.as

@@ -1,14 +1,16 @@
 class leanUnit.Failure
 {
+	var className:String
 	var method:String
 	var message:String
 
 	//-------------------------------------------------------------------
 	//	CONSTRUCTOR
 	//-------------------------------------------------------------------
 
-	function Failure(method, message)
+	function Failure(className, method, message)
 	{
+		this.className = className
 		this.method = method
 		this.message = message
 	}
@@ -19,7 +21,7 @@ class leanUnit.Failure
 
 	function toString()
 	{
-		return method+": "+message
+		return className+"#"+method+" - "+message
 	}
 
 }

leanUnit/Failure.as

@@ -43,27 +43,49 @@ class leanUnit.TestCase extends Assertions
 	var setup:Function
 	var teardown:Function
 
+	//-------------------------------------------------------------------
+	//	CONSTRUCTOR
+	//-------------------------------------------------------------------
+
+	function TestCase()
+	{
+		className = Reflection.getClassName(this)
+		className = className.substr(className.lastIndexOf('.')+1) // remove namespace
+	
+		reset()
+	}
+	
 	//-------------------------------------------------------------------
 	//	PUBLIC METHODS
 	//-------------------------------------------------------------------
 
-	function run()
+	function run( silent:Boolean )
 	{
 		reset()
 
-		var startTime = getTimer()
-		Output.writeln("Running "+currentClass)
+		if( !silent) 
+		{
+			Output.writeln("Running "+className)
+		}
 
+		var startTime = getTimer()
 		for(var i=0; i<testMethods.length; i++)
 		{
 			runMethod(testMethods[i])
 		}
 		var endTime = getTimer() - startTime
 
-		Output.writeln()
-		Output.writeln('Finished in '+(endTime/1000)+' seconds')
-		
-		report()
+		if( !silent)
+		{
+			Output.writeln()
+			Output.writeln('Finished in '+(endTime/1000)+' seconds')
+			report()
+		}
+	}
+	
+	function toString()
+	{
+		return className
 	}
 
 	//-------------------------------------------------------------------
@@ -74,8 +96,6 @@ class leanUnit.TestCase extends Assertions
 	{
 		failures = new Array()
 		assertionCount = 0
-		currentClass = Reflection.getClassName(this)
-		currentClass = currentClass.substr(currentClass.lastIndexOf('.')+1) // remove namespace
 	}
 
 	private function runMethod(methodName)

leanUnit/TestCase.as

@@ -0,0 +1,90 @@
+/*
+Should hold n TestCase's, run them and do a single report for all.
+*/
+
+import leanUnit.*
+
+class leanUnit.TestSuite
+{
+	var testCases:Array
+	
+	var testCount:Number = 0
+	var assertionCount:Number = 0
+	var failures:Array = new Array()
+	
+	//-------------------------------------------------------------------
+	//	CONSTRUCTOR
+	//-------------------------------------------------------------------
+
+	function TestSuite()
+	{
+		testCases = new Array()
+	}
+	
+	
+	//-------------------------------------------------------------------
+	//	PUBLIC FUNCTIONS
+	//-------------------------------------------------------------------
+	
+	function addCase( testCase:TestCase )
+	{
+		testCases.push( testCase )
+	}
+	
+	function run()
+	{
+		reset()
+		
+		Output.writeln( "Running "+testCases.join(', ') )
+		
+		var startTime = getTimer()
+		for( var i=0; i<testCases.length; i++ )
+		{
+			var testCase:TestCase = testCases[i]
+			testCase.run( true )
+			
+			failures = merge( failures, testCase.failures )
+			testCount += testCase.testMethods.length
+			assertionCount += testCase.assertionCount
+		}	
+		var endTime = getTimer() - startTime
+		
+		Output.writeln()
+		Output.writeln('Finished in '+(endTime/1000)+' seconds')
+		
+		report()
+	}
+	
+	//-------------------------------------------------------------------
+	//	PRIVATE FUNCTIONS
+	//-------------------------------------------------------------------
+	
+	private function reset()
+	{
+		testCount = 0
+		assertionCount = 0
+		failures = new Array()
+	}
+	
+	private function merge( array:Array, array2:Array )
+	{
+		for( var i=0; i<array2.length; i++ )
+		{
+			array.push(array2[i])
+		}
+		return array
+	}
+	
+	private function report()
+	{
+		for( var i=0; i<failures.length; i++ )
+		{
+			Output.writeln()
+			Output.writeln( (i+1)+")")
+			Output.writeln( failures[i], "fail" )
+		}
+		Output.writeln()
+		Output.writeln( testCount+" tests, "+assertionCount+" assertions, "+failures.length+" failures", failures.length > 0 ? 'fail' : 'success' )
+	}
+	
+}