From 821f6d42adf92c09a0df082c14c2c4ade21f8c78 Mon Sep 17 00:00:00 2001 From: Daniel Bovensiepen Date: Fri, 14 Jun 2013 21:32:13 +0800 Subject: Add block mode to assert_equal --- test/assert.rb | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'test/assert.rb') diff --git a/test/assert.rb b/test/assert.rb index 6d727e889..f7c2c97b9 100644 --- a/test/assert.rb +++ b/test/assert.rb @@ -99,7 +99,16 @@ def assert_false(ret, msg = nil, diff = nil) !ret end -def assert_equal(exp, act, msg = nil) +def assert_equal(arg1, arg2 = nil, arg3 = nil) + if block_given? + exp = yield + act = arg1 + msg = arg2 + else + exp = arg1 + act = arg2 + msg = arg3 + end msg = "Expected to be equal" unless msg diff = assertion_diff(exp, act) assert_true(exp == act, msg, diff) -- cgit v1.2.3 From 60d230d0fdf9a6e22ae13f30cb11f4c948c1d62b Mon Sep 17 00:00:00 2001 From: Daniel Bovensiepen Date: Fri, 14 Jun 2013 21:49:56 +0800 Subject: Add assert_float to test environment --- test/assert.rb | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'test/assert.rb') diff --git a/test/assert.rb b/test/assert.rb index f7c2c97b9..38141d1e8 100644 --- a/test/assert.rb +++ b/test/assert.rb @@ -178,6 +178,14 @@ def assert_kind_of(cls, obj, msg = nil) assert_true(obj.kind_of?(cls), msg, diff) end +## +# Fails unless +exp+ is equal to +act+ in terms of a Float +def assert_float(exp, act, msg = nil) + msg = "Float #{exp} expected to be equal to float #{act}" unless msg + diff = assertion_diff(exp, act) + assert_true check_float(exp, act), msg, diff +end + ## # Report the test result and print all assertions # which were reported broken. -- cgit v1.2.3 From 1a6731fbdeb2642d95aeeddc2e8bee5a288d5f2e Mon Sep 17 00:00:00 2001 From: Daniel Bovensiepen Date: Fri, 14 Jun 2013 22:39:10 +0800 Subject: assert_not_equal can now also handle blocks --- test/assert.rb | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'test/assert.rb') diff --git a/test/assert.rb b/test/assert.rb index 38141d1e8..dc282925f 100644 --- a/test/assert.rb +++ b/test/assert.rb @@ -101,20 +101,23 @@ end def assert_equal(arg1, arg2 = nil, arg3 = nil) if block_given? - exp = yield - act = arg1 - msg = arg2 + exp, act, msg = yield, arg1, arg2 else - exp = arg1 - act = arg2 - msg = arg3 + exp, act, msg = arg1, arg2, arg3 end + msg = "Expected to be equal" unless msg diff = assertion_diff(exp, act) assert_true(exp == act, msg, diff) end -def assert_not_equal(exp, act, msg = nil) +def assert_not_equal(arg1, arg2 = nil, arg3 = nil) + if block_given? + exp, act, msg = yield, arg1, arg2 + else + exp, act, msg = arg1, arg2, arg3 + end + msg = "Expected to be not equal" unless msg diff = assertion_diff(exp, act) assert_false(exp == act, msg, diff) -- cgit v1.2.3