summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--test/ruby/test_settracefunc.rb6
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 2a1e22f..15658dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Apr 16 06:11:49 2008 Akinori MUSHA <knu@iDaemons.org>
+
+ * test/ruby/test_settracefunc.rb (TestSetTraceFunc#test_event):
+ Fix tests to reflect the following changes: r15833, r15759.
+
Wed Apr 16 02:09:14 2008 Kouhei Sutou <kou@cozmixng.org>
* lib/xmlrpc/client.rb: fix cookie handling. [ruby-dev:34403]
diff --git a/test/ruby/test_settracefunc.rb b/test/ruby/test_settracefunc.rb
index 39e1b03..14d6679 100644
--- a/test/ruby/test_settracefunc.rb
+++ b/test/ruby/test_settracefunc.rb
@@ -53,12 +53,12 @@ class TestSetTraceFunc < Test::Unit::TestCase
events.shift) # 1 + 2
assert_equal(["line", 23, :test_event, TestSetTraceFunc],
events.shift) # if b == 3
- assert_equal(["line", 23, :test_event, TestSetTraceFunc],
- events.shift) # if b == 3
assert_equal(["c-call", 23, :==, Fixnum],
events.shift) # b == 3
assert_equal(["c-return", 23, :==, Fixnum],
events.shift) # b == 3
+ assert_equal(["line", 23, :test_event, TestSetTraceFunc],
+ events.shift) # if b == 3
assert_equal(["line", 24, :test_event, TestSetTraceFunc],
events.shift) # case b
assert_equal(["line", 25, :test_event, TestSetTraceFunc],
@@ -130,7 +130,7 @@ class TestSetTraceFunc < Test::Unit::TestCase
events = bar
set_trace_func(nil)
assert_equal(["line", 11, :bar, TestSetTraceFunc], events.shift)
- assert_equal(["return", 7, :bar, TestSetTraceFunc], events.shift)
+ assert_equal(["return", 11, :bar, TestSetTraceFunc], events.shift)
assert_equal(["line", 131, :test_event, TestSetTraceFunc], events.shift)
assert_equal(["c-call", 131, :set_trace_func, Kernel], events.shift)
assert_equal([], events)