GUnit 0.2.1 → 0.2.2

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/gunit.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{GUnit}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Greg Sterndale"]
@@ -44,14 +44,18 @@ Gem::Specification.new do |s|
      "test/test_helper.rb",
      "test/unit/assertions_test.rb",
      "test/unit/context_test.rb",
+     "test/unit/exception_response_test.rb",
      "test/unit/exercise_test.rb",
      "test/unit/fail_response_test.rb",
+     "test/unit/pass_response_test.rb",
      "test/unit/proc_extensions_test.rb",
      "test/unit/setup_test.rb",
      "test/unit/teardown_test.rb",
      "test/unit/test_case_test.rb",
+     "test/unit/test_response_test.rb",
      "test/unit/test_runner_test.rb",
      "test/unit/test_suite_test.rb",
+     "test/unit/to_do_response_test.rb",
      "test/unit/verification_test.rb"
   ]
   s.homepage = %q{http://github.com/gsterndale/gunit}
@@ -64,14 +68,18 @@ Gem::Specification.new do |s|
      "test/test_helper.rb",
      "test/unit/assertions_test.rb",
      "test/unit/context_test.rb",
+     "test/unit/exception_response_test.rb",
      "test/unit/exercise_test.rb",
      "test/unit/fail_response_test.rb",
+     "test/unit/pass_response_test.rb",
      "test/unit/proc_extensions_test.rb",
      "test/unit/setup_test.rb",
      "test/unit/teardown_test.rb",
      "test/unit/test_case_test.rb",
+     "test/unit/test_response_test.rb",
      "test/unit/test_runner_test.rb",
      "test/unit/test_suite_test.rb",
+     "test/unit/to_do_response_test.rb",
      "test/unit/verification_test.rb"
   ]
 

data/lib/gunit/exception_response.rb

@@ -1,6 +1,7 @@
 module GUnit
   
   class ExceptionResponse < TestResponse
+    DEFAULT_MESSAGE = 'Exception'
   end
   
 end

data/lib/gunit/fail_response.rb

@@ -1,29 +1,7 @@
 module GUnit
   
   class FailResponse < TestResponse
-    
     DEFAULT_MESSAGE = 'Fail'
-    
-    attr_accessor :message
-    attr_reader :backtrace, :line_number, :file_name
-    
-    # FailResponse.new("my message")
-    def initialize(*args)
-      self.message = args.find{|a| a.is_a?(String) } || DEFAULT_MESSAGE
-      self.backtrace = args.find{|a| a.is_a?(Array) } || []
-    end
-    
-    def backtrace=(a=[])
-      @backtrace = a
-      @line_number = nil
-      @backtrace.find do |trace|
-        trace =~ /([\w\.]+):(\d+):/
-        $1 != 'assertions.rb' and @file_name = $1 and @line_number = $2 and @file_name = $1
-      end
-      @line_number = @line_number ? @line_number.to_i : nil
-      @backtrace
-    end
-    
   end
   
 end

data/lib/gunit/pass_response.rb

@@ -1,6 +1,7 @@
 module GUnit
   
   class PassResponse < TestResponse
+    DEFAULT_MESSAGE = 'Pass'
   end
   
 end

data/lib/gunit/test_response.rb

@@ -1,6 +1,54 @@
 module GUnit
   
   class TestResponse
+    
+    DEFAULT_MESSAGE = ''
+    
+    attr_accessor :message
+    attr_reader :backtrace, :line_number, :file_name
+    
+    # FailResponse.new("my message")
+    def initialize(*args)
+      self.message = args.find{|a| a.is_a?(String) } || self.class::DEFAULT_MESSAGE
+      self.backtrace = args.find{|a| a.is_a?(Array) } || []
+    end
+    
+    def backtrace=(a=[])
+      @backtrace = a
+      discover_file_name
+      discover_line_number
+      @backtrace
+    end
+    
+  protected
+    
+    def discover_line_number
+      return @line_number = nil if self.scrubbed_backtrace.empty?
+      self.scrubbed_backtrace.first =~ /[\/\w\.]+:(\d+)/
+      @line_number = $1
+      @line_number = @line_number ? @line_number.to_i : nil
+    end
+    
+    def discover_file_name
+      return @file_name = nil if self.scrubbed_backtrace.empty?
+      self.scrubbed_backtrace.first =~ /([\w\.]+):\d+/
+      @file_name = $1
+    end
+    
+    def scrubbed_backtrace
+      @backtrace.select do |trace|
+        !self.class.blacklisted?(trace)
+      end
+    end
+    
+    def self.blacklisted?(trace)
+      trace =~ /\A([\/\w\.]+):\d+.+\z/
+      path = $1
+      return false unless path
+      dir = path.split('/')[-2]
+      dir && dir == 'gunit'
+    end
+    
   end
   
 end

data/lib/gunit/test_runner.rb

@@ -54,8 +54,8 @@ module GUnit
       
       unless self.silent
         @io.puts ""
-        fails.each do |fail|
-          @io.puts "#{fail.message} (#{fail.file_name}:#{fail.line_number})"
+        @responses.each do |response|
+          @io.puts "#{response.message} (#{response.file_name}:#{response.line_number})" unless response.is_a?(GUnit::PassResponse)
         end
         @io.puts "#{@responses.length} verifications: #{passes.length} passed, #{fails.length} failed, #{exceptions.length} exceptions, #{to_dos.length} to-dos"
       end

data/lib/gunit/to_do_response.rb

@@ -1,6 +1,7 @@
 module GUnit
   
   class ToDoResponse < TestResponse
+    DEFAULT_MESSAGE = 'To do'
   end
   
 end

data/lib/gunit/verification.rb

@@ -19,15 +19,12 @@ module GUnit
           bound_task.call
           PassResponse.new
         else
-          ToDoResponse.new
+          ToDoResponse.new(self.message, Kernel.caller)
         end
       rescue GUnit::AssertionFailure => e
-# require 'rubygems'
-# require 'ruby-debug'
-# debugger
         FailResponse.new(e.message, e.backtrace)
-      rescue ::StandardError => e
-        ExceptionResponse.new
+      rescue ::Exception => e
+        ExceptionResponse.new(e.message, e.backtrace)
       end
     end
     

data/test/unit/exception_response_test.rb

@@ -0,0 +1,19 @@
+require File.join(File.dirname(__FILE__), '..', 'test_helper')
+
+class GUnit::ExceptionResponseTest < Test::Unit::TestCase
+  
+  def setup
+    @exception_response1 = GUnit::ExceptionResponse.new
+  end
+  
+  def test_it_is_a_test_response
+    assert @exception_response1.is_a?(GUnit::TestResponse)
+  end
+  
+  def test_has_default_message
+    assert_not_nil @exception_response1.message
+    assert @exception_response1.message != ''
+    assert_equal GUnit::ExceptionResponse::DEFAULT_MESSAGE, @exception_response1.message
+  end
+
+end

data/test/unit/fail_response_test.rb

@@ -6,98 +6,14 @@ class GUnit::FailResponseTest < Test::Unit::TestCase
     @fail_response1 = GUnit::FailResponse.new
   end
   
-  def test_it_is_a_fail_response
-    assert @fail_response1.is_a?(GUnit::FailResponse)
+  def test_it_is_a_test_response
+    assert @fail_response1.is_a?(GUnit::TestResponse)
   end
   
   def test_has_default_message
     assert_not_nil @fail_response1.message
     assert @fail_response1.message != ''
+    assert_equal GUnit::FailResponse::DEFAULT_MESSAGE, @fail_response1.message
   end
-  
-  def test_has_default_backtrace
-    assert_not_nil @fail_response1.backtrace
-    assert_equal [], @fail_response1.backtrace
-  end
-  
-  def test_message_setter
-    message = "Whoops."
-    @fail_response1.message = message
-    assert_equal message, @fail_response1.message
-  end
-  
-  def test_backtrace_setter
-    backtrace = ['a', 'b', 'c']
-    @fail_response1.backtrace = backtrace
-    assert_equal backtrace, @fail_response1.backtrace
-  end
-  
-  # FailResponse.new('my fixtures')
-  def test_initialize_with_string
-    message = 'Uhohs'
-    @fail_response2 = GUnit::FailResponse.new(message)
-    assert @fail_response2.message === message
-  end
-  
-  def test_initialize_with_array
-    backtrace = ['a', 'b', 'c']
-    @fail_response2 = GUnit::FailResponse.new(backtrace)
-    assert_equal backtrace, @fail_response2.backtrace
-  end
-  
-  def test_initialize_with_string_and_array
-    message = 'Uhohs'
-    backtrace = ['a', 'b', 'c']
-    @fail_response2 = GUnit::FailResponse.new(message, backtrace)
-    assert_equal backtrace, @fail_response2.backtrace
-    assert @fail_response2.message === message
-  end
-  
-  def test_line_number
-    assert_nil @fail_response1.line_number
-    
-    line_number = 63
-    backtrace = ["./samples/../lib/gunit/assertions.rb:23:in `assert'",
-      "./samples/../lib/gunit/assertions.rb:79:in `assert_raises'",
-      "samples/foo_sample.rb:#{line_number}:in `__bind_1264219445_661068'",
-      "./samples/../lib/gunit/verification.rb:19:in `call'",
-      "./samples/../lib/gunit/verification.rb:19:in `run'",
-      "./samples/../lib/gunit/test_case.rb:108:in `test_not_exceptional'",
-      "./samples/../lib/gunit/test_case.rb:38:in `send'",
-      "./samples/../lib/gunit/test_case.rb:38:in `run'",
-      "./samples/../lib/gunit/test_suite.rb:21:in `run'",
-      "./samples/../lib/gunit/test_suite.rb:16:in `each'",
-      "./samples/../lib/gunit/test_suite.rb:16:in `run'",
-      "./samples/../lib/gunit/test_runner.rb:44:in `run'",
-      "./samples/../lib/gunit/test_runner.rb:41:in `each'",
-      "./samples/../lib/gunit/test_runner.rb:41:in `run'",
-      "samples/foo_sample.rb:177"]
-    @fail_response2 = GUnit::FailResponse.new(backtrace)
-    assert_equal line_number, @fail_response2.line_number
-  end
-  
-  def test_file_name
-    assert_nil @fail_response1.file_name
-    
-    file_name = 'my_test.rb'
-    backtrace = ["./samples/../lib/gunit/assertions.rb:23:in `assert'",
-      "./samples/../lib/gunit/assertions.rb:79:in `assert_raises'",
-      "samples/#{file_name}:63:in `__bind_1264219445_661068'",
-      "./samples/../lib/gunit/verification.rb:19:in `call'",
-      "./samples/../lib/gunit/verification.rb:19:in `run'",
-      "./samples/../lib/gunit/test_case.rb:108:in `test_not_exceptional'",
-      "./samples/../lib/gunit/test_case.rb:38:in `send'",
-      "./samples/../lib/gunit/test_case.rb:38:in `run'",
-      "./samples/../lib/gunit/test_suite.rb:21:in `run'",
-      "./samples/../lib/gunit/test_suite.rb:16:in `each'",
-      "./samples/../lib/gunit/test_suite.rb:16:in `run'",
-      "./samples/../lib/gunit/test_runner.rb:44:in `run'",
-      "./samples/../lib/gunit/test_runner.rb:41:in `each'",
-      "./samples/../lib/gunit/test_runner.rb:41:in `run'",
-      "samples/foo_sample.rb:177"]
-    @fail_response2 = GUnit::FailResponse.new(backtrace)
-    assert_equal file_name, @fail_response2.file_name
-  end
-  
-  
+
 end

data/test/unit/pass_response_test.rb

@@ -0,0 +1,19 @@
+require File.join(File.dirname(__FILE__), '..', 'test_helper')
+
+class GUnit::PassResponseTest < Test::Unit::TestCase
+  
+  def setup
+    @pass_response1 = GUnit::PassResponse.new
+  end
+  
+  def test_it_is_a_test_response
+    assert @pass_response1.is_a?(GUnit::TestResponse)
+  end
+  
+  def test_has_default_message
+    assert_not_nil @pass_response1.message
+    assert @pass_response1.message != ''
+    assert_equal GUnit::PassResponse::DEFAULT_MESSAGE, @pass_response1.message
+  end
+
+end

data/test/unit/test_response_test.rb

@@ -0,0 +1,102 @@
+require File.join(File.dirname(__FILE__), '..', 'test_helper')
+
+class GUnit::TestResponseTest < Test::Unit::TestCase
+  
+  def setup
+    @test_response1 = GUnit::TestResponse.new
+  end
+  
+  def test_it_is_a_test_response
+    assert @test_response1.is_a?(GUnit::TestResponse)
+  end
+  
+  def test_has_default_message
+    assert_not_nil @test_response1.message
+  end
+  
+  def test_has_default_backtrace
+    assert_not_nil @test_response1.backtrace
+    assert_equal [], @test_response1.backtrace
+  end
+  
+  def test_message_setter
+    message = "Whoops."
+    @test_response1.message = message
+    assert_equal message, @test_response1.message
+  end
+  
+  def test_backtrace_setter
+    backtrace = ['a', 'b', 'c']
+    @test_response1.backtrace = backtrace
+    assert_equal backtrace, @test_response1.backtrace
+  end
+  
+  # TestResponse.new('my fixtures')
+  def test_initialize_with_string
+    message = 'Uhohs'
+    @test_response2 = GUnit::TestResponse.new(message)
+    assert @test_response2.message === message
+  end
+  
+  def test_initialize_with_array
+    backtrace = ['a', 'b', 'c']
+    @test_response2 = GUnit::TestResponse.new(backtrace)
+    assert_equal backtrace, @test_response2.backtrace
+  end
+  
+  def test_initialize_with_string_and_array
+    message = 'Uhohs'
+    backtrace = ['a', 'b', 'c']
+    @test_response2 = GUnit::TestResponse.new(message, backtrace)
+    assert_equal backtrace, @test_response2.backtrace
+    assert @test_response2.message === message
+  end
+  
+  def test_line_number
+    assert_nil @test_response1.line_number
+    
+    line_number = 63
+    backtrace = ["./samples/../lib/gunit/assertions.rb:23:in `assert'",
+      "./samples/../lib/gunit/assertions.rb:79:in `assert_raises'",
+      "samples/foo_sample.rb:#{line_number}:in `__bind_1264219445_661068'",
+      "./samples/../lib/gunit/verification.rb:19:in `call'",
+      "./samples/../lib/gunit/verification.rb:19:in `run'",
+      "./samples/../lib/gunit/test_case.rb:108:in `test_not_exceptional'",
+      "./samples/../lib/gunit/test_case.rb:38:in `send'",
+      "./samples/../lib/gunit/test_case.rb:38:in `run'",
+      "./samples/../lib/gunit/test_suite.rb:21:in `run'",
+      "./samples/../lib/gunit/test_suite.rb:16:in `each'",
+      "./samples/../lib/gunit/test_suite.rb:16:in `run'",
+      "./samples/../lib/gunit/test_runner.rb:44:in `run'",
+      "./samples/../lib/gunit/test_runner.rb:41:in `each'",
+      "./samples/../lib/gunit/test_runner.rb:41:in `run'",
+      "samples/foo_sample.rb:177"]
+    @test_response2 = GUnit::TestResponse.new(backtrace)
+    assert_equal line_number, @test_response2.line_number
+  end
+  
+  def test_file_name
+    assert_nil @test_response1.file_name
+    
+    file_name = 'my_test.rb'
+    backtrace = ["./samples/../lib/gunit/assertions.rb:23:in `assert'",
+      "./samples/../lib/gunit/assertions.rb:79:in `assert_raises'",
+      "samples/#{file_name}:63:in `__bind_1264219445_661068'",
+      "./samples/../lib/gunit/verification.rb:19:in `call'",
+      "./samples/../lib/gunit/verification.rb:19:in `run'",
+      "./samples/../lib/gunit/test_case.rb:108:in `test_not_exceptional'",
+      "./samples/../lib/gunit/test_case.rb:38:in `send'",
+      "./samples/../lib/gunit/test_case.rb:38:in `run'",
+      "./samples/../lib/gunit/test_suite.rb:21:in `run'",
+      "./samples/../lib/gunit/test_suite.rb:16:in `each'",
+      "./samples/../lib/gunit/test_suite.rb:16:in `run'",
+      "./samples/../lib/gunit/test_runner.rb:44:in `run'",
+      "./samples/../lib/gunit/test_runner.rb:41:in `each'",
+      "./samples/../lib/gunit/test_runner.rb:41:in `run'",
+      "samples/foo_sample.rb:177"]
+    @test_response2 = GUnit::TestResponse.new(backtrace)
+    assert_equal file_name, @test_response2.file_name
+  end
+  
+  
+end

data/test/unit/test_runner_test.rb

@@ -65,15 +65,17 @@ class GUnit::TestRunnerTest < Test::Unit::TestCase
   end
   
   def test_run_not_silent
-    fail_response_message = "Whoops. Failed."
-    line_number = 63
-    file_name = 'my_test.rb'
-    backtrace = ["samples/#{file_name}:#{line_number}:in `my_method'"]
     test_response1 = GUnit::PassResponse.new
-    test_response2 = GUnit::FailResponse.new(fail_response_message, backtrace)
-    test_response3 = GUnit::ExceptionResponse.new
+    fail_response_message = "Whoops. Failed."
+    fail_line_number = 63
+    fail_file_name = 'my_test.rb'
+    backtrace = 
+    test_response2 = GUnit::FailResponse.new(fail_response_message, ["samples/#{fail_file_name}:#{fail_line_number}:in `my_method'"])
+    exception_response_message = "Exceptional"
+    exception_line_number = 72
+    exception_file_name = 'my_other_test.rb'
+    test_response3 = GUnit::ExceptionResponse.new(exception_response_message, ["samples/#{exception_file_name}:#{exception_line_number}:in `my_method'"])
     test_response4 = GUnit::ToDoResponse.new
-    
     @test_runner.silent = false
     io = mock
     io.expects(:print).with(GUnit::TestRunner::PASS_CHAR).at_least(1)
@@ -81,7 +83,8 @@ class GUnit::TestRunnerTest < Test::Unit::TestCase
     io.expects(:print).with(GUnit::TestRunner::EXCEPTION_CHAR).at_least(1)
     io.expects(:print).with(GUnit::TestRunner::TODO_CHAR).at_least(1)
     io.stubs(:puts)
-    io.expects(:puts).with() { |value| value =~ /#{fail_response_message}/ && value =~ /#{file_name}/ && value =~ /#{line_number}/ }.at_least(1)
+    io.expects(:puts).with() { |value| value =~ /#{fail_response_message}/ && value =~ /#{fail_file_name}/ && value =~ /#{fail_line_number}/ }.at_least(1)
+    io.expects(:puts).with() { |value| value =~ /#{exception_response_message}/ && value =~ /#{exception_file_name}/ && value =~ /#{exception_line_number}/ }.at_least(1)
     @test_runner.io = io
     
     test_suite = GUnit::TestSuite.new

data/test/unit/to_do_response_test.rb

@@ -0,0 +1,19 @@
+require File.join(File.dirname(__FILE__), '..', 'test_helper')
+
+class GUnit::ToDoResponseTest < Test::Unit::TestCase
+  
+  def setup
+    @to_do_response1 = GUnit::ToDoResponse.new
+  end
+  
+  def test_it_is_a_test_response
+    assert @to_do_response1.is_a?(GUnit::TestResponse)
+  end
+  
+  def test_has_default_message
+    assert_not_nil @to_do_response1.message
+    assert @to_do_response1.message != ''
+    assert_equal GUnit::ToDoResponse::DEFAULT_MESSAGE, @to_do_response1.message
+  end
+
+end

data/test/unit/verification_test.rb

@@ -71,10 +71,27 @@ class GUnit::VerificationTest < Test::Unit::TestCase
   end
   
   def test_run_with_task_is_nil
+    message = 'Not dun yet'
+    stack = ["./samples/../lib/gunit/verification.rb:25:in `test_not_dun_yet'",
+             "./samples/../lib/gunit/verification.rb:25:in `test_not_dun_yet'",
+             "./samples/../lib/gunit/test_case.rb:38:in `send'",
+             "./samples/../lib/gunit/test_case.rb:38:in `run'",
+             "./samples/../lib/gunit/test_suite.rb:21:in `run'",
+             "./samples/../lib/gunit/test_suite.rb:16:in `each'",
+             "./samples/../lib/gunit/test_suite.rb:16:in `run'",
+             "./samples/../lib/gunit/test_runner.rb:44:in `run'",
+             "./samples/../lib/gunit/test_runner.rb:41:in `each'",
+             "./samples/../lib/gunit/test_runner.rb:41:in `run'",
+             "samples/foo_sample.rb:177"]
+    to_do_response = GUnit::ToDoResponse.new(message, stack)
+    @verification1.message = message
     @verification1.task = nil
+    GUnit::ToDoResponse.expects(:new).with{|m,b| m == message && b.is_a?(Array) }.once.returns(to_do_response)
     response = @verification1.run
     assert response.is_a?(GUnit::TestResponse)
     assert response.is_a?(GUnit::ToDoResponse)
+    assert_equal message, response.message
+    assert_equal stack, response.backtrace
   end
   
   def test_run_with_binding
@@ -101,10 +118,16 @@ class GUnit::VerificationTest < Test::Unit::TestCase
   end
   
   def test_run_with_random_exception
-    @verification1.task = lambda { raise 'Boom' }
+    message = "boooooooom"
+    backtrace = ['ohnoes']
+    exception = Exception.new(message)
+    exception.set_backtrace(backtrace)
+    @verification1.task = lambda { raise exception }
     response = @verification1.run
     assert response.is_a?(GUnit::TestResponse)
     assert response.is_a?(GUnit::ExceptionResponse)
+    assert_equal message, response.message
+    assert_equal backtrace, response.backtrace
   end
     
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: GUnit
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Greg Sterndale
@@ -50,14 +50,18 @@ files:
 - test/test_helper.rb
 - test/unit/assertions_test.rb
 - test/unit/context_test.rb
+- test/unit/exception_response_test.rb
 - test/unit/exercise_test.rb
 - test/unit/fail_response_test.rb
+- test/unit/pass_response_test.rb
 - test/unit/proc_extensions_test.rb
 - test/unit/setup_test.rb
 - test/unit/teardown_test.rb
 - test/unit/test_case_test.rb
+- test/unit/test_response_test.rb
 - test/unit/test_runner_test.rb
 - test/unit/test_suite_test.rb
+- test/unit/to_do_response_test.rb
 - test/unit/verification_test.rb
 has_rdoc: true
 homepage: http://github.com/gsterndale/gunit
@@ -92,12 +96,16 @@ test_files:
 - test/test_helper.rb
 - test/unit/assertions_test.rb
 - test/unit/context_test.rb
+- test/unit/exception_response_test.rb
 - test/unit/exercise_test.rb
 - test/unit/fail_response_test.rb
+- test/unit/pass_response_test.rb
 - test/unit/proc_extensions_test.rb
 - test/unit/setup_test.rb
 - test/unit/teardown_test.rb
 - test/unit/test_case_test.rb
+- test/unit/test_response_test.rb
 - test/unit/test_runner_test.rb
 - test/unit/test_suite_test.rb
+- test/unit/to_do_response_test.rb
 - test/unit/verification_test.rb