diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/-ext-/debug/test_debug.rb | 30 | ||||
| -rw-r--r-- | test/-ext-/old_thread_select/test_old_thread_select.rb | 2 | ||||
| -rw-r--r-- | test/-ext-/postponed_job/test_postponed_job.rb | 4 | ||||
| -rw-r--r-- | test/-ext-/string/test_ellipsize.rb | 2 | ||||
| -rw-r--r-- | test/-ext-/tracepoint/test_tracepoint.rb | 6 |
5 files changed, 24 insertions, 20 deletions
diff --git a/test/-ext-/debug/test_debug.rb b/test/-ext-/debug/test_debug.rb index 4c45057b5d..ec506e0ca5 100644 --- a/test/-ext-/debug/test_debug.rb +++ b/test/-ext-/debug/test_debug.rb @@ -3,42 +3,42 @@ require '-test-/debug' class TestDebug < Test::Unit::TestCase - def binds_check binds + def binds_check(binds, msg = nil) count = Hash.new(0) - assert_instance_of(Array, binds) + assert_instance_of(Array, binds, msg) binds.each{|(_self, bind, klass, iseq, loc)| if _self == self count[:self] += 1 end if bind - assert_instance_of(Binding, bind) + assert_instance_of(Binding, bind, msg) count[:bind] += 1 end if klass - assert(klass.instance_of?(Module) || klass.instance_of?(Class)) + assert(klass.instance_of?(Module) || klass.instance_of?(Class), msg) count[:class] += 1 end if iseq count[:iseq] += 1 - assert_instance_of(RubyVM::InstructionSequence, iseq) + assert_instance_of(RubyVM::InstructionSequence, iseq, msg) # check same location - assert_equal(loc.path, iseq.path) - assert_equal(loc.absolute_path, iseq.absolute_path) - assert_equal(loc.label, iseq.label) - assert_operator(loc.lineno, :>=, iseq.first_lineno) + assert_equal(loc.path, iseq.path, msg) + assert_equal(loc.absolute_path, iseq.absolute_path, msg) + assert_equal(loc.label, iseq.label, msg) + assert_operator(loc.lineno, :>=, iseq.first_lineno, msg) end - assert_instance_of(Thread::Backtrace::Location, loc) + assert_instance_of(Thread::Backtrace::Location, loc, msg) } - assert_operator(0, :<, count[:self]) - assert_operator(0, :<, count[:bind]) - assert_operator(0, :<, count[:iseq]) - assert_operator(0, :<, count[:class]) + assert_operator(0, :<, count[:self], msg) + assert_operator(0, :<, count[:bind], msg) + assert_operator(0, :<, count[:iseq], msg) + assert_operator(0, :<, count[:class], msg) end def test_inspector_open @@ -53,6 +53,6 @@ class TestDebug < Test::Unit::TestCase def test_inspector_open_in_eval bug7635 = '[ruby-core:51640]' binds = inspector_in_eval - binds_check binds + binds_check binds, bug7635 end end diff --git a/test/-ext-/old_thread_select/test_old_thread_select.rb b/test/-ext-/old_thread_select/test_old_thread_select.rb index 292b7176e2..99a0a506bd 100644 --- a/test/-ext-/old_thread_select/test_old_thread_select.rb +++ b/test/-ext-/old_thread_select/test_old_thread_select.rb @@ -46,8 +46,10 @@ class TestOldThreadSelect < Test::Unit::TestCase w.syswrite '.' rfds = [ r.fileno, r2.fileno ] rc = IO.old_thread_select(rfds, nil, nil, nil) + diff = Time.now - t0 assert_equal [ r.fileno ], rfds, bug5306 assert_equal 1, rc, bug5306 + assert_operator diff, :>=, 0, "returned too early: diff=#{diff}" end end end diff --git a/test/-ext-/postponed_job/test_postponed_job.rb b/test/-ext-/postponed_job/test_postponed_job.rb index b1111ba330..032e35c055 100644 --- a/test/-ext-/postponed_job/test_postponed_job.rb +++ b/test/-ext-/postponed_job/test_postponed_job.rb @@ -19,8 +19,8 @@ class TestPostponed_job < Test::Unit::TestCase Bug.postponed_job_call_direct_wrapper(direct) Bug.postponed_job_register_wrapper(registered) - assert_match /postponed_job_call_direct_wrapper/, direct.join - assert_not_match /postponed_job_register_wrapper/, registered.join + assert_match( /postponed_job_call_direct_wrapper/, direct.join) + assert_not_match( /postponed_job_register_wrapper/, registered.join) Bug.postponed_job_register_one(ary = []) assert_equal [1], ary diff --git a/test/-ext-/string/test_ellipsize.rb b/test/-ext-/string/test_ellipsize.rb index 6ef7d0a1a3..2c14c0cf84 100644 --- a/test/-ext-/string/test_ellipsize.rb +++ b/test/-ext-/string/test_ellipsize.rb @@ -32,7 +32,7 @@ class Test_StringEllipsize < Test::Unit::TestCase def test_nonascii a = "\u3042" - encs = Encoding.list.each do |enc| + Encoding.list.each do |enc| next if enc.dummy? begin s = a.encode(enc) diff --git a/test/-ext-/tracepoint/test_tracepoint.rb b/test/-ext-/tracepoint/test_tracepoint.rb index f7a0f6c783..45792042af 100644 --- a/test/-ext-/tracepoint/test_tracepoint.rb +++ b/test/-ext-/tracepoint/test_tracepoint.rb @@ -12,7 +12,7 @@ class TestTracepointObj < Test::Unit::TestCase result = Bug.tracepoint_track_objspace_events{ 99 'abc' - v="foobar" + _="foobar" Object.new nil } @@ -22,6 +22,8 @@ class TestTracepointObj < Test::Unit::TestCase assert_equal 2, newobjs.size assert_equal 'foobar', newobjs[0] assert_equal Object, newobjs[1].class + assert_operator free_count, :>=, 0 + assert_operator gc_start_count, :>=, gc_end_count end def test_tracks_objspace_count @@ -37,7 +39,7 @@ class TestTracepointObj < Test::Unit::TestCase GC.stat(stat2) GC.enable - newobj_count, free_count, gc_start_count, gc_end_count, *newobjs = *result + newobj_count, free_count, gc_start_count, gc_end_count, *_newobjs = *result assert_operator stat2[:total_allocated_object] - stat1[:total_allocated_object], :>=, newobj_count assert_operator 1_000_000, :<=, newobj_count |