asunit4 4.2.2.pre → 4.2.3.pre

data/Gemfile.lock

@@ -0,0 +1,26 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    archive-tar-minitar (0.5.2)
+    flashsdk (1.0.23.pre)
+      sprout (>= 1.1.8.pre)
+    mocha (0.9.10)
+      rake
+    open4 (1.0.1)
+    rake (0.8.7)
+    rubyzip (0.9.4)
+    shoulda (2.11.3)
+    sprout (1.1.10.pre)
+      archive-tar-minitar (= 0.5.2)
+      bundler (>= 0.9.19)
+      open4 (>= 0.9.6)
+      rake (>= 0.8.7)
+      rubyzip (= 0.9.4)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  flashsdk (>= 1.0.2.pre)
+  mocha
+  shoulda

data/build.xml

@@ -14,7 +14,13 @@
 	<property name="libs.dir" location="${root.dir}/lib"/>
 	<property name="output.dir" location="${root.dir}/bin"/>
 	<property name="output.swc" location="${output.dir}/asunit.swc"/>
-			
+	<property name="tests.swf" location="${root.dir}/AsUnitCIRunner.swf"/>
+	<property name="report.dir" location="${root.dir}/report"/>
+	
+	<taskdef resource="flexUnitTasks.tasks" classpath="${libs.dir}/flexUnitTasks.jar" />
+
+	<!-- TARGETS -->
+
 	<target name="swc" depends="" description="Compile AS3 code into a SWC">
 		<echo>Using Flex SDK at: ${FLEX_HOME}</echo>
 			
@@ -29,7 +35,7 @@
 			<arg value="-include-sources=${src.dir}" />
 			
 			<!-- Link in classes from swc library (only those used). -->
-			<!--<arg value="-library-path+=${libs.dir}" />-->
+			<arg value="-library-path+=${libs.dir}" />
 			
 			<!-- Exclude Flex and AIR framework classes from swc. -->
 			<arg value="-external-library-path+=${FLEX_HOME}/frameworks/libs" />
@@ -42,5 +48,39 @@
 		</java>
 			
 	</target>
+	
+	<target name="ci" depends="swc" description="Run continuous integration">
+		<echo>[test] Running Unit Tests</echo>
+		<delete dir="${report.dir}" quiet="true"/>
+		<mkdir dir="${report.dir}"/>
+		
+		<!-- Compile SWF -->
+		<java jar="${FLEX_HOME}/lib/mxmlc.jar" dir="${FLEX_HOME}/frameworks" fork="true" failonerror="true">
+			<arg value="${test.dir}/AsUnitCIRunner.as"/>
+			<arg value="-incremental=true"/>
+			<arg value="-source-path+=${src.dir}"/>
+			<arg value="-output=${tests.swf}"/>
+			<arg value="-target-player=10"/>
+			<arg value="-default-size=1000,800"/>
+			<arg value="-default-background-color=0x000000"/>
+			<arg value="-static-link-runtime-shared-libraries=true"/>
+			<!-- Include classes from SWCs in this folder, but only the ones we use. -->
+			<arg value="-library-path+=${libs.dir}"/>
+			<arg value="-verbose-stacktraces=true"/>
+			<arg value="-headless-server=true"/>
+			<arg value="-keep-as3-metadata+=Test,Suite,Before,BeforeClass,After,AfterClass,RunWith,Ignore,Inject"/>
+		</java>
+		
+		<!-- Execute TestRunner.swf as FlexUnit tests and publish reports -->
+		<flexunit swf="${tests.swf}" toDir="${report.dir}" haltonfailure="false" verbose="true" localTrusted="false" />
+
+		<!-- Generate readable JUnit-style reports -->
+		<junitreport todir="${report.dir}">
+			<fileset dir="${report.dir}">
+				<include name="TEST-*.xml" />
+			</fileset>
+			<report format="frames" todir="${report.dir}/html" />
+		</junitreport>
+	</target>
 		
 </project>

data/rakefile.rb

@@ -41,6 +41,7 @@ def configure_test_task(t)
   t.default_size = '1000,600'
   t.source_path << 'src'
   t.library_path << 'lib/Reflection.swc'
+  t.library_path << 'lib/SwiftSuspenders-v1.5.1.swc'
   t.debug = true
   t.static_link_runtime_shared_libraries = true
   apply_as3_meta_data_args(t)
@@ -133,10 +134,12 @@ compc "bin/AsUnit-#{AsUnit::VERSION}.swc" do |t|
   t.include_sources << 'src'
   t.source_path << 'src'
   t.library_path << 'lib/Reflection.swc'
+  t.library_path << 'lib/SwiftSuspenders-v1.5.1.swc'
   t.static_link_runtime_shared_libraries = true
   apply_as3_meta_data_args(t)
 end
 
+desc "Build the SWC file for #{AsUnit::VERSION}"
 task :swc => "bin/AsUnit-#{AsUnit::VERSION}.swc"
 
 ##########################################
@@ -171,7 +174,7 @@ task :gem => [:clean, :swc, "bin/asunit4-#{AsUnit::VERSION}.gem"]
 
 
 desc "Create the gem package"
-task :package_gem => :swc do
+task :package => :swc do
   sh "gem build asunit4.gemspec"
 end
 

data/sprout/lib/asunit4.rb

@@ -4,7 +4,7 @@ $:.unshift File.dirname(__FILE__)
 
 module AsUnit
   NAME    = 'asunit4'
-  VERSION = '4.2.2.pre'
+  VERSION = '4.2.3.pre'
 end
 
 require 'asunit4/test_class_generator'

data/src/asunit/asserts/assertMatches.as

@@ -0,0 +1,6 @@
+
+package asunit.asserts {
+	import asunit.framework.Assert;
+	
+	public const assertMatches:Function = Assert.assertMatches;
+}

data/src/asunit/asserts/assertThrowsWithMessage.as

@@ -0,0 +1,5 @@
+package asunit.asserts {
+	import asunit.framework.Assert;
+	
+	public var assertThrowsWithMessage:Function = Assert.assertThrowsWithMessage;
+}

data/src/asunit/core/AsUnitCore.as

@@ -1,47 +1,41 @@
 package asunit.core {
-
-    import asunit.framework.IResult;
-    import asunit.framework.IRunListener;
-    import asunit.framework.IRunner;
-    import asunit.framework.Result;
-    import asunit.framework.RunnerFactory;
-    import asunit.framework.TestObserver;
-    import asunit.runners.LegacyRunner;
-
-    import flash.display.DisplayObjectContainer;
-    import flash.events.Event;
-    import flash.events.EventDispatcher;
-    import flash.events.IEventDispatcher;
-    import asunit.framework.InjectionDelegate;
-    import asunit.framework.CallbackBridge;
 	
-	public class AsUnitCore implements IEventDispatcher {
+	import asunit.framework.IResult;
+	import asunit.framework.IRunnerFactory;
+	import asunit.framework.Result;
+	import asunit.framework.IRunner;
+	import asunit.framework.RunnerFactory;
+	import asunit.framework.IRunListener;
+	import asunit.runners.LegacyRunner;
+	import org.swiftsuspenders.Injector;
+
+	import flash.display.DisplayObjectContainer;
+	import flash.events.Event;
+	import flash.events.EventDispatcher;
+	
+	public class AsUnitCore extends EventDispatcher {
 
-		[Inject]
-        public var bridge:CallbackBridge;
+        internal var result:IResult;
 
-		protected var bridgeInjector:InjectionDelegate;
-        protected var dispatcher:IEventDispatcher;
+		protected var injector:Injector;
         protected var legacyRunnerReference:LegacyRunner;
-        protected var observers:Array;
         protected var runner:IRunner;
         protected var _visualContext:DisplayObjectContainer;
 
         public function AsUnitCore() {
             super();
-			initializeBridgeInjector();
-            initializeDispatcher();
+			initializeInjector();
             initializeObservers();
             initialize();
         }
 
-		protected function initializeBridgeInjector():void {
-			bridgeInjector = new InjectionDelegate();
+		protected function initializeInjector():void {
+			injector = new Injector();
+			injector.mapValue(Injector, injector);
+			injector.mapClass(IRunnerFactory, RunnerFactory);
+ 			result = new Result();
+			injector.mapValue(IResult, result);
 		}
-		
-        protected function initializeDispatcher():void {
-            dispatcher = new EventDispatcher();
-        }
 
         /**
          * Template method for subclasses to override,
@@ -60,18 +54,8 @@ package asunit.core {
         }
 
         /**
-         * Add a new Observer instance to this test run. 
-         *
-         * The TestObserver interface is simply a marker interface
-         * that indicates your observer has at least one [Inject]
-         * variable where a bridge will be injected.
-         *
-         * Concrete observers are coupled to concrete runners
-         * by using [Inject] metadata and Bridges for message passing.
+         * Add a listener to this test run. 
          *
-         * The primary TestRunner, CallbackBridge and TextPrinter
-         * are good examples of how to build this relationship.
-         * 
          * To use a different TestRunner on a Suite or Test, simply set:
          *
          *   [RunWith("fully.qualified.ClassName")]
@@ -85,9 +69,9 @@ package asunit.core {
          * provided by a couple of concrete runners.
          *
          */
-        public function addObserver(observer:TestObserver):void {
-			bridgeInjector.updateInjectionPoints(observer, InjectionDelegate.THROW_ERROR_ON_MISSING_INJECTION_POINT);
-        }
+        public function addListener(listener:IRunListener):void {
+			result.addListener(listener);
+		}
 
         /**
          * Set the visual context that will parent all injected
@@ -119,59 +103,29 @@ package asunit.core {
          */
 		public function start(testOrSuite:Class, testMethodName:String=null, visualContext:DisplayObjectContainer=null):void {
 
-			// Will instantiate a new CallbackBridge:
-            // and set it on this instance - but share it
-            // with any Runners or Observers that also
-            // use the CallbackBridge.
-			bridgeInjector.updateInjectionPoints(this, InjectionDelegate.THROW_ERROR_ON_MISSING_INJECTION_POINT);
-            // Must use the accessor, not the _ value:
-            if(visualContext) this.visualContext = visualContext;
+			// Must use the accessor, not the _ value:
+			if(visualContext) this.visualContext = visualContext;
 
-            var factory:RunnerFactory = new RunnerFactory();
-			factory.injector = bridgeInjector;
-            runner = factory.runnerFor(testOrSuite);
-			runner.addEventListener(Event.COMPLETE, runCompleteHandler);
-			bridge.onRunStarted();
-		    runner.run(testOrSuite, testMethodName, this.visualContext);
-        }
+			var factory:IRunnerFactory = injector.getInstance(IRunnerFactory);
+			runner = factory.runnerFor(testOrSuite);
+			runner.addEventListener(Event.COMPLETE, onRunnerComplete);
+			result.onRunStarted();
+			runner.run(testOrSuite, testMethodName, this.visualContext);
+		}
 
-        private function runCompleteHandler(event:Event):void {
+        protected function onRunnerComplete(event:Event):void {
 			runner.removeEventListener(Event.COMPLETE, onRunCompleted);
-			bridge.onRunCompleted(bridge);
-            onRunCompleted();
+			result.onRunCompleted(result);
+			onRunCompleted();
             dispatchEvent(event);
         }
-
-
-        /**
-         * Template method that subclasses can override to perform some
+		
+         /**
+         * Subclasses can override to perform some
          * operation when the run is complete.
          */
 		protected function onRunCompleted():void {
+			
 		}
-
-        // BEGIN: Implement the IEvent Dispatcher Interface:
-
-		public function addEventListener(type:String, listener:Function, useCapture:Boolean=false, priority:int=0, useWeakReference:Boolean=false):void {
-			dispatcher.addEventListener(type, listener, useCapture, priority, useWeakReference);
-		}
-		
-		public function removeEventListener(type:String, listener:Function, useCapture:Boolean=false):void {
-			dispatcher.removeEventListener(type, listener, useCapture);
-		}
-		
-		public function dispatchEvent(event:Event):Boolean {
-			return dispatcher.dispatchEvent(event);
-		}
-		
-		public function hasEventListener(type:String):Boolean {
-			return dispatcher.hasEventListener(type);
-		}
-		
-		public function willTrigger(type:String):Boolean {
-			return dispatcher.willTrigger(type);
-		}
-
-        // END: Implement the IEvent Dispatcher Interface:
 	}
 }

data/src/asunit/core/FlashBuilderCore.as

@@ -8,10 +8,10 @@ package asunit.core {
 
         override protected function initializeObservers():void {
             super.initializeObservers();
-
             var projectName:String = 'SomeProject';
-            addObserver(new FlashBuilderPrinter(projectName));
+            addListener(new FlashBuilderPrinter(projectName));
         } 
+		
 		override protected function onRunCompleted():void {
             super.onRunCompleted();
 			fscommand('quit'); // fails silently if not in debug player

data/src/asunit/core/FlashDevelopCore.as

@@ -8,7 +8,7 @@ package asunit.core {
 
         override protected function initializeObservers():void {
             super.initializeObservers();
-            addObserver(new FlashDevelopPrinter());
+            addListener(new FlashDevelopPrinter());
         }
 
 		override protected function onRunCompleted():void {

data/src/asunit/core/FlexUnitCICore.as

@@ -0,0 +1,17 @@
+package asunit.core {
+
+    import asunit.printers.FlexUnitCIPrinter;
+
+    public class FlexUnitCICore extends TextCore {
+
+        override protected function initializeObservers():void {
+            super.initializeObservers();
+            addListener(new FlexUnitCIPrinter());
+        }
+
+		override protected function onRunCompleted():void {
+            super.onRunCompleted();
+			// The FlexUnitCIPrinter will close Flash Player when the socket acknowledges the end.
+		}
+    }
+}

data/src/asunit/core/TextCore.as

@@ -1,54 +1,36 @@
-package asunit.core {
-
-    import asunit.printers.TextPrinter;
-
-    import flash.display.DisplayObjectContainer;
-
-    /**
-     * TextCore is just a simple helper class that
-     * configures the base class AsUnitCore to use the 
-     * standard TextPrinter.
-     *
-     * The main idea is that you may want a completely
-     * different text output without the default TextPrinter,
-     * and if that's the case, you can go ahead and 
-     * instantiate AsUnitCore and configure it however you
-     * wish.
-     */
-    public class TextCore extends AsUnitCore {
-
-        private var textPrinter:TextPrinter;
-
-        override protected function initializeObservers():void {
-            super.initializeObservers();
-
-            textPrinter = new TextPrinter();
-            addObserver(textPrinter);
-        }
-
-        /* Delegate some configuration to the TextPrinter */
-        public function set displayPerformanceDetails(show:Boolean):void {
-            textPrinter.displayPerformanceDetails = show;
-        }
-
-        public function get displayPerformanceDetails():Boolean {
-            return textPrinter.displayPerformanceDetails;
-        }
-
-        public function set traceOnComplete(should:Boolean):void {
-            textPrinter.traceOnComplete = should;
-        }
-
-        public function get traceOnComplete():Boolean {
-            return textPrinter.traceOnComplete;
-        }
-        
-
-        override public function set visualContext(context:DisplayObjectContainer):void {
-            super.visualContext = context;
-            // Add the TextPrinter to the Display List:
-            visualContext.addChild(textPrinter);
-        }
-    }
-}
-
+package asunit.core {
+
+	import asunit.printers.TextPrinter;
+
+	import flash.display.DisplayObjectContainer;
+	
+    /**
+     * TextCore is just a simple helper class that
+     * configures the base class AsUnitCore to use the 
+     * standard TextPrinter.
+     *
+     * The main idea is that you may want a completely
+     * different text output without the default TextPrinter,
+     * and if that's the case, you can go ahead and 
+     * instantiate AsUnitCore and configure it however you
+     * wish.
+     */
+    public class TextCore extends AsUnitCore {
+
+        public var textPrinter:TextPrinter;
+
+        override protected function initializeObservers():void {
+            super.initializeObservers();
+
+            textPrinter = new TextPrinter();
+            addListener(textPrinter);
+        }
+
+        override public function set visualContext(context:DisplayObjectContainer):void {
+            super.visualContext = context;
+            // Add the TextPrinter to the Display List:
+            visualContext.addChild(textPrinter);
+        }
+    }
+}
+