lib/assay/assertions/equality_failure.rb in assay-0.2.0 vs lib/assay/assertions/equality_failure.rb in assay-0.3.0

@@ -25,10 +25,11 @@
       exp != act
     end
 
     #
     def to_s
+      return @mesg if @mesg
       return super unless @arguments.size == 2
 
       oper = @_negated ? "!=" : "=="
       iexp = @arguments[0].inspect
       iact = @arguments[1].inspect
@@ -51,25 +52,19 @@
     # since a helpful error message is generated when this
     # one fails that tells you the values of expected and actual.
     #
     #   assert_equal 'MY STRING', 'my string'.upcase
     #
-    def assert_equal(exp, act, opts={})
-      opts[:backtrace] ||= caller
-      #message   = opts[:message]
-      EqualityFailure.assert(exp, act, opts)
-      #err = EqualityFailure.new(message, exp, act)
-      #err.set_backtrace(backtrace)
-      #err.assert(opts)
+    def assert_equal(exp, act, msg=nil)
+      EqualityFailure.assert(exp, act, :message=>msg, :backtrace=>caller)
     end
 
     # Passes if expected != actual
     #
     #  assert_not_equal 'some string', 5
     #
-    def assert_not_equal(exp, act, opts)
-       opts[:backtrace] ||= caller
-       EqualityFailure.refute(exp, act, opts)
+    def assert_not_equal(exp, act, msg=nil)
+       EqualityFailure.refute(exp, act, :message=>msg, :backtrace=>caller)
     end
   end
 
 
   module Matchers