GUnit 0.3.0 → 0.3.1

data/README.rdoc

@@ -4,7 +4,7 @@ Unit Test. Gangsta style.
 
 GUnit is a fresh new XUnit Test implementation, poppin' a cap in the ass of TestUnit. 
 
-Just playin'. TestUnit is our boy.
+Just playin'. TestUnit is the shizzle.
 
 == Rolling with the following features:
 * Nested contexts

data/Rakefile

@@ -6,7 +6,7 @@ begin
   Jeweler::Tasks.new do |gem|
     gem.name = "GUnit"
     gem.summary = %Q{XUnit Test. Gangsta style.}
-    gem.description = %Q{GUnit is a fresh new XUnit Test implementation, poppin' a cap in the ass of TestUnit. Just playin'. TestUnit is our boy.}
+    gem.description = %Q{GUnit is a fresh new XUnit Test implementation, poppin' a cap in the ass of TestUnit. Just playin'. TestUnit is the shizzle.}
     gem.email = "gsterndale@gmail.com"
     gem.homepage = "http://github.com/gsterndale/gunit"
     gem.authors = ["Greg Sterndale"]

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/gunit.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{GUnit}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Greg Sterndale"]
-  s.date = %q{2010-01-27}
-  s.description = %q{GUnit is a fresh new XUnit Test implementation, poppin' a cap in the ass of TestUnit. Just playin'. TestUnit is our boy.}
+  s.date = %q{2010-01-30}
+  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 = [
     "LICENSE",

data/lib/gunit/assertions.rb

@@ -54,18 +54,29 @@ module GUnit
         actual = e
       end
 
-      bool = case
-      when actual.nil?
+      bool = if actual.nil?
         false
-      when expected.is_a?(String)
-        actual.to_s == expected
-      when expected.is_a?(Class)
-        actual.is_a?(expected)
-      when expected.nil?
-        !actual.nil?
       else
-        actual == expected
+        case expected
+        when String   then actual.to_s == expected
+        when Class    then actual.is_a?(expected)
+        when Nil      then !actual.nil?
+        else;              actual == expected
+        end
       end
+
+      # bool = case
+      # when actual.nil?
+      #   false
+      # when expected.is_a?(String)
+      #   actual.to_s == expected
+      # when expected.is_a?(Class)
+      #   actual.is_a?(expected)
+      # when expected.nil?
+      #   !actual.nil?
+      # else
+      #   actual == expected
+      # end
       
       message ||= case
       when !expected.nil? && !actual.nil?

data/lib/gunit/test_runner.rb

@@ -20,11 +20,16 @@ module GUnit
 
     include Singleton
 
-    PASS_CHAR      = '.'
-    FAIL_CHAR      = 'F'
-    TODO_CHAR      = '*'
-    EXCEPTION_CHAR = 'E'
-    
+    PASS_CHAR       = '.'
+    FAIL_CHAR       = 'F'
+    TODO_CHAR       = '*'
+    EXCEPTION_CHAR  = 'E'
+    PASS_COLOR      = "\e[0;32m"
+    FAIL_COLOR      = "\e[0;31m"
+    EXCEPTION_COLOR = "\e[0;31m"
+    TODO_COLOR      = "\e[0;33m"
+    DEFAULT_COLOR   = "\e[0m"
+
     DEFAULT_PATTERNS = ['test/**/*_test.rb', 'test/**/test_*.rb']
 
     # TestSuites and/or TestCases
@@ -65,24 +70,25 @@ module GUnit
     end
 
     def run
-      self.tests.each do |test|
-        case
-        when test.is_a?(TestSuite)
-          test.run do |response|
-            @responses << response
-            @io.print self.class.response_character(response) unless self.silent
-          end
-        when test.is_a?(TestCase)
-          response = test.run
-          @responses << response
-          @io.print self.class.response_character(response) unless self.silent
+      @io.puts test_case_classes.map{|klass| klass.to_s }.join(', ') unless self.silent
+      self.test_cases.each do |test_case|
+        response = test_case.run
+        @responses << response
+        unless self.silent
+          @io.print self.class.response_color(response)
+          @io.print self.class.response_character(response)
+          @io.print DEFAULT_COLOR
         end
       end
       
       unless self.silent
         @io.puts ""
         @responses.each do |response|
-          @io.puts "#{response.message} (#{response.file_name}:#{response.line_number})" unless response.is_a?(GUnit::PassResponse)
+          unless response.is_a?(GUnit::PassResponse)
+            @io.print self.class.response_color(response)
+            @io.print "#{response.message} (#{response.file_name}:#{response.line_number})\n"
+            @io.print DEFAULT_COLOR
+          end
         end
         @io.puts "#{@responses.length} verifications: #{passes.length} passed, #{fails.length} failed, #{exceptions.length} exceptions, #{to_dos.length} to-dos"
       end
@@ -105,20 +111,41 @@ module GUnit
     end
     
   protected
-    
+
+    # Flatten array of TestSuites and TestCases into a single dimensional array of TestCases
+    def test_cases(a=self.tests)
+      a.map do |test|
+        case test
+        when GUnit::TestSuite
+          test_cases(test.tests)
+        when GUnit::TestCase
+          test
+        end
+      end.flatten
+    end
+
+    # Unique TestCase subclasses
+    def test_case_classes
+      test_cases.map{|test| test.class }.uniq
+    end
+
     def self.response_character(response)
-      case
-      when response.is_a?(PassResponse)
-        PASS_CHAR
-      when response.is_a?(FailResponse)
-        FAIL_CHAR
-      when response.is_a?(ExceptionResponse)
-        EXCEPTION_CHAR
-      when response.is_a?(ToDoResponse)
-        TODO_CHAR
+      case response
+      when PassResponse       then PASS_CHAR
+      when FailResponse       then FAIL_CHAR
+      when ExceptionResponse  then EXCEPTION_CHAR
+      when ToDoResponse       then TODO_CHAR
+      end
+    end
+
+    def self.response_color(response)
+      case response
+      when PassResponse       then PASS_COLOR
+      when FailResponse       then FAIL_COLOR
+      when ExceptionResponse  then EXCEPTION_COLOR
+      when ToDoResponse       then TODO_COLOR
       end
     end
-    
   end
   
 end

data/lib/gunit/test_suite.rb

@@ -1,29 +1,17 @@
 module GUnit
-  
+
   class TestSuite
-    
-    # TestCases (TODO and/or TestSuites)
+
+    # TestCases and/or TestSuites
     attr_writer :tests
-    
+
     def initialize()
     end
-    
+
     def tests
       @tests ||= []
     end
-    
-    def run(&blk)
-      self.tests.each do |test|
-        case
-        when test.is_a?(TestSuite)
-          test.run{|response| blk.call(response) if blk }
-        when test.is_a?(TestCase)
-          response = test.run
-          blk.call(response) if blk
-        end
-      end
-    end
-    
+
   end
-  
+
 end

data/samples/test/test_helper.rb

@@ -1,8 +1,7 @@
 require 'rubygems'
 require 'ruby-debug'
 require File.join(File.dirname(__FILE__), '..', 'martini')
-require File.join(File.dirname(__FILE__), '..', '..', 'lib', 'gunit')
 
-# $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-# $LOAD_PATH.unshift(File.dirname(__FILE__))
-# require 'gunit'
+# Let's use this version of GUnit, instead of whatever may be install via Gem
+require File.join(File.dirname(__FILE__), '..', '..', 'lib', 'gunit')
+# require 'GUnit'

data/test/unit/test_runner_test.rb

@@ -77,8 +77,10 @@ class GUnit::TestRunnerTest < Test::Unit::TestCase
     patterns = [ 'test/**/*_MY_test.rb', 'test/**/MY_test_*.rb' ]
     @test_runner.patterns = patterns
     test_response1 = GUnit::PassResponse.new
+    test_case = GUnit::TestCase.new
+    test_case.expects(:run).returns(test_response1)
     test_suite = GUnit::TestSuite.new
-    test_suite.expects(:run).multiple_yields(test_response1)
+    test_suite.expects(:tests).returns([test_case]).at_least(1)
     @test_runner.tests = [test_suite]
     @test_runner.autorun = false
     @test_runner.run
@@ -130,9 +132,11 @@ class GUnit::TestRunnerTest < Test::Unit::TestCase
   def test_run_silent
     @test_runner.io = mock() # fails if any methods on io are called
     @test_runner.silent = true
-    test_response1 = GUnit::PassResponse.new    
+    test_response1 = GUnit::PassResponse.new
+    test_case = GUnit::TestCase.new
+    test_case.expects(:run).returns(test_response1)
     test_suite = GUnit::TestSuite.new
-    test_suite.expects(:run).yields(test_response1)
+    test_suite.tests = [test_case]
     @test_runner.tests = [test_suite]
     @test_runner.run
   end
@@ -140,15 +144,16 @@ class GUnit::TestRunnerTest < Test::Unit::TestCase
   def test_run_bang
     @test_runner.io = mock() # fails if any methods on io are called
     @test_runner.silent = true
-    test_response1 = GUnit::PassResponse.new
+    test_case = GUnit::TestCase.new
     test_suite = GUnit::TestSuite.new
+    test_suite.tests = [test_case]
     @test_runner.tests = [test_suite]
-
-    test_suite.expects(:run).times(0)
+    test_case.expects(:run).times(0)
     @test_runner.autorun = false
     @test_runner.run!
-
-    test_suite.expects(:run).times(1).yields(test_response1)
+    
+    test_response1 = GUnit::PassResponse.new
+    test_case.expects(:run).times(1).returns(test_response1)
     @test_runner.autorun = true
     @test_runner.run!
   end
@@ -158,29 +163,49 @@ class GUnit::TestRunnerTest < Test::Unit::TestCase
     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
+    to_do_response_message = "Not dun yet"
+    test_response4 = GUnit::ToDoResponse.new(to_do_response_message)
     @test_runner.silent = false
     io = mock
     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)
     io.expects(:print).with(GUnit::TestRunner::TODO_CHAR).at_least(1)
+
+    io.expects(:print).with(GUnit::TestRunner::PASS_COLOR).at_least(1)
+    # One call to print with each color for every response char and every failing message
+    io.expects(:print).with(GUnit::TestRunner::FAIL_COLOR).at_least(4)
+    # FAIL_COLOR and EXCEPTION_COLOR are the same. Setting two identical expectations causes a failure
+    # io.expects(:print).with(GUnit::TestRunner::EXCEPTION_COLOR).at_least(2)
+    io.expects(:print).with(GUnit::TestRunner::TODO_COLOR).at_least(2)
+
+    io.expects(:print).with(GUnit::TestRunner::DEFAULT_COLOR).at_least(7)
+
     io.stubs(:puts)
-    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)
+    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.expects(:run).multiple_yields(test_response1, test_response2, test_response4)
-    test_case = GUnit::TestCase.new
-    test_case.expects(:run).returns(test_response3)
-    @test_runner.tests = [test_suite, test_case]
+    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
   end
@@ -190,11 +215,17 @@ class GUnit::TestRunnerTest < Test::Unit::TestCase
     test_response2 = GUnit::FailResponse.new
     test_response3 = GUnit::ExceptionResponse.new
     test_response4 = GUnit::ToDoResponse.new
+    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.expects(:run).multiple_yields(test_response1, test_response2, test_response4)
-    test_case = GUnit::TestCase.new
-    test_case.expects(:run).returns(test_response3)
-    @test_runner.tests = [test_suite, test_case]
+    test_suite.tests = [test_case1, test_case2, test_case4]
+    @test_runner.tests = [test_suite, test_case3]
     
     @test_runner.run
     

data/test/unit/test_suite_test.rb

@@ -1,48 +1,26 @@
 require File.join(File.dirname(__FILE__), '..', 'test_helper')
 
 class GUnit::TestSuiteTest < Test::Unit::TestCase
-  
+
   def setup
     @test_suite = GUnit::TestSuite.new
   end
-  
+
   def test_it_is_a_test_suite
     assert @test_suite.is_a?(GUnit::TestSuite)
   end
-  
+
   def test_tests_getter_setter
     tests = [GUnit::TestSuite.new, GUnit::TestCase.new]
     assert @test_suite.tests != tests
     @test_suite.tests = tests
     assert @test_suite.tests == tests
   end
-  
+
   def test_tests_set_nil_has_empty_tests
     @test_suite.tests = nil
     assert @test_suite.tests.empty?
     assert @test_suite.tests.is_a?(Enumerable)
   end
-  
-  def test_run_runs_all_tests_saves_responses
-    test_response1 = GUnit::PassResponse.new
-    test_response2 = GUnit::FailResponse.new
-    test_response3 = GUnit::ExceptionResponse.new
 
-    test_suite = GUnit::TestSuite.new
-    test_suite.expects(:run).multiple_yields(test_response1, test_response2)
-
-    test_case = GUnit::TestCase.new
-    test_case.expects(:run).returns(test_response3)
-
-    @test_suite.tests = [test_suite, test_case]
-
-    responses = []
-    @test_suite.run{|r| responses << r }
-    
-    assert responses.include?(test_response1)
-    assert responses.include?(test_response2)
-    assert responses.include?(test_response3)
-    assert responses.length == 3
-  end
-  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: GUnit
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Greg Sterndale
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-27 00:00:00 -05:00
+date: 2010-01-30 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
-description: GUnit is a fresh new XUnit Test implementation, poppin' a cap in the ass of TestUnit. Just playin'. TestUnit is our boy.
+description: GUnit is a fresh new XUnit Test implementation, poppin' a cap in the ass of TestUnit. Just playin'. TestUnit is the shizzle.
 email: gsterndale@gmail.com
 executables: []