asunit4 4.2.2.pre → 4.2.3.pre

data/src/asunit/framework/Assert.as

@@ -111,6 +111,37 @@ package asunit.framework {
 			throw new AssertionFailedError("expected error type:<" + getQualifiedClassName(errorType) + "> but none was thrown." );
         }
 
+        /**
+        *  Asserts that the provided block throws an exception that matches
+        *  the type and message provided.
+        *
+        *  <listing>
+        *  public function testFailingCode():void {
+        *     assertThrows(CustomError, "Invalid state", function():void {
+        *           var instance:Sprite = new Sprite();
+        *           instance.callMethodThatThrows();
+        *     });
+        *  }
+        *  </listing>
+        **/
+        static public function assertThrowsWithMessage(errorType:Class, errorMessage:String, block:Function):void {
+			try {
+				block.call();
+			}
+			catch(e:Error) {
+				if(!(e is errorType)) {
+					throw new AssertionFailedError("expected error type:<" + getQualifiedClassName(errorType)
+						+"> but was:<" + getQualifiedClassName(e) + ">");
+				}
+				if(e.message != errorMessage) {
+					throw new AssertionFailedError("expected error message:<" + errorMessage
+						+"> but was:<" + e.message + ">");
+				}
+				return;
+			}
+			throw new AssertionFailedError("expected error type:<" + getQualifiedClassName(errorType) + "> with message:<" + errorMessage + "> but none was thrown." );
+        }
+
         /**
          *  Asserts that two objects are equal. If they are not
          *  an AssertionFailedError is thrown with the given message.
@@ -188,6 +219,30 @@ package asunit.framework {
 				throw new AssertionFailedError(message + "expected not null but was:<" + actual + ">");
 			}
         }
+
+        static public function assertMatches(...args:Array):void {
+            var message:String;
+            var expr:RegExp;
+            var content:String;
+
+            if(args.length == 2) {
+                message = "";
+                expr = args[0];
+                content = args[1];
+            }
+            else if(args.length == 3) {
+                message = args[0];
+                expr = args[1];
+                content = args[2];
+            }
+            else {
+                throw new IllegalOperationError("Invalid argument count");
+            }
+            if(!content.match(expr)) {
+                fail("Unable to match [" + expr + "] in content: [" + content + "]");
+            }
+        }
+
         /**
          * Asserts that an object is null.  If it is not
          * an AssertionFailedError is thrown with the given message.
@@ -373,24 +428,34 @@ package asunit.framework {
             if (expected.length != actual.length) {
                 failNotEquals(message, expected, actual);
             }
-            for (var i : int = 0; i < expected.length; i++) {
-                var foundMatch : Boolean = false;
-                var expectedMember : Object = expected[i];
-                for (var j : int = 0; j < actual.length; j++) {
-                    var actualMember : Object = actual[j];
+            
+            var unusedPotentialMatches:Array = actual.slice();
+		    
+			var iLength:uint = expected.length;
+			var jLength:uint;
+			
+			searchingForExpectedItems: 
+			for (var i:int = 0; i < iLength; i++)
+			{
+				var expectedMember : Object = expected[i];
+				jLength = unusedPotentialMatches.length;
+				
+				checkingAgainstActualItems: 
+				for (var j : int = 0; j < jLength; j++) {
+                    var actualMember : Object = unusedPotentialMatches[j];
                     try {
                         assertEquals(expectedMember, actualMember);
-                        foundMatch = true;
-                        break;
+                        unusedPotentialMatches.splice(j, 1);
+						continue searchingForExpectedItems;
                     }
                     catch (e : AssertionFailedError) {
                         //  no match, try next
                     }
                 }
-                if (!foundMatch) {
-                    failNotEquals("Found no match for " + expectedMember + ";", expected, actual);
-                }
-            }
+				
+				failNotEquals("Found no match for " + expectedMember + ";", expected, actual);
+				
+			}
         }
 
         static private function failNotEquals(message:String, expected:Object, actual:Object):void {

data/src/asunit/framework/Async.as

@@ -61,7 +61,7 @@ package asunit.framework {
         }
 		
         /**
-         * Returns a new async handler that should be used as the observer of some
+         * Returns a new async handler that should be used as the listener of some
          * presumably asynchronous event.
          *
          * You can optionally pass a function closure that you would like to have

data/src/asunit/framework/IResult.as

@@ -1,15 +1,10 @@
 package asunit.framework {
 
-	import asunit.framework.ITestFailure;
-
-	public interface IResult extends MessageBridge, IRunListener, ITestListener {
+	public interface IResult extends IRunListener, ITestListener {
 		
 		function addListener(listener:IRunListener):void;
 		function removeListener(listener:IRunListener):void;
 
-        function addObserver(observer:TestObserver):void;
-        function shouldRunTest(testClass:Class):Boolean;
-		
 		function get errors():Array;
 		function get errorCount():uint;
 		

data/src/asunit/framework/IRunListener.as

@@ -1,8 +1,5 @@
 package asunit.framework {
 
-	import asunit.framework.ITestFailure;
-	import asunit.framework.IResult;
-	
 	public interface IRunListener extends ITestListener {
 		function onRunStarted():void;
 		function onRunCompleted(result:IResult):void;

data/src/asunit/framework/IRunner.as

@@ -6,10 +6,7 @@ package asunit.framework {
 	public interface IRunner extends IEventDispatcher {
 
 		function run(testOrSuite:Class, testMethodName:String=null, visualContext:DisplayObjectContainer=null):void;
-        function shouldRunTest(testClass:Class):Boolean;
 
-        function set factory(factory:IRunnerFactory):void;
-        function get factory():IRunnerFactory;
 	}
 }
 

data/src/asunit/framework/IRunnerFactory.as

@@ -1,9 +1,9 @@
 package asunit.framework {
-
+	import org.swiftsuspenders.Injector;
 
     public interface IRunnerFactory {
-		function get injector():InjectionDelegate;
-		function set injector(value:InjectionDelegate):void;
+		function get injector():Injector;
+		function set injector(value:Injector):void;
         function runnerFor(testOrSuite:Class):IRunner;
     }
 }

data/src/asunit/framework/ITestListener.as

@@ -1,9 +1,8 @@
 package asunit.framework {
 
 	import asunit.framework.ITestFailure;
-    import asunit.framework.TestObserver;
 	
-	public interface ITestListener extends TestObserver {
+	public interface ITestListener {
 		function onTestStarted(test:Object):void;
 		function onTestCompleted(test:Object):void;
 		function onTestFailure(failure:ITestFailure):void;

data/src/asunit/framework/Method.as

@@ -1,80 +1,82 @@
-package asunit.framework {
-
-    import p2.reflect.Reflection;
-    import p2.reflect.ReflectionMethod;
-    import p2.reflect.ReflectionMetaData;
-	
-	public class Method {
-
-        private var _scopeName:String;
-
-		public var expects:String;
-		public var ignore:Boolean;
-        public var ignoreDescription:String;
-		public var metadata:ReflectionMetaData;
-		public var name:String;
-		public var order:int      = 0;
-		public var scope:Object;
-		public var timeout:int = -1;
-		public var value:Function;
-		
-		public function Method(scope:Object, reflection:ReflectionMethod) {
-            this.scope = scope;
-            this.name = reflection.name;
-            this.value = scope[reflection.name];
-
-            metadata = reflection.getMetaDataByName('Test');
-
-            if(metadata != null) {
-                var ignoreReflection:ReflectionMetaData = reflection.getMetaDataByName('Ignore');
-                if(ignoreReflection) {
-                    ignore = true;
-                    ignoreDescription = ignoreReflection.getValueFor('description');
-                }
-
-                handleTimeoutMetaData();
-                applyMetaData('expects');
-                applyMetaData('order');
-            }
-        }
-
-        public function get scopeName():String {
-            return _scopeName ||= Reflection.create(scope).name
-        }
-
-        private function handleTimeoutMetaData():void {
-            var value:* = metadata.getValueFor('timeout');
-            if(value != null) {
-                var message:String = "It seems you're using [Test(timeout=n)] for " + name + ", but this has been deprecated.\n";
-                message += "If you'd like to set a different timeout value, please send it to your Async instance methods like: async.add(null, timeoutInMilliseconds)";
-                trace("[DEPRECATION WARNING] " + message);
-            }
-        }
-
-        // The null response for timeout was updating the
-        // int field to zero when it needs to be -1...
-        private function applyMetaData(name:String):void {
-            var value:* = metadata.getValueFor(name);
-            if(value != null) {
-                this[name] = value;
-            }
-        }
-
-        public function execute():void {
-            value.call(scope);
-        }
-
-        public function get isTest():Boolean {
-            return (metadata != null || isLegacyTest);
-        }
-
-        public function get isLegacyTest():Boolean {
-            return (metadata == null && name.match(/^test/));
-        }
-
-		public function toString():String {
-			return name;
-		}
-	}
-}
-
+package asunit.framework {
+
+    import p2.reflect.Reflection;
+    import p2.reflect.ReflectionMethod;
+    import p2.reflect.ReflectionMetaData;
+	
+	public class Method {
+
+        private var _scopeName:String;
+
+		public var expects:String;
+        public var message:String;
+		public var ignore:Boolean;
+        public var ignoreDescription:String;
+		public var metadata:ReflectionMetaData;
+		public var name:String;
+		public var order:int      = 0;
+		public var scope:Object;
+		public var timeout:int = -1;
+		public var value:Function;
+		
+		public function Method(scope:Object, reflection:ReflectionMethod) {
+            this.scope = scope;
+            this.name = reflection.name;
+            this.value = scope[reflection.name];
+
+            metadata = reflection.getMetaDataByName('Test');
+
+            if(metadata != null) {
+                var ignoreReflection:ReflectionMetaData = reflection.getMetaDataByName('Ignore');
+                if(ignoreReflection) {
+                    ignore = true;
+                    ignoreDescription = ignoreReflection.getValueFor('description');
+                }
+
+                handleTimeoutMetaData();
+                applyMetaData('expects');
+                applyMetaData('message');
+                applyMetaData('order');
+            }
+        }
+
+        public function get scopeName():String {
+            return _scopeName ||= Reflection.create(scope).name
+        }
+
+        private function handleTimeoutMetaData():void {
+            var value:* = metadata.getValueFor('timeout');
+            if(value != null) {
+                var message:String = "It seems you're using [Test(timeout=n)] for " + name + ", but this has been deprecated.\n";
+                message += "If you'd like to set a different timeout value, please send it to your Async instance methods like: async.add(null, timeoutInMilliseconds)";
+                trace("[DEPRECATION WARNING] " + message);
+            }
+        }
+
+        // The null response for timeout was updating the
+        // int field to zero when it needs to be -1...
+        private function applyMetaData(name:String):void {
+            var value:* = metadata.getValueFor(name);
+            if(value != null) {
+                this[name] = value;
+            }
+        }
+
+        public function execute():void {
+            value.call(scope);
+        }
+
+        public function get isTest():Boolean {
+            return (metadata != null || isLegacyTest);
+        }
+
+        public function get isLegacyTest():Boolean {
+            return (metadata == null && name.match(/^test/));
+        }
+
+		public function toString():String {
+			return name;
+		}
+	}
+}
+

data/src/asunit/framework/Result.as

@@ -1,10 +1,6 @@
 package asunit.framework {
-
-    import asunit.errors.UsageError;
-	import asunit.framework.ITestFailure;
-
-	import flash.events.EventDispatcher;
-    import flash.utils.Dictionary;
+	
+	import asunit.errors.UsageError;
 
 	/**
      * A <code>Result</code> collects the results of executing
@@ -15,7 +11,7 @@ package asunit.framework {
      *
      * @see Test
      */
-    public class Result extends EventDispatcher implements IResult {
+    public class Result implements IResult {
 
 		protected var _runCount:uint = 0;
 		protected var _runTime:Number;
@@ -27,7 +23,6 @@ package asunit.framework {
 
 		protected var listeners:Array;
         protected var runComplete:Boolean;
-        protected var knownTests:Dictionary;
 
         public function Result() {
 			_errors       = [];
@@ -36,7 +31,6 @@ package asunit.framework {
 			_successes    = [];
             _warnings     = [];
 			listeners     = [];
-            knownTests    = new Dictionary();
         }
 		
         public function get errors():Array { return _errors; }
@@ -72,21 +66,6 @@ package asunit.framework {
 		
 		public function get runTime():Number { return _runTime; }
 		public function set runTime(value:Number):void { _runTime = value; }
-
-        public function shouldRunTest(testClass:Class):Boolean {
-            if(!knownTests[testClass]) {
-                knownTests[testClass] = testClass;
-                return true;
-            }
-            return false;
-        }
-		
-        public function addObserver(observer:TestObserver):void {
-            if(!(observer is IRunListener)) {
-                throw new UsageError("Result.addObserver called with an instance that wasn't an IRunListener. This should work soon, but doesn't yet...");
-            }
-            addListener(IRunListener(observer));
-        }
 		
 		public function addListener(listener:IRunListener):void {
 			if (listeners.indexOf(listener) >= 0) return;

data/src/asunit/framework/RunnerFactory.as

@@ -9,7 +9,7 @@ package asunit.framework {
 
     import p2.reflect.Reflection;
     import p2.reflect.ReflectionMetaData;
-    import asunit.framework.InjectionDelegate;
+    import org.swiftsuspenders.Injector;
 
 	public class RunnerFactory implements IRunnerFactory {
 
@@ -34,21 +34,20 @@ package asunit.framework {
          */
         public var DefaultSuiteRunner:Class;
 		
-        public function RunnerFactory() {
+        public function RunnerFactory(injector:Injector = null) {
             DefaultSuiteRunner = DEFAULT_SUITE_RUNNER;
             DefaultTestRunner  = DEFAULT_TEST_RUNNER;
-            injector = new InjectionDelegate();
+            this.injector = injector ||= new Injector();
+			injector.mapValue(Injector, injector);
         }
 		
-		private var _injector:InjectionDelegate;
+		private var _injector:Injector;
 		
-		public function get injector():InjectionDelegate
-		{
+		public function get injector():Injector {
 			return _injector;
 		}
 		
-		public function set injector(value:InjectionDelegate):void
-		{
+		public function set injector(value:Injector):void {
 			_injector = value;
 		}
 		
@@ -56,7 +55,6 @@ package asunit.framework {
          * runnerFor is the primary inerface to the RunnerFactory
          */
         public function runnerFor(testOrSuite:Class):IRunner {
-            //trace(">> runnerFor: " + testOrSuite + " with current default of: " + DefaultTestRunner);
             validate(testOrSuite);
             return getRunnerForTestOrSuite(testOrSuite);
         }
@@ -84,31 +82,21 @@ package asunit.framework {
         }
 
         protected function getRunnerForSuite(reflection:Reflection):IRunner {
-            // First update the DefaultTestRunner with the provided RunWith
-            // if necessary...
-            var Constructor:Class = getRunWithConstructor(reflection);
-            if(Constructor) {
-                DefaultTestRunner = Constructor;
-            }
-            // Always return the default Suite Runner:
-            var runner:IRunner = new DefaultSuiteRunner();
-            configureRunner(runner);
+            // Use the provided RunWith class, or the DefaultSuiteRunner
+            var Constructor:Class = getRunWithConstructor(reflection) || DefaultSuiteRunner;
+            var runner:IRunner = injector.instantiate(Constructor);
             return runner;
         }
 
         protected function getLegacyRunnerForTest(reflection:Reflection):IRunner {
-            var runner:IRunner = new LegacyRunner();
-            configureRunner(runner);
+            var runner:IRunner = injector.instantiate(LegacyRunner);
             return runner;
         }
 
         protected function getRunnerForTest(reflection:Reflection):IRunner {
-            // Use the provided RunWith class, or the DefaultTestRunner (this may
-            // have been overridden by a parent Suite
+            // Use the provided RunWith class, or the DefaultTestRunner
             var Constructor:Class = getRunWithConstructor(reflection) || DefaultTestRunner;
-			//FIXME: This will choke if given a class with constructor arguments!
-            var runner:IRunner = new Constructor();
-            configureRunner(runner);
+            var runner:IRunner = injector.instantiate(Constructor);
             return runner;
         }
 
@@ -152,15 +140,6 @@ package asunit.framework {
 	        }
 	        return null;
 	    }
-	
-		/**
-		 * @private
-		 */
-		protected function configureRunner(runner:IRunner):void
-		{
-			runner.factory = this;
-			injector.updateInjectionPoints(runner, InjectionDelegate.THROW_ERROR_ON_MISSING_INJECTION_POINT);
-		}
 
 		public static function isSuite(reflection:Reflection):Boolean {
             return (reflection.getMetaDataByName('Suite') != null);