@@ -2964,13 +2964,13 @@ def test_tracepoint_ivar_set_via_direct_assignment
29642964 line_2 = nil
29652965
29662966 TracePoint . new ( :ivar_set ) do |tp |
2967- events << [ tp . event , tp . self , tp . lineno ]
2967+ events << [ tp . event , tp . ivar_name , tp . return_value , tp . lineno ]
29682968 end . enable do
29692969 @a = 1 ; line_1 = __LINE__
29702970 @a = 2 ; line_2 = __LINE__
29712971 end
29722972
2973- assert_equal ( [ [ :ivar_set , self , line_1 ] , [ :ivar_set , self , line_2 ] ] , events )
2973+ assert_equal ( [ [ :ivar_set , :@a , 1 , line_1 ] , [ :ivar_set , :@a , 2 , line_2 ] ] , events )
29742974 end
29752975
29762976 def test_tracepoint_ivar_set_via_attr_writer
@@ -2984,26 +2984,26 @@ def test_tracepoint_ivar_set_via_attr_writer
29842984 f = foo_class . new
29852985
29862986 TracePoint . new ( :ivar_set ) do |tp |
2987- events << [ tp . event , tp . self , tp . lineno ]
2987+ events << [ tp . event , tp . ivar_name , tp . return_value , tp . lineno ]
29882988 end . enable do
29892989 f . a = 1 ; line_1 = __LINE__
29902990 f . a = 2 ; line_2 = __LINE__
29912991 end
29922992
2993- assert_equal ( [ [ :ivar_set , f , line_1 ] , [ :ivar_set , f , line_2 ] ] , events )
2993+ assert_equal ( [ [ :ivar_set , :@a , 1 , line_1 ] , [ :ivar_set , :@a , 2 , line_2 ] ] , events )
29942994 end
29952995
29962996 def test_tracepoint_ivar_set_via_instance_variable_set
29972997 events = [ ]
29982998 line = nil
29992999
30003000 TracePoint . new ( :ivar_set ) do |tp |
3001- events << [ tp . event , tp . self , tp . lineno ]
3001+ events << [ tp . event , tp . ivar_name , tp . return_value , tp . lineno ]
30023002 end . enable do
30033003 self . instance_variable_set ( :@a , 1 ) ; line = __LINE__
30043004 end
30053005
3006- assert_equal ( [ [ :ivar_set , self , line ] ] , events )
3006+ assert_equal ( [ [ :ivar_set , :@a , 1 , line ] ] , events )
30073007 end
30083008
30093009 def test_tracepoint_ivar_set_via_instance_variable_set_isnt_triggered_recursively
@@ -3012,13 +3012,13 @@ def test_tracepoint_ivar_set_via_instance_variable_set_isnt_triggered_recursivel
30123012 line_2 = nil
30133013
30143014 TracePoint . new ( :ivar_set ) do |tp |
3015- events << [ tp . event , tp . self , tp . lineno ]
3015+ events << [ tp . event , tp . ivar_name , tp . return_value , tp . lineno ]
30163016 self . instance_variable_set ( :@not_this , 1 )
30173017 end . enable do
30183018 self . instance_variable_set ( :@a , 1 ) ; line_1 = __LINE__
30193019 self . instance_variable_set ( :@a , 2 ) ; line_2 = __LINE__
30203020 end
30213021
3022- assert_equal ( [ [ :ivar_set , self , line_1 ] , [ :ivar_set , self , line_2 ] ] , events )
3022+ assert_equal ( [ [ :ivar_set , :@a , 1 , line_1 ] , [ :ivar_set , :@a , 2 , line_2 ] ] , events )
30233023 end
30243024end
0 commit comments