drunit 0.2 → 0.4.1

data/Rakefile

@@ -17,7 +17,7 @@ end
 
 spec = Gem::Specification.new do |s|
   s.name        = %q{drunit}
-  s.version     = "0.2"
+  s.version     = "0.4.1"
   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.}
 
@@ -43,10 +43,3 @@ end
 
 desc "Clean files generated by rake tasks"
 task :clobber => [:clobber_rdoc, :clobber_package]
-
-desc "Generate a gemspec file"
-task :gemspec do
-  File.open("#{spec.name}.gemspec", 'w') do |f|
-    f.write spec.to_ruby
-  end
-end

data/lib/drunit/remote_app.rb

@@ -3,42 +3,30 @@ require 'ruby2ruby'
 
 module Drunit
   class RemoteApp
-    def initialize(name, boot = nil)
+    def initialize(name, boot = nil, dir = nil)
       @name = name
       @boot = boot
-      @boot ||= "#{name}/test/drunit_test_helper.rb" if File.exist? "#{name}/test/drunit_test_helper.rb"
-      @boot ||= "#{name}/test/test_helper.rb" if File.exist? "#{name}/test/test_helper.rb"
+      @dir = File.expand_path(dir || name)
+      @boot ||= "test/drunit_test_helper.rb" if File.exist? "#{@dir}/test/drunit_test_helper.rb"
+      @boot ||= "test/test_helper.rb" if File.exist? "#{@dir}/test/test_helper.rb"
       @remote_object = nil
     end
 
-    def run(method_name, file, line, *args, &block)
-      raise_or_return(app.eval(block_to_source(method_name, &block), file, line, method_name, *args), method_name)
-    end
-
-    def last_assertion_count
-      app.last_assertion_count
+    def new_test_case(class_name = "Test::Unit::TestCase")
+      app.new_test_case(class_name)
     end
 
   private
-    def raise_or_return(e, method_name)
-      return e unless e.is_a? Exception
-      if first_remote_line = e.backtrace.grep(Regexp.new(method_name)).last
-        index = e.backtrace.index(first_remote_line)
-        raise e, e.message, e.backtrace[0..index] + ["RemoteApp<#{@name}>"] + caller(0)
-      end
-      raise e
-    end
-
     def get_url(pipe)
       pipe.each_line do |line|
         return $1 if line =~ /^DRUNIT:URI (.*)$/
-        STDERR.puts "From drunit_remote>> #{line}"
+        STDERR.puts "From drunit_remote(#{@name})>> #{line}"
       end
     end
 
     def start_app!
       drb_server = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "bin", "drunit_remote"))
-      pipe = IO.popen("#{drb_server} #{@boot}")
+      pipe = IO.popen("cd #{@dir} && #{drb_server} #{@boot}")
       pid = pipe.pid
       url = get_url(pipe) or raise "Could not establish connection to the remote drunit instance."
       remote_object = DRbObject.new(nil, url)
@@ -49,11 +37,5 @@ module Drunit
     def app
       @remote_object ||= start_app!
     end
-
-    def block_to_source(method_name, &block)
-      m = Module.new
-      m.send(:define_method, method_name, &block)
-      Ruby2Ruby.translate(m, method_name)
-    end
   end
 end

data/lib/drunit/remote_error.rb

@@ -0,0 +1,31 @@
+module Drunit
+  class RemoteError < RuntimeError
+
+    class << self
+      def name
+        @name || super
+      end
+      attr_writer :name
+    end
+
+    def initialize(exception_name)
+      @exception_name = exception_name.to_s
+    end
+
+    def class
+      type = look_up_exception
+      return type if type
+      super.name = @exception_name #Now we hope and prey that the name of the class is checked imidiately
+      super
+    end
+
+    def look_up_exception
+      @exception_name.split("::").inject(Object){|node, part|
+        node && node.const_defined?(part) && node.const_get(part)
+      }
+    end
+
+  end
+end
+
+

data/lib/drunit/remote_test.rb

@@ -1,54 +1,54 @@
 require 'drb'
 require 'test/unit'
+require File.join(File.dirname(__FILE__), *%w[remote_error])
 
 module Drunit
-  class RemoteError < RuntimeError
-    def initialize(real_exception)
-      @real_exception = real_exception
-    end
-  end
-
   class RemoteTest
-    attr_reader :last_assertion_count
+    def new_test_case(name)
+      tc = Class.new(eval(name, Object.class_eval{ binding }))
+      tc.send(:include, TestCaseModule)
+      tc.allocate
+    end
 
-    class TestCase
-      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(code, source_file, source_line, method_name)
+      def initialize
         @assertion_count = 0
-        @method_name = method_name
-        instance_eval(code, source_file, source_line)
       end
 
       def add_assertion
         @assertion_count += 1
       end
 
-      def run(*args)
-        send(@method_name, *args)
+      def define(code, source_file, source_line)
+        instance_eval(code, source_file, source_line)
       end
-    end
 
-    def eval(code, source_file, source_line, method_name, *args)
-      test_case = TestCase.new(code, source_file, source_line, method_name)
-      return rewrite_exceptions{ test_case.run(*args) }
-    rescue Exception => e
-      return e
-    ensure
-      @last_assertion_count = defined?(test_case.assertion_count) ? test_case.assertion_count : 0
-    end
-  private
-    # We need to strib down and generalise the exceptions to prevent the integration project from having to know anything about anything.
-    def rewrite_exceptions
-      return yield
-    rescue Test::Unit::AssertionFailedError
-      raise
-    rescue ArgumentError => e
-      raise e unless e.message =~ /Anonymous modules /
-      raise NameError, "Const Missing", e.backtrace[3..-1]
-    rescue Exception => e
-      raise Drunit::RemoteError.new(e.class.name), e.message, e.backtrace
+      def run(method_name, *args)
+        @assertion_count = 0
+        rewrite_exceptions{ __send__(method_name, *args) }
+      end
+
+    private
+      # We need to strip down and generalise the exceptions to prevent the integration project from having to know anything about anything.
+      def rewrite_exceptions
+        begin
+          return yield
+        rescue Test::Unit::AssertionFailedError
+          raise
+        rescue ArgumentError => e
+          raise e unless e.message =~ /Anonymous modules /
+          raise NameError, "Const Missing", e.backtrace[3..-1]
+        rescue Exception => e
+          raise Drunit::RemoteError.new(e.class.name), e.message, e.backtrace
+        end
+      end
     end
   end
 end

data/lib/drunit.rb

@@ -1,47 +1,76 @@
+require "rubygems"
+
 module Drunit
-  class RemoteError < RuntimeError
-    def self.name
-      @@name
-    end
 
-    def class
-      if type = look_up_exception
-        return type
-      else
-        @@name = @real_exception.to_s
-        super
-      end
+  module ClassMethods
+    def RemoteApp(name, *args)
+      const_set "RemoteAppFor_#{name}", RemoteApp.new(name, *args)
     end
 
-    def look_up_exception
-      @real_exception.split("::").inject(Object){|node, part|
-        node && node.const_defined?(part) && node.const_get(part)
-      }
+    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
-  end
 
-  module ClassMethods
-    def RemoteApp(name, *args)
-      const_set "RemoteAppFor_#{name}", RemoteApp.new(name, *args)
+    def set_drunit_test_case_class_name(name)
+      @drunit_test_case_class_name = name
     end
   end
 
   def in_app(name, *args, &block)
-    file, line, method = caller(2).first.split(":")
-    method ||= "unknown_method"
-    remote_app_for(name).run(method.gsub(/^in /, "").gsub(/[^a-zA-Z0-9_?!]/, ""), file, line.to_i, *args, &block)
+    file, line, method = caller_file_and_method_for_block(&block)
+    test_case = remote_test_case_for(name)
+    test_case.define(block_to_source(method, &block), file, line)
+    test_case.run(method, *args)
+  rescue Exception => e
+    rewrite_backtrace(e, method, name) or raise
   ensure
-    remote_app_for(name).last_assertion_count.times{ add_assertion } rescue nil
+    test_case.assertion_count.times{ add_assertion } rescue nil
+  end
+
+private
+  def rewrite_backtrace(e, method_name, app_name)
+    backtrace = e.backtrace
+    if first_remote_line = backtrace.grep(Regexp.new(method_name)).first
+      index = backtrace.index(first_remote_line)
+      backtrace = backtrace[0..index] + ["in drunit_remote(#{app_name})"] + caller(1)
+      backtrace.map!{|line| line.gsub(/\(druby:\/\/[^\)]+\) /, "")}
+      raise e, e.message, backtrace
+    end
+  end
+
+  def block_to_source(method_name, &block)
+    m = Module.new
+    m.send(:define_method, method_name, &block)
+    Ruby2Ruby.translate(m, method_name)
   end
 
   def remote_app_for(name)
     self.class.const_get("RemoteAppFor_#{name}")
   end
 
+  def remote_test_case_for(name)
+    @remote_test_cases ||= {}
+    @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)
+    eval(%%caller(0)[0] =~ /in `(.*)'/; [__FILE__, __LINE__, $1 || 'unknown_method']%, block.binding)
+  end
+
   def self.included(other)
     other.send(:extend, ClassMethods)
   end
 end
 
 require File.join(File.dirname(__FILE__), *%w[drunit remote_app])
+require File.join(File.dirname(__FILE__), *%w[drunit remote_error])
 

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

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), *%w[.. test_helper])
 
 class MainTest < Test::Unit::TestCase
   include Drunit
-  RemoteApp(:fake_app, FAKE_APP_PATH + "/fake_app.rb")
+  RemoteApp(:fake_app, "fake_app.rb", FAKE_APP_PATH)
   def InApp(*args, &block)
     in_app(:fake_app, *args, &block)
   end
@@ -13,6 +13,11 @@ class MainTest < Test::Unit::TestCase
     end
   end
 
+  def test_should_be_in_the_given_dir
+    actual = InApp{ File.expand_path Dir.pwd }
+    assert_equal File.expand_path(FAKE_APP_PATH), actual
+  end
+
   def test_should_raise_an_exception
     assert_raise(RuntimeError) { InApp{ raise "Fail" } }
   end
@@ -26,7 +31,7 @@ class MainTest < Test::Unit::TestCase
 
   def test_should_inject_the_fact_we_are_in_a_remote_app_into_the_backtrace
     e = assert_raise(RuntimeError) { InApp{ raise "Fail" } }
-    assert_equal 1, e.backtrace.grep("RemoteApp<fake_app>").size
+    assert_equal 1, e.backtrace.grep("in drunit_remote(fake_app)").size, e.backtrace.join("\n")
   end
 
   def test_should_raise_the_assertion_count_when_we_assert
@@ -35,7 +40,19 @@ 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
+
+  def test_consistant_remote_instance
+    InApp{ @foo = 1 }
+    InApp{ assert_equal 1, @foo }
+  end
 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,12 @@
 --- !ruby/object:Gem::Specification 
 name: drunit
 version: !ruby/object:Gem::Version 
-  version: "0.2"
+  prerelease: false
+  segments: 
+  - 0
+  - 4
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Tom Lea
@@ -9,8 +14,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-07 00:00:00 +01:00
-default_executable: drunit_remote
+date: 2010-03-25 00:00:00 +00:00
+default_executable: 
 dependencies: []
 
 description: A library for running tests across multiple applications from a single test case.
@@ -25,15 +30,18 @@ files:
 - Rakefile
 - README.markdown
 - lib/drunit/remote_app.rb
+- lib/drunit/remote_error.rb
 - lib/drunit/remote_test.rb
 - lib/drunit.rb
 - test/fake_app/fake_app.rb
 - test/test_helper.rb
 - test/unit/exception_handling_test.rb
 - test/unit/main_test.rb
-- bin/drunit_remote
+- test/unit/test_case_switching_test.rb
 has_rdoc: true
 homepage: 
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --line-numbers
@@ -46,21 +54,24 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.1
+rubygems_version: 1.3.6
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: A library for running tests across multiple applications from a single test case.
 test_files: 
 - test/unit/exception_handling_test.rb
 - test/unit/main_test.rb
+- test/unit/test_case_switching_test.rb