cwninja-drunit 0.2 → 0.3

data/Rakefile

@@ -17,7 +17,7 @@ end
 
 spec = Gem::Specification.new do |s|
   s.name        = %q{drunit}
-  s.version     = "0.2"
+  s.version     = "0.3"
   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

@@ -1,24 +1,6 @@
-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
-    end
+require "rubygems"
 
-    def look_up_exception
-      @real_exception.split("::").inject(Object){|node, part|
-        node && node.const_defined?(part) && node.const_get(part)
-      }
-    end
-  end
+module Drunit
 
   module ClassMethods
     def RemoteApp(name, *args)
@@ -27,21 +9,48 @@ module Drunit
   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)
+    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] + ["in drunit_remote(#{app_name})"] + caller(0)
+    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
+  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/lib/drunit/remote_app.rb

@@ -11,28 +11,15 @@ module Drunit
       @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
+      app.new_test_case
     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
 
@@ -49,11 +36,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,48 @@
 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
+      TestCase.new
+    end
 
     class TestCase
+      include DRb::DRbUndumped
       include Test::Unit::Assertions
       attr_reader :assertion_count
 
-      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)
+        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/test/unit/main_test.rb

@@ -26,7 +26,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
@@ -38,4 +38,9 @@ class MainTest < Test::Unit::TestCase
   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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cwninja-drunit
 version: !ruby/object:Gem::Version 
-  version: "0.2"
+  version: "0.3"
 platform: ruby
 authors: 
 - Tom Lea
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-07 00:00:00 -07:00
+date: 2009-05-28 00:00:00 -07:00
 default_executable: drunit_remote
 dependencies: []
 
@@ -22,9 +22,10 @@ extensions: []
 extra_rdoc_files: 
 - README.markdown
 files: 
-- Rakefile
 - README.markdown
+- Rakefile
 - lib/drunit/remote_app.rb
+- lib/drunit/remote_error.rb
 - lib/drunit/remote_test.rb
 - lib/drunit.rb
 - test/fake_app/fake_app.rb