ActionPack/src/actionpack/TestRunner.hx ActionPack/test/AllTests.hx ActionPack/vendor/generators/suite/suite_generator.rb ActionPack/vendor/generators/suite/templates/TestSuite.hx ActionPack/vendor/generators/test/templates/TestCase.hx ActionPack/vendor/generators/test/templates/TestSuite.hx ActionPack/vendor/generators/test/test_generator.rb @@ -71,7 +71,7 @@ class AbstractEnvironment implements IEnvironment { return response; } - public function render(?options:Dynamic):Bool { + public function render(?options:Dynamic):Dynamic { if(rendered && (options == null || options.partial == null)) { throw new ActionPackError('render can only be called once during a request/response cycle'); } @@ -95,7 +95,7 @@ class AbstractEnvironment implements IEnvironment { trace(">> currentLayout: " + currentLayout); trace(">> currentView: " + currentView); - return rendered = true; + return currentLayout; } // Subclasses can add this layout to whatever @@ -171,6 +171,8 @@ class AbstractEnvironment implements IEnvironment { Reflect.callMethod(controller, actionMethod, []); } catch(e:Dynamic) { + // TODO: Figure out how to identify built-in types that + // don't exist in Haxe lib. if(e.toString().indexOf('ReferenceError') > -1) { throw new ActionPackError('Unable to call action ' + action + ' on ' + controller); } ActionPack/src/actionpack/AbstractEnvironment.hx @@ -22,9 +22,9 @@ interface IEnvironment { var viewsPackage:String; /** - * Render a view using options hash. + * Render a view using options hash. Return the rendered view (or layout). **/ - function render(?options:Dynamic):Bool; + function render(?options:Dynamic):Dynamic; /** * Create a get request using a string path. ActionPack/src/actionpack/IEnvironment.hx @@ -1,34 +1,22 @@ -import haxe.unit.TestRunner; -import actionpack.AbstractEnvironmentTest; -import actionpack.ActionControllerTest; -import actionpack.ActionRoutesTest; -import actionpack.ActionRouteTest; -import actionpack.FlashEnvironmentTest; -import actionpack.OptionsTest; -import actionpack.StringHelperTest; -import actionpack.TestCaseTest; -import actionpack.WaybeamsTest; +import haxe.PosInfos; +import haxe.Log; -class WaybeamsRunner { +import fixtures.complete.app.views.layouts.ApplicationLayout; +import fixtures.complete.app.views.products.Index; +import fixtures.complete.config.environments.Production; +import fixtures.complete.config.environments.Test; +import fixtures.complete.config.environments.UnknownEnv; +import fixtures.simple.FakeController; +import fixtures.simple.FakeProductsController; +import fixtures.simple.OtherFakeController; +import fixtures.complete.config.Routes; +import fixtures.complete.app.controllers.ProductsController; +import fixtures.complete.app.models.Product; - /** - * 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! - */ +class WaybeamsRunner { static function main() { - var r = new TestRunner(); - r.add(new actionpack.AbstractEnvironmentTest()); - r.add(new actionpack.ActionControllerTest()); - r.add(new actionpack.ActionRoutesTest()); - r.add(new actionpack.ActionRouteTest()); - r.add(new actionpack.FlashEnvironmentTest()); - r.add(new actionpack.OptionsTest()); - r.add(new actionpack.StringHelperTest()); - r.add(new actionpack.TestCaseTest()); - r.add(new actionpack.WaybeamsTest()); - r.run(); + var suite = new AllTests(); + suite.run(); } } ActionPack/test/WaybeamsRunner.hx @@ -3,8 +3,6 @@ package actionpack; import actionpack.TestCase; import fixtures.complete.config.environments.Development; -import fixtures.complete.app.views.layouts.ApplicationLayout; -import fixtures.complete.app.views.products.Index; class AbstractEnvironmentTest extends TestCase { ActionPack/test/actionpack/AbstractEnvironmentTest.hx @@ -1,9 +1,7 @@ package actionpack; -import actionpack.TestCase; import fixtures.simple.FakeController; import fixtures.simple.OtherFakeController; -import fixtures.simple.FakeProductsController; class ActionRouteTest extends TestCase { ActionPack/test/actionpack/ActionRouteTest.hx @@ -1,7 +1,7 @@ package actionpack; -import actionpack.TestCase; import actionpack.errors.RoutingError; + import fixtures.simple.FakeController; import fixtures.simple.OtherFakeController; import fixtures.simple.FakeProductsController; ActionPack/test/actionpack/ActionRoutesTest.hx @@ -1,12 +1,7 @@ package actionpack; -import actionpack.TestCase; import actionpack.errors.ActionPackError; -import fixtures.complete.config.environments.Test; -import fixtures.complete.config.environments.Production; -import fixtures.complete.config.environments.UnknownEnv; - class WaybeamsTest extends TestCase { private var environmentsPackage:String; ActionPack/test/actionpack/WaybeamsTest.hx @@ -9,6 +9,5 @@ class ApplicationLayout extends FlashLayoutBase { graphics.beginFill(0xFF0000); graphics.drawRect(0, 0, 640, 480); graphics.endFill(); - } } ActionPack/test/fixtures/complete/app/views/layouts/ApplicationLayout.hx @@ -4,4 +4,10 @@ import flash.display.Sprite; class Index extends Sprite { + public function new() { + super(); + graphics.beginFill(0x00FF00); + graphics.drawRect(0, 0, 400, 200); + graphics.endFill(); + } } ActionPack/test/fixtures/complete/app/views/products/Index.hx @@ -1,9 +1,5 @@ package fixtures.complete.config; -import fixtures.complete.config.Routes; -import fixtures.complete.app.controllers.ProductsController; -import fixtures.complete.app.models.Product; - import actionpack.FlashEnvironment; class Environment extends FlashEnvironment { ActionPack/test/fixtures/complete/config/Environment.hx @@ -12,7 +12,7 @@ class ClassGenerator < Sprout::Generator::HaxeBase # :nodoc: m.directory full_test_dir m.template 'TestCase.hx', full_test_case_path - m.template 'TestSuite.hx', File.join(test_dir, "#{project_name}Runner.hx"), :collision => :force + m.template 'TestSuite.hx', File.join(test_dir, "AllTests.hx"), :collision => :force end end ActionPack/vendor/generators/class/class_generator.rb @@ -1,7 +1,7 @@ import haxe.unit.TestRunner;<% test_case_classes.each do |test_case| %> import <%= test_case %>;<% end %> -class <%= project_name %>Runner { +class AllTests extends TestRunner { /** * This file has been automatically created using @@ -10,9 +10,9 @@ class <%= project_name %>Runner { * modifications will be lost! */ - static function main() { - var r = new TestRunner();<% test_case_classes.each do |test_case| %> - r.add(new <%= test_case %>());<% end %> - r.run(); + public function new() { + super(); + <% test_case_classes.each do |test_case| %> + add(new <%= test_case %>());<% end %> } } ActionPack/vendor/generators/class/templates/TestSuite.hx 4f3827bdaca09f00259579c985b2e2461549366a Luke Bayes lbayes@patternpark.com http://github.com/lukebayes/waybeams/commit/760973697eae8ea077a1e94e8333d2c12668340e 760973697eae8ea077a1e94e8333d2c12668340e 2009-07-04T09:52:00-07:00 2009-07-04T09:52:00-07:00 Added full set of generators Extracted test suite from outer runner class Added support for single test and single method execution 85edf4930ad4f957c07c2f9d5404e38ed9e432a7 Luke Bayes lbayes@patternpark.com