rubyunit 0.4.23 → 0.4.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d88b937416b22f572f04440f7a0065216e040a5
-  data.tar.gz: 96c0e73090b854965d5c4153701d154c90f896fa
+  metadata.gz: 3803155b1bf2e7d8d4625e2b4fe954e1d731b512
+  data.tar.gz: dc4a21f703bd88fd83287ca9a49542ab9a9974c3
 SHA512:
-  metadata.gz: 8c2056ea74a124f676f30b4384a61ba5acf1dc65e2aa33c6f92677232653a0ee657c1d28e0b3ff87a580ec978289f882e4a03bcd3712f1f632aeea1797240fc1
-  data.tar.gz: ded6018f7b70dbbf6326eec4ecd35f1653cce8e8c6ad969622d26b9345f7c8f9e76edd63b9270c4146c32afc91f910e3c8b5a93d648e965ece20a6846c9da2c8
+  metadata.gz: cf28bd7bcf9ba89c492ffe5b5c6859750be325591046e68033891073967e6c483a5c228c2b4e67d1bb82c0abca161ad561f49a19f63a52f1102bb22e0f4b71fe
+  data.tar.gz: 03e28da972fc0c61816a78fe1dd49d96deefcf5251f6f5d44d450aacf0d41494846330b38cb263c25fbee644ae47156ecda1f142e9f383fe662060c525894fda

data/TestSuite.rb

@@ -9,6 +9,7 @@ $:.unshift("#{path}/lib") unless ARGV.include? '--gem'
 require 'RubyUnit'
 
 RubyUnit.debug = true if ARGV.include? '--debug'
+RubyUnit::Report.trace = false if ARGV.include? '--no-trace'
 
 # Automatically load Test Sets
 RubyUnit::TestSuite.new Dir['tests/TS_*.rb']

data/lib/RubyUnit.rb

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

data/lib/RubyUnit/Assertions.rb

@@ -4,6 +4,7 @@ require_relative 'Assertions/Collections' # Collection assertions
 require_relative 'Assertions/Comparisons' # Comparison assertions
 require_relative 'Assertions/Exceptions'  # Exception assertions
 require_relative 'Assertions/Methods'     # Method assertions
+require_relative 'Assertions/Variables'   # Variable assertions
 
 module RubyUnit
   ##
@@ -34,5 +35,6 @@ module RubyUnit
     include Assertions::Comparisons
     include Assertions::Exceptions
     include Assertions::Methods
+    include Assertions::Variables
   end
 end

data/lib/RubyUnit/Assertions/Root.rb

@@ -42,6 +42,12 @@ module RubyUnit
         result
       end
 
+      def __reject_block error = '', message = nil, data = {} # :nodoc:
+        Assertions.add_assertion
+        result = block_given? ? yield : false
+        __fail error, message, data if result
+        !result
+      end
       ##
       # This is now a wrapper for __assert_block so it can be called 'nicely' in one line
       # * raises RubyUnit::AssertionFailure unless _value_ is true 
@@ -86,7 +92,9 @@ module RubyUnit
       #  __reject value, 'Failed to assert value is not true', message, {:value=>value}
       #
       def __reject value, error, message, data # :nodoc:
-        __assert !value, error, message, data
+        __reject_block error, message, data do
+          value
+        end
       end
     end
   end

data/lib/RubyUnit/Assertions/Variables.rb

@@ -0,0 +1,51 @@
+require_relative 'Root'
+
+module RubyUnit
+  module Assertions
+    module Variables
+      include RubyUnit::AssertionMessage
+      include Root
+
+      def assertInstanceVariableDefined object, variable, message = nil
+        __assert_block ASSERT_INSTANCE_VARIABLE_DEFINED_ERROR, message, {:object=>object, :variable=>variable} do
+          object.instance_variables.include? variable
+        end
+      end
+
+      def assertInstanceVariableNotDefined object, variable, message = nil
+        __reject_block ASSERT_INSTANCE_VARIABLE_NOT_DEFINED_ERROR, message, {:object=>object, :variable=>variable} do
+          object.instance_variables.include? variable
+        end
+      end
+
+      def assertInstanceVariableEqual expected, object, variable, message = nil
+        __assert_block ASSERT_INSTANCE_VARIABLE_VALUE_ERROR, message, {:expected=>expected, :object=>object, :variable=>variable} do
+          expected == __instance_variable(object, variable)
+        end
+      end
+
+      def assertInstanceVariableNotEqual expected, object, variable, message = nil
+        __assert_block ASSERT_INSTANCE_VARIABLE_NOT_VALUE_ERROR, message, {:expected=>expected, :object=>object, :variable=>variable} do
+          expected != __instance_variable(object, variable)
+        end
+      end
+
+      def assertInstanceVariableKindOf klass, object, variable, message = nil
+        __assert_block ASSERT_INSTANCE_VARIABLE_KIND_OF_ERROR, message, {:class=>klass, :object=>object, :variable=>variable} do
+          __instance_variable(object, variable).kind_of? klass
+        end
+      end
+
+      def assertInstanceVariableNotKindOf klass, object, variable, message = nil
+        __reject_block ASSERT_INSTANCE_VARIABLE_NOT_KIND_OF_ERROR, message, {:class=>klass, :object=>object, :variable=>variable} do
+          __instance_variable(object, variable).kind_of? klass
+        end
+      end
+
+      private
+      def __instance_variable object, variable
+        object.instance_variable_get "@#{variable}".to_sym
+      end
+    end
+  end
+end

data/lib/RubyUnit/Report.rb

@@ -15,6 +15,7 @@ module RubyUnit
     @@finish     = nil
 
     @@i          = 0
+    @@trace      = true
     def self.record result
       @@results << result
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubyunit
 version: !ruby/object:Gem::Version
-  version: 0.4.23
+  version: 0.4.24
 platform: ruby
 authors:
 - Matthew Clower
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-04 00:00:00.000000000 Z
+date: 2014-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -53,6 +53,7 @@ files:
 - lib/RubyUnit/Assertions/Exceptions.rb
 - lib/RubyUnit/Assertions/Methods.rb
 - lib/RubyUnit/Assertions/Root.rb
+- lib/RubyUnit/Assertions/Variables.rb
 - lib/RubyUnit/IncompleteTest.rb
 - lib/RubyUnit/Report.rb
 - lib/RubyUnit/Result.rb