rubyunit 0.3.15 → 0.3.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbbc44756c8014588e15f7b9db7f6d07e3d40ad4
-  data.tar.gz: c3a39f3f2a8a55fdeaeabfab1857655714a18c26
+  metadata.gz: ca80c88f05e1945496377a6b44d73c622412c985
+  data.tar.gz: 6a86a2572e1a7cc2e25f9af74224732e5664b3ca
 SHA512:
-  metadata.gz: 623a1fe7c5dfde8032454373019dc7e51eed67e3b4c2dca6360bfe3ebb4d64ccfd61765fa8b0ba6b97b22ba475e585570a1b847e6062341fc17386e3ac3478eb
-  data.tar.gz: e95597151407a17709aade4fc6a955c4500b53e750113c9827fc20f08d99d3a81c36a6826999262dfa879913627da868ca4546f42f37eb800e4d57e356f64533
+  metadata.gz: 4dc2a9820139f22073934d121751fb7bbc0edc4099caf27a3b646976935c467173c600784ba8007ac829794014b8d980727a7a450c1b1682cae6fc8e4f0d0892
+  data.tar.gz: a01214430b5f3f640e264a81e9012de8e88f7d92b736d6d180e95a22d2b0aef93c3237ec17f89c05f80aca95450e1cd732e2ee1a907520edfd3025dc995816a1

data/lib/RubyUnit/Assertions/Class.rb

@@ -103,6 +103,7 @@ module RubyUnit
     #  assertDescendent Numeric, Exception, 'Nope'  # => fail
     #
     def assertDescendent klass, descendent, message = nil
+      raise ArgumentError, 'Expecting Class' unless klass.is_a? Class
       __assert (descendent < klass), ASSERT_DESCENDENT_ERROR, message, {:klass=>klass, :descendent=>descendent}
     end
 
@@ -122,7 +123,8 @@ module RubyUnit
     #  assertDescendent StandardError, Exception, 'It is'  # => fail
     #
     def assertNotDescendent klass, illegal, message = nil
-      __reject (descendent < klass), ASSERT_NOT_DESCENDENT_ERROR, message, {:klass=>klass, :descendent=>descendent}
+      raise ArgumentError, 'Expecting Class' unless klass.is_a? Class
+      __reject (illegal < klass), ASSERT_NOT_DESCENDENT_ERROR, message, {:klass=>klass, :illegal=>illegal}
     end
 
     #

data/lib/RubyUnit/Assertions.rb

@@ -99,8 +99,8 @@ module RubyUnit
     # * raises ArgumentError unless _e_ is a descendent of the Exception class
     #
     def __validate_exception pattern, e = Exception # :nodoc:
-      raise ArgumentError, "Exception message must be a Regexp or String" unless pattern.is_a? Regexp or pattern.is_a? String
-      raise ArgumentError, "Exception must be a subclass of Exception" unless e < Exception
+      raise ArgumentError, 'Exception message must be a Regexp or String' unless pattern.is_a? Regexp or pattern.is_a? String
+      raise ArgumentError, 'Exception must be a subclass of Exception' unless e < Exception
     end
   end
 end

data/lib/RubyUnit/Runner.rb

@@ -104,7 +104,7 @@ module RubyUnit
         puts "#{@@errors.count} Errors:\n" if @@errors.count > 0
         @@errors.each_with_index do |error, i|
           puts "#{i + 1}) #{error[0]}::#{error[1]}(#{error[2]})"
-          puts error[3].message
+          puts "#{error[3].class}: #{error[3].message}"
           puts error[3].backtrace.join("\n")
         end
 

data/lib/RubyUnit.rb

@@ -9,7 +9,7 @@ module RubyUnit
   INVALID_DEBUG_MODE = 'Debug mode must be Boolean'
 
   # Current RubyUnit version
-  VERSION = '0.3.15'
+  VERSION = '0.3.16'
 
   #
   # Set debug mode

data/tests/Assertions/TC_Class.rb

@@ -38,6 +38,21 @@ module AssertionsTests
       end
     end
 
+    ##
+    # Test assertKindOf invalid
+    #
+    # klass::
+    #   Class name for assertion
+    #
+    # object::
+    #   Object to be asserted
+    #
+    def assertKindOfInvalidTest klass, object
+      assertRaiseKindOf TypeError do
+        assertKindOf klass, object
+      end
+    end
+
     ##
     # Test assertKindOf with message
     #
@@ -71,5 +86,309 @@ module AssertionsTests
         assertKindOf klass, object, message
       end
     end
+
+    ##
+    # Test assertKindOf invalid with message
+    #
+    # klass::
+    #   Class name for assertion
+    #
+    # object::
+    #   Object to be asserted
+    #
+    # message::
+    #   The assertion message
+    #
+    def assertKindOfWithMessageInvalidTest klass, object, message
+      assertRaiseKindOf TypeError, message do
+        assertKindOf klass, object, message
+      end
+    end
+
+    ##
+    # Test assertInstanceOf
+    #
+    # klass::
+    #   Class name for assertion
+    #
+    # object::
+    #   Object to be asserted
+    #
+    def assertInstanceOfTest klass, object
+      assertInstanceOf klass, object
+    end
+
+    ##
+    # Test assertInstanceOf failure
+    #
+    # klass::
+    #   Class name for assertion
+    #
+    # object::
+    #   Object to be asserted
+    #
+    def assertInstanceOfFailTest klass, object
+      rescue_assertion /#{ASSERT_INSTANCE_OF_ERROR}/ do
+        assertInstanceOf klass, object
+      end
+    end
+
+    ##
+    # Test assertInstanceOf invalid
+    #
+    # klass::
+    #   Class name for assertion
+    #
+    # object::
+    #   Object to be asserted
+    #
+    def assertInstanceOfInvalidTest klass, object
+      assertRaiseKindOf TypeError do
+        assertInstanceOf klass, object
+      end
+    end
+
+    ##
+    # Test assertInstanceOf with message
+    #
+    # klass::
+    #   Class name for assertion
+    #
+    # object::
+    #   Object to be asserted
+    #
+    # message::
+    #   The assertion message
+    #
+    def assertInstanceOfWithMessageTest klass, object, message
+      assertInstanceOf klass, object, message
+    end
+
+    ##
+    # Test assertInstanceOf failure
+    #
+    # klass::
+    #   Class name for assertion
+    #
+    # object::
+    #   Object to be asserted
+    #
+    # message::
+    #   The assertion message
+    #
+    def assertInstanceOfWithMessageFailTest klass, object, message
+      rescue_assertion /#{ASSERT_INSTANCE_OF_ERROR}/, message do
+        assertInstanceOf klass, object, message
+      end
+    end
+
+    ##
+    # Test assertInstanceOf invalid with message
+    #
+    # klass::
+    #   Class name for assertion
+    #
+    # object::
+    #   Object to be asserted
+    #
+    # message::
+    #   The assertion message
+    #
+    def assertInstanceOfWithMessageInvalidTest klass, object, message
+      assertRaiseKindOf TypeError, message do
+        assertInstanceOf klass, object, message
+      end
+    end
+
+    ##
+    # Test assertDescendent
+    #
+    # klass::
+    #   Class name for assertion
+    #
+    # descendent::
+    #   Class to be asserted
+    #
+    def assertDescendentTest klass, descendent
+      assertDescendent klass, descendent
+    end
+
+    ##
+    # Test assertDescendent failure
+    #
+    # klass::
+    #   Class name for assertion
+    #
+    # descendent::
+    #   Class to be asserted
+    #
+    def assertDescendentFailTest klass, descendent
+      rescue_assertion /#{ASSERT_DESCENDENT_ERROR}/ do
+        assertDescendent klass, descendent
+      end
+    end
+
+    ##
+    # Test assertDescendent invalid
+    #
+    # klass::
+    #   Class name for assertion
+    #
+    # descendent::
+    #   Class to be asserted
+    #
+    def assertDescendentInvalidTest klass, descendent
+      assertRaiseKindOf ArgumentError do
+        assertDescendent klass, descendent
+      end
+    end
+
+    ##
+    # Test assertDescendent with message
+    #
+    # klass::
+    #   Class name for assertion
+    #
+    # descendent::
+    #   Class to be asserted
+    #
+    # message::
+    #   The assertion message
+    #
+    def assertDescendentWithMessageTest klass, descendent, message
+      assertDescendent klass, descendent, message
+    end
+
+    ##
+    # Test assertDescendent failure
+    #
+    # klass::
+    #   Class name for assertion
+    #
+    # descendent::
+    #   Class to be asserted
+    #
+    # message::
+    #   The assertion message
+    #
+    def assertDescendentWithMessageFailTest klass, descendent, message
+      rescue_assertion /#{ASSERT_DESCENDENT_ERROR}/, message do
+        assertDescendent klass, descendent, message
+      end
+    end
+
+    ##
+    # Test assertDescendent invalid with message
+    #
+    # klass::
+    #   Class name for assertion
+    #
+    # descendent::
+    #   Class to be asserted
+    #
+    # message::
+    #   The assertion message
+    #
+    def assertDescendentWithMessageInvalidTest klass, descendent, message
+      assertRaiseKindOf ArgumentError, message do
+        assertDescendent klass, descendent, message
+      end
+    end
+
+    ##
+    # Test assertNotDescendent
+    #
+    # klass::
+    #   Class name for assertion
+    #
+    # descendent::
+    #   Class to be asserted
+    #
+    def assertNotDescendentTest klass, descendent
+      assertNotDescendent klass, descendent
+    end
+
+    ##
+    # Test assertNotDescendent failure
+    #
+    # klass::
+    #   Class name for assertion
+    #
+    # descendent::
+    #   Class to be asserted
+    #
+    def assertNotDescendentFailTest klass, descendent
+      rescue_assertion /#{ASSERT_NOT_DESCENDENT_ERROR}/ do
+        assertNotDescendent klass, descendent
+      end
+    end
+
+    ##
+    # Test assertNotDescendent invalid
+    #
+    # klass::
+    #   Class name for assertion
+    #
+    # descendent::
+    #   Class to be asserted
+    #
+    def assertNotDescendentInvalidTest klass, descendent
+      assertRaiseKindOf ArgumentError do
+        assertNotDescendent klass, descendent
+      end
+    end
+
+    ##
+    # Test assertNotDescendent with message
+    #
+    # klass::
+    #   Class name for assertion
+    #
+    # descendent::
+    #   Class to be asserted
+    #
+    # message::
+    #   The assertion message
+    #
+    def assertNotDescendentWithMessageTest klass, descendent, message
+      assertNotDescendent klass, descendent, message
+    end
+
+    ##
+    # Test assertNotDescendent failure
+    #
+    # klass::
+    #   Class name for assertion
+    #
+    # descendent::
+    #   Class to be asserted
+    #
+    # message::
+    #   The assertion message
+    #
+    def assertNotDescendentWithMessageFailTest klass, descendent, message
+      rescue_assertion /#{ASSERT_NOT_DESCENDENT_ERROR}/, message do
+        assertNotDescendent klass, descendent, message
+      end
+    end
+
+    ##
+    # Test assertNotDescendent invalid with message
+    #
+    # klass::
+    #   Class name for assertion
+    #
+    # descendent::
+    #   Class to be asserted
+    #
+    # message::
+    #   The assertion message
+    #
+    def assertNotDescendentWithMessageInvalidTest klass, descendent, message
+      assertRaiseKindOf ArgumentError, message do
+        assertNotDescendent klass, descendent, message
+      end
+    end
+
   end
 end

data/tests/Assertions/data/Class.rb

@@ -43,6 +43,10 @@ module AssertionsTests
       data += add_parameter classes_exclude([Hash]), hashObjects
     end
 
+    def assertKindOfInvalidData
+      add_parameter non_classes, [[Object]]
+    end
+
     def assertKindOfWithMessageData
       add_parameter assertKindOfData
     end
@@ -50,5 +54,118 @@ module AssertionsTests
     def assertKindOfWithMessageFailData
       add_parameter assertKindOfFailData
     end
+
+    def assertKindOfWithMessageInvalidData
+      add_parameter assertKindOfInvalidData
+    end
+
+    def assertInstanceOfData
+      data  = add_parameter [[Class]], classObjects
+      data += add_parameter [[NilClass]], nilObjects
+      data += add_parameter [[TrueClass]], trueObjects
+      data += add_parameter [[FalseClass]], falseObjects
+      data += add_parameter [[Fixnum]], fixnumObjects
+      data += add_parameter [[Bignum]], bignumObjects
+      data += add_parameter [[Float]], floatObjects
+      data += add_parameter [[Rational]], rationalObjects
+      data += add_parameter [[Complex]], complexObjects
+      data += add_parameter [[Time]], timeObjects
+      data += add_parameter [[String]], stringObjects
+      data += add_parameter [[Range]], rangeObjects
+      data += add_parameter [[Regexp]], regexpObjects
+      data += add_parameter [[Array]], arrayObjects
+      data += add_parameter [[Hash]], hashObjects
+    end
+
+    def assertInstanceOfFailData
+      data  = add_parameter classes_exclude([Class]), classObjects
+      data += add_parameter classes_exclude([NilClass]), nilObjects
+      data += add_parameter classes_exclude([TrueClass]), trueObjects
+      data += add_parameter classes_exclude([FalseClass]), falseObjects
+      data += add_parameter classes_exclude([Fixnum]), fixnumObjects
+      data += add_parameter classes_exclude([Bignum]), bignumObjects
+      data += add_parameter classes_exclude([Float]), floatObjects
+      data += add_parameter classes_exclude([Rational]), rationalObjects
+      data += add_parameter classes_exclude([Complex]), complexObjects
+      data += add_parameter classes_exclude([Time]), timeObjects
+      data += add_parameter classes_exclude([String]), stringObjects
+      data += add_parameter classes_exclude([Range]), rangeObjects
+      data += add_parameter classes_exclude([Regexp]), regexpObjects
+      data += add_parameter classes_exclude([Array]), arrayObjects
+      data += add_parameter classes_exclude([Hash]), hashObjects
+    end
+
+    def assertInstanceOfInvalidData
+      add_parameter non_classes, [[Object]]
+    end
+
+    def assertInstanceOfWithMessageData
+      add_parameter assertInstanceOfData
+    end
+
+    def assertInstanceOfWithMessageFailData
+      add_parameter assertInstanceOfFailData
+    end
+
+    def assertInstanceOfWithMessageInvalidData
+      add_parameter assertInstanceOfInvalidData
+    end
+
+    def assertDescendentData
+      data  = add_parameter [[BasicObject], [Object]], [[NilClass]]
+      data += add_parameter [[BasicObject], [Object]], [[TrueClass]]
+      data += add_parameter [[BasicObject], [Object]], [[FalseClass]]
+      data += add_parameter [[BasicObject], [Object], [Numeric], [Integer]], [[Fixnum]]
+      data += add_parameter [[BasicObject], [Object], [Numeric], [Integer]], [[Bignum]]
+      data += add_parameter [[BasicObject], [Object], [Numeric]], [[Float]]
+      data += add_parameter [[BasicObject], [Object], [Numeric]], [[Rational]]
+      data += add_parameter [[BasicObject], [Object], [Numeric]], [[Complex]]
+      data += add_parameter [[BasicObject], [Object]], [[Time]]
+      data += add_parameter [[BasicObject], [Object]], [[String]]
+      data += add_parameter [[BasicObject], [Object]], [[Range]]
+      data += add_parameter [[BasicObject], [Object]], [[Regexp]]
+      data += add_parameter [[BasicObject], [Object]], [[Array]]
+      data += add_parameter [[BasicObject], [Object]], [[Hash]]
+    end
+    alias_method :assertNotDescendentFailData, :assertDescendentData
+
+    def assertDescendentFailData
+      data  = add_parameter classes_exclude([BasicObject, Object]), [[NilClass]]
+      data += add_parameter classes_exclude([BasicObject, Object]), [[TrueClass]]
+      data += add_parameter classes_exclude([BasicObject, Object]), [[FalseClass]]
+      data += add_parameter classes_exclude([BasicObject, Object, Numeric, Integer]), [[Fixnum]]
+      data += add_parameter classes_exclude([BasicObject, Object, Numeric, Integer]), [[Bignum]]
+      data += add_parameter classes_exclude([BasicObject, Object, Numeric]), [[Float]]
+      data += add_parameter classes_exclude([BasicObject, Object, Numeric]), [[Rational]]
+      data += add_parameter classes_exclude([BasicObject, Object, Numeric]), [[Complex]]
+      data += add_parameter classes_exclude([BasicObject, Object]), [[Time]]
+      data += add_parameter classes_exclude([BasicObject, Object]), [[String]]
+      data += add_parameter classes_exclude([BasicObject, Object]), [[Range]]
+      data += add_parameter classes_exclude([BasicObject, Object]), [[Regexp]]
+      data += add_parameter classes_exclude([BasicObject, Object]), [[Array]]
+      data += add_parameter classes_exclude([BasicObject, Object]), [[Hash]]
+    end
+    alias_method :assertNotDescendentData, :assertDescendentFailData
+
+    def assertDescendentInvalidData
+      data  = add_parameter non_classes, [[Class]]
+      data += add_parameter non_classes, non_classes
+    end
+    alias_method :assertNotDescendentInvalidData, :assertDescendentInvalidData
+
+    def assertDescendentWithMessageData
+      add_parameter assertDescendentData
+    end
+    alias_method :assertNotDescendentWithMessageFailData, :assertDescendentWithMessageData
+
+    def assertDescendentWithMessageFailData
+      add_parameter assertDescendentFailData
+    end
+    alias_method :assertNotDescendentWithMessageData, :assertDescendentWithMessageFailData
+
+    def assertDescendentWithMessageInvalidData
+      add_parameter assertDescendentInvalidData
+    end
+    alias_method :assertNotDescendentWithMessageInvalidData, :assertDescendentWithMessageInvalidData
   end
 end

data/tests/Assertions/data/ObjectTypes.rb

@@ -22,6 +22,23 @@ module AssertionsTests
       classes
     end
 
+    def non_classes
+      nilObjects      +
+      trueObjects     +
+      falseObjects    +
+      fixnumObjects   +
+      bignumObjects   +
+      floatObjects    +
+      rationalObjects +
+      complexObjects  +
+      timeObjects     +
+      stringObjects   +
+      rangeObjects    +
+      regexpObjects   +
+      arrayObjects    +
+      hashObjects
+    end
+
     def classObjects
       [
         [  NilClass],

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubyunit
 version: !ruby/object:Gem::Version
-  version: 0.3.15
+  version: 0.3.16
 platform: ruby
 authors:
 - Matthew Clower