rubyunit 0.3.19 → 0.3.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b42f86c558335da460eae82ff6cd75f73a91524c
-  data.tar.gz: 83c926d309db46f940becd13cdd5d05dc2c53639
+  metadata.gz: fd9ffda90dff8ebfa3160c4b4ceec4576e408342
+  data.tar.gz: c70119c8318e8d5859e9d88970ed068501fd7b8f
 SHA512:
-  metadata.gz: 96d32102c962c4791dd4e8c4df95b497161c93c7d6741fd962cc99c1075d51902ee025ff8c661ceeb376ce30f05a9f1450b6d2158b112bf6706ab96f643c3ae3
-  data.tar.gz: 8c3a266c53efebc08d7ea4d0389729309719c43682ae327df6574dfb043da12baf4d51d2127e53966102f216cc6db09e845f87dd648b741a8097c92fb67bed2b
+  metadata.gz: a29157a5f264788674d89c37bbc179decb028266ae4af93927370689abb7c522ce89b64a75b4f13d1f13a1f61c31854b70fc816699cab70d334dbf6540f8f728
+  data.tar.gz: 42f7bfb1e1f8c6c9d3f9d665044ac467fc2a59aa9da70812fed6bec342d2efe76c7f5f8316a12772ebe2d73bb9bad7e9dd2f7053a5b163c94ce64c925a80b4f9

data/TestSuite.rb

@@ -4,7 +4,7 @@
 # in this repository
 path = File.dirname(__FILE__)
 
-$LOAD_PATH.unshift("#{path}/lib") unless ARGV.include? '--gem'
+$:.unshift("#{path}/lib") unless ARGV.include? '--gem'
 
 require 'RubyUnit'
 

data/lib/RubyUnit/AssertionFailure.rb

@@ -15,7 +15,7 @@ module RubyUnit
     #   The data associated with the assertion
     #
     def initialize data = {}
-      raise ArgumentError, 'Data for AssertionFailure must be a Hash' unless data.is_a? Hash
+      raise TypeError, 'Data for AssertionFailure must be a Hash' unless data.is_a? Hash
       @data = data
     end
 

data/lib/RubyUnit/AssertionMessage.rb

@@ -51,6 +51,7 @@ module RubyUnit
 
     ##
     # Exception assertions
+    ASSERT_RAISE_ERROR          = 'Exception WAS raised'
     ASSERT_NOTHING_RAISED_ERROR = 'Exception WAS NOT raised'
     ASSERT_RAISE_MESSAGE_ERROR  = 'Exception message WAS raised'
     ASSERT_RAISE_KIND_OF_ERROR  = 'Exception Class WAS raised'

data/lib/RubyUnit/Assertions/Classes.rb

@@ -205,8 +205,21 @@ module RubyUnit
       private
       ##
       # Helper for asserting descendents
-      def __assert_descendent error, klass, descendent, message
-        raise ArgumentError, "Expecting Class, got #{klass.class}" unless klass.is_a? Class
+      #
+      # error::
+      #   The error message
+      #
+      # klass::
+      #   The parent class
+      #
+      # descendent::
+      #   The descendent class
+      #
+      # message::
+      #   The message provided to be reported for a failure
+      #
+      def __assert_descendent error, klass, descendent, message # :nodoc:
+        raise TypeError, "Expecting Class, got #{klass.class}" unless klass.is_a? Class
         __assert_block error, message, {:class=>klass, :descendent=>descendent} do
           yield
         end

data/lib/RubyUnit/Assertions/Exceptions.rb

@@ -49,14 +49,14 @@ module RubyUnit
       #  end
       #
       def assertRaiseMessage pattern, message = nil, &block
-        assertRaiseExpected Exception, pattern, message, &block
+        __assert_exception ASSERT_RAISE_MESSAGE_ERROR, Exception, pattern, message, &block
       end
 
       ##
       # Assert that a specified exception type is raised.
       # * raises RubyUnit::AssertionFailure unless the correct Exception type is raised
       #
-      # e::
+      # exception::
       #   The Exception class that is expected.
       #
       # message::
@@ -69,8 +69,8 @@ module RubyUnit
       #    # do something
       #  end
       #
-      def assertRaiseKindOf e, message = nil, &block
-        assertRaiseExpected e, '', message, &block
+      def assertRaiseKindOf exception, message = nil, &block
+        __assert_exception ASSERT_RAISE_KIND_OF_ERROR, exception, '', message, &block
       end
 
       ##
@@ -93,29 +93,68 @@ module RubyUnit
       #    raise StandardError, 'Invalid Retroincabulator'
       #  end
       #
-      def assertRaiseExpected exception, pattern, message = nil &block
-        __assert_exception pattern, exception
-        __assert_block ASSERT_RAISE_EXPECTED_ERROR, message, {:exception=>exception, :pattern=>pattern} do
-          e = false
-          begin
-            yield
-          rescue exception => e
-            assertEqual pattern, e.message, message if pattern.is_a? String and pattern.length > 0
-            assertMatch pattern, e.message, message if pattern.is_a? Regexp
-          end
-          e
-        end
+      def assertRaiseExpected exception, pattern, message = nil, &block
+        __assert_exception ASSERT_RAISE_EXPECTED_ERROR, exception, pattern, message, &block
       end
 
       private
       ##
       # Validate the parameters for exception assertions
-      # * raises ArgumentError if _pattern_ is not a String or Regexp
-      # * raises ArgumentError unless _e_ is a descendent of the Exception class
+      # * raises TypeError if _pattern_ is not a String or Regexp
+      # * raises TypeError unless _e_ is a descendent of the Exception class
+      #
+      # pattern:
+      #   The regular expression which validates the exception message
+      #
+      # exception:
+      #   The exception type that is expected to be raised
+      #
+      # message:
+      #   The message provided to be reported for a failure
+      #
+      def __validate_exception pattern, exception = Exception # :nodoc:
+        raise TypeError, "Expected subclass of Exception, got #{exception.class}" unless exception.instance_of? Class and exception <= Exception
+        regex = pattern
+        if pattern.is_a? String
+          regex = pattern.length.zero? ? /#{pattern}/ : /^#{pattern}$/
+        elsif not pattern.is_a? Regexp
+          raise TypeError, "Message pattern must be a Regexp or String, got #{pattern.class}"
+        end
+        regex
+      end
+
+      ##
+      # Common method to get catch exceptions and build error message
+      #
+      # error:
+      #   The error message for the current assertion
       #
-      def __assert_exception pattern, e = Exception # :nodoc:
-        raise ArgumentError, "Message patter must be a Regexp or String, got #{pattern.class}" unless pattern.is_a? Regexp or pattern.is_a? String
-        raise ArgumentError, "Expected subclass of Exception, got #{e.class}" unless e < Exception
+      # exception:
+      #   The exception type that is expected to be raised
+      #
+      # pattern:
+      #   The regular expression which validates the exception message
+      #
+      # message:
+      #   The message provided to be reported for a failure
+      #
+      def __assert_exception error, exception, pattern, message = nil, &block # :nodoc:
+        pattern = __validate_exception pattern, exception
+        Assertions.add_assertion
+        errors  = []
+        failure = false
+        begin
+          yield
+          errors << ASSERT_RAISE_ERROR
+        rescue exception => failure
+          errors << ASSERT_RAISE_MESSAGE_ERROR unless pattern =~ failure.message
+        # we'll need to revisit this.
+        rescue Exception => failure
+          errors << ASSERT_RAISE_KIND_OF_ERROR
+        end
+        errors.unshift error unless errors.count.zero?
+        __fail errors.join("\n"), message, {:exception=>exception, :pattern=>pattern, :raised=>failure} unless errors.count.zero?
+        failure
       end
     end
   end

data/lib/RubyUnit/Assertions/Root.rb

@@ -5,9 +5,9 @@ module RubyUnit
       ##
       # Builds the message that will be used with the assertion
       # * raises RubyUnit::AssertionFailure
-      # * raises ArgumentError unless error is a String
-      # * raises ArgumentError unless message is nil or a String
-      # * raises ArgumentError unless data is a Hash
+      # * raises TypeError unless error is a String
+      # * raises TypeError unless message responds to to_s
+      # * raises TypeError unless data is a Hash
       #
       # error::
       #   The assertion description
@@ -21,10 +21,10 @@ module RubyUnit
       #  __fail 'Failing Test', message, {'expected' => expected, 'actual' => actual }
       #
       def __fail error, message, data = {} # :nodoc:
-        raise ArgumentError, 'Error description must be a String' unless error.is_a? String
-        raise ArgumentError, 'Failure message must be String' unless message.nil? or message.is_a? String
-        raise ArgumentError, 'Failure data must be a Hash' unless data.is_a? Hash
-        raise AssertionFailure.new({'Assertion Failure'=>message}.merge data), error
+        raise TypeError, 'Error description must be a String' unless error.is_a? String
+        raise TypeError, 'Failure message must be String' unless message.respond_to? :to_s
+        raise TypeError, 'Failure data must be a Hash' unless data.is_a? Hash
+        raise AssertionFailure.new({'Assertion Failure'=>message.to_s}.merge data), error
       end
 
       ##

data/lib/RubyUnit/Runner.rb

@@ -40,8 +40,8 @@ module RubyUnit
       public
       #
       # The static test runner
-      # * raises ArgumentError if any data method doesn't return an array
-      # * raises ArgumentError if any data method doesn't return an array of arrays
+      # * raises TypeError if any data method doesn't return an array
+      # * raises TypeError if any data method doesn't return an array of arrays
       # * Returns the sum of the failure and error counts
       #
       #  RubyUnit::Runner.run
@@ -63,9 +63,9 @@ module RubyUnit
             if data_methods.include? data_method
               data = object.send data_method
 
-              raise ArgumentError, "Data method #{data_method} must return an array" unless data.is_a? Array
+              raise TypeError, "Data method #{data_method} must return an array" unless data.is_a? Array
               data.each do |params|
-                raise ArgumentError, "Data method #{data_method} must return an array of arrays" unless data.is_a? Array
+                raise TypeError, "Data method #{data_method} must return an array of arrays" unless data.is_a? Array
                 runner.run test_case, test, params
               end
             else
@@ -143,7 +143,7 @@ module RubyUnit
     # Run a test and record the results. The test object is instantiated and
     # TestCaseObject.setup is called. TestCaseObject.teardown is called after
     # the test has finished. This is called by the static runner.
-    # * raises ArgumentError unless _params_ is an Array
+    # * raises TypeError unless _params_ is an Array
     #
     # test_case_class::
     #   The test case class that has the test
@@ -157,7 +157,7 @@ module RubyUnit
     #  run TestCaseClass, :myTest, [param1, param2]
     #
     def run test_case_class, test, params = []
-      raise ArgumentError, "Parameter list for #{object.class}::#{test} must be an array" unless params.is_a? Array
+      raise TypeError, "Parameter list for #{object.class}::#{test} must be an array" unless params.is_a? Array
       test_case = test_case_class.new
 
       begin

data/lib/RubyUnit.rb

@@ -13,17 +13,17 @@ module RubyUnit
 
   ##
   # Current RubyUnit version
-  VERSION            = '0.3.19'
+  VERSION            = '0.3.20'
 
   ##
   # Set debug mode
-  # * raises ArgumentError if _bool_ is not a Boolean
+  # * raises TypeError if _bool_ is not a Boolean
   #
   # bool::
   #   New value for debug mode
   #
   def self.debug= bool
-    raise ArgumentError, INVALID_DEBUG_MODE unless [true, false].include? bool
+    raise TypeError, INVALID_DEBUG_MODE unless [true, false].include? bool
     @@debug = bool
   end
 

data/tests/Assertions/TC_Classes.rb

@@ -238,7 +238,7 @@ module AssertionsTests
     #   Class to be asserted
     #
     def assertDescendentInvalidTest klass, descendent
-      assertRaiseKindOf ArgumentError do
+      assertRaiseKindOf TypeError do
         assertDescendent klass, descendent
       end
     end
@@ -290,7 +290,7 @@ module AssertionsTests
     #   The assertion message
     #
     def assertDescendentWithMessageInvalidTest klass, descendent, message
-      assertRaiseKindOf ArgumentError, message do
+      assertRaiseKindOf TypeError, message do
         assertDescendent klass, descendent, message
       end
     end
@@ -333,7 +333,7 @@ module AssertionsTests
     #   Class to be asserted
     #
     def assertNotDescendentInvalidTest klass, descendent
-      assertRaiseKindOf ArgumentError do
+      assertRaiseKindOf TypeError do
         assertNotDescendent klass, descendent
       end
     end
@@ -385,7 +385,7 @@ module AssertionsTests
     #   The assertion message
     #
     def assertNotDescendentWithMessageInvalidTest klass, descendent, message
-      assertRaiseKindOf ArgumentError, message do
+      assertRaiseKindOf TypeError, message do
         assertNotDescendent klass, descendent, message
       end
     end

data/tests/Assertions/TC_Comparisons.rb

@@ -10,200 +10,608 @@ module AssertionsTests
   class TC_Comparisons < AssertionsTestCase
     include ComparisonsData
 
+    ##
+    # Test assertEqualTest
+    #
+    # expected::
+    #   The expected value
+    #
+    # value::
+    #   Value to assert
+    #
     def assertEqualTest expected, value
       assertEqual expected, value
     end
 
+    ##
+    # Test assertEqualFailTest
+    #
+    # expected::
+    #   The expected value
+    #
+    # value::
+    #   Value to assert
+    #
     def assertEqualFailTest expected, value
       rescue_assertion ASSERT_EQUAL_ERROR do
         assertEqual expected, value
       end
     end
 
+    ##
+    # Test assertEqualWithMessageTest
+    #
+    # expected::
+    #   The expected value
+    #
+    # value::
+    #   Value to assert
+    #
+    # message::
+    #   The assertion message
+    #
     def assertEqualWithMessageTest expected, value, message
       assertEqual expected, value, message
     end
 
+    ##
+    # Test assertEqualWithMessageFailTest
+    #
+    # expected::
+    #   The expected value
+    #
+    # value::
+    #   Value to assert
+    #
+    # message::
+    #   The assertion message
+    #
     def assertEqualWithMessageFailTest expected, value, message
       rescue_assertion ASSERT_EQUAL_ERROR, message do
         assertEqual expected, value, message
       end
     end
 
+    ##
+    # Test assertNotEqualTest
+    #
+    # expected::
+    #   The expected value
+    #
+    # value::
+    #   Value to assert
+    #
     def assertNotEqualTest expected, value
       assertNotEqual expected, value
     end
 
+    ##
+    # Test assertNotEqualFailTest
+    #
+    # expected::
+    #   The expected value
+    #
+    # value::
+    #   Value to assert
+    #
     def assertNotEqualFailTest expected, value
       rescue_assertion ASSERT_NOT_EQUAL_ERROR do
         assertNotEqual expected, value
       end
     end
 
+    ##
+    # Test assertNotEqualWithMessageTest
+    #
+    # expected::
+    #   The expected value
+    #
+    # value::
+    #   Value to assert
+    #
+    # message::
+    #   The assertion message
+    #
     def assertNotEqualWithMessageTest expected, value, message
       assertNotEqual expected, value, message
     end
 
+    ##
+    # Test assertNotEqualWithMessageFailTest
+    #
+    # expected::
+    #   The expected value
+    #
+    # value::
+    #   Value to assert
+    #
+    # message::
+    #   The assertion message
+    #
     def assertNotEqualWithMessageFailTest expected, value, message
       rescue_assertion ASSERT_NOT_EQUAL_ERROR, message do
         assertNotEqual expected, value, message
       end
     end
 
+    ##
+    # Test assertGreaterThanTest
+    #
+    # greater::
+    #   The greater value
+    #
+    # value::
+    #   Value to assert
+    #
     def assertGreaterThanTest greater, value
       assertGreaterThan greater, value
     end
 
+    ##
+    # Test assertGreaterThanFailTest
+    #
+    # greater::
+    #   The greater value
+    #
+    # value::
+    #   Value to assert
+    #
     def assertGreaterThanFailTest greater, value
       rescue_assertion ASSERT_GREATERTHAN_ERROR do
         assertGreaterThan greater, value
       end
     end
 
+    ##
+    # Test assertGreaterThanWithMessageTest
+    #
+    # greater::
+    #   The greater value
+    #
+    # value::
+    #   Value to assert
+    #
+    # message::
+    #   The assertion message
+    #
     def assertGreaterThanWithMessageTest greater, value, message
       assertGreaterThan greater, value, message
     end
 
+    ##
+    # Test assertGreaterThanWithMessageFailTest
+    #
+    # greater::
+    #   The greater value
+    #
+    # value::
+    #   Value to assert
+    #
+    # message::
+    #   The assertion message
+    #
     def assertGreaterThanWithMessageFailTest greater, value, message
       rescue_assertion ASSERT_GREATERTHAN_ERROR, message do
         assertGreaterThan greater, value, message
       end
     end
 
+    ##
+    # Test assertGreaterThanOrEqualTest
+    #
+    # greater::
+    #   The greater value
+    #
+    # value::
+    #   Value to assert
+    #
     def assertGreaterThanOrEqualTest greater, value
       assertGreaterThanOrEqual greater, value
     end
 
+    ##
+    # Test assertGreaterThanOrEqualFailTest
+    #
+    # greater::
+    #   The greater value
+    #
+    # value::
+    #   Value to assert
+    #
     def assertGreaterThanOrEqualFailTest greater, value
       rescue_assertion ASSERT_GREATERTHANOREQUAL_ERROR do
         assertGreaterThanOrEqual greater, value
       end
     end
 
+    ##
+    # Test assertGreaterThanOrEqualWithMessageTest
+    #
+    # greater::
+    #   The greater value
+    #
+    # value::
+    #   Value to assert
+    #
+    # message::
+    #   The assertion message
+    #
     def assertGreaterThanOrEqualWithMessageTest greater, value, message
       assertGreaterThanOrEqual greater, value, message
     end
 
+    ##
+    # Test assertGreaterThanOrEqualWithMessageFailTest
+    #
+    # greater::
+    #   The greater value
+    #
+    # value::
+    #   Value to assert
+    #
+    # message::
+    #   The assertion message
+    #
     def assertGreaterThanOrEqualWithMessageFailTest greater, value, message
       rescue_assertion ASSERT_GREATERTHANOREQUAL_ERROR, message do
         assertGreaterThanOrEqual greater, value, message
       end
     end
 
-    def assertLessThanTest less, value
-      assertLessThan less, value
-    end
-
-    def assertLessThanFailTest less, value
+    ##
+    # Test assertLessThanTest
+    #
+    # lesser::
+    #   The lesser value
+    #
+    # value::
+    #   Value to assert
+    #
+    def assertLessThanTest lesser, value
+      assertLessThan lesser, value
+    end
+
+    ##
+    # Test assertLessThanFailTest
+    #
+    # lesser::
+    #   The lesser value
+    #
+    # value::
+    #   Value to assert
+    #
+    def assertLessThanFailTest lesser, value
       rescue_assertion ASSERT_LESSTHAN_ERROR do
-        assertLessThan less, value
+        assertLessThan lesser, value
       end
     end
 
-    def assertLessThanWithMessageTest less, value, message
-      assertLessThan less, value, message
-    end
-
-    def assertLessThanWithMessageFailTest less, value, message
+    ##
+    # Test assertLessThanWithMessageTest
+    #
+    # lesser::
+    #   The lesser value
+    #
+    # value::
+    #   Value to assert
+    #
+    # message::
+    #   The assertion message
+    #
+    def assertLessThanWithMessageTest lesser, value, message
+      assertLessThan lesser, value, message
+    end
+
+    ##
+    # Test assertLessThanWithMessageFailTest
+    #
+    # lesser::
+    #   The lesser value
+    #
+    # value::
+    #   Value to assert
+    #
+    # message::
+    #   The assertion message
+    #
+    def assertLessThanWithMessageFailTest lesser, value, message
       rescue_assertion ASSERT_LESSTHAN_ERROR, message do
-        assertLessThan less, value, message
+        assertLessThan lesser, value, message
       end
     end
 
-    def assertLessThanOrEqualTest less, value
-      assertLessThanOrEqual less, value
-    end
-
-    def assertLessThanOrEqualFailTest less, value
+    ##
+    # Test assertLessThanOrEqualTest
+    #
+    # lesser::
+    #   The lesser value
+    #
+    # value::
+    #   Value to assert
+    #
+    def assertLessThanOrEqualTest lesser, value
+      assertLessThanOrEqual lesser, value
+    end
+
+    ##
+    # Test assertLessThanOrEqualFailTest
+    #
+    # lesser::
+    #   The lesser value
+    #
+    # value::
+    #   Value to assert
+    #
+    def assertLessThanOrEqualFailTest lesser, value
       rescue_assertion ASSERT_LESSTHANOREQUAL_ERROR do
-        assertLessThanOrEqual less, value
+        assertLessThanOrEqual lesser, value
       end
     end
 
-    def assertLessThanOrEqualWithMessageTest less, value, message
-      assertLessThanOrEqual less, value, message
-    end
-
-    def assertLessThanOrEqualWithMessageFailTest less, value, message
+    ##
+    # Test assertLessThanOrEqualWithMessageTest
+    #
+    # lesser::
+    #   The lesser value
+    #
+    # value::
+    #   Value to assert
+    #
+    # message::
+    #   The assertion message
+    #
+    def assertLessThanOrEqualWithMessageTest lesser, value, message
+      assertLessThanOrEqual lesser, value, message
+    end
+
+    ##
+    # Test assertLessThanOrEqualWithMessageFailTest
+    #
+    # lesser::
+    #   The lesser value
+    #
+    # value::
+    #   Value to assert
+    #
+    # message::
+    #   The assertion message
+    #
+    def assertLessThanOrEqualWithMessageFailTest lesser, value, message
       rescue_assertion ASSERT_LESSTHANOREQUAL_ERROR, message do
-        assertLessThanOrEqual less, value, message
+        assertLessThanOrEqual lesser, value, message
       end
     end
 
+    ##
+    # Test assertMatchTest
+    #
+    # pattern::
+    #   The pattern to check against
+    #
+    # value::
+    #   Value to assert
+    #
     def assertMatchTest pattern, value
       assertMatch pattern, value
     end
 
+    ##
+    # Test assertMatchFailTest
+    #
+    # pattern::
+    #   The pattern to check against
+    #
+    # value::
+    #   Value to assert
+    #
     def assertMatchFailTest pattern, value
       rescue_assertion ASSERT_MATCH_ERROR do
         assertMatch pattern, value
       end
     end
 
+    ##
+    # Test assertMatchWithMessageTest
+    #
+    # pattern::
+    #   The pattern to check against
+    #
+    # value::
+    #   Value to assert
+    #
+    # message::
+    #   The assertion message
+    #
     def assertMatchWithMessageTest pattern, value, message
       assertMatch pattern, value, message
     end
 
+    ##
+    # Test assertMatchWithMessageFailTest
+    #
+    # pattern::
+    #   The pattern to check against
+    #
+    # value::
+    #   Value to assert
+    #
+    # message::
+    #   The assertion message
+    #
     def assertMatchWithMessageFailTest pattern, value, message
       rescue_assertion ASSERT_MATCH_ERROR, message do
         assertMatch pattern, value, message
       end
     end
 
+    ##
+    # Test assertNotMatchTest
+    #
+    # pattern::
+    #   The pattern to check against
+    #
+    # value::
+    #   Value to assert
+    #
     def assertNotMatchTest pattern, value
       assertNotMatch pattern, value
     end
 
+    ##
+    # Test assertNotMatchFailTest
+    #
+    # pattern::
+    #   The pattern to check against
+    #
+    # value::
+    #   Value to assert
+    #
     def assertNotMatchFailTest pattern, value
       rescue_assertion ASSERT_NOT_MATCH_ERROR do
         assertNotMatch pattern, value
       end
     end
 
+    ##
+    # Test assertNotMatchWithMessageTest
+    #
+    # pattern::
+    #   The pattern to check against
+    #
+    # value::
+    #   Value to assert
+    #
+    # message::
+    #   The assertion message
+    #
     def assertNotMatchWithMessageTest pattern, value, message
       assertNotMatch pattern, value, message
     end
 
+    ##
+    # Test assertNotMatchWithMessageFailTest
+    #
+    # pattern::
+    #   The pattern to check against
+    #
+    # value::
+    #   Value to assert
+    #
+    # message::
+    #   The assertion message
+    #
     def assertNotMatchWithMessageFailTest pattern, value, message
       rescue_assertion ASSERT_NOT_MATCH_ERROR, message do
         assertNotMatch pattern, value, message
       end
     end
 
+    ##
+    # Test assertSameTest
+    #
+    # object::
+    #   The object to check
+    #
     def assertSameTest object
       assertSame object, object
     end
 
+    ##
+    # Test assertSameFailTest
+    #
+    # expected::
+    #   The expected object to check against
+    #
+    # object::
+    #   The object to check
+    #
     def assertSameFailTest expected, object
       rescue_assertion ASSERT_SAME_ERROR do
         assertSame expected, object
       end
     end
 
+    ##
+    # Test assertSameWithMessageTest
+    #
+    # object::
+    #   The object to check
+    #
+    # message::
+    #   The assertion message
+    #
     def assertSameWithMessageTest object, message
       assertSame object, object, message
     end
 
+    ##
+    # Test assertSameWithMessageFailTest
+    #
+    # expected::
+    #   The expected object to check against
+    #
+    # object::
+    #   The object to check
+    #
+    # message::
+    #   The assertion message
+    #
     def assertSameWithMessageFailTest expected, object, message
       rescue_assertion ASSERT_SAME_ERROR, message do
         assertSame expected, object, message
       end
     end
 
+    ##
+    # Test assertNotSameTest
+    #
+    # expected::
+    #   The expected object to check against
+    #
+    # object::
+    #   The object to check
+    #
     def assertNotSameTest expected, object
       assertNotSame expected, object
     end
 
+    ##
+    # Test assertNotSameFailTest
+    #
+    # object::
+    #   The object to check
+    #
     def assertNotSameFailTest object
       rescue_assertion ASSERT_NOT_SAME_ERROR do
         assertNotSame object, object
       end
     end
 
+    ##
+    # Test assertNotSameWithMessageTest
+    #
+    # expected::
+    #   The expected object to check against
+    #
+    # object::
+    #   The object to check
+    #
+    # message::
+    #   The assertion message
+    #
     def assertNotSameWithMessageTest expected, object, message
       assertNotSame expected, object, message
     end
 
+    ##
+    # Test assertNotSameWithMessageFailTest
+    #
+    # object::
+    #   The object to check
+    #
+    # message::
+    #   The assertion message
+    #
     def assertNotSameWithMessageFailTest object, message
       rescue_assertion ASSERT_NOT_SAME_ERROR, message do
         assertNotSame object, object, message

data/tests/Assertions/TC_Exceptions.rb

@@ -1,13 +1,138 @@
 require 'RubyUnit/Assertions'
 
-# Data provider for RubyUnit::TestCase tests
+# Data provider for RubyUnit::Assertions Exceptions tests
 require_relative 'data/Exceptions'
 
+# Fixture for Exceptions tests
+require_relative 'fixture/Exceptions'
+
 module AssertionsTests
-  #
+  ##
   # Test Case for RubyUnit::Assertions Exceptions assertions
   #
   class TC_Exceptions < AssertionsTestCase
     include ExceptionsData
+
+    def assertNothingRaisedTest block_data
+      assertNothingRaised do
+        block_data
+      end
+    end
+
+    def assertNothingRaisedFailTest
+      rescue_assertion /#{ASSERT_NOTHING_RAISED_ERROR}/ do
+        assertNothingRaised do
+          raise
+        end
+      end
+    end
+
+    def assertNothingRaisedWithMessageTest block_data, message
+      assertNothingRaised message do
+        block_data
+      end
+    end
+
+    def assertNothingRaisedWithMessageFailTest message
+      rescue_assertion /#{ASSERT_NOTHING_RAISED_ERROR}/, message do
+        assertNothingRaised message do
+          raise
+        end
+      end
+    end
+
+    def assertRaiseMessageTest pattern, exception, error
+      assertRaiseMessage pattern do
+        raise exception, error
+      end
+    end
+
+    def assertRaiseMessageFailTest pattern, exception
+      rescue_assertion /#{ASSERT_RAISE_MESSAGE_ERROR}/ do
+        assertRaiseMessage pattern do
+          raise exception
+        end
+      end
+    end
+
+    def assertRaiseMessageInvalidTest pattern
+      assertRaiseKindOf TypeError do
+        assertRaiseMessage pattern do
+          raise
+        end
+      end
+    end
+
+    def assertRaiseMessageWithMessageTest pattern, exception, error, message
+      assertRaiseMessage pattern, message do
+        raise exception, error
+      end
+    end
+
+    def assertRaiseMessageWithMessageFailTest pattern, exception, message
+      rescue_assertion /#{ASSERT_RAISE_MESSAGE_ERROR}/, message do
+        assertRaiseMessage pattern, message do
+          raise exception
+        end
+      end
+    end
+
+    def assertRaiseMessageWithMessageInvalidTest pattern, message
+      assertRaiseKindOf TypeError do
+        assertRaiseMessage pattern, message do
+          raise
+        end
+      end
+    end
+
+    def assertRaiseKindOfTest exception
+      assertRaiseKindOf exception do
+        raise exception
+      end
+    end
+
+    def assertRaiseKindOfFailTest exception
+      rescue_assertion /#{ASSERT_RAISE_KIND_OF_ERROR}/ do
+        assertRaiseKindOf AssertionsTestsError do
+          raise exception
+        end
+      end
+    end
+
+    def assertRaiseKindOfInvalidTest exception
+      assertRaiseKindOf TypeError do
+        assertRaiseKindOf exception do
+          raise
+        end
+      end
+    end
+
+    def assertRaiseKindOfWithMessageTest exception, message
+      assertRaiseKindOf exception, message do
+        raise exception
+      end
+    end
+
+    def assertRaiseKindOfWithMessageFailTest exception, message
+      rescue_assertion /#{ASSERT_RAISE_KIND_OF_ERROR}/, message do
+        assertRaiseKindOf AssertionsTestsError, message do
+          raise exception
+        end
+      end
+    end
+
+    def assertRaiseKindOfWithMessageInvalidTest exception, message
+      assertRaiseKindOf TypeError do
+        assertRaiseKindOf exception, message do
+          raise
+        end
+      end
+    end
+
+    def assertRaiseExpectedTest pattern, exception, error
+      assertRaisedExpected exception, pattern do
+        raise exception, error
+      end
+    end
   end
 end

data/tests/Assertions/data/Comparisons.rb

@@ -1,7 +1,7 @@
 require_relative 'ObjectTypes'
 
 module AssertionsTests
-  #
+  ##
   # Data provider for RubyUnit::Assertions Comparisons assertions
   #
   module ComparisonsData

data/tests/Assertions/data/Exceptions.rb

@@ -1,7 +1,108 @@
+require_relative 'ObjectTypes'
+
 module AssertionsTests
-  #
+  ##
   # Data provider for RubyUnit::Assertions Exceptions assertions
   #
   module ExceptionsData
+    include ObjectTypes
+
+    def assertNothingRaisedData
+      non_classes + classObjects
+    end
+
+    def assertNothingRaisedWithMessageData
+      add_parameter assertNothingRaisedData
+    end
+
+    def assertNothingRaisedWithMessageFailData
+      MESSAGE
+    end
+
+    def assertRaiseMessageData
+      [
+        [      /^Message/,     Exception, 'Message raised'],
+        [      / raised$/, StandardError, 'Message raised'],
+        ['Message raised', ArgumentError, 'Message raised'],
+      ]
+    end
+    alias_method :assertRaiseExpectedData, :assertRaiseMessageData
+
+    def assertRaiseMessageInvalidData
+      exceptionObjects +
+      nilObjects       +
+      trueObjects      +
+      falseObjects     +
+      fixnumObjects    +
+      bignumObjects    +
+      floatObjects     +
+      rationalObjects  +
+      complexObjects   +
+      timeObjects      +
+      rangeObjects     +
+      arrayObjects     +
+      hashObjects
+    end
+
+    def assertRaiseMessageFailData
+      [
+        [      /Message$/,     Exception],
+        [      /No Match/, StandardError],
+        [       'Message', ArgumentError],
+        [      'No Match',     TypeError],
+      ]
+    end
+
+    def assertRaiseMessageWithMessageData
+      add_parameter assertRaiseMessageData
+    end
+
+    def assertRaiseMessageWithMessageFailData
+      add_parameter assertRaiseMessageFailData
+    end
+
+    def assertRaiseMessageWithMessageInvalidData
+      add_parameter assertRaiseMessageInvalidData
+    end
+
+    def assertRaiseKindOfData
+      exceptionObjects
+    end
+    alias_method :assertRaiseKindOfFailData, :assertRaiseKindOfData
+
+    def assertRaiseKindOfInvalidData
+      nilObjects      +
+      trueObjects     +
+      falseObjects    +
+      fixnumObjects   +
+      bignumObjects   +
+      floatObjects    +
+      rationalObjects +
+      complexObjects  +
+      timeObjects     +
+      stringObjects   +
+      rangeObjects    +
+      regexpObjects   +
+      arrayObjects    +
+      hashObjects
+    end
+
+    def assertRaiseKindOfWithMessageData
+      add_parameter assertRaiseKindOfData
+    end
+
+    def assertRaiseKindOfWithMessageFailData
+      add_parameter assertRaiseKindOfFailData
+    end
+
+    def assertRaiseKindOfWithMessageInvalidData
+      add_parameter assertRaiseKindOfInvalidData
+    end
+
+    def assertRaiseExpectedData
+      [
+        
+      ]
+    end
   end
 end

data/tests/Assertions/data/ObjectTypes.rb

@@ -56,6 +56,15 @@ module AssertionsTests
         [     Range],
         [     Array],
         [      Hash],
+        ] +
+        exceptionObjects
+    end
+
+    def exceptionObjects
+      [
+        [    Exception],
+        [StandardError],
+        [ArgumentError],
       ]
     end
 

data/tests/Assertions/fixture/Exceptions.rb

@@ -0,0 +1,4 @@
+module AssertionsTests
+  class AssertionsTestsError < Exception
+  end
+end

data/tests/RubyUnit/TC_RubyUnit.rb

@@ -35,7 +35,7 @@ module RubyUnitTests
     #
     def invalidDebugModeTest mode
       old_mode = RubyUnit.debug
-      assertRaiseExpected ArgumentError, RubyUnit::INVALID_DEBUG_MODE, RubyUnit::INVALID_DEBUG_MODE do
+      assertRaiseExpected TypeError, RubyUnit::INVALID_DEBUG_MODE, RubyUnit::INVALID_DEBUG_MODE do
         RubyUnit.debug = mode
       end
       assertEqual old_mode, RubyUnit.debug, 'Invalid debug mode should not change debug mode'

data/tests/TS_Assertions.rb

@@ -36,9 +36,7 @@ module AssertionsTests
     # Wrapper to rescue assertions
     #
     def rescue_assertion pattern = '', message = nil, data = {}, &block
-      failure = assertRaiseExpected RubyUnit::AssertionFailure, pattern, message do
-        yield
-      end
+      failure = assertRaiseExpected RubyUnit::AssertionFailure, pattern, message, &block
       info = failure.info
       assertMatch /#{message}/, info, 'Assertion failure message mismatch'
       data.each do |key, value|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubyunit
 version: !ruby/object:Gem::Version
-  version: 0.3.19
+  version: 0.3.20
 platform: ruby
 authors:
 - Matthew Clower
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-24 00:00:00.000000000 Z
+date: 2014-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -76,6 +76,7 @@ files:
 - tests/Assertions/data/Exceptions.rb
 - tests/Assertions/data/Methods.rb
 - tests/Assertions/data/ObjectTypes.rb
+- tests/Assertions/fixture/Exceptions.rb
 - tests/IncompleteTest/TC_IncompleteTest.rb
 - tests/RubyUnit/TC_GemInfo.rb
 - tests/RubyUnit/TC_RubyUnit.rb