test/unit/test-source.rb in rb-threadframe-0.39 vs test/unit/test-source.rb in rb-threadframe-0.40

@@ -1,9 +1,8 @@
 require 'test/unit'
 
-# require 'thread_frame'  # To compare with previous version
-require_relative '../../ext/thread_frame'
+require_relative '../../ext/thread_frame' if '1.9.2' == RUBY_VERSION
 
 # Test source_location and source_container.
 class TestSource < Test::Unit::TestCase
 
   def test_iseq_source_container
@@ -19,29 +18,29 @@
 
     iseq = RubyVM::InstructionSequence.compile("1+2")
     assert_equal('string',  iseq.source_container[0])
     # puts iseq.source_container[1]
 
-    eval_str = '  RubyVM::ThreadFrame.current.source_container # test'
+    eval_str = '  RubyVM::Frame.current.source_container # test'
     tuple = eval(eval_str)
     assert_equal('string',  tuple[0])
     assert_equal(eval_str,  tuple[1])
 
   end
 
   def test_basic
-    tf = RubyVM::ThreadFrame::current
+    tf = RubyVM::Frame::current
     # Is this too specific to test/unit.rb implementation details? 
     tup = tf.source_container
     tup[1] = File.basename(tup[1])
     assert_equal(['file',  File.basename(__FILE__)], tup)
     assert_equal(__LINE__, tf.source_location[0])
 
     # 1.times creates a C frame.
     1.times do 
       expect_line = __LINE__ - 1
-      tf = RubyVM::ThreadFrame::current
+      tf = RubyVM::Frame::current
       tup = tf.source_container
       tup[1] = File.basename(tup[1])
       assert_equal(['file',  File.basename(__FILE__)], tup)
       assert_equal(tf.source_location[0], __LINE__)
       tf = tf.prev
@@ -52,11 +51,11 @@
     end
 
     # 1.upto also creates a C frame.
     1.upto(1) do 
       expect_line = __LINE__ - 1
-      tf = RubyVM::ThreadFrame::current
+      tf = RubyVM::Frame::current
       assert_equal('BLOCK', tf.type)
       tup = tf.source_container
       tup[1] = File.basename(tup[1])
       assert_equal(['file',  File.basename(__FILE__)], tup)
       assert_equal(__LINE__, tf.source_location[0])
@@ -66,11 +65,11 @@
       tup[1] = File.basename(tup[1])
       assert_equal(expect_line, tf.source_location[0])
     end
 
     x  = lambda do |expect_line| 
-      tf = RubyVM::ThreadFrame::current
+      tf = RubyVM::Frame::current
       assert_equal('LAMBDA', tf.type)
       tup = tf.source_container
       tup[1] = File.basename(tup[1])
       assert_equal(['file',  File.basename(__FILE__)], tup)
       assert_equal(__LINE__, tf.source_location[0])
@@ -81,10 +80,10 @@
       assert_equal(expect_line, tf.source_location[0])
     end
     x.call(__LINE__)
 
     x  = Proc.new do |expect_line|
-      tf = RubyVM::ThreadFrame::current
+      tf = RubyVM::Frame::current
       tup = tf.source_container
       tup[1] = File.basename(tup[1])
       assert_equal(['file',  File.basename(__FILE__)], tup)
       assert_equal(__LINE__, tf.source_location[0])
       tf = tf.prev