asunit4 4.2.1.pre → 4.2.2.pre

data/Gemfile

@@ -1,5 +1,9 @@
 source :rubygems
 
-gem 'sprout'
-#gem 'as3', '>= 1.0.pre'
+gem 'flashsdk', '>= 1.0.2.pre'
+
+group :development do
+  gem "shoulda"
+  gem "mocha"
+end
 

data/asunit4.gemspec

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 
-require File.dirname(__FILE__) + '/asunit4'
+require File.join(File.dirname(__FILE__), 'sprout', 'lib', 'asunit4')
 require 'rake'
 
 Gem::Specification.new do |s|
@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.description               = "AsUnit is the only ActionScript unit test framework that support every development and runtime environment that is currently available. This includes Flex 2, 3, 4, AIR 1 and 2, Flash Lite, and of course the Flash Authoring tool"
   s.rubyforge_project         = "sprout"
   s.required_rubygems_version = ">= 1.3.6"
-  s.require_path              = "."
+  s.require_path              = "sprout/lib"
   s.files                     = FileList["**/*"].exclude /docs|.DS_Store|generated|.svn|.git|airglobal.swc|airframework.swc/
 end
 

data/rakefile.rb

@@ -1,10 +1,8 @@
 require 'bundler'
-Bundler.setup 
+Bundler.require 
 
-require 'sprout'
-sprout 'as3'
-
-require File.dirname(__FILE__) + '/asunit4'
+require 'rake/clean'
+require File.join(File.dirname(__FILE__), 'sprout', 'lib', 'asunit4')
 
 test_input = "AsUnitRunner"
 
@@ -40,7 +38,7 @@ end
 # Configure a Test Build:
 
 def configure_test_task(t)
-  t.default_size = '1000 600'
+  t.default_size = '1000,600'
   t.source_path << 'src'
   t.library_path << 'lib/Reflection.swc'
   t.debug = true
@@ -54,28 +52,28 @@ end
 desc "Compile the ActionScript test harness"
 mxmlc "bin/#{test_input}.swf" do |t|
   t.input = "test/AsUnitRunner.as"
-  t.gem_name = 'sprout-flex4sdk-tool'
+  t.pkg_name = 'flex4'
   configure_test_task t
 end
 
 desc "Compile the Flex 3 test harness"
 mxmlc "bin/Flex3#{test_input}.swf" do |t|
   t.input = "test/Flex3Runner.mxml"
-  t.gem_name = 'sprout-flex3sdk-tool'
+  t.pkg_name = 'flex3'
   configure_test_task t
 end
 
 desc "Compile the Flex 4 test harness"
 mxmlc "bin/Flex4#{test_input}.swf" do |t|
   t.input = "test/Flex4Runner.mxml"
-  t.gem_name = 'sprout-flex4sdk-tool'
+  t.pkg_name = 'flex4'
   configure_test_task t
 end
 
 desc "Compile the AIR 2 test harness"
 mxmlc "bin/AIR2#{test_input}.swf" do |t|
   t.input = "air/AIR2Runner.mxml"
-  t.gem_name = 'sprout-flex4sdk-tool'
+  t.pkg_name = 'flex4'
   t.source_path << 'air'
   t.source_path << 'test'
   t.library_path << 'lib/airglobal.swc'
@@ -95,12 +93,17 @@ flashplayer :test_flex3 => "bin/Flex3#{test_input}.swf"
 desc "Compile and run the Flex 4 Harness"
 flashplayer :test_flex4 => "bin/Flex4#{test_input}.swf"
 
-desc "Compile and run the AIR 2 Harness"
-adl :test_air2 => "bin/AIR2#{test_input}.swf" do |t|
-  t.gem_name = "sprout-flex4sdk-tool"
-  t.root_directory = Dir.pwd
-  t.application_descriptor = "air/AIR2RunnerDescriptor.xml"
-end
+# TODO: Reactivate this once the new sprout harness
+# support adl / adt
+
+task :test_air2
+
+#desc "Compile and run the AIR 2 Harness"
+#adl :test_air2 => "bin/AIR2#{test_input}.swf" do |t|
+  #t.pkg_name = 'flex4'
+  #t.root_directory = Dir.pwd
+  #t.application_descriptor = "air/AIR2RunnerDescriptor.xml"
+#end
 
 desc "Compile and run the ActionScript 3 test harness"
 task :test => :test_as3
@@ -108,11 +111,25 @@ task :test => :test_as3
 desc "Compile and run test harnesses for all supported environments"
 task :test_all => [:test_as3, :test_flex3, :test_flex4, :test_air2]
 
+##########################################
+# Run the Sprout Ruby tests
+
+require 'rake/testtask'
+
+namespace :sprout do
+  desc "Run the Sprout Generator tests"
+  Rake::TestTask.new(:test) do |t|
+    t.libs << "test/unit"
+    t.test_files = FileList["sprout/test/unit/*_test.rb"]
+    t.verbose = true
+  end
+end
+
 ##########################################
 # Compile the SWC
 
-def configure_swc_task(t)
-  t.gem_name = 'sprout-flex4sdk-tool'
+compc "bin/AsUnit-#{AsUnit::VERSION}.swc" do |t|
+  t.pkg_name = 'flex4'
   t.include_sources << 'src'
   t.source_path << 'src'
   t.library_path << 'lib/Reflection.swc'
@@ -120,25 +137,34 @@ def configure_swc_task(t)
   apply_as3_meta_data_args(t)
 end
 
-compc "bin/AsUnit-#{AsUnit::VERSION}.swc" do |t|
-  configure_swc_task t
+task :swc => "bin/AsUnit-#{AsUnit::VERSION}.swc"
+
+##########################################
+# Compile the Gem
+
+file "bin/asunit4-#{AsUnit::VERSION}.gem" do
+  sh "gem build asunit4.gemspec"
+  mv "asunit4-#{AsUnit::VERSION}.gem", "bin/"
 end
 
-task :swc => "bin/AsUnit-#{AsUnit::VERSION}.swc"
+CLEAN.add("bin/*.gem")
+
+desc "Build the rubygem"
+task :gem => [:clean, :swc, "bin/asunit4-#{AsUnit::VERSION}.gem"]
 
 ##########################################
 # Generate documentation
 
-desc "Generate documentation"
-asdoc 'doc' do |t|
-  t.appended_args = '-examples-path=examples'
-  t.source_path << 'src'
-  t.doc_classes << 'AsUnit'
-  t.library_path << 'lib/Reflection.swc'
+#desc "Generate documentation"
+#asdoc 'doc' do |t|
+  #t.appended_args = '-examples-path=examples'
+  #t.source_path << 'src'
+  #t.doc_classes << 'AsUnit'
+  #t.library_path << 'lib/Reflection.swc'
 
   # Not on asdoc?
   #t.static_link_runtime_shared_libraries = true
-end
+#end
 
 ##########################################
 # Package framework ZIPs
@@ -151,6 +177,8 @@ end
 
 CLEAN.add '*.gem'
 
+=begin
+# TODO: Add back when zip task is working
 archive = "AsUnit-#{AsUnit::VERSION}.zip"
 
 zip archive do |t|
@@ -161,6 +189,7 @@ CLEAN.add '*.zip'
 
 desc "Create zip archives"
 task :zip => [:clean, :test_all, archive]
+=end
 
 ##########################################
 # Set up task wrappers

data/sprout/lib/asunit4/suite_class_generator.rb

@@ -0,0 +1,17 @@
+module AsUnit4
+  class SuiteClassGenerator < FlashSDK::ClassGenerator
+    include FlashSDK::FlashHelper
+    
+    def initialize
+      super
+      self.input = 'AllTests.as'
+    end
+
+    def manifest
+      directory test do
+        template input, 'AsUnit4SuiteClass.as'
+      end
+    end
+  end
+end
+

data/sprout/lib/asunit4/templates/AsUnit4SuiteClass.as

@@ -0,0 +1,18 @@
+package {
+    /**
+     * This file has been automatically created using
+     * #!/usr/bin/ruby script/generate suite
+     * If you modify it and run this script, your
+     * modifications will be lost!
+     */
+    <% test_case_classes.each do |test_case| %>import <%= test_case %>;
+    <% end %>
+
+    [Suite]
+    public class AllTests {
+        <% test_case_classes.each do |test_case| %>public var <%= test_case.gsub('.', '_') %>:<%= test_case %>;
+        <% end %>
+
+    }
+}
+

data/sprout/lib/asunit4/templates/AsUnit4TestClass.as

@@ -0,0 +1,33 @@
+package <%= package_name %> {
+    
+    import asunit.asserts.*;
+    import asunit.framework.IAsync;
+    import flash.display.Sprite;
+
+    public class <%= test_class_name %> {
+
+        [Inject]
+        public var async:IAsync;
+
+        [Inject]
+        public var context:Sprite;
+
+        private var <%= instance_name %>:<%= class_name %>;
+
+        [Before]
+        public function setUp():void {
+            <%= instance_name %> = new <%= class_name %>();
+        }
+
+        [After]
+        public function tearDown():void {
+            <%= instance_name %> = null;
+        }
+
+        [Test]
+        public function shouldBeInstantiated():void {
+            assertTrue("<%= instance_name %> is <%= class_name %>", <%= instance_name %> is <%= class_name %>);
+        }
+    }
+}
+

data/sprout/lib/asunit4/test_class_generator.rb

@@ -0,0 +1,15 @@
+
+module AsUnit4
+  class TestClassGenerator < FlashSDK::ClassGenerator
+
+    def manifest
+      directory test_class_directory do
+        template "#{test_class_name}.as", 'AsUnit4TestClass.as'
+      end
+
+      generator :suite_class, {:input => 'AllTests.as'}
+    end
+
+  end
+end
+

data/sprout/lib/asunit4.rb

@@ -0,0 +1,23 @@
+require 'flashsdk'
+
+$:.unshift File.dirname(__FILE__)
+
+module AsUnit
+  NAME    = 'asunit4'
+  VERSION = '4.2.2.pre'
+end
+
+require 'asunit4/test_class_generator'
+require 'asunit4/suite_class_generator'
+
+Sprout::Specification.new do |s|
+  s.name    = AsUnit::NAME
+  s.version = AsUnit::VERSION
+  s.add_file_target do |f|
+    f.add_library :swc, File.join('..', '..', 'bin', "AsUnit-#{AsUnit::VERSION}.swc")
+    # Removed the src compilation for now, b/c it requires additional compiler
+    # configuration - like keep-as3-metadata...
+    #f.add_library :src, [File.join(path, 'src'), File.join(path, 'vendor/as3reflection')]
+  end
+end
+

data/sprout/test/unit/test_class_generator_test.rb

@@ -0,0 +1,51 @@
+require File.join(File.dirname(__FILE__), "test_helper")
+
+class TestClassGeneratorTest < Test::Unit::TestCase
+  include SproutTestCase
+
+  context "a new test class generator" do
+
+    setup do
+      @fixtures = File.join('sprout', 'test', 'fixtures')
+      @temp = File.join(fixtures, 'tmp')
+      FileUtils.mkdir_p @temp
+
+      @generator = AsUnit4::TestClassGenerator.new
+      @generator.path = @temp
+      @generator.logger = StringIO.new
+    end
+
+    teardown do
+      remove_file @temp
+    end
+
+    should "work with a simple class" do
+      @generator.input = 'utils.MathUtilTest'
+      @generator.execute
+
+      assert_file File.join(@temp, 'test', 'utils', 'MathUtilTest.as') do |content|
+        assert_matches /class MathUtilTest \{/, content
+        assert_matches /private var .*:MathUtil;/, content
+        assert_matches /new MathUtil\(\);/, content
+      end
+      assert_file File.join(@temp, 'test', 'AllTests.as') do |content|
+        assert_matches /import utils.MathUtilTest;/, content
+        assert_matches /public var utils_MathUtilTest:utils\.MathUtilTest;/, content
+      end
+    end
+
+    should "work without test suffix in the request" do
+      @generator.input = 'utils.MathUtil'
+      @generator.execute
+      assert_file File.join(@temp, 'test', 'utils', 'MathUtilTest.as') do |content|
+        assert_matches /class MathUtilTest \{/, content
+        assert_matches /private var instance:MathUtil/, content
+      end
+      assert_file File.join(@temp, 'test', 'AllTests.as') do |content|
+        assert_matches /import utils.MathUtilTest/, content
+        assert_matches /public var utils_MathUtilTest:utils\.MathUtilTest;/, content
+      end
+    end
+  end
+end
+

data/sprout/test/unit/test_helper.rb

@@ -0,0 +1,17 @@
+require "rubygems"
+require "bundler"
+
+Bundler.require :default, :development
+
+# These require statments *must* be in this order:
+# http://bit.ly/bCC0Ew
+# Somewhat surprised they're not being required by Bundler...
+require 'shoulda'
+require 'mocha'
+require 'test/unit'
+
+require File.join(File.dirname(__FILE__), '..', '..', 'lib', 'asunit4')
+$:.unshift File.dirname(__FILE__)
+
+require 'sprout/test/sprout_test_case'
+

data/src/asunit/runners/TestRunner.as

@@ -205,12 +205,12 @@ package asunit.runners {
             }
 
             // Calling synchronously is faster but keeps adding to the call stack.
-            //runNextMethod();
+            runNextMethod();
             
             // green thread for runNextMethod()
             // This runs much slower in Flash Player 10.1.
-            timer.reset();
-            timer.start();
+            //timer.reset();
+            //timer.start();
         }
         
         protected function onAsyncMethodCalled(event:TimeoutCommandEvent):void {

data/test/asunit/core/AsUnitCoreTest.as

@@ -73,7 +73,7 @@ package asunit.core {
                 assertEquals("Total Test Count", testMethodCount, core.bridge.runCount);
             }
 
-            core.addEventListener(Event.COMPLETE, async.add(handler));
+            core.addEventListener(Event.COMPLETE, async.add(handler, 200));
             core.start(Suite);
         }
 

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   segments: 
   - 4
   - 2
-  - 1
+  - 2
   - pre
-  version: 4.2.1.pre
+  version: 4.2.2.pre
 platform: ruby
 authors: 
 - Luke Bayes
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-21 00:00:00 -07:00
+date: 2010-07-05 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -34,8 +34,8 @@ files:
 - air/AIR2Runner.mxml
 - air/AIR2RunnerDescriptor.xml
 - asunit4.gemspec
-- asunit4.rb
-- bin/AsUnit-4.1.pre.swc
+- bin/AsUnit-4.2.1.pre.swc
+- bin/AsUnit-4.2.2.pre.swc
 - bin/AsUnitRunner.swf
 - build.xml
 - Gemfile
@@ -43,7 +43,13 @@ files:
 - MIT-LICENSE.txt
 - rakefile.rb
 - README.textile
-- script/generate
+- sprout/lib/asunit4/suite_class_generator.rb
+- sprout/lib/asunit4/templates/AsUnit4SuiteClass.as
+- sprout/lib/asunit4/templates/AsUnit4TestClass.as
+- sprout/lib/asunit4/test_class_generator.rb
+- sprout/lib/asunit4.rb
+- sprout/test/unit/test_class_generator_test.rb
+- sprout/test/unit/test_helper.rb
 - src/asunit/asserts/assertEquals.as
 - src/asunit/asserts/assertEqualsArrays.as
 - src/asunit/asserts/assertEqualsArraysIgnoringOrder.as
@@ -188,7 +194,7 @@ post_install_message:
 rdoc_options: []
 
 require_paths: 
-- .
+- sprout/lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="

data/asunit4.rb

@@ -1,16 +0,0 @@
-require 'sprout'
-
-module AsUnit
-  NAME    = 'asunit4'
-  VERSION = '4.2.1.pre'
-end
-
-Sprout::Specification.new do |s|
-  s.name    = AsUnit::NAME
-  s.version = AsUnit::VERSION
-  s.add_file_target do |f|
-    f.add_library :swc, 'bin/AsUnit-4.1.pre.swc'
-    f.add_library :src, ['src', 'vendor/as3reflection']
-  end
-end
-

data/script/generate

@@ -1,21 +0,0 @@
-#!/usr/bin/env ruby
-require 'rubygems'
-require 'sprout'
-sprout 'sprout-as3-bundle'
-
-# Add a class name if TestSuites were generated
-if(ARGV.size == 1 && ARGV[0] == 'suite')
-  ARGV << 'AllTests'
-end
-
-# Insert class type by default
-if(ARGV.size == 1)
-  ARGV.unshift('class')
-end
-
-# Execute generators like this:
-# script/generate class utils.MathUtil
-# script/generate suite
-# script/generate test utils.MathUtilTest
-
-Sprout::Sprout.generate('as3', ARGV.shift, ARGV, File.dirname(File.dirname(__FILE__)))