* test/ruby/test_settracefunc.rb (test_event): added tests for

  "class" and "end" and "raise".


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8183 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 111 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index 9e2f604a82..17bbf0b94b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Mar 23 00:35:10 2005  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* test/ruby/test_settracefunc.rb (test_event): added tests for
+	  "class" and "end" and "raise".
+
 Tue Mar 22 22:40:18 2005  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* eval.c (rb_call0): check event_hooks instead of trace_func.
diff --git a/test/ruby/test_settracefunc.rb b/test/ruby/test_settracefunc.rb
index e8ac6e2abb..aa21812fa0 100644
--- a/test/ruby/test_settracefunc.rb
+++ b/test/ruby/test_settracefunc.rb
@@ -5,24 +5,118 @@ class TestSetTraceFunc < Test::Unit::TestCase
 
   def test_event
     events = []
-    set_trace_func(Proc.new { |event, file, lineno|
-      events << [event, lineno]
+    set_trace_func(Proc.new { |event, file, lineno, mid, bidning, klass|
+      events << [event, lineno, mid, klass]
     })
     a = 1
     foo
     a
     b = 1 + 2
+    if b == 3
+      case b
+      when 2
+        c = "b == 2"
+      when 3
+        c = "b == 3"
+      end
+    end
+    begin
+      raise "error"
+    rescue
+    end
+    eval("class Foo; end")
     set_trace_func nil
 
-    assert_equal(["line", 11], events.shift)     # line "a = 1"
-    assert_equal(["line", 12], events.shift)     # line "foo"
-    assert_equal(["call", 4], events.shift)      # call foo
-    assert_equal(["return", 4], events.shift)    # return foo
-    assert_equal(["line", 13], events.shift)     # line "a"
-    assert_equal(["line", 14], events.shift)     # line "b = 1 + 2"
-    assert_equal(["c-call", 14], events.shift)   # c-call Fixnum#+
-    assert_equal(["c-return", 14], events.shift) # c-return Fixnum#+
-    assert_equal(["line", 15], events.shift)     # line "set_trace_func nil"
-    assert_equal(["c-call", 15], events.shift)   # c-call set_trace_func
+    assert_equal(["line", 11, :test_event, TestSetTraceFunc],
+                 events.shift)     # a = 1
+    assert_equal(["line", 12, :test_event, TestSetTraceFunc],
+                 events.shift)     # foo
+    assert_equal(["call", 4, :foo, TestSetTraceFunc],
+                 events.shift)     # foo
+    assert_equal(["return", 4, :foo, TestSetTraceFunc],
+                 events.shift)     # foo
+    assert_equal(["line", 13, :test_event, TestSetTraceFunc],
+                 events.shift)     # a
+    assert_equal(["line", 14, :test_event, TestSetTraceFunc],
+                 events.shift)     # b = 1 + 2
+    assert_equal(["c-call", 14, :+, Fixnum],
+                 events.shift)     # 1 + 2
+    assert_equal(["c-return", 14, :+, Fixnum],
+                 events.shift)     # 1 + 2
+    assert_equal(["line", 15, :test_event, TestSetTraceFunc],
+                 events.shift)     # if b == 3
+    assert_equal(["line", 15, :test_event, TestSetTraceFunc],
+                 events.shift)     # if b == 3
+    assert_equal(["c-call", 15, :==, Fixnum],
+                 events.shift)     # b == 3
+    assert_equal(["c-return", 15, :==, Fixnum],
+                 events.shift)     # b == 3
+    assert_equal(["line", 16, :test_event, TestSetTraceFunc],
+                 events.shift)     # case b
+    assert_equal(["line", 17, :test_event, TestSetTraceFunc],
+                 events.shift)     # when 2
+    assert_equal(["c-call", 17, :===, Kernel],
+                 events.shift)     # when 2
+    assert_equal(["c-call", 17, :==, Fixnum],
+                 events.shift)     # when 2
+    assert_equal(["c-return", 17, :==, Fixnum],
+                 events.shift)     # when 2
+    assert_equal(["c-return", 17, :===, Kernel],
+                 events.shift)     # when 2
+    assert_equal(["line", 19, :test_event, TestSetTraceFunc],
+                 events.shift)     # when 3
+    assert_equal(["c-call", 19, :===, Kernel],
+                 events.shift)     # when 3
+    assert_equal(["c-return", 19, :===, Kernel],
+                 events.shift)     # when 3
+    assert_equal(["line", 20, :test_event, TestSetTraceFunc],
+                 events.shift)     # c = "b == 3"
+    assert_equal(["line", 23, :test_event, TestSetTraceFunc],
+                 events.shift)     # begin
+    assert_equal(["line", 24, :test_event, TestSetTraceFunc],
+                 events.shift)     # raise "error"
+    assert_equal(["c-call", 24, :raise, Kernel],
+                 events.shift)     # raise "error"
+    assert_equal(["c-call", 24, :new, Class],
+                 events.shift)     # raise "error"
+    assert_equal(["c-call", 24, :initialize, Exception],
+                 events.shift)     # raise "error"
+    assert_equal(["c-return", 24, :initialize, Exception],
+                 events.shift)     # raise "error"
+    assert_equal(["c-return", 24, :new, Class],
+                 events.shift)     # raise "error"
+    assert_equal(["c-call", 24, :backtrace, Exception],
+                 events.shift)     # raise "error"
+    assert_equal(["c-return", 24, :backtrace, Exception],
+                 events.shift)     # raise "error"
+    assert_equal(["c-call", 24, :set_backtrace, Exception],
+                 events.shift)     # raise "error"
+    assert_equal(["c-return", 24, :set_backtrace, Exception],
+                 events.shift)     # raise "error"
+    assert_equal(["raise", 24, :test_event, TestSetTraceFunc],
+                 events.shift)     # raise "error"
+    assert_equal(["c-return", 24, :raise, Kernel],
+                 events.shift)     # raise "error"
+    assert_equal(["line", 27, :test_event, TestSetTraceFunc],
+                 events.shift)     # eval(<<EOF)
+    assert_equal(["c-call", 27, :eval, Kernel],
+                 events.shift)     # eval(<<EOF)
+    assert_equal(["line", 1, :test_event, TestSetTraceFunc],
+                 events.shift)     # class Foo
+    assert_equal(["c-call", 1, :inherited, Class],
+                 events.shift)     # class Foo
+    assert_equal(["c-return", 1, :inherited, Class],
+                 events.shift)     # class Foo
+    assert_equal(["class", 1, :test_event, TestSetTraceFunc],
+                 events.shift)     # class Foo
+    assert_equal(["end", 1, :test_event, TestSetTraceFunc],
+                 events.shift)     # class Foo
+    assert_equal(["c-return", 27, :eval, Kernel],
+                 events.shift)     # eval(<<EOF)
+    assert_equal(["line", 28, :test_event, TestSetTraceFunc],
+                 events.shift)     # set_trace_func nil
+    assert_equal(["c-call", 28, :set_trace_func, Kernel],
+                 events.shift)     # set_trace_func nil
+    assert_equal([], events)
   end
 end