cwninja-drunit 0.3.1 → 0.4.0

data/Rakefile

@@ -17,7 +17,7 @@ end
 
 spec = Gem::Specification.new do |s|
   s.name        = %q{drunit}
-  s.version     = "0.3.1"
+  s.version     = "0.4.0"
   s.summary     = %q{A library for running tests across multiple applications from a single test case.}
   s.description = %q{A library for running tests across multiple applications from a single test case.}
 

data/lib/drunit.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)

data/lib/drunit/remote_app.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

data/lib/drunit/remote_test.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
@@ -26,6 +31,7 @@ module Drunit
       end
 
       def run(method_name, *args)
+        @assertion_count = 0
         rewrite_exceptions{ __send__(method_name, *args) }
       end
 

data/test/fake_app/fake_app.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

data/test/unit/main_test.rb

@@ -35,6 +35,13 @@ class MainTest < Test::Unit::TestCase
     assert_equal original_count + 1, @_result.assertion_count
   end
 
+  def test_should_not_count_the_same_assert_twice
+    original_count = @_result.assertion_count
+    InApp{ assert true}
+    InApp{ assert true}
+    assert_equal original_count + 2, @_result.assertion_count
+  end
+
   def test_should_be_able_to_pass_in_simple_params
     assert_equal 12, InApp(2,6){|a,b| SomeFoo.new.multiply(a, b)}
   end

data/test/unit/test_case_switching_test.rb

@@ -0,0 +1,17 @@
+require File.join(File.dirname(__FILE__), *%w[.. test_helper])
+
+class SomeOtherTestCaseTest < Test::Unit::TestCase
+  include Drunit
+  RemoteApp(:fake_app, FAKE_APP_PATH + "/fake_app.rb")
+  def InApp(*args, &block)
+    in_app(:fake_app, *args, &block)
+  end
+
+  set_drunit_test_case_class_name "SomeOtherTestCase"
+
+  def test_foo
+    InApp{ assert_in_new_test_case }
+  end
+
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cwninja-drunit
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors: 
 - Tom Lea
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-28 00:00:00 -07:00
+date: 2009-06-08 00:00:00 -07:00
 default_executable: drunit_remote
 dependencies: []
 
@@ -32,6 +32,7 @@ files:
 - test/test_helper.rb
 - test/unit/exception_handling_test.rb
 - test/unit/main_test.rb
+- test/unit/test_case_switching_test.rb
 - bin/drunit_remote
 has_rdoc: true
 homepage: 
@@ -65,3 +66,4 @@ summary: A library for running tests across multiple applications from a single
 test_files: 
 - test/unit/exception_handling_test.rb
 - test/unit/main_test.rb
+- test/unit/test_case_switching_test.rb