Commit a215292b authored by dearblue's avatar dearblue

Use nested `assert`

parent 1b9f949f
...@@ -3,9 +3,11 @@ require 'open3' ...@@ -3,9 +3,11 @@ require 'open3'
def assert_mruby(exp_out, exp_err, exp_success, args) def assert_mruby(exp_out, exp_err, exp_success, args)
out, err, stat = Open3.capture3(cmd("mruby"), *args) out, err, stat = Open3.capture3(cmd("mruby"), *args)
assert do
assert_operator(exp_out, :===, out, "standard output") assert_operator(exp_out, :===, out, "standard output")
assert_operator(exp_err, :===, err, "standard error") assert_operator(exp_err, :===, err, "standard error")
assert_equal(exp_success, stat.success?, "exit success?") assert_equal(exp_success, stat.success?, "exit success?")
end
end end
assert('regression for #1564') do assert('regression for #1564') do
......
def assert_complex(real, exp) def assert_complex(real, exp)
assert do
assert_float real.real, exp.real assert_float real.real, exp.real
assert_float real.imaginary, exp.imaginary assert_float real.imaginary, exp.imaginary
end
end end
assert 'Complex' do assert 'Complex' do
......
...@@ -5,6 +5,7 @@ MRubyIOTestUtil.io_test_setup ...@@ -5,6 +5,7 @@ MRubyIOTestUtil.io_test_setup
$cr, $crlf, $cmd = MRubyIOTestUtil.win? ? [1, "\r\n", "cmd /c "] : [0, "\n", ""] $cr, $crlf, $cmd = MRubyIOTestUtil.win? ? [1, "\r\n", "cmd /c "] : [0, "\n", ""]
def assert_io_open(meth) def assert_io_open(meth)
assert do
fd = IO.sysopen($mrbtest_io_rfname) fd = IO.sysopen($mrbtest_io_rfname)
assert_equal Fixnum, fd.class assert_equal Fixnum, fd.class
io1 = IO.__send__(meth, fd) io1 = IO.__send__(meth, fd)
...@@ -23,6 +24,7 @@ def assert_io_open(meth) ...@@ -23,6 +24,7 @@ def assert_io_open(meth)
end end
end end
io2.close unless meth == :open io2.close unless meth == :open
end
end end
assert('IO.class', '15.2.20') do assert('IO.class', '15.2.20') do
......
...@@ -2,8 +2,10 @@ PACK_IS_LITTLE_ENDIAN = "\x01\00".unpack('S')[0] == 0x01 ...@@ -2,8 +2,10 @@ PACK_IS_LITTLE_ENDIAN = "\x01\00".unpack('S')[0] == 0x01
def assert_pack tmpl, packed, unpacked def assert_pack tmpl, packed, unpacked
t = tmpl.inspect t = tmpl.inspect
assert do
assert_equal packed, unpacked.pack(tmpl), "#{unpacked.inspect}.pack(#{t})" assert_equal packed, unpacked.pack(tmpl), "#{unpacked.inspect}.pack(#{t})"
assert_equal unpacked, packed.unpack(tmpl), "#{packed.inspect}.unpack(#{t})" assert_equal unpacked, packed.unpack(tmpl), "#{packed.inspect}.unpack(#{t})"
end
end end
# pack & unpack 'm' (base64) # pack & unpack 'm' (base64)
......
...@@ -23,11 +23,14 @@ class ComplexLikeNumeric < UserDefinedNumeric ...@@ -23,11 +23,14 @@ class ComplexLikeNumeric < UserDefinedNumeric
end end
def assert_rational(exp, real) def assert_rational(exp, real)
assert do
assert_float exp.numerator, real.numerator assert_float exp.numerator, real.numerator
assert_float exp.denominator, real.denominator assert_float exp.denominator, real.denominator
end
end end
def assert_equal_rational(exp, o1, o2) def assert_equal_rational(exp, o1, o2)
assert do
if exp if exp
assert_operator(o1, :==, o2) assert_operator(o1, :==, o2)
assert_not_operator(o1, :!=, o2) assert_not_operator(o1, :!=, o2)
...@@ -35,6 +38,7 @@ def assert_equal_rational(exp, o1, o2) ...@@ -35,6 +38,7 @@ def assert_equal_rational(exp, o1, o2)
assert_not_operator(o1, :==, o2) assert_not_operator(o1, :==, o2)
assert_operator(o1, :!=, o2) assert_operator(o1, :!=, o2)
end end
end
end end
def assert_cmp(exp, o1, o2) def assert_cmp(exp, o1, o2)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment