test/unit/test_case_switching_test.rb @@ -6,6 +6,15 @@ module Drunit def RemoteApp(name, *args) const_set "RemoteAppFor_#{name}", RemoteApp.new(name, *args) end + + def drunit_test_case_class_name + @drunit_test_case_class_name || + (superclass.respond_to?(:drunit_test_case_class_name) ? superclass.drunit_test_case_class_name : "Test::Unit::TestCase") + end + + def set_drunit_test_case_class_name(name) + @drunit_test_case_class_name = name + end end def in_app(name, *args, &block) @@ -42,7 +51,15 @@ private def remote_test_case_for(name) @remote_test_cases ||= {} - @remote_test_cases[name.to_sym] ||= remote_app_for(name).new_test_case + @remote_test_cases[name.to_sym] ||= remote_app_for(name).new_test_case(drunit_test_case_class_name) + end + + def set_drunit_test_case_class_name(name) + @drunit_test_case_class_name = name + end + + def drunit_test_case_class_name + @drunit_test_case_class_name || self.class.drunit_test_case_class_name end def caller_file_and_method_for_block(&block) lib/drunit.rb @@ -11,8 +11,8 @@ module Drunit @remote_object = nil end - def new_test_case - app.new_test_case + def new_test_case(class_name = "Test::Unit::TestCase") + app.new_test_case(class_name) end private lib/drunit/remote_app.rb @@ -4,14 +4,19 @@ require File.join(File.dirname(__FILE__), *%w[remote_error]) module Drunit class RemoteTest - def new_test_case - TestCase.new + def new_test_case(name) + tc = Class.new(eval(name, Object.class_eval{ binding })) + tc.send(:include, TestCaseModule) + tc.allocate end - class TestCase - include DRb::DRbUndumped - include Test::Unit::Assertions - attr_reader :assertion_count + module TestCaseModule + def self.included(other) + other.send(:class_eval) do + include DRb::DRbUndumped + attr_reader :assertion_count + end + end def initialize @assertion_count = 0 lib/drunit/remote_test.rb @@ -7,6 +7,12 @@ end class SomeException < Exception end +class SomeOtherTestCase + def assert_in_new_test_case + add_assertion + end +end + module MyModule class SomeOtherException < Exception end test/fake_app/fake_app.rb 60c3a3327907e8a43e815701280aeeaa77eea739 Tom Lea commit@tomlea.co.uk http://github.com/cwninja/drunit/commit/3a1d8c332477d1830eea302078c1ea365d097929 3a1d8c332477d1830eea302078c1ea365d097929 2009-06-08T05:58:34-07:00 2009-06-08T05:58:34-07:00 Added support for swappable remote test classes. We should be able to test with a ActionController::TestCase if we want to. f028fdf90f2c6d79711409a5df47b2d6eb516d87 Tom Lea commit@tomlea.co.uk