diff options
| author | Shokuji <[email protected]> | 2019-04-16 09:47:32 +0900 |
|---|---|---|
| committer | Shokuji <[email protected]> | 2019-04-16 09:47:32 +0900 |
| commit | cdfeb53887d886adc10848e4a6e76c81fbd2a4c4 (patch) | |
| tree | 2bc17e536d396f7d20b8c9de4ce39c4f284d9256 /test/assert.rb | |
| parent | 164985881b6d7d96218ec5cd986ca1bb4c919698 (diff) | |
| parent | 4e3e4260c3860e4c0c274f520744bdb7629ea9cd (diff) | |
| download | mruby-cdfeb53887d886adc10848e4a6e76c81fbd2a4c4.tar.gz mruby-cdfeb53887d886adc10848e4a6e76c81fbd2a4c4.zip | |
Merge branch 'master' into fix_mruby-io_test
Diffstat (limited to 'test/assert.rb')
| -rw-r--r-- | test/assert.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/assert.rb b/test/assert.rb index c57b04c12..e0fac4d90 100644 --- a/test/assert.rb +++ b/test/assert.rb @@ -149,11 +149,11 @@ end # Fails unless +exp+ is equal to +act+ in terms of a Float def assert_float(exp, act, msg = nil) e, a = exp.to_f, act.to_f - if (e.infinite? || a.infinite?) && e != a || + if e.finite? && a.finite? && (n = (e - a).abs) > Mrbtest::FLOAT_TOLERANCE + flunk(msg, " Expected |#{exp} - #{act}| (#{n}) to be <= #{Mrbtest::FLOAT_TOLERANCE}.") + elsif (e.infinite? || a.infinite?) && e != a || e.nan? && !a.nan? || !e.nan? && a.nan? flunk(msg, " Expected #{act} to be #{exp}.") - elsif (n = (e - a).abs) > Mrbtest::FLOAT_TOLERANCE - flunk(msg, " Expected |#{exp} - #{act}| (#{n}) to be <= #{Mrbtest::FLOAT_TOLERANCE}.") else pass end |