rubyunit 0.3.20 → 0.3.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd9ffda90dff8ebfa3160c4b4ceec4576e408342
-  data.tar.gz: c70119c8318e8d5859e9d88970ed068501fd7b8f
+  metadata.gz: 75fe63431cbce5d2e16085376ff604bc88f3de26
+  data.tar.gz: 29bcadf52f69285f3bb015e9c19edadfb7f90059
 SHA512:
-  metadata.gz: a29157a5f264788674d89c37bbc179decb028266ae4af93927370689abb7c522ce89b64a75b4f13d1f13a1f61c31854b70fc816699cab70d334dbf6540f8f728
-  data.tar.gz: 42f7bfb1e1f8c6c9d3f9d665044ac467fc2a59aa9da70812fed6bec342d2efe76c7f5f8316a12772ebe2d73bb9bad7e9dd2f7053a5b163c94ce64c925a80b4f9
+  metadata.gz: cd237330bc5ea09c1a2cfaf9bbbfeda28037e2b557e03e49f11ed3d294417807f8cfe46a75faf3db944921a828dd44f321b01f86364c57677debc79158f920da
+  data.tar.gz: cfbb9dab0b5b457f4bab8ad15238207f3085f36e6d3e6fe6fc0331e8da2927fdcd91bb37a49cc3c5136d5948b0a04bcd1d7a1cb320b0a7e238252a2e7956fd23

data/lib/RubyUnit.rb

@@ -13,7 +13,7 @@ module RubyUnit
 
   ##
   # Current RubyUnit version
-  VERSION            = '0.3.20'
+  VERSION            = '0.3.21'
 
   ##
   # Set debug mode

data/lib/RubyUnit/Report.rb

@@ -0,0 +1,85 @@
+require_relative 'Result'
+
+module RubyUnit
+  ##
+  # The RubyUnit::Report module is the test results report
+  #
+  module Report
+    @@results    = []
+    @@fail       = []
+    @@skip       = []
+    @@incomplete = []
+    @@errors     = []
+
+    @@start      = nil
+    @@finish     = nil
+
+    def self.record result
+      @@results << result
+
+      case result.error
+      when RubyUnit::AssertionFailure
+        @@fail << result
+      when RubyUnit::SkippedTest
+        @@skip << result
+      when RubyUnit::IncompleteTest
+        @@incomplete << result
+      else
+        if result.error.class <= Exception
+          puts "error #{result.error.class}"
+          @@errors << result
+        end
+      end
+    end
+
+    def self.tests
+      @@results.count
+    end
+
+    def self.start
+      @@start = Time.new if @@start.nil?
+      @@start
+    end
+
+    def self.finish
+      @@finish = Time.new if @@finish.nil?
+      @@finish
+    end
+
+    def self.report type, results = [], trace = true
+      puts "\n#{results.count} #{type}:\n" if results.count > 0
+      results.each_with_index do |result, i|
+        puts "\n#{i + 1}) #{result.test_case}::#{result.test}(#{result.params})"
+        puts "#{result.error.class}: #{result.error.message}"
+        puts result.error.backtrace * "\n" if trace
+      end
+    end
+
+    def self.errors
+      report 'Errors in Tests', @@errors
+    end
+
+    def self.failures
+      report 'Failed Tests', @@fail
+    end
+
+    def self.skips
+      report 'Skipped Tests', @@skip, false
+    end
+
+    def self.incompletes
+      report 'Incomplete Tests', @@incomplete, false
+    end
+
+    def self.stats
+      elapsed  = @@finish - @@start
+      inverse  = Rational(elapsed.to_r.denominator,elapsed.to_r.numerator)
+      puts
+      puts "Tests Complete in #{elapsed} seconds!"
+      puts "%.3f tests/s, %.3f assertions/s" % [(tests * inverse).to_f, (TestCase.assertions * inverse).to_f]
+      puts "%d Assertions, %d Skipped Tests, %d Incomplete Tests" % [TestCase.assertions, @@skip.count, @@incomplete.count]
+      puts "%d Tests, %d Errors, %d Failures" % [tests, @@errors.count, @@fail.count]
+      puts
+    end
+  end
+end

data/lib/RubyUnit/Result.rb

@@ -0,0 +1,23 @@
+module RubyUnit
+  ##
+  # The RubyUnit::Result class is a result of individual tests
+  #
+  class Result
+    attr_accessor :test_case, :test, :params, :error
+
+    @test_case
+    @test
+    @params
+    @error
+
+    def initialize test_case, test, params = [], error = nil
+      @test_case = test_case
+      @test      = test
+      @params    = params
+      @error     = error
+
+      # Automatically add result to the test results...
+      Report.record self
+    end
+  end
+end

data/lib/RubyUnit/Runner.rb

@@ -1,5 +1,6 @@
 require_relative 'TestCase'
 require_relative 'AssertionFailure'
+require_relative 'Report'
 
 module RubyUnit
   #
@@ -27,12 +28,6 @@ module RubyUnit
       # The list of non RubyUnit::AssertionFailure exceptions that were caught by
       # the test runner during testing
       @@errors      = []
-      # The total number of tests that have been run
-      @@tests       = 0
-      # The time the tests were started
-      @@start       = nil
-      # The time the tests completed
-      @@finish      = nil
       # Whether or not the test suite still needs to be run. This is used by the
       # automatic runner to determine if it must be run before the program exits.
       @@autorun     = true
@@ -48,15 +43,17 @@ module RubyUnit
       #
       def run
         @@autorun = false
-        @@start   = Time.new
         runner    = new
+        puts "RubyUnit #{RubyUnit::VERSION}"
+        puts "Started Tests #{Report.start.strftime("%Y-%m-%d %H:%M:%S")}"
+
         TestCase.descendents.each do |test_case|
           @@test_cases << test_case
           object = test_case.new
           test_case.setup
 
-          data_methods = test_case.instance_methods.grep /Data\Z/
-          test_methods = test_case.instance_methods.grep /Test\Z/
+          data_methods = test_case.instance_methods.grep /Data$/
+          test_methods = test_case.instance_methods.grep /Test$/
 
           test_methods.each do |test|
             data_method = "#{test.slice(0..-5)}Data".to_sym
@@ -74,8 +71,8 @@ module RubyUnit
           end
           test_case.teardown
         end
-        @@finish = Time.new
-        report unless @@tests.zero?
+        Report.finish
+        report unless Report.tests.zero?
         @@failures.count + @@errors.count
       end
 
@@ -97,44 +94,11 @@ module RubyUnit
       #  report # => nice and simple
       #
       def report
-        # haven't figured out what I want to do for reporting yet but I need some results
-        puts "RubyUnit #{RubyUnit::VERSION}"
-        puts "Started Tests #{@@start.strftime("%Y-%m-%d %H:%M:%S")}"
-
-        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].class}: #{error[3].message}"
-          puts error[3].backtrace.join("\n")
-        end
-
-        puts "#{@@skips.count} Skipped Tests:\n" if @@skips.count > 0
-        @@skips.each_with_index do |skip, i|
-          puts "#{i + 1}) #{skip[0]}::#{skip[1]}(#{skip[2]})"
-          puts skip[3]
-        end
-
-        puts "#{@@incompletes.count} Skipped Tests:\n" if @@incompletes.count > 0
-        @@incompletes.each_with_index do |incomplete, i|
-          puts "#{i + 1}) #{incomplete[0]}::#{incomplete[1]}(#{incomplete[2]})"
-          puts incomplete[3]
-        end
-
-        puts "#{@@failures.count} Failures:\n" if @@failures.count > 0
-        @@failures.each_with_index do |failure, i|
-          puts "#{i + 1}) #{failure[0]}::#{failure[1]}(#{failure[2]})"
-          puts failure[3].info
-          puts failure[3].backtrace.join("\n")
-        end
-        
-        elapsed  = @@finish - @@start
-        inverse  = Rational(elapsed.to_r.denominator,elapsed.to_r.numerator)
-        puts
-        puts "Tests Complete in #{elapsed} seconds!"
-        puts "%.3f tests/s, %.3f assertions/s" % [(@@tests * inverse).to_f, (TestCase.assertions * inverse).to_f]
-        puts "%d Assertions, %d Skipped Tests, %d Incomplete Tests" % [TestCase.assertions, @@skips.count, @@incompletes.count]
-        puts "%d Tests, %d Errors, %d Failures" % [@@tests, @@errors.count, @@failures.count]
-        puts
+        Report.errors
+        Report.skips
+        Report.incompletes
+        Report.failures
+        Report.stats
       end
     end
 
@@ -156,24 +120,18 @@ module RubyUnit
     #
     #  run TestCaseClass, :myTest, [param1, param2]
     #
-    def run test_case_class, test, params = []
+    def run klass, test, params = []
       raise TypeError, "Parameter list for #{object.class}::#{test} must be an array" unless params.is_a? Array
-      test_case = test_case_class.new
+      test_case = klass.new
 
+      error = nil
       begin
-        @@tests += 1
         test_case.setup
         test_case.send test, *params
         test_case.teardown
-      rescue AssertionFailure => failure
-        @@failures << [test_case.class.name, test, params, failure]
-      rescue SkippedTest => skip
-        @@skips << [test_case.class.name, test, params, skip]
-      rescue IncompleteTest => incomplete
-        @@incompletes << [test_case.class.name, test, params, incomplete]
       rescue Exception => error
-        @@errors << [test_case.class.name, test, params, error]
       end
+      Result.new test_case.class, test, params, error
     end
   end
 end

data/tests/Assertions/TC_Comparisons.rb

@@ -4,14 +4,14 @@ require 'RubyUnit/Assertions'
 require_relative 'data/Comparisons'
 
 module AssertionsTests
-  #
+  ##
   # Test Case for RubyUnit::Assertions Comparisons assertions
   #
   class TC_Comparisons < AssertionsTestCase
     include ComparisonsData
 
     ##
-    # Test assertEqualTest
+    # Test assertEqual
     #
     # expected::
     #   The expected value
@@ -24,7 +24,7 @@ module AssertionsTests
     end
 
     ##
-    # Test assertEqualFailTest
+    # Test assertEqual failure
     #
     # expected::
     #   The expected value
@@ -39,7 +39,7 @@ module AssertionsTests
     end
 
     ##
-    # Test assertEqualWithMessageTest
+    # Test assertEqual with message
     #
     # expected::
     #   The expected value
@@ -55,7 +55,7 @@ module AssertionsTests
     end
 
     ##
-    # Test assertEqualWithMessageFailTest
+    # Test assertEqual with message failure
     #
     # expected::
     #   The expected value
@@ -73,7 +73,7 @@ module AssertionsTests
     end
 
     ##
-    # Test assertNotEqualTest
+    # Test assertNotEqual
     #
     # expected::
     #   The expected value
@@ -86,7 +86,7 @@ module AssertionsTests
     end
 
     ##
-    # Test assertNotEqualFailTest
+    # Test assertNotEqual failure
     #
     # expected::
     #   The expected value
@@ -101,7 +101,7 @@ module AssertionsTests
     end
 
     ##
-    # Test assertNotEqualWithMessageTest
+    # Test assertNotEqual with message
     #
     # expected::
     #   The expected value
@@ -117,7 +117,7 @@ module AssertionsTests
     end
 
     ##
-    # Test assertNotEqualWithMessageFailTest
+    # Test assertNotEqual with message failure
     #
     # expected::
     #   The expected value
@@ -135,7 +135,7 @@ module AssertionsTests
     end
 
     ##
-    # Test assertGreaterThanTest
+    # Test assertGreaterThan
     #
     # greater::
     #   The greater value
@@ -148,7 +148,7 @@ module AssertionsTests
     end
 
     ##
-    # Test assertGreaterThanFailTest
+    # Test assertGreaterThan failure
     #
     # greater::
     #   The greater value
@@ -163,7 +163,7 @@ module AssertionsTests
     end
 
     ##
-    # Test assertGreaterThanWithMessageTest
+    # Test assertGreaterThan with message
     #
     # greater::
     #   The greater value
@@ -179,7 +179,7 @@ module AssertionsTests
     end
 
     ##
-    # Test assertGreaterThanWithMessageFailTest
+    # Test assertGreaterThan with message failure
     #
     # greater::
     #   The greater value
@@ -197,7 +197,7 @@ module AssertionsTests
     end
 
     ##
-    # Test assertGreaterThanOrEqualTest
+    # Test assertGreaterThanOrEqual
     #
     # greater::
     #   The greater value
@@ -210,7 +210,7 @@ module AssertionsTests
     end
 
     ##
-    # Test assertGreaterThanOrEqualFailTest
+    # Test assertGreaterThanOrEqual failure
     #
     # greater::
     #   The greater value
@@ -225,7 +225,7 @@ module AssertionsTests
     end
 
     ##
-    # Test assertGreaterThanOrEqualWithMessageTest
+    # Test assertGreaterThanOrEqual with message
     #
     # greater::
     #   The greater value
@@ -241,7 +241,7 @@ module AssertionsTests
     end
 
     ##
-    # Test assertGreaterThanOrEqualWithMessageFailTest
+    # Test assertGreaterThanOrEqual with message failure
     #
     # greater::
     #   The greater value
@@ -259,7 +259,7 @@ module AssertionsTests
     end
 
     ##
-    # Test assertLessThanTest
+    # Test assertLessThan
     #
     # lesser::
     #   The lesser value
@@ -272,7 +272,7 @@ module AssertionsTests
     end
 
     ##
-    # Test assertLessThanFailTest
+    # Test assertLessThan failure
     #
     # lesser::
     #   The lesser value
@@ -287,7 +287,7 @@ module AssertionsTests
     end
 
     ##
-    # Test assertLessThanWithMessageTest
+    # Test assertLessThan with message
     #
     # lesser::
     #   The lesser value
@@ -303,7 +303,7 @@ module AssertionsTests
     end
 
     ##
-    # Test assertLessThanWithMessageFailTest
+    # Test assertLessThan with message failure
     #
     # lesser::
     #   The lesser value
@@ -321,7 +321,7 @@ module AssertionsTests
     end
 
     ##
-    # Test assertLessThanOrEqualTest
+    # Test assertLessThanOrEqual
     #
     # lesser::
     #   The lesser value
@@ -334,7 +334,7 @@ module AssertionsTests
     end
 
     ##
-    # Test assertLessThanOrEqualFailTest
+    # Test assertLessThanOrEqual failure
     #
     # lesser::
     #   The lesser value
@@ -349,7 +349,7 @@ module AssertionsTests
     end
 
     ##
-    # Test assertLessThanOrEqualWithMessageTest
+    # Test assertLessThanOrEqual with message
     #
     # lesser::
     #   The lesser value
@@ -365,7 +365,7 @@ module AssertionsTests
     end
 
     ##
-    # Test assertLessThanOrEqualWithMessageFailTest
+    # Test assertLessThanOrEqual with message failure
     #
     # lesser::
     #   The lesser value
@@ -383,7 +383,7 @@ module AssertionsTests
     end
 
     ##
-    # Test assertMatchTest
+    # Test assertMatch
     #
     # pattern::
     #   The pattern to check against
@@ -396,7 +396,7 @@ module AssertionsTests
     end
 
     ##
-    # Test assertMatchFailTest
+    # Test assertMatch failure
     #
     # pattern::
     #   The pattern to check against
@@ -411,7 +411,7 @@ module AssertionsTests
     end
 
     ##
-    # Test assertMatchWithMessageTest
+    # Test assertMatch with message
     #
     # pattern::
     #   The pattern to check against
@@ -427,7 +427,7 @@ module AssertionsTests
     end
 
     ##
-    # Test assertMatchWithMessageFailTest
+    # Test assertMatch with message failure
     #
     # pattern::
     #   The pattern to check against
@@ -445,7 +445,7 @@ module AssertionsTests
     end
 
     ##
-    # Test assertNotMatchTest
+    # Test assertNotMatch
     #
     # pattern::
     #   The pattern to check against
@@ -458,7 +458,7 @@ module AssertionsTests
     end
 
     ##
-    # Test assertNotMatchFailTest
+    # Test assertNotMatch failure
     #
     # pattern::
     #   The pattern to check against
@@ -473,7 +473,7 @@ module AssertionsTests
     end
 
     ##
-    # Test assertNotMatchWithMessageTest
+    # Test assertNotMatch with message
     #
     # pattern::
     #   The pattern to check against
@@ -489,7 +489,7 @@ module AssertionsTests
     end
 
     ##
-    # Test assertNotMatchWithMessageFailTest
+    # Test assertNotMatch with message failure
     #
     # pattern::
     #   The pattern to check against
@@ -507,7 +507,7 @@ module AssertionsTests
     end
 
     ##
-    # Test assertSameTest
+    # Test assertSame
     #
     # object::
     #   The object to check
@@ -517,7 +517,7 @@ module AssertionsTests
     end
 
     ##
-    # Test assertSameFailTest
+    # Test assertSame failure
     #
     # expected::
     #   The expected object to check against
@@ -532,7 +532,7 @@ module AssertionsTests
     end
 
     ##
-    # Test assertSameWithMessageTest
+    # Test assertSame with message
     #
     # object::
     #   The object to check
@@ -545,7 +545,7 @@ module AssertionsTests
     end
 
     ##
-    # Test assertSameWithMessageFailTest
+    # Test assertSame with message failure
     #
     # expected::
     #   The expected object to check against
@@ -563,7 +563,7 @@ module AssertionsTests
     end
 
     ##
-    # Test assertNotSameTest
+    # Test assertNotSame
     #
     # expected::
     #   The expected object to check against
@@ -576,7 +576,7 @@ module AssertionsTests
     end
 
     ##
-    # Test assertNotSameFailTest
+    # Test assertNotSame failure
     #
     # object::
     #   The object to check
@@ -588,7 +588,7 @@ module AssertionsTests
     end
 
     ##
-    # Test assertNotSameWithMessageTest
+    # Test assertNotSame with message
     #
     # expected::
     #   The expected object to check against
@@ -604,7 +604,7 @@ module AssertionsTests
     end
 
     ##
-    # Test assertNotSameWithMessageFailTest
+    # Test assertNotSame with message failure
     #
     # object::
     #   The object to check

data/tests/Assertions/TC_Exceptions.rb

@@ -13,12 +13,21 @@ module AssertionsTests
   class TC_Exceptions < AssertionsTestCase
     include ExceptionsData
 
+    ##
+    # Test assertNothingRaised
+    #
+    # block_data::
+    #   block to be asserted
+    #
     def assertNothingRaisedTest block_data
       assertNothingRaised do
         block_data
       end
     end
 
+    ##
+    # Test assertNothingRaised failure
+    #
     def assertNothingRaisedFailTest
       rescue_assertion /#{ASSERT_NOTHING_RAISED_ERROR}/ do
         assertNothingRaised do
@@ -27,12 +36,27 @@ module AssertionsTests
       end
     end
 
+    ##
+    # Test assertNothingRaised with message
+    #
+    # block_data::
+    #   block to be asserted
+    #
+    # message::
+    #   The assertion message
+    #
     def assertNothingRaisedWithMessageTest block_data, message
       assertNothingRaised message do
         block_data
       end
     end
 
+    ##
+    # Test assertNothingRaised with message failure
+    #
+    # message::
+    #   The assertion message
+    #
     def assertNothingRaisedWithMessageFailTest message
       rescue_assertion /#{ASSERT_NOTHING_RAISED_ERROR}/, message do
         assertNothingRaised message do
@@ -41,20 +65,50 @@ module AssertionsTests
       end
     end
 
+    ##
+    # Test assertRaiseMessage
+    #
+    # pattern::
+    #   The pattern to match the exception
+    #
+    # exception::
+    #   The exception to raise
+    #
+    # error::
+    #   The exception message
+    #
     def assertRaiseMessageTest pattern, exception, error
       assertRaiseMessage pattern do
         raise exception, error
       end
     end
 
-    def assertRaiseMessageFailTest pattern, exception
+    ##
+    # Test assertRaiseMessage failure
+    #
+    # pattern::
+    #   The pattern to match the exception
+    #
+    # exception::
+    #   The exception to raise
+    #
+    # error::
+    #   The exception message
+    #
+    def assertRaiseMessageFailTest pattern, exception, error
       rescue_assertion /#{ASSERT_RAISE_MESSAGE_ERROR}/ do
         assertRaiseMessage pattern do
-          raise exception
+          raise exception, error
         end
       end
     end
 
+    ##
+    # Test assertRaiseMessage with invalid input
+    #
+    # pattern::
+    #   The pattern to match the exception
+    #
     def assertRaiseMessageInvalidTest pattern
       assertRaiseKindOf TypeError do
         assertRaiseMessage pattern do
@@ -63,20 +117,59 @@ module AssertionsTests
       end
     end
 
+    ##
+    # Test assertRaiseMessage with message
+    #
+    # pattern::
+    #   The pattern to match the exception
+    #
+    # exception::
+    #   The exception to raise
+    #
+    # error::
+    #   The exception message
+    #
+    # message::
+    #   The assertion message
+    #
     def assertRaiseMessageWithMessageTest pattern, exception, error, message
       assertRaiseMessage pattern, message do
         raise exception, error
       end
     end
 
-    def assertRaiseMessageWithMessageFailTest pattern, exception, message
+    ##
+    # Test assertRaiseMessage with message failure
+    #
+    # pattern::
+    #   The pattern to match the exception
+    #
+    # exception::
+    #   The exception to raise
+    #
+    # error::
+    #   The exception message
+    #
+    # message::
+    #   The assertion message
+    #
+    def assertRaiseMessageWithMessageFailTest pattern, exception, error, message
       rescue_assertion /#{ASSERT_RAISE_MESSAGE_ERROR}/, message do
         assertRaiseMessage pattern, message do
-          raise exception
+          raise exception, error
         end
       end
     end
 
+    ##
+    # Test assertRaiseMessage with invalid input with message
+    #
+    # pattern::
+    #   The pattern to match the exception
+    #
+    # message::
+    #   The assertion message
+    #
     def assertRaiseMessageWithMessageInvalidTest pattern, message
       assertRaiseKindOf TypeError do
         assertRaiseMessage pattern, message do
@@ -85,12 +178,24 @@ module AssertionsTests
       end
     end
 
+    ##
+    # Test assertRaiseKindOf
+    #
+    # exception::
+    #   The exception to raise
+    #
     def assertRaiseKindOfTest exception
       assertRaiseKindOf exception do
         raise exception
       end
     end
 
+    ##
+    # Test assertRaiseKindOf failure
+    #
+    # exception::
+    #   The exception to raise
+    #
     def assertRaiseKindOfFailTest exception
       rescue_assertion /#{ASSERT_RAISE_KIND_OF_ERROR}/ do
         assertRaiseKindOf AssertionsTestsError do
@@ -99,6 +204,12 @@ module AssertionsTests
       end
     end
 
+    ##
+    # Test assertRaiseKindOf with invalid input
+    #
+    # exception::
+    #   The exception to raise
+    #
     def assertRaiseKindOfInvalidTest exception
       assertRaiseKindOf TypeError do
         assertRaiseKindOf exception do
@@ -107,12 +218,30 @@ module AssertionsTests
       end
     end
 
+    ##
+    # Test assertRaiseKindOf with message
+    #
+    # exception::
+    #   The exception to raise
+    #
+    # message::
+    #   The assertion message
+    #
     def assertRaiseKindOfWithMessageTest exception, message
       assertRaiseKindOf exception, message do
         raise exception
       end
     end
 
+    ##
+    # Test assertRaiseKindOf with message failure
+    #
+    # exception::
+    #   The exception to raise
+    #
+    # message::
+    #   The assertion message
+    #
     def assertRaiseKindOfWithMessageFailTest exception, message
       rescue_assertion /#{ASSERT_RAISE_KIND_OF_ERROR}/, message do
         assertRaiseKindOf AssertionsTestsError, message do
@@ -121,6 +250,15 @@ module AssertionsTests
       end
     end
 
+    ##
+    # Test assertRaiseKindOf with invalid input with message
+    #
+    # exception::
+    #   The exception to raise
+    #
+    # message::
+    #   The assertion message
+    #
     def assertRaiseKindOfWithMessageInvalidTest exception, message
       assertRaiseKindOf TypeError do
         assertRaiseKindOf exception, message do
@@ -129,10 +267,203 @@ module AssertionsTests
       end
     end
 
+    ##
+    # Test assertRaiseExpected
+    #
+    # pattern::
+    #   The pattern to match the exception
+    #
+    # exception::
+    #   The exception to raise
+    #
+    # error::
+    #   The exception message
+    #
     def assertRaiseExpectedTest pattern, exception, error
-      assertRaisedExpected exception, pattern do
+      assertRaiseExpected exception, pattern do
+        raise exception, error
+      end
+    end
+
+    ##
+    # Test assertRaiseExpected failure
+    #
+    # pattern::
+    #   The pattern to match the exception
+    #
+    # expected::
+    #   The exception that is expected to be raised
+    #
+    # exception::
+    #   The exception to raise
+    #
+    # error::
+    #   The exception message
+    #
+    def assertRaiseExpectedFailTest pattern, expected, exception, error
+      rescue_assertion /#{ASSERT_RAISE_EXPECTED_ERROR}/ do
+        assertRaiseExpected expected, pattern do
+          raise exception, error
+        end
+      end
+    end
+
+    ##
+    # Test assertRaiseExpected with invalid exception
+    #
+    # pattern::
+    #   The pattern to match the exception
+    #
+    # expected::
+    #   The exception that is expected to be raised
+    #
+    def assertRaiseExpectedInvalidExceptionTest pattern, expected
+      assertRaiseKindOf TypeError do
+        assertRaiseExpected expected, pattern do
+          raise StandardError, pattern
+        end
+      end
+    end
+
+    ##
+    # Test assertRaiseExpected with invalid error
+    #
+    # pattern::
+    #   The pattern to match the exception
+    #
+    # expected::
+    #   The exception that is expected to be raised
+    #
+    def assertRaiseExpectedInvalidErrorTest pattern, expected
+      assertRaiseKindOf TypeError do
+        assertRaiseExpected expected, pattern do
+          raise StandardError, pattern
+        end
+      end
+    end
+
+    ##
+    # Test assertRaiseExpected with invalid exception and error
+    #
+    # pattern::
+    #   The pattern to match the exception
+    #
+    # expected::
+    #   The exception that is expected to be raised
+    #
+    def assertRaiseExpectedInvalidBothTest pattern, expected
+      assertRaiseKindOf TypeError do
+        assertRaiseExpected expected, pattern do
+          raise StandardError, pattern
+        end
+      end
+    end
+
+    ##
+    # Test assertRaiseExpected with message
+    #
+    # pattern::
+    #   The pattern to match the exception
+    #
+    # exception::
+    #   The exception to raise
+    #
+    # error::
+    #   The exception message
+    #
+    # message::
+    #   The assertion message
+    #
+    def assertRaiseExpectedWithMessageTest pattern, exception, error, message
+      assertRaiseExpected exception, pattern, message do
         raise exception, error
       end
     end
+
+    ##
+    # Test assertRaiseExpected with message failure
+    #
+    # pattern::
+    #   The pattern to match the exception
+    #
+    # expected::
+    #   The exception that is expected to be raised
+    #
+    # exception::
+    #   The exception to raise
+    #
+    # error::
+    #   The exception message
+    #
+    # message::
+    #   The assertion message
+    #
+    def assertRaiseExpectedWithMessageFailTest pattern, expected, exception, error, message
+      rescue_assertion /#{ASSERT_RAISE_EXPECTED_ERROR}/ do
+        assertRaiseExpected expected, pattern, message do
+          raise exception, error
+        end
+      end
+    end
+
+    ##
+    # Test assertRaiseExpected with invalid exception with message
+    #
+    # pattern::
+    #   The pattern to match the exception
+    #
+    # expected::
+    #   The exception that is expected to be raised
+    #
+    # message::
+    #   The assertion message
+    #
+    def assertRaiseExpectedInvalidExceptionWithMessageTest pattern, expected, message
+      assertRaiseKindOf TypeError do
+        assertRaiseExpected expected, pattern, message do
+          raise StandardError, pattern
+        end
+      end
+    end
+
+    ##
+    # Test assertRaiseExpected with invalid error with message
+    #
+    # pattern::
+    #   The pattern to match the exception
+    #
+    # expected::
+    #   The exception that is expected to be raised
+    #
+    # message::
+    #   The assertion message
+    #
+    def assertRaiseExpectedInvalidErrorWithMessageTest pattern, expected, message
+      assertRaiseKindOf TypeError do
+        assertRaiseExpected expected, pattern, message do
+          raise StandardError, pattern
+        end
+      end
+    end
+
+    ##
+    # Test assertRaiseExpected with invalid exception and error with message
+    #
+    # pattern::
+    #   The pattern to match the exception
+    #
+    # expected::
+    #   The exception that is expected to be raised
+    #
+    # message::
+    #   The assertion message
+    #
+    def assertRaiseExpectedInvalidBothWithMessageTest pattern, expected, message
+      assertRaiseKindOf TypeError do
+        assertRaiseExpected expected, pattern, message do
+          raise StandardError, pattern
+        end
+      end
+    end
   end
 end

data/tests/Assertions/data/Exceptions.rb

@@ -28,6 +28,15 @@ module AssertionsTests
     end
     alias_method :assertRaiseExpectedData, :assertRaiseMessageData
 
+    def assertRaiseMessageFailData
+      [
+        [/Message$/,     Exception, 'Message raised'],
+        [/No Match/, StandardError, 'Message raised'],
+        [ 'Message', ArgumentError, 'Message raised'],
+        ['No Match',     TypeError, 'Message raised'],
+      ]
+    end
+
     def assertRaiseMessageInvalidData
       exceptionObjects +
       nilObjects       +
@@ -44,18 +53,10 @@ module AssertionsTests
       hashObjects
     end
 
-    def assertRaiseMessageFailData
-      [
-        [      /Message$/,     Exception],
-        [      /No Match/, StandardError],
-        [       'Message', ArgumentError],
-        [      'No Match',     TypeError],
-      ]
-    end
-
     def assertRaiseMessageWithMessageData
       add_parameter assertRaiseMessageData
     end
+    alias_method :assertRaiseExpectedWithMessageData, :assertRaiseMessageWithMessageData
 
     def assertRaiseMessageWithMessageFailData
       add_parameter assertRaiseMessageFailData
@@ -99,10 +100,48 @@ module AssertionsTests
       add_parameter assertRaiseKindOfInvalidData
     end
 
-    def assertRaiseExpectedData
+    def assertRaiseExpectedFailData
       [
-        
+        [      /Message$/,     Exception,     Exception, 'Message raised'],
+        [      /No Match/, StandardError, StandardError, 'Message raised'],
+        [       'Message', ArgumentError, ArgumentError, 'Message raised'],
+        [      'No Match',     TypeError,     TypeError, 'Message raised'],
+        ['Message raised', StandardError,     Exception, 'Message raised'],
+        ['Message raised', ArgumentError, StandardError, 'Message raised'],
+        ['Message raised',     TypeError, ArgumentError, 'Message raised'],
+        [      /Message$/, StandardError,     Exception, 'Message raised'],
+        [      /No Match/, ArgumentError, StandardError, 'Message raised'],
+        [       'Message',     TypeError, ArgumentError, 'Message raised'],
+        [      'No Match',     Exception,     TypeError, 'Message raised'],
       ]
     end
+
+    def assertRaiseExpectedInvalidExceptionData
+      add_parameter MESSAGE, assertRaiseKindOfInvalidData
+    end
+
+    def assertRaiseExpectedInvalidErrorData
+      add_parameter assertRaiseMessageInvalidData, [[StandardError]]
+    end
+
+    def assertRaiseExpectedInvalidBothData
+      add_parameter assertRaiseMessageInvalidData, assertRaiseKindOfInvalidData
+    end
+
+    def assertRaiseExpectedWithMessageFailData
+      add_parameter assertRaiseExpectedFailData
+    end
+
+    def assertRaiseExpectedInvalidExceptionWithMessageData
+      add_parameter assertRaiseExpectedInvalidExceptionData
+    end
+
+    def assertRaiseExpectedInvalidErrorWithMessageData
+      add_parameter assertRaiseExpectedInvalidErrorData
+    end
+
+    def assertRaiseExpectedInvalidBothWithMessageData
+      add_parameter assertRaiseExpectedInvalidBothData
+    end
   end
 end

data/tests/Assertions/data/ObjectTypes.rb

@@ -151,7 +151,6 @@ module AssertionsTests
         [                   ''],
         [         'string one'],
         [           "STRING 2"],
-        [       "String #{42}"],
         [    'Two Word string'],
         ["Three\nLINE\nString"],
       ]
@@ -169,11 +168,10 @@ module AssertionsTests
 
     def regexpObjects
       [
-        [                          //],
-        [                  /Regexp 1/],
-        [            /\AStart Regexp/],
-        [               /END regexp$/],
-        [/^#{'interpolated'} REGEXP$/],
+        [              //],
+        [      /Regexp 1/],
+        [/\AStart Regexp/],
+        [   /END regexp$/],
       ]
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubyunit
 version: !ruby/object:Gem::Version
-  version: 0.3.20
+  version: 0.3.21
 platform: ruby
 authors:
 - Matthew Clower
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-26 00:00:00.000000000 Z
+date: 2014-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -54,6 +54,8 @@ files:
 - lib/RubyUnit/Assertions/Methods.rb
 - lib/RubyUnit/Assertions/Root.rb
 - lib/RubyUnit/IncompleteTest.rb
+- lib/RubyUnit/Report.rb
+- lib/RubyUnit/Result.rb
 - lib/RubyUnit/Runner.rb
 - lib/RubyUnit/SkippedTest.rb
 - lib/RubyUnit/TestCase.rb