diff options
Diffstat (limited to 'test')
-rw-r--r-- | test/drb/drbtest.rb | 4 | ||||
-rw-r--r-- | test/ruby/test_object.rb | 25 | ||||
-rw-r--r-- | test/test_pp.rb | 1 |
3 files changed, 27 insertions, 3 deletions
diff --git a/test/drb/drbtest.rb b/test/drb/drbtest.rb index 1cb8b1f95b..d0156fd9e4 100644 --- a/test/drb/drbtest.rb +++ b/test/drb/drbtest.rb @@ -73,7 +73,7 @@ module DRbCore def teardown @ext.stop_service if defined?(@ext) && @ext DRbService.manager.unregist(@service_name) - while (@there.inspect rescue nil) + while (@there.to_s rescue nil) # nop end signal = /mswin|mingw/ =~ RUBY_PLATFORM ? :INT : :TERM @@ -294,7 +294,7 @@ module DRbAry def teardown @ext.stop_service if defined?(@ext) && @ext DRbService.manager.unregist(@service_name) - while (@there.inspect rescue nil) + while (@there.to_s rescue nil) # nop end signal = /mswin|mingw/ =~ RUBY_PLATFORM ? :INT : :TERM diff --git a/test/ruby/test_object.rb b/test/ruby/test_object.rb index 70dcd04201..61482f7c1a 100644 --- a/test/ruby/test_object.rb +++ b/test/ruby/test_object.rb @@ -690,6 +690,31 @@ class TestObject < Test::Unit::TestCase assert_equal(true, s.tainted?) end + def test_inspect + x = Object.new + assert_match(/\A#<Object:0x\h+>\z/, x.inspect) + + x.instance_variable_set(:@ivar, :value) + assert_match(/\A#<Object:0x\h+ @ivar=:value>\z/, x.inspect) + + x = Object.new + x.instance_variable_set(:@recur, x) + assert_match(/\A#<Object:0x\h+ @recur=#<Object:0x\h+ \.\.\.>>\z/, x.inspect) + + x = Object.new + x.instance_variable_set(:@foo, "value") + x.instance_variable_set(:@bar, 42) + assert_match(/\A#<Object:0x\h+ (?:@foo="value", @bar=42|@bar=42, @foo="value")>\z/, x.inspect) + + # #inspect does not call #to_s anymore + feature6130 = '[ruby-core:43238]' + x = Object.new + def x.to_s + "to_s" + end + assert_match(/\A#<Object:0x\h+>\z/, x.inspect, feature6130) + end + def test_exec_recursive Thread.current[:__recursive_key__] = nil a = [[]] diff --git a/test/test_pp.rb b/test/test_pp.rb index fe65287d88..acd3e835b9 100644 --- a/test/test_pp.rb +++ b/test/test_pp.rb @@ -118,7 +118,6 @@ class PPInspectTest < Test::Unit::TestCase def a.to_s() "aaa" end result = PP.pp(a, '') assert_equal("#{a.inspect}\n", result) - assert_equal("aaa\n", result) end end |