GUnit 0.3.1 → 0.3.2

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/gunit.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{GUnit}
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Greg Sterndale"]
@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
      "lib/gunit/exception_response.rb",
      "lib/gunit/exercise.rb",
      "lib/gunit/fail_response.rb",
+     "lib/gunit/groundwork.rb",
      "lib/gunit/pass_response.rb",
      "lib/gunit/proc_extensions.rb",
      "lib/gunit/setup.rb",
@@ -51,6 +52,7 @@ Gem::Specification.new do |s|
      "test/unit/exception_response_test.rb",
      "test/unit/exercise_test.rb",
      "test/unit/fail_response_test.rb",
+     "test/unit/groundwork_test.rb",
      "test/unit/pass_response_test.rb",
      "test/unit/proc_extensions_test.rb",
      "test/unit/setup_test.rb",
@@ -75,6 +77,7 @@ Gem::Specification.new do |s|
      "test/unit/exception_response_test.rb",
      "test/unit/exercise_test.rb",
      "test/unit/fail_response_test.rb",
+     "test/unit/groundwork_test.rb",
      "test/unit/pass_response_test.rb",
      "test/unit/proc_extensions_test.rb",
      "test/unit/setup_test.rb",

data/lib/gunit.rb

@@ -6,6 +6,7 @@ require 'gunit/assertions'
 
 require 'gunit/context'
 
+require 'gunit/groundwork'
 require 'gunit/exercise'
 require 'gunit/setup'
 require 'gunit/teardown'

data/lib/gunit/assertions.rb

@@ -45,39 +45,25 @@ module GUnit
     end
     
     def assert_raises(*args, &blk)
-      expected = args[0]
-      message  = args[1]
-      
+      expected, message = args[0], args[1]
+
       begin
         blk.call
       rescue Exception => e
         actual = e
       end
 
-      bool = if actual.nil?
+      was_raised = if actual.nil?
         false
       else
         case expected
         when String   then actual.to_s == expected
         when Class    then actual.is_a?(expected)
-        when Nil      then !actual.nil?
+        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?
         "Expected #{expected.to_s} to be raised, but got #{actual.to_s}"
@@ -86,8 +72,8 @@ module GUnit
       else
         "Nothing raised"
       end
-      
-      assert bool, message
+
+      assert was_raised, message
     end
     
   end

data/lib/gunit/exercise.rb

@@ -1,41 +1,6 @@
 module GUnit
-  
-  class Exercise
-    attr_writer :message
-    attr_accessor :task
-    
-    # Exercise.new("my message")
-    # Exercise.new("my message") { @foo.bar() }
-    # Exercise.new() { @foo.bar() }
-    def initialize(*args, &blk)
-      self.message = args[0]
-      self.task = blk if blk
-    end
-    
-    def run(binding=self)
-      begin
-        if @task.is_a?(Proc)
-          bound_task = @task.bind(binding)
-          bound_task.call
-        end
-        return true
-      rescue GUnit::AssertionFailure => e
-        FailResponse.new
-      rescue ::StandardError => e
-        ExceptionResponse.new
-      end
-    end
-    
-    def message
-      @message || default_message
-    end
-    
-    def default_message
-      "Exercise"
-    end
-    
-  end
-  
-end
 
+  class Exercise < Groundwork
+  end
 
+end

data/lib/gunit/groundwork.rb

@@ -0,0 +1,41 @@
+module GUnit
+  
+  class Groundwork
+    attr_writer :message
+    attr_accessor :task
+    
+    # Groundwork.new("my message")
+    # Groundwork.new("my message") { @foo.bar() }
+    # Groundwork.new() { @foo.bar() }
+    def initialize(*args, &blk)
+      self.message = args[0]
+      self.task = blk if blk
+    end
+    
+    def run(binding=self)
+      begin
+        if @task.is_a?(Proc)
+          bound_task = @task.bind(binding)
+          bound_task.call
+        end
+        return true
+      rescue GUnit::AssertionFailure => e
+        FailResponse.new
+      rescue ::StandardError => e
+        ExceptionResponse.new
+      end
+    end
+    
+    def message
+      @message || default_message
+    end
+    
+    def default_message
+      self.class.to_s.split('::').last
+    end
+    
+  end
+  
+end
+
+

data/lib/gunit/setup.rb

@@ -1,41 +1,6 @@
 module GUnit
-  
-  class Setup
-    attr_writer :message
-    attr_accessor :task
-    
-    # Setup.new("my message")
-    # Setup.new("my message") { @foo = "bar" }
-    # Setup.new() { @foo = "bar" }
-    def initialize(*args, &blk)
-      self.message = args[0]
-      self.task = blk if blk
-    end
-    
-    def run(binding=self)
-      begin
-        if @task.is_a?(Proc)
-          bound_task = @task.bind(binding)
-          bound_task.call
-        end
-        return true
-      rescue GUnit::AssertionFailure => e
-        FailResponse.new
-      rescue ::StandardError => e
-        ExceptionResponse.new
-      end
-    end
-    
-    def message
-      @message || default_message
-    end
-    
-    def default_message
-      "Setup"
-    end
-    
-  end
-  
-end
 
+  class Setup < Groundwork
+  end
 
+end

data/lib/gunit/teardown.rb

@@ -1,41 +1,6 @@
 module GUnit
-  
-  class Teardown
-    attr_writer :message
-    attr_accessor :task
-    
-    # Teardown.new("my message")
-    # Teardown.new("my message") { @foo = "bar" }
-    # Teardown.new() { @foo = "bar" }
-    def initialize(*args, &blk)
-      self.message = args[0]
-      self.task = blk if blk
-    end
-    
-    def run(binding=self)
-      begin
-        if @task.is_a?(Proc)
-          bound_task = @task.bind(binding)
-          bound_task.call
-        end
-        return true
-      rescue GUnit::AssertionFailure => e
-        FailResponse.new
-      rescue ::StandardError => e
-        ExceptionResponse.new
-      end
-    end
-    
-    def message
-      @message || default_message
-    end
-    
-    def default_message
-      "Teardown"
-    end
-    
-  end
-  
-end
 
+  class Teardown < Groundwork
+  end
 
+end

data/lib/gunit/test_runner.rb

@@ -70,28 +70,13 @@ module GUnit
     end
 
     def run
-      @io.puts test_case_classes.map{|klass| klass.to_s }.join(', ') unless self.silent
+      self.print_test_cases_summary 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|
-          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"
+        self.print_response_char(response) unless self.silent
       end
+      self.print_responses_summary unless self.silent
     end
     
     def passes
@@ -112,6 +97,26 @@ module GUnit
     
   protected
 
+    def print_test_cases_summary
+      @io.puts test_case_classes.map{|klass| klass.to_s }.join(', ')
+    end
+
+    def print_response_char(response)
+      @io.print self.class.response_color(response)
+      @io.print self.class.response_character(response)
+      @io.print DEFAULT_COLOR
+    end
+
+    def print_responses_summary
+      @io.puts ""
+      @responses.select{|r| !r.is_a?(GUnit::PassResponse) }.each do |response|
+        @io.print self.class.response_color(response)
+        @io.print "#{response.message} (#{response.file_name}:#{response.line_number})\n"
+        @io.print DEFAULT_COLOR
+      end
+      @io.puts "#{@responses.length} verifications: #{passes.length} passed, #{fails.length} failed, #{exceptions.length} exceptions, #{to_dos.length} to-dos"
+    end
+
     # Flatten array of TestSuites and TestCases into a single dimensional array of TestCases
     def test_cases(a=self.tests)
       a.map do |test|

data/test/unit/exercise_test.rb

@@ -19,82 +19,13 @@ class GUnit::ExerciseTest < Test::Unit::TestCase
     @exercise1 = GUnit::Exercise.new
   end
   
-  def test_it_is_a_exercise
-    assert @exercise1.is_a?(GUnit::Exercise)
+  def test_it_is_a_groundwork
+    assert @exercise1.is_a?(GUnit::Groundwork)
   end
   
   def test_has_default_message
     assert_not_nil @exercise1.message
+    assert_equal 'Exercise', @exercise1.message
   end
-  
-  def test_message_setter
-    message = "Exercise some code"
-    @exercise1.message = message
-    assert_equal message, @exercise1.message
-  end
-  
-  # Exercise.new('some feature')
-  def test_initialize_with_one_arg
-    message = 'some feature'
-    @exercise2 = GUnit::Exercise.new(message)
-    assert @exercise2.message === message
-  end
-  
-  # Exercise.new('some feature'){ @foo = "bar" }
-  def test_initialize_with_one_arg_and_block
-    message = 'some feature'
-    task    = (@foo = "bar")
-    @exercise2 = GUnit::Exercise.new(message) { (@foo = "bar") }
-    assert message === @exercise2.message
-    assert task === @exercise2.task.call
-  end
-  
-  def test_run_with_task_called_returns_true
-    @exercise1.task = Proc.new { true }
-    response = @exercise1.run
-    assert response === true
-  end
-  
-  def test_run_with_task_called_returns_false
-    @exercise1.task = Proc.new { false }
-    response = @exercise1.run
-    assert response === true
-  end
-  
-  def test_run_with_task_is_false
-    @exercise1.task = false
-    response = @exercise1.run
-    assert response === true
-  end
-  
-  def test_run_with_task_is_nil
-    @exercise1.task = nil
-    response = @exercise1.run
-    assert response === true
-  end
-  
-  def test_run_with_assertion_failure_exception
-    @exercise1.task = lambda { raise GUnit::AssertionFailure }
-    response = @exercise1.run
-    assert response.is_a?(GUnit::TestResponse)
-    assert response.is_a?(GUnit::FailResponse)
-  end
-  
-  def test_run_with_random_exception
-    @exercise1.task = lambda { raise 'Boom' }
-    response = @exercise1.run
-    assert response.is_a?(GUnit::TestResponse)
-    assert response.is_a?(GUnit::ExceptionResponse)
-  end
-  
-  def test_run_with_binding
-    obj = Object.new
-    obj.instance_variable_set("@foo", "bar")
-    @exercise1.task = Proc.new { instance_variable_set("@foo", "zip") }
-    @exercise1.run
-    assert_equal "bar", obj.instance_variable_get("@foo")
-    @exercise1.run(obj)
-    assert_equal "zip", obj.instance_variable_get("@foo")
-  end
-  
+
 end

data/test/unit/groundwork_test.rb

@@ -0,0 +1,98 @@
+require File.join(File.dirname(__FILE__), '..', 'test_helper')
+
+# class MyClassTest < GUnit::TestCase
+#   groundwork "Some fixtures should be created here"
+#   
+#   context "An instance of MyClass"
+#     groundwork "renamed" do
+#       @foo.rename("the foo")
+#     end
+#   end
+# end
+
+class GUnit::GroundworkTest < Test::Unit::TestCase
+  
+  def setup
+    @groundwork1 = GUnit::Groundwork.new
+  end
+  
+  def test_it_is_a_groundwork
+    assert @groundwork1.is_a?(GUnit::Groundwork)
+  end
+  
+  def test_has_default_message
+    assert_not_nil @groundwork1.message
+    assert_equal 'Groundwork', @groundwork1.message
+  end
+  
+  def test_message_setter
+    message = "Groundwork some code"
+    @groundwork1.message = message
+    assert_equal message, @groundwork1.message
+  end
+  
+  # Groundwork.new('some feature')
+  def test_initialize_with_one_arg
+    message = 'some feature'
+    @groundwork2 = GUnit::Groundwork.new(message)
+    assert @groundwork2.message === message
+  end
+  
+  # Groundwork.new('some feature'){ @foo = "bar" }
+  def test_initialize_with_one_arg_and_block
+    message = 'some feature'
+    task    = (@foo = "bar")
+    @groundwork2 = GUnit::Groundwork.new(message) { (@foo = "bar") }
+    assert message === @groundwork2.message
+    assert task === @groundwork2.task.call
+  end
+  
+  def test_run_with_task_called_returns_true
+    @groundwork1.task = Proc.new { true }
+    response = @groundwork1.run
+    assert response === true
+  end
+  
+  def test_run_with_task_called_returns_false
+    @groundwork1.task = Proc.new { false }
+    response = @groundwork1.run
+    assert response === true
+  end
+  
+  def test_run_with_task_is_false
+    @groundwork1.task = false
+    response = @groundwork1.run
+    assert response === true
+  end
+  
+  def test_run_with_task_is_nil
+    @groundwork1.task = nil
+    response = @groundwork1.run
+    assert response === true
+  end
+  
+  def test_run_with_assertion_failure_exception
+    @groundwork1.task = lambda { raise GUnit::AssertionFailure }
+    response = @groundwork1.run
+    assert response.is_a?(GUnit::TestResponse)
+    assert response.is_a?(GUnit::FailResponse)
+  end
+  
+  def test_run_with_random_exception
+    @groundwork1.task = lambda { raise 'Boom' }
+    response = @groundwork1.run
+    assert response.is_a?(GUnit::TestResponse)
+    assert response.is_a?(GUnit::ExceptionResponse)
+  end
+  
+  def test_run_with_binding
+    obj = Object.new
+    obj.instance_variable_set("@foo", "bar")
+    @groundwork1.task = Proc.new { instance_variable_set("@foo", "zip") }
+    @groundwork1.run
+    assert_equal "bar", obj.instance_variable_get("@foo")
+    @groundwork1.run(obj)
+    assert_equal "zip", obj.instance_variable_get("@foo")
+  end
+  
+end

data/test/unit/setup_test.rb

@@ -11,87 +11,18 @@ require File.join(File.dirname(__FILE__), '..', 'test_helper')
 # end
 
 class GUnit::SetupTest < Test::Unit::TestCase
-  
+
   def setup
     @setup1 = GUnit::Setup.new
   end
-  
-  def test_it_is_a_setup
-    assert @setup1.is_a?(GUnit::Setup)
+
+  def test_it_is_a_groundwork
+    assert @setup1.is_a?(GUnit::Groundwork)
   end
-  
+
   def test_has_default_message
     assert_not_nil @setup1.message
+    assert_equal 'Setup', @setup1.message
   end
-  
-  def test_message_setter
-    message = "Set something up"
-    @setup1.message = message
-    assert_equal message, @setup1.message
-  end
-  
-  # Setup.new('my fixtures')
-  def test_initialize_with_one_arg
-    message = 'my fixtures'
-    @setup2 = GUnit::Setup.new(message)
-    assert @setup2.message === message
-  end
-  
-  # Setup.new('my fixtures'){ @foo = "bar" }
-  def test_initialize_with_one_arg_and_block
-    message = 'my fixtures'
-    task    = (@foo = "bar")
-    @setup2 = GUnit::Setup.new(message) { (@foo = "bar") }
-    assert message === @setup2.message
-    assert task === @setup2.task.call
-  end
-  
-  def test_run_with_task_called_returns_true
-    @setup1.task = Proc.new { true }
-    response = @setup1.run
-    assert response === true
-  end
-  
-  def test_run_with_task_called_returns_false
-    @setup1.task = Proc.new { false }
-    response = @setup1.run
-    assert response === true
-  end
-  
-  def test_run_with_task_is_false
-    @setup1.task = false
-    response = @setup1.run
-    assert response === true
-  end
-  
-  def test_run_with_task_is_nil
-    @setup1.task = nil
-    response = @setup1.run
-    assert response === true
-  end
-  
-  def test_run_with_assertion_failure_exception
-    @setup1.task = lambda { raise GUnit::AssertionFailure }
-    response = @setup1.run
-    assert response.is_a?(GUnit::TestResponse)
-    assert response.is_a?(GUnit::FailResponse)
-  end
-  
-  def test_run_with_random_exception
-    @setup1.task = lambda { raise 'Boom' }
-    response = @setup1.run
-    assert response.is_a?(GUnit::TestResponse)
-    assert response.is_a?(GUnit::ExceptionResponse)
-  end
-  
-  def test_run_with_binding
-    obj = Object.new
-    obj.instance_variable_set("@foo", "bar")
-    @setup1.task = Proc.new { instance_variable_set("@foo", "zip") }
-    @setup1.run
-    assert_equal "bar", obj.instance_variable_get("@foo")
-    @setup1.run(obj)
-    assert_equal "zip", obj.instance_variable_get("@foo")
-  end
-  
+
 end

data/test/unit/teardown_test.rb

@@ -11,87 +11,18 @@ require File.join(File.dirname(__FILE__), '..', 'test_helper')
 # end
 
 class GUnit::TeardownTest < Test::Unit::TestCase
-  
+
   def setup
     @teardown1 = GUnit::Teardown.new
   end
-  
-  def test_it_is_a_teardown
-    assert @teardown1.is_a?(GUnit::Teardown)
+
+  def test_it_is_a_groundwork
+    assert @teardown1.is_a?(GUnit::Groundwork)
   end
-  
+
   def test_has_default_message
     assert_not_nil @teardown1.message
+    assert_equal 'Teardown', @teardown1.message
   end
-  
-  def test_message_setter
-    message = "Set something up"
-    @teardown1.message = message
-    assert_equal message, @teardown1.message
-  end
-  
-  # Teardown.new('my fixtures')
-  def test_initialize_with_one_arg
-    message = 'my fixtures'
-    @teardown2 = GUnit::Teardown.new(message)
-    assert @teardown2.message === message
-  end
-  
-  # Teardown.new('my fixtures'){ @foo = "bar" }
-  def test_initialize_with_one_arg_and_block
-    message = 'my fixtures'
-    task    = (@foo = "bar")
-    @teardown2 = GUnit::Teardown.new(message) { (@foo = "bar") }
-    assert message === @teardown2.message
-    assert task === @teardown2.task.call
-  end
-  
-  def test_run_with_task_called_returns_true
-    @teardown1.task = Proc.new { true }
-    response = @teardown1.run
-    assert response === true
-  end
-  
-  def test_run_with_task_called_returns_false
-    @teardown1.task = Proc.new { false }
-    response = @teardown1.run
-    assert response === true
-  end
-  
-  def test_run_with_task_is_false
-    @teardown1.task = false
-    response = @teardown1.run
-    assert response === true
-  end
-  
-  def test_run_with_task_is_nil
-    @teardown1.task = nil
-    response = @teardown1.run
-    assert response === true
-  end
-  
-  def test_run_with_assertion_failure_exception
-    @teardown1.task = lambda { raise GUnit::AssertionFailure }
-    response = @teardown1.run
-    assert response.is_a?(GUnit::TestResponse)
-    assert response.is_a?(GUnit::FailResponse)
-  end
-  
-  def test_run_with_random_exception
-    @teardown1.task = lambda { raise 'Boom' }
-    response = @teardown1.run
-    assert response.is_a?(GUnit::TestResponse)
-    assert response.is_a?(GUnit::ExceptionResponse)
-  end
-  
-  def test_run_with_binding
-    obj = Object.new
-    obj.instance_variable_set("@foo", "bar")
-    @teardown1.task = Proc.new { instance_variable_set("@foo", "zip") }
-    @teardown1.run
-    assert_equal "bar", obj.instance_variable_get("@foo")
-    @teardown1.run(obj)
-    assert_equal "zip", obj.instance_variable_get("@foo")
-  end
-  
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: GUnit
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - Greg Sterndale
@@ -36,6 +36,7 @@ files:
 - lib/gunit/exception_response.rb
 - lib/gunit/exercise.rb
 - lib/gunit/fail_response.rb
+- lib/gunit/groundwork.rb
 - lib/gunit/pass_response.rb
 - lib/gunit/proc_extensions.rb
 - lib/gunit/setup.rb
@@ -57,6 +58,7 @@ files:
 - test/unit/exception_response_test.rb
 - test/unit/exercise_test.rb
 - test/unit/fail_response_test.rb
+- test/unit/groundwork_test.rb
 - test/unit/pass_response_test.rb
 - test/unit/proc_extensions_test.rb
 - test/unit/setup_test.rb
@@ -103,6 +105,7 @@ test_files:
 - test/unit/exception_response_test.rb
 - test/unit/exercise_test.rb
 - test/unit/fail_response_test.rb
+- test/unit/groundwork_test.rb
 - test/unit/pass_response_test.rb
 - test/unit/proc_extensions_test.rb
 - test/unit/setup_test.rb