rubyunit 0.2.13 → 0.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1b6f9831dc4e7b9f1764b157d1320600730bc6e
-  data.tar.gz: a4dc1ce088ce56e36ca70c0219698a72029fc27c
+  metadata.gz: b64f6dbfe4319e46907b2011f73fdadd28eefe7a
+  data.tar.gz: b71d665242db3cfc15f5db95b9c4410bd5f67d38
 SHA512:
-  metadata.gz: 8741adb6fb0ed18fd208ab9dd6492dab1bd7ea508dc2e1ef5b3f787e77b801f9ade9d92008eb931e2339c8f91d5f4f437278ac1746ce0cc8c65c46eedaec2f3c
-  data.tar.gz: 8e740f6ffcaa0bbec4b1dfe45fb723d3c861ab37fafe0dc9283808b5c5fa99a413120d005ac37e1f1c3f7bb532c35936603914761afdf8b4c56db136e5bda91d
+  metadata.gz: bad85169080b04079d2603d31ebd4bcd9eba77c9b62770d1418d4e6abcc16df2b942f5d72ae1e6a94d5c37e45ffcc656033e3e8dac39cf679e411cc198b31ab0
+  data.tar.gz: c7ff085f436ef93f1a13b07fd5b5b547906cd13690d32d9759c6c512bc5316d8b095d258c1f529b561d81fcfa1b2e87e68735e0968f6555e3247730021dbcd65

data/TestSuite.rb

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 
-# IMPORTANT
 # require relative RubyUnit framework for local so that the tests are run on the build
 # in this repository
 path = File.dirname(__FILE__)
@@ -10,14 +9,13 @@ $LOAD_PATH.unshift("#{path}/tests")
 
 require 'RubyUnit'
 
-# Test Cases
+# Test Sets
 
 # RubyUnit module => RubyUnit.rb
-require 'TEST_RubyUnit'
-require 'TEST_GemInfo'
+require 'TS_RubyUnit'
 
 # AssertionFailure exception => RubyUnit/AssertionFailure.rb
-require 'TEST_AssertionFailure'
+require 'TS_AssertionFailure'
 
 # Assertions module => RubyUnit/Assertions.rb
 require 'TEST_Assertions'

data/lib/RubyUnit/AssertionFailure.rb

@@ -3,8 +3,32 @@ module RubyUnit
   # Exception that is raised when a test assertion fails.
   #
   class AssertionFailure < StandardError
+    attr_reader :data
+
     # Error messages
     FAILING = 'Failing test'
 
+    #
+    # Create a RubyUnit::AssertionFailure exception
+    #
+    # data::
+    #   The data associated with the assertion
+    #
+    def initialize data = {}
+      raise ArgumentError, 'Data for AssertionFailure must be a Hash' unless data.is_a? Hash
+      @data = data
+    end
+
+    #
+    # Create a string from the assertion data
+    #
+    def info
+      s = "\n"
+      s = "#{message}\n" if message.length > 0
+      @data.each do |index, value|
+        s << "\n#{index}:\n\t#{value.inspect}"
+      end
+      s
+    end
   end
 end

data/lib/RubyUnit/Assertions.rb

@@ -82,7 +82,7 @@ module RubyUnit
     # message::
     #   The message provided to be reported for a failure
     #
-    #  assertNot true, "This will fail"  # => fail
+    #  assertNil true, "This will fail"  # => fail
     #
     def assertFalse value, message = nil
       __assert (false == value), 'Failed to assert that value is EXACTLY false', message, {:value=>value}
@@ -98,10 +98,62 @@ module RubyUnit
     # message::
     #   The message provided to be reported for a failure
     #
-    #  assertNot true, "This will fail"  # => fail
+    #  assertNil true, "This will fail"  # => fail
     #
     def assertNil value, message = nil
-      __assert value, 'Failed to assert that value is EXACTLY nil', message, {:value=>value}
+      __assert value.nil?, 'Failed to assert that value is EXACTLY nil', message, {:value=>value}
+    end
+
+    #
+    # Assert that a test condition is not nil.
+    # * raises RubyUnit::AssertionFailure if _value_ is nil
+    #
+    # value::
+    #   The value that is being checked by the assertion
+    #
+    # message::
+    #   The message provided to be reported for a failure
+    #
+    #  assertNotNil nil, "This will fail"  # => fail
+    #
+    def assertNotNil value, message = nil
+      __reject value.nil?, 'Failed to assert that value is NOT nil', message, {:value=>value}
+    end
+
+    #
+    # Assert that a value is empty
+    # * raises RubyUnit::AssertionFailure unless _object_ responds to :empty?
+    # * raises RubyUnit::AssertionFailure unless _object_ is empty
+    #
+    # object::
+    #   The object to check
+    #
+    # message::
+    #   The message provided to be reported for a failure
+    #
+    #  assertEmpty [1, 2], 'Not empty'  # => fail
+    #
+    def assertEmpty object, message = nil
+      assertRespondTo object, :include?, message
+      __assert object.empty?, 'Failed to assert object is empty', message, {:object=>object}
+    end
+
+    #
+    # Assert that a value is not empty
+    # * raises RubyUnit::AssertionFailure unless _object_ responds to :empty?
+    # * raises RubyUnit::AssertionFailure if _object_ is empty
+    #
+    # object::
+    #   The object to check
+    #
+    # message::
+    #   The message provided to be reported for a failure
+    #
+    #  assertNotInclude [1, 2, 3], 2, 'It does, so close'  # => fail
+    #
+    def assertNotEmpty object, message = nil
+      assertRespondTo object, :include?, message
+      __reject object.empty?, 'Failed to assert object is NOT empty', message, {:object=>object}
     end
 
     #
@@ -585,6 +637,7 @@ module RubyUnit
         rescue exception => e
           assertEqual pattern, e.message if pattern.is_a? String and pattern.length > 0
           assertMatch pattern, e.message if pattern.is_a? Regexp
+          e
         end
       end
     end
@@ -612,13 +665,7 @@ module RubyUnit
       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
-
-      error_message  = "\n\n#{error}"
-      error_message << "\n#{message}" if not message.nil?
-      data.each do |index, value|
-        error_message << "\n#{index}:\n\t#{value.inspect}"
-      end
-      raise AssertionFailure, error_message
+      raise AssertionFailure.new({'Assertion Failure'=>message}.merge data), error
     end
 
     #

data/lib/RubyUnit/Runner.rb

@@ -123,7 +123,7 @@ module RubyUnit
         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]
+          puts failure[3].info
           puts failure[3].backtrace.join("\n")
         end
         

data/lib/RubyUnit.rb

@@ -5,7 +5,7 @@
 #
 module RubyUnit
   # Current RubyUnit version
-  VERSION = '0.2.13'
+  VERSION = '0.2.14'
 
   #
   # RubyUnit::GemInfo contains data and functionality needed by the gem builder
@@ -35,6 +35,7 @@ Module.new do
   #--
   # TODO: add alias and call the alias so that the function doesn't break any
   # functionality that may have also extended this event.  Before/After?
+  # * Test and see if I even need to do that.
   #++
   #
   at_exit do

data/tests/AssertionFailure/TC_Class.rb

@@ -0,0 +1,27 @@
+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 ClassTestsData
+
+    #
+    # Validate that RubyUnit::AssertionFailure is an Exception
+    #
+    def isExceptionTest
+      assertDescendent Exception, RubyUnit::AssertionFailure, 'AssertionFailure MUST be an Exception'
+    end
+
+    #
+    # Assert all required constants are defined
+    #
+    def constantTest konstant
+      assertConstDefined RubyUnit::AssertionFailure, konstant, 'Required constant is missing'
+    end
+  end
+end

data/tests/AssertionFailure/TC_Instance.rb

@@ -0,0 +1,43 @@
+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 InstanceTestsData
+
+    #
+    # 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}"
+      end
+    end
+  end
+end

data/tests/AssertionFailure/data/Class.rb

@@ -0,0 +1,12 @@
+module AssertionFailureTests
+  #
+  # Data provider for RubyUnit::AssertionFailure class Test Case
+  #
+  module ClassTestsData
+    def constantData
+      [
+        ['FAILING'],
+      ]
+    end
+  end
+end

data/tests/AssertionFailure/data/Instance.rb

@@ -0,0 +1,20 @@
+module AssertionFailureTests
+  #
+  # Data provider for RubyUnit::AssertionFailure class Test Case
+  #
+  module InstanceTestsData
+    def dataData
+      [
+        [{}],
+      ] +
+      infoData
+    end
+
+    def infoData
+      [
+        [{       :integer=>42, :string=>'string'}],
+        [{'String Index'=>nil, :string=>'string'}],
+      ]
+    end
+  end
+end

data/tests/RubyUnit/TC_GemInfo.rb

@@ -0,0 +1,27 @@
+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
+      assertInclude RubyUnit::GemInfo::FILES, 'LICENSE.md', 'Gem MUST be distributed with the license'
+    end
+  end
+end

data/tests/RubyUnit/TC_RubyUnit.rb

@@ -0,0 +1,15 @@
+require 'RubyUnit'
+
+module RubyUnitTests
+  #
+  # Test Case for the RubyUnit module
+  #
+  class TC_RubyUnit < RubyUnit::TestCase
+    #
+    # Verify that the VERSION constant is defined in the RubyUnit module
+    #
+    def versionDefinedTest
+      assertConstDefined RubyUnit, 'VERSION', 'Version must be defined in RubyUnit::VERSION'
+    end
+  end
+end

data/tests/RubyUnit/data/GemInfo.rb

@@ -0,0 +1,13 @@
+module RubyUnitTests
+  #
+  # Data provider for RubyUnit::GemInfo module Test Case
+  #
+  module GemInfoTestsData
+    def constantsDefinedData
+      [
+        [      'FILES'],
+        ['DESCRIPTION'],
+      ]
+    end
+  end
+end

data/tests/TEST_Assertions.rb

@@ -7,6 +7,7 @@ require_relative 'data/Assertions'
 # Test Case for RubyUnit::Assertions module
 #
 class TEST_Assertions < RubyUnit::TestCase
+  include AssertionsData
   @assertions
 
   #
@@ -19,8 +20,8 @@ class TEST_Assertions < RubyUnit::TestCase
   #
   # Wrapper to rescue assertions
   #
-  def rescue_assertion pattern = '', &block
-    assertRaiseExpected RubyUnit::AssertionFailure, pattern do
+  def rescue_assertion pattern = '', message = nil, data = {}, &block
+    assertRaiseExpected RubyUnit::AssertionFailure, pattern, message do
       yield
     end
   end
@@ -28,8 +29,8 @@ class TEST_Assertions < RubyUnit::TestCase
   #
   # Test for default failure
   #
-  def failTest
-    rescue_assertion  /#{RubyUnit::AssertionFailure::FAILING}/ do
+  def failDefaultTest
+    rescue_assertion /#{RubyUnit::AssertionFailure::FAILING}/ do
       fail
     end
   end

data/tests/TS_AssertionFailure.rb

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+require 'RubyUnit'
+
+# Test Cases
+require_relative 'AssertionFailure/TC_Class'
+require_relative 'AssertionFailure/TC_Instance'

data/tests/TS_RubyUnit.rb

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+require 'RubyUnit'
+
+# Test Cases
+require_relative 'RubyUnit/TC_RubyUnit'
+require_relative 'RubyUnit/TC_GemInfo'

data/tests/data/Assertions.rb

@@ -2,4 +2,22 @@
 # Data provider for RubyUnit::TestCase class Test Case
 #
 module AssertionsData
+  #
+  # Create data string that will be in assertion from data list
+  # * This makes me really want to build RubyUnit::AssertionFailure properly
+  #
+  def data_string data = {}
+    error_message = ''
+    data.each do |index, value|
+      error_message << "\n#{index}:\n\t#{value.inspect}"
+    end
+    error_message
+  end
+
+  def failData
+    [
+      ['message'                            ],
+      ['message', {:string=>'test',:int=>10}],
+    ]
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubyunit
 version: !ruby/object:Gem::Version
-  version: 0.2.13
+  version: 0.2.14
 platform: ruby
 authors:
 - Matthew Clower
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-17 00:00:00.000000000 Z
+date: 2014-10-18 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
@@ -34,16 +34,21 @@ files:
 - lib/RubyUnit/Runner.rb
 - lib/RubyUnit/SkippedTest.rb
 - lib/RubyUnit/TestCase.rb
-- tests/TEST_AssertionFailure.rb
+- tests/AssertionFailure/TC_Class.rb
+- tests/AssertionFailure/TC_Instance.rb
+- tests/AssertionFailure/data/Class.rb
+- tests/AssertionFailure/data/Instance.rb
+- tests/RubyUnit/TC_GemInfo.rb
+- tests/RubyUnit/TC_RubyUnit.rb
+- tests/RubyUnit/data/GemInfo.rb
 - tests/TEST_Assertions.rb
-- tests/TEST_GemInfo.rb
 - tests/TEST_IncompleteTest.rb
-- tests/TEST_RubyUnit.rb
 - tests/TEST_Runner.rb
 - tests/TEST_SkippedTest.rb
 - tests/TEST_TestCase.rb
+- tests/TS_AssertionFailure.rb
+- tests/TS_RubyUnit.rb
 - tests/data/Assertions.rb
-- tests/data/GemInfo.rb
 - tests/data/TestCase.rb
 - tests/fixture/TestCase.rb
 homepage: http://github.com/RubyUnit/RubyUnit

data/tests/TEST_AssertionFailure.rb

@@ -1,13 +0,0 @@
-require 'RubyUnit/AssertionFailure'
-
-#
-# Test Case for RubyUnit::AssertionFailure
-#
-class TEST_AssertionFailure < RubyUnit::TestCase
-  #
-  # Validate that RubyUnit::AssertionFailure is an Exception
-  #
-  def isExceptionTest
-    assertDescendent Exception, RubyUnit::AssertionFailure, 'AssertionFailure MUST be an Exception!'
-  end
-end

data/tests/TEST_GemInfo.rb

@@ -1,25 +0,0 @@
-require 'RubyUnit'
-
-# Data provider for RubyUnit::GemInfo tests
-require_relative 'data/GemInfo'
-
-#
-# Test Case for the RubyUnit::GemInfo module
-#
-class TEST_GemInfo < RubyUnit::TestCase
-  include GemInfoData
-
-  #
-  # 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
-    assertInclude RubyUnit::GemInfo::FILES, 'LICENSE.md', 'Gem MUST be distributed with the license!'
-  end
-end

data/tests/TEST_RubyUnit.rb

@@ -1,13 +0,0 @@
-require 'RubyUnit'
-
-#
-# Test Case for the RubyUnit module
-#
-class TEST_RubyUnit < RubyUnit::TestCase
-  #
-  # Verify that the VERSION constant is defined in the RubyUnit module
-  #
-  def versionDefinedTest
-    assertConstDefined RubyUnit, 'VERSION', 'Version must be defined in RubyUnit::VERSION!'
-  end
-end

data/tests/data/GemInfo.rb

@@ -1,11 +0,0 @@
-#
-# Data provider for RubyUnit::GemInfo module Test Case
-#
-module GemInfoData
-  def constantsDefinedData
-    [
-      [      'FILES'],
-      ['DESCRIPTION'],
-    ]
-  end
-end