rubyunit 0.3.16 → 0.3.17

data/lib/RubyUnit/Assertions.rb

@@ -1,113 +1,38 @@
+require_relative 'Assertions/Basic'       # Basic assertions
+require_relative 'Assertions/Classes'     # Class assertions
+require_relative 'Assertions/Collections' # Collection assertions
+require_relative 'Assertions/Comparisons' # Comparison assertions
+require_relative 'Assertions/Exceptions'  # Exception assertions
+require_relative 'Assertions/Methods'     # Method assertions
+
 module RubyUnit
-  #
+  ##
   # Assertions that can be used by RubyUnit::TestCase
   #
   module Assertions
-    include AssertionMessage
-
+    ##
     # Tracks the total number of assertions made during the tests
     @@assertions = 0
 
-    private
-    #
-    # 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
-    #
-    # error::
-    #   The assertion description
-    #
-    # message::
-    #   The message provided by the test for the assertion
-    #
-    # data::
-    #   The data associated with assertion failure
-    #
-    #  build_message 'Failing Test', message, {'expected' => expected, 'actual' => actual }
+    ##
+    # Get the current number of test assertions
     #
-    def build_message 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
+    def self.assertions
+      @@assertions
     end
 
+    ##
+    # Increment the number of test assertions
     #
-    # The assertion wrapper is responsible for doing everything that must be done
-    # on each assertion.
-    # * keep track of the total number of assertions
-    #
-    # &block::
-    #   The assertion which is being wrapped
-    #
-    def __wrap_assertion &block # :nodoc:
+    def self.add_assertion
       @@assertions += 1
-      yield
-    end
-
-    #
-    # Internally validate that an assertion not false or nil
-    # * raises RubyUnit::AssertionFailure unless _value_ is true 
-    #
-    # value::
-    #   The value to be asserted
-    #
-    # error::
-    #   The error associated with the assertion being checked
-    #
-    # message::
-    #   The message provided to be reported for a failure
-    #
-    # data::
-    #   The data associated with assertion
-    #
-    #  __assert value, 'Failed to assert value is true', message, {:value=>value}
-    #
-    def __assert value, error, message, data # :nodoc:
-      __wrap_assertion do
-        build_message error, message, data unless value
-      end
-    end
-
-    #
-    # Internally validate that an assertion is false or nil
-    # * raises RubyUnit::AssertionFailure unless _value_ is false or nil 
-    #
-    # value::
-    #   The value to be asserted
-    #
-    # error::
-    #   The error associated with the assertion being checked
-    #
-    # message::
-    #   The message provided to be reported for a failure
-    #
-    # data::
-    #   The data associated with assertion
-    #
-    #  __reject value, 'Failed to assert value is not true', message, {:value=>value}
-    #
-    def __reject value, error, message, data # :nodoc:
-      __assert (not value), error, message, data
     end
 
-    #
-    # 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
-    #
-    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
-    end
+    include Assertions::Basic
+    include Assertions::Classes
+    include Assertions::Collections
+    include Assertions::Comparisons
+    include Assertions::Exceptions
+    include Assertions::Methods
   end
 end
-
-require_relative 'Assertions/Basic'      # Basic assertions
-require_relative 'Assertions/Class'      # Class assertions
-require_relative 'Assertions/Collection' # Collection assertions
-require_relative 'Assertions/Comparison' # Comparison assertions
-require_relative 'Assertions/Exception'  # Exception assertions
-require_relative 'Assertions/Method'     # Method assertions

data/lib/RubyUnit.rb

@@ -1,17 +1,21 @@
-#
+##
 # A Simple Unit Test Framework for Ruby
 #
 # The RubyModule is the root object for all RubyUnit modules and classes.
 #
 module RubyUnit
+  ##
   # Debug mode
   @@debug            = false
+  ##
+  # Error message
   INVALID_DEBUG_MODE = 'Debug mode must be Boolean'
 
+  ##
   # Current RubyUnit version
-  VERSION = '0.3.16'
+  VERSION            = '0.3.17'
 
-  #
+  ##
   # Set debug mode
   # * raises ArgumentError if _bool_ is not a Boolean
   #
@@ -23,14 +27,14 @@ module RubyUnit
     @@debug = bool
   end
 
-  #
+  ##
   # Get the current debug mode
   #
   def self.debug
     @@debug
   end
 
-  #
+  ##
   # RubyUnit::GemInfo contains data and functionality needed by the gem builder
   # when building and distributing the RubyUnit gem.
   #
@@ -41,19 +45,21 @@ module RubyUnit
                   ['TestSuite.rb']            +  # Test Suite
                   Dir['tests/**/*.rb']           # TESTS
 
-    DESCRIPTION = 'Unit testing and test-driven development are crucial parts of '  +
-                  'the software development life cycle. This tool is intended to '  +
+    DESCRIPTION = 'Unit testing and test-driven development are crucial parts of '     +
+                  'the software development life cycle. This tool is intended to '     +
                   'make development and testing in Ruby easier on everyone. RubyUnit ' +
-                  'is also designed to with a focus on data-driven testing.'
+                  'is also designed to with a focus on data-driven testing and meta-.' +
+                  'programming.'
   end
 end
 
 require_relative 'RubyUnit/TestCase'
 require_relative 'RubyUnit/Runner'
 
+##
 # Automatically Run Test Cases if they haven't been run already
 Module.new do
-  #
+  ##
   # Automatically run defined Test Cases
   #
   #--
@@ -63,6 +69,7 @@ Module.new do
   #++
   #
   at_exit do
+    ##
     # Don't run if it there is an exception or it has already been run
     if $ERROR_INFO.nil? and RubyUnit::Runner.autorun?
       RubyUnit::Runner.run

data/tests/AssertionFailure/TC_Class.rb

@@ -1,16 +1,21 @@
 require 'RubyUnit/AssertionFailure'
 
+##
+# Data provider for RubyUnit::AssertionFailure tests
+require_relative 'data/Class'
+
 module AssertionFailureTests
   ##
   # Test Case for RubyUnit::AssertionFailure
   #
   class TC_Class < RubyUnit::TestCase
+    include ClassData
 
     ##
-    # Validate that RubyUnit::AssertionFailure is an Exception
+    # Validate that RubyUnit::AssertionFailure has the correct super classes
     #
-    def isExceptionTest
-      assertDescendent Exception, RubyUnit::AssertionFailure, 'AssertionFailure MUST be an Exception'
+    def isDescendentTest e
+      assertDescendent e, RubyUnit::AssertionFailure, 'AssertionFailure MUST be an Exception'
     end
   end
 end

data/tests/AssertionFailure/TC_Instance.rb

@@ -1,42 +1,29 @@
 require 'RubyUnit/AssertionFailure'
 
+##
 # Data provider for RubyUnit::AssertionFailure tests
 require_relative 'data/Instance'
 
 module AssertionFailureTests
-  #
+  ##
   # Test Case for RubyUnit::AssertionFailure
   #
   class TC_Instance < RubyUnit::TestCase
     include InstanceData
 
-    #
-    # Test creation of default AssertionFailure
-    #
-    def createDefaultTest
-      assertNothingRaised 'Should be able to create default AssertionFailure' do
-        failure = RubyUnit::AssertionFailure.new
-        hash = {}
-        assertEqual hash, failure.data, 'Default data Hash should be empty'
-      end
-    end
-
-    #
-    # Test the data for the AssertionFailure
-    #
-    def dataTest data
-      failure = RubyUnit::AssertionFailure.new(data)
-      assertEqual data, failure.data, 'Assertion data Hash is incorrect'
-    end
-
-    #
+    ##
     # Test the info string for the AssertionFailure
     #
-    def infoTest data
-      failure = RubyUnit::AssertionFailure.new(data)
-      data.each do |index, value|
-        assertMatch /#{index}/, failure.info, "Missing index for #{index}"
-        assertMatch /#{value}/, failure.info, "Missing value for #{index}"
+    def assertionFailureTest data, message
+      begin
+        raise RubyUnit::AssertionFailure.new(data), message
+      rescue RubyUnit::AssertionFailure => failure
+        assertEqual data, failure.data, 'Assertion data Hash is incorrect'
+        assertEqual message, failure.message, 'Excpected message mismatch'
+        data.each do |index, value|
+          assertMatch /#{index}/, failure.info, "Missing index for #{index}"
+          assertMatch /#{value}/, failure.info, "Missing value for #{index}"
+        end
       end
     end
   end

data/tests/AssertionFailure/data/Class.rb

@@ -0,0 +1,13 @@
+module AssertionFailureTests
+  ##
+  # Data provider for RubyUnit::AssertionFailure Class Test Case
+  #
+  module ClassData
+    def isDescendentData
+      [
+        [    Exception],
+        [StandardError],
+      ]
+    end
+  end
+end

data/tests/AssertionFailure/data/Instance.rb

@@ -3,17 +3,16 @@ module AssertionFailureTests
   # Data provider for RubyUnit::AssertionFailure class Test Case
   #
   module InstanceData
-    def dataData
-      infoData +
+    def assertionFailureData
       [
-        [{}],
-      ]
-    end
-
-    def infoData
-      [
-        [{       :integer=>42, :string=>'string'}],
-        [{'String Index'=>nil, :string=>'string'}],
+                                                {},
+                                {:regex=>/Regexp/},
+                      {:string=>'string',:int=>42},
+        {:class=>Class,:int=>42,:string=>'string'},
+      ].product [
+                                          '',
+         'AssertionsTests Assertion Message',
+        "#{'iterpolated'} Assertion Message",
       ]
     end
   end

data/tests/Assertions/{TC_Class.rb → TC_Classes.rb}

@@ -1,14 +1,14 @@
 require 'RubyUnit/Assertions'
 
 # Data provider for RubyUnit::TestCase tests
-require_relative 'data/Class'
+require_relative 'data/Classes'
 
 module AssertionsTests
   ##
   # Test Case for RubyUnit::Assertions Class assertions
   #
-  class TC_Class < AssertionsTestCase
-    include ClassData
+  class TC_Classes < AssertionsTestCase
+    include ClassesData
 
     ##
     # Test assertKindOf
@@ -389,6 +389,5 @@ module AssertionsTests
         assertNotDescendent klass, descendent, message
       end
     end
-
   end
 end

data/tests/Assertions/TC_Collections.rb

@@ -0,0 +1,13 @@
+require 'RubyUnit/Assertions'
+
+# Data provider for RubyUnit::TestCase tests
+require_relative 'data/Collections'
+
+module AssertionsTests
+  #
+  # Test Case for RubyUnit::Assertions Collections assertions
+  #
+  class TC_Collections < AssertionsTestCase
+    include CollectionsData
+  end
+end

data/tests/Assertions/TC_Comparisons.rb

@@ -0,0 +1,13 @@
+require 'RubyUnit/Assertions'
+
+# Data provider for RubyUnit::TestCase tests
+require_relative 'data/Comparisons'
+
+module AssertionsTests
+  #
+  # Test Case for RubyUnit::Assertions Comparisons assertions
+  #
+  class TC_Comparisons < AssertionsTestCase
+    include ComparisonsData
+  end
+end

data/tests/Assertions/TC_Exceptions.rb

@@ -0,0 +1,13 @@
+require 'RubyUnit/Assertions'
+
+# Data provider for RubyUnit::TestCase tests
+require_relative 'data/Exceptions'
+
+module AssertionsTests
+  #
+  # Test Case for RubyUnit::Assertions Exceptions assertions
+  #
+  class TC_Exceptions < AssertionsTestCase
+    include ExceptionsData
+  end
+end

data/tests/Assertions/TC_Methods.rb

@@ -0,0 +1,13 @@
+require 'RubyUnit/Assertions'
+
+# Data provider for RubyUnit::TestCase tests
+require_relative 'data/Methods'
+
+module AssertionsTests
+  #
+  # Test Case for RubyUnit::Assertions Methods assertions
+  #
+  class TC_Methods < AssertionsTestCase
+    include MethodsData
+  end
+end

data/tests/Assertions/data/Basic.rb

@@ -8,11 +8,11 @@ module AssertionsTests
     include ObjectTypes
 
     def failWithMessageData
-      AssertionsTests::MESSAGES
+      AssertionsTests::MESSAGE
     end
 
     def failWithDataData
-      add_parameter AssertionsTests::MESSAGES, hashObjects
+      add_parameter AssertionsTests::MESSAGE, hashObjects
     end
 
     def assertData

data/tests/Assertions/data/{Class.rb → Classes.rb}

@@ -4,7 +4,7 @@ module AssertionsTests
   ##
   # Data provider for RubyUnit::Assertions Class assertions
   #
-  module ClassData
+  module ClassesData
     include ObjectTypes
 
     def assertKindOfData

data/tests/Assertions/data/Collections.rb

@@ -0,0 +1,13 @@
+require_relative 'ObjectTypes'
+
+module AssertionsTests
+  #
+  # Data provider for RubyUnit::Assertions Collections assertions
+  #
+  module CollectionsData
+    include ObjectTypes
+
+    def includeData
+    end
+  end
+end

data/tests/Assertions/data/Comparisons.rb

@@ -0,0 +1,7 @@
+module AssertionsTests
+  #
+  # Data provider for RubyUnit::Assertions Comparisons assertions
+  #
+  module ComparisonsData
+  end
+end

data/tests/Assertions/data/Exceptions.rb

@@ -0,0 +1,7 @@
+module AssertionsTests
+  #
+  # Data provider for RubyUnit::Assertions Exceptions assertions
+  #
+  module ExceptionsData
+  end
+end

data/tests/Assertions/data/Methods.rb

@@ -0,0 +1,7 @@
+module AssertionsTests
+  #
+  # Data provider for RubyUnit::Assertions Methods assertions
+  #
+  module MethodsData
+  end
+end

data/tests/RubyUnit/TC_GemInfo.rb

@@ -1,23 +1,24 @@
 require 'RubyUnit'
 
+##
 # Data provider for RubyUnit::GemInfo tests
 require_relative 'data/GemInfo'
 
 module RubyUnitTests
-  #
+  ##
   # Test Case for the RubyUnit::GemInfo module
   #
   class TC_GemInfo < RubyUnit::TestCase
     include GemInfoTestsData
 
-    #
+    ##
     # Verify that the required constants are defined
     #
     def constantsDefinedTest konstant
       assertConstDefined RubyUnit::GemInfo, konstant, "missing constant in GemInfo: #{konstant}"
     end
 
-    #
+    ##
     # Verify that the list of files contains the LICENSE file
     #
     def validateFilesIncludesLicenseTest

data/tests/RubyUnit/TC_RubyUnit.rb

@@ -1,23 +1,24 @@
 require 'RubyUnit'
 
-# Data provider for RubyUnit::GemInfo tests
+##
+# Data provider for RubyUnit module
 require_relative 'data/RubyUnit'
 
 module RubyUnitTests
-  #
+  ##
   # Test Case for the RubyUnit module
   #
   class TC_RubyUnit < RubyUnit::TestCase
     include RubyUnitTestsData
 
-    #
+    ##
     # Verify that the VERSION constant is defined in the RubyUnit module
     #
-    def versionDefinedTest
-      assertConstDefined RubyUnit, 'VERSION', 'Version must be defined in RubyUnit::VERSION'
+    def constantTest konstant
+      assertConstDefined RubyUnit, konstant, 'Expected constant missing'
     end
 
-    #
+    ##
     # Test debug mode
     #
     def debugModeTest
@@ -29,7 +30,7 @@ module RubyUnitTests
       RubyUnit.debug = old_mode
     end
 
-    #
+    ##
     # Test that debug mode doesn't accept non-Boolean
     #
     def invalidDebugModeTest mode

data/tests/RubyUnit/data/GemInfo.rb

@@ -1,5 +1,5 @@
 module RubyUnitTests
-  #
+  ##
   # Data provider for RubyUnit::GemInfo module Test Case
   #
   module GemInfoTestsData

data/tests/RubyUnit/data/RubyUnit.rb

@@ -1,8 +1,15 @@
 module RubyUnitTests
-  #
-  # Data provider for RubyUnit::GemInfo module Test Case
+  ##
+  # Data provider for RubyUnit module
   #
   module RubyUnitTestsData
+    def constantData
+      [
+        [           'VERSION'],
+        ['INVALID_DEBUG_MODE'],
+      ]
+    end
+
     def invalidDebugModeData
       [
         [      42],

data/tests/TS_Assertions.rb

@@ -6,10 +6,8 @@ module AssertionsTests
   ##
   # Messages to be used in the tests
   #
-  MESSAGES = [
-    [                                  ''],
+  MESSAGE = [
     [ 'AssertionsTests Assertion Message'],
-    ["#{'iterpolated'} Assertion Message"],
   ]
 
   class AssertionsTestCase < RubyUnit::TestCase
@@ -50,7 +48,7 @@ module AssertionsTests
 
     ##
     # Add parameter on the end of each param list
-    def add_parameter array, params = MESSAGES
+    def add_parameter array, params = MESSAGE
       a = []
       params.each do |param|
         a = a + array.collect {|element| element.clone + param}

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: rubyunit
 version: !ruby/object:Gem::Version
-  version: 0.3.16
+  version: 0.3.17
 platform: ruby
 authors:
 - Matthew Clower
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-19 00:00:00.000000000 Z
+date: 2014-10-21 00:00:00.000000000 Z
 dependencies: []
 description: Unit testing and test-driven development are crucial parts of the software
   development life cycle. This tool is intended to make development and testing in
   Ruby easier on everyone. RubyUnit is also designed to with a focus on data-driven
-  testing.
+  testing and meta-.programming.
 email:
 - matthewclower@gmail.com
 executables: []
@@ -33,26 +33,34 @@ files:
 - lib/RubyUnit/AssertionMessage.rb
 - lib/RubyUnit/Assertions.rb
 - lib/RubyUnit/Assertions/Basic.rb
-- lib/RubyUnit/Assertions/Class.rb
-- lib/RubyUnit/Assertions/Collection.rb
-- lib/RubyUnit/Assertions/Comparison.rb
-- lib/RubyUnit/Assertions/Exception.rb
-- lib/RubyUnit/Assertions/Method.rb
+- lib/RubyUnit/Assertions/Classes.rb
+- lib/RubyUnit/Assertions/Collections.rb
+- lib/RubyUnit/Assertions/Comparisons.rb
+- lib/RubyUnit/Assertions/Exceptions.rb
+- lib/RubyUnit/Assertions/Methods.rb
+- lib/RubyUnit/Assertions/Root.rb
 - lib/RubyUnit/IncompleteTest.rb
 - lib/RubyUnit/Runner.rb
 - lib/RubyUnit/SkippedTest.rb
 - lib/RubyUnit/TestCase.rb
 - tests/AssertionFailure/TC_Class.rb
 - tests/AssertionFailure/TC_Instance.rb
+- tests/AssertionFailure/data/Class.rb
 - tests/AssertionFailure/data/Instance.rb
 - tests/AssertionMessage/TC_Constant.rb
 - tests/AssertionMessage/data/Constant.rb
 - tests/Assertions/TC_Basic.rb
-- tests/Assertions/TC_Class.rb
-- tests/Assertions/TC_Comparison.rb
+- tests/Assertions/TC_Classes.rb
+- tests/Assertions/TC_Collections.rb
+- tests/Assertions/TC_Comparisons.rb
+- tests/Assertions/TC_Exceptions.rb
+- tests/Assertions/TC_Methods.rb
 - tests/Assertions/data/Basic.rb
-- tests/Assertions/data/Class.rb
-- tests/Assertions/data/Comparison.rb
+- tests/Assertions/data/Classes.rb
+- tests/Assertions/data/Collections.rb
+- tests/Assertions/data/Comparisons.rb
+- tests/Assertions/data/Exceptions.rb
+- tests/Assertions/data/Methods.rb
 - tests/Assertions/data/ObjectTypes.rb
 - tests/IncompleteTest/TC_IncompleteTest.rb
 - tests/RubyUnit/TC_GemInfo.rb