GUnit 0.3.3 → 0.3.4

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.3.4

data/gunit.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{GUnit}
-  s.version = "0.3.3"
+  s.version = "0.3.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Greg Sterndale"]
-  s.date = %q{2010-02-03}
+  s.date = %q{2010-02-08}
   s.description = %q{GUnit is a fresh new XUnit Test implementation, poppin' a cap in the ass of TestUnit. Just playin'. TestUnit is the shizzle.}
   s.email = %q{gsterndale@gmail.com}
   s.extra_rdoc_files = [

data/lib/gunit/test_case.rb

@@ -124,12 +124,12 @@ module GUnit
       self.run_excercise
       response = self.send(self.method_name.to_sym)
       self.run_teardowns
-    rescue GUnit::NothingToDo => e
-      response = ToDoResponse.new(e.message, e.backtrace)
-    rescue GUnit::AssertionFailure => e
-      response = FailResponse.new(e.message, e.backtrace)
     rescue ::Exception => e
-      response = ExceptionResponse.new(e.message, e.backtrace)
+      response = case e
+      when GUnit::NothingToDo       then ToDoResponse
+      when GUnit::AssertionFailure  then FailResponse
+      else;                              ExceptionResponse
+      end.new(e.message, e.backtrace, self)
     ensure
       return response
     end

data/lib/gunit/test_response.rb

@@ -4,13 +4,14 @@ module GUnit
     
     DEFAULT_MESSAGE = ''
     
-    attr_accessor :message
+    attr_accessor :message, :test_case
     attr_reader :backtrace, :line_number, :file_name
     
     # FailResponse.new("my message")
     def initialize(*args)
       self.message = args.find{|arg| arg.is_a?(String) } || self.class::DEFAULT_MESSAGE
       self.backtrace = args.find{|arg| arg.is_a?(Array) } || []
+      self.test_case = args.find{|arg| arg.is_a?(GUnit::TestCase) }
     end
     
     def backtrace=(traces=[])

data/lib/gunit/test_runner.rb

@@ -111,6 +111,7 @@ module GUnit
       @io.puts ""
       @responses.select{|response| !response.is_a?(GUnit::PassResponse) }.each do |response|
         @io.print self.class.response_color(response)
+        @io.print response.test_case.context.all_message + "\n" if response.test_case && response.test_case.context
         @io.print "#{response.message} (#{response.file_name}:#{response.line_number})\n"
         @io.print DEFAULT_COLOR
       end

data/test/unit/test_case_test.rb

@@ -160,6 +160,7 @@ class GUnit::TestCaseTest < Test::Unit::TestCase
     assert response.is_a?(GUnit::TestResponse)
     assert response.is_a?(GUnit::FailResponse)
     assert_equal exception_message, response.message
+    assert_equal @my_test_case4, response.test_case
   end
 
   def test_run_with_test_method_raising_nothing_to_do_exception
@@ -192,6 +193,20 @@ class GUnit::TestCaseTest < Test::Unit::TestCase
     assert_equal exception_message, response.message
   end
 
+  def test_run_with_test_method_raising_string
+    exception = 'Whoops'
+    verify_message = "The truth"
+    verification = mock
+    verification.expects(:run).raises(exception)
+    dynamic_method_name = MyClassTest.verify(verify_message)
+    GUnit::Verification.expects(:new).with(verify_message).returns(verification)
+    @my_test_case5 = MyClassTest.new(dynamic_method_name)
+    response = @my_test_case5.run
+    assert response.is_a?(GUnit::TestResponse)
+    assert response.is_a?(GUnit::ExceptionResponse)
+    assert_equal exception, response.message
+  end
+  
   def test_test_methods
     assert MyClassTest.test_methods.include?(:test_one)
     assert MyClassTest.test_methods.include?(:test_two)

data/test/unit/test_response_test.rb

@@ -31,6 +31,12 @@ class GUnit::TestResponseTest < Test::Unit::TestCase
     assert_equal backtrace, @test_response1.backtrace
   end
   
+  def test_test_case_setter
+    test_case = GUnit::TestCase.new
+    @test_response1.test_case = test_case
+    assert_equal test_case, @test_response1.test_case
+  end
+  
   # TestResponse.new('my fixtures')
   def test_initialize_with_string
     message = 'Uhohs'
@@ -38,12 +44,21 @@ class GUnit::TestResponseTest < Test::Unit::TestCase
     assert @test_response2.message === message
   end
   
+  # TestResponse.new(['a', 'b', 'c'])
   def test_initialize_with_array
     backtrace = ['a', 'b', 'c']
     @test_response2 = GUnit::TestResponse.new(backtrace)
     assert_equal backtrace, @test_response2.backtrace
   end
   
+  # TestResponse.new(GUnit::TestCase.new)
+  def test_initialize_with_test_case
+    test_case = GUnit::TestCase.new
+    @test_response2 = GUnit::TestResponse.new(test_case)
+    assert_equal test_case, @test_response2.test_case
+  end
+  
+  # TestResponse.new('my fixtures', ['a', 'b', 'c'])
   def test_initialize_with_string_and_array
     message = 'Uhohs'
     backtrace = ['a', 'b', 'c']
@@ -52,6 +67,15 @@ class GUnit::TestResponseTest < Test::Unit::TestCase
     assert @test_response2.message === message
   end
   
+  # TestResponse.new('my fixtures', GUnit::TestCase.new, ['a', 'b', 'c'])
+  def test_initialize_with_string_test_case_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
     

data/test/unit/test_runner_test.rb

@@ -159,11 +159,19 @@ class GUnit::TestRunnerTest < Test::Unit::TestCase
   end
 
   def test_run_not_silent
+    test_case1 = GUnit::TestCase.new
+    test_case2 = GUnit::TestCase.new
+    context2_message = "my context here"
+    context2 = mock(:all_message => context2_message)
+    test_case2.expects(:context).at_least(1).returns(context2)
+    test_case3 = GUnit::TestCase.new
+    test_case4 = GUnit::TestCase.new
+
     test_response1 = GUnit::PassResponse.new
     fail_response_message = "Whoops. Failed."
     fail_line_number = 63
     fail_file_name = 'my_test.rb'
-    test_response2 = GUnit::FailResponse.new(fail_response_message, ["samples/#{fail_file_name}:#{fail_line_number}:in `my_method'"])
+    test_response2 = GUnit::FailResponse.new(fail_response_message, ["samples/#{fail_file_name}:#{fail_line_number}:in `my_method'"], test_case2)
     exception_response_message = "Exceptional"
     exception_line_number = 72
     exception_file_name = 'my_other_test.rb'
@@ -171,7 +179,19 @@ class GUnit::TestRunnerTest < Test::Unit::TestCase
     to_do_response_message = "Not dun yet"
     test_response4 = GUnit::ToDoResponse.new(to_do_response_message)
     @test_runner.silent = false
+
+    test_case1.expects(:run).returns(test_response1)
+    test_case2.expects(:run).returns(test_response2)
+    test_case3.expects(:run).returns(test_response3)
+    test_case4.expects(:run).returns(test_response4)
+
+    test_suite = GUnit::TestSuite.new
+    test_suite.tests = [test_case1, test_case2, test_case4]
+    @test_runner.tests = [test_suite, test_case3]
+
     io = mock
+    io.stubs(:puts)
+
     io.expects(:print).with(GUnit::TestRunner::PASS_CHAR).at_least(1)
     io.expects(:print).with(GUnit::TestRunner::FAIL_CHAR).at_least(1)
     io.expects(:print).with(GUnit::TestRunner::EXCEPTION_CHAR).at_least(1)
@@ -186,25 +206,12 @@ class GUnit::TestRunnerTest < Test::Unit::TestCase
 
     io.expects(:print).with(GUnit::TestRunner::DEFAULT_COLOR).at_least(7)
 
-    io.stubs(:puts)
+    io.expects(:print).with() { |value| value =~ /#{context2_message}/ }
     io.expects(:print).with() { |value| value =~ /#{fail_response_message}/ && value =~ /#{fail_file_name}/ && value =~ /#{fail_line_number}/ }.at_least(1)
     io.expects(:print).with() { |value| value =~ /#{exception_response_message}/ && value =~ /#{exception_file_name}/ && value =~ /#{exception_line_number}/ }.at_least(1)
     io.expects(:print).with() { |value| value =~ /#{to_do_response_message}/ }.at_least(1)
     @test_runner.io = io
 
-    test_case1 = GUnit::TestCase.new
-    test_case1.expects(:run).returns(test_response1)
-    test_case2 = GUnit::TestCase.new
-    test_case2.expects(:run).returns(test_response2)
-    test_case3 = GUnit::TestCase.new
-    test_case3.expects(:run).returns(test_response3)
-    test_case4 = GUnit::TestCase.new
-    test_case4.expects(:run).returns(test_response4)
-
-    test_suite = GUnit::TestSuite.new
-    test_suite.tests = [test_case1, test_case2, test_case4]
-    @test_runner.tests = [test_suite, test_case3]
-
     io.expects(:puts).with(test_case1.class.to_s).at_least(1)
 
     @test_runner.run

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: GUnit
 version: !ruby/object:Gem::Version 
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors: 
 - Greg Sterndale
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-03 00:00:00 -05:00
+date: 2010-02-08 00:00:00 -05:00
 default_executable: 
 dependencies: []