ruby-prof 1.4.3 → 1.4.5

data/test/alias_test.rb

@@ -20,107 +20,103 @@ class AliasTest < TestCase
     RubyProf::measure_mode = RubyProf::WALL_TIME
   end
 
-  # This test only correct works on Ruby 2.5 and higher because - see:
-  # https://bugs.ruby-lang.org/issues/12747
-  if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.5.0')
-    def test_alias
-      result = RubyProf.profile do
-        TestMe.new.some_method
-      end
-
-      methods = result.threads.first.methods
-      assert_equal(6, methods.count)
-
-      # Method 0
-      method = methods[0]
-      assert_equal('AliasTest#test_alias', method.full_name)
-      assert_equal(28, method.line)
-      refute(method.recursive?)
-
-      assert_equal(0, method.call_trees.callers.count)
-
-      assert_equal(2, method.call_trees.callees.count)
-      call_tree = method.call_trees.callees[0]
-      assert_equal('Class#new', call_tree.target.full_name)
-      assert_equal(28, call_tree.line)
-
-      call_tree = method.call_trees.callees[1]
-      assert_equal('AliasTest::TestMe#some_method', call_tree.target.full_name)
-      assert_equal(28, call_tree.line)
-
-      # Method 1
-      method = methods[1]
-      assert_equal('Class#new', method.full_name)
-      assert_equal(0, method.line)
-      refute(method.recursive?)
-
-      assert_equal(1, method.call_trees.callers.count)
-      call_tree = method.call_trees.callers[0]
-      assert_equal('AliasTest#test_alias', call_tree.parent.target.full_name)
-      assert_equal(28, call_tree.line)
-
-      assert_equal(1, method.call_trees.callees.count)
-      call_tree = method.call_trees.callees[0]
-      assert_equal('BasicObject#initialize', call_tree.target.full_name)
-      assert_equal(0, call_tree.line)
-
-      # Method 2
-      method = methods[2]
-      assert_equal('BasicObject#initialize', method.full_name)
-      assert_equal(0, method.line)
-      refute(method.recursive?)
-
-      assert_equal(1, method.call_trees.callers.count)
-      call_tree = method.call_trees.callers[0]
-      assert_equal('Class#new', call_tree.parent.target.full_name)
-      assert_equal(0, call_tree.line)
-
-      assert_equal(0, method.call_trees.callees.count)
-
-      # Method 3
-      method = methods[3]
-      assert_equal('AliasTest::TestMe#some_method', method.full_name)
-      assert_equal(13, method.line)
-      refute(method.recursive?)
-
-      assert_equal(1, method.call_trees.callers.count)
-      call_tree = method.call_trees.callers[0]
-      assert_equal('AliasTest#test_alias', call_tree.parent.target.full_name)
-      assert_equal(28, call_tree.line)
-
-      assert_equal(1, method.call_trees.callees.count)
-      call_tree = method.call_trees.callees[0]
-      assert_equal('AliasTest::TestMe#some_method_original', call_tree.target.full_name)
-      assert_equal(14, call_tree.line)
-
-      # Method 4
-      method = methods[4]
-      assert_equal('AliasTest::TestMe#some_method_original', method.full_name)
-      assert_equal(8, method.line)
-      refute(method.recursive?)
-
-      assert_equal(1, method.call_trees.callers.count)
-      call_tree = method.call_trees.callers[0]
-      assert_equal('AliasTest::TestMe#some_method', call_tree.parent.target.full_name)
-      assert_equal(14, call_tree.line)
-
-      assert_equal(1, method.call_trees.callees.count)
-      call_tree = method.call_trees.callees[0]
-      assert_equal('Kernel#sleep', call_tree.target.full_name)
-      assert_equal(9, call_tree.line)
-
-      # Method 5
-      method = methods[5]
-      assert_equal('Kernel#sleep', method.full_name)
-      assert_equal(0, method.line)
-      refute(method.recursive?)
-
-      assert_equal(1, method.call_trees.callers.count)
-      call_tree = method.call_trees.callers[0]
-      assert_equal('AliasTest::TestMe#some_method_original', call_tree.parent.target.full_name)
-      assert_equal(9, call_tree.line)
-
-      assert_equal(0, method.call_trees.callees.count)
+  def test_alias
+    result = RubyProf.profile do
+      TestMe.new.some_method
     end
+
+    methods = result.threads.first.methods
+    assert_equal(6, methods.count)
+
+    # Method 0
+    method = methods[0]
+    assert_equal('AliasTest#test_alias', method.full_name)
+    assert_equal(25, method.line)
+    refute(method.recursive?)
+
+    assert_equal(0, method.call_trees.callers.count)
+
+    assert_equal(2, method.call_trees.callees.count)
+    call_tree = method.call_trees.callees[0]
+    assert_equal('Class#new', call_tree.target.full_name)
+    assert_equal(25, call_tree.line)
+
+    call_tree = method.call_trees.callees[1]
+    assert_equal('AliasTest::TestMe#some_method', call_tree.target.full_name)
+    assert_equal(25, call_tree.line)
+
+    # Method 1
+    method = methods[1]
+    assert_equal('Class#new', method.full_name)
+    assert_equal(0, method.line)
+    refute(method.recursive?)
+
+    assert_equal(1, method.call_trees.callers.count)
+    call_tree = method.call_trees.callers[0]
+    assert_equal('AliasTest#test_alias', call_tree.parent.target.full_name)
+    assert_equal(25, call_tree.line)
+
+    assert_equal(1, method.call_trees.callees.count)
+    call_tree = method.call_trees.callees[0]
+    assert_equal('BasicObject#initialize', call_tree.target.full_name)
+    assert_equal(0, call_tree.line)
+
+    # Method 2
+    method = methods[2]
+    assert_equal('BasicObject#initialize', method.full_name)
+    assert_equal(0, method.line)
+    refute(method.recursive?)
+
+    assert_equal(1, method.call_trees.callers.count)
+    call_tree = method.call_trees.callers[0]
+    assert_equal('Class#new', call_tree.parent.target.full_name)
+    assert_equal(0, call_tree.line)
+
+    assert_equal(0, method.call_trees.callees.count)
+
+    # Method 3
+    method = methods[3]
+    assert_equal('AliasTest::TestMe#some_method', method.full_name)
+    assert_equal(13, method.line)
+    refute(method.recursive?)
+
+    assert_equal(1, method.call_trees.callers.count)
+    call_tree = method.call_trees.callers[0]
+    assert_equal('AliasTest#test_alias', call_tree.parent.target.full_name)
+    assert_equal(25, call_tree.line)
+
+    assert_equal(1, method.call_trees.callees.count)
+    call_tree = method.call_trees.callees[0]
+    assert_equal('AliasTest::TestMe#some_method_original', call_tree.target.full_name)
+    assert_equal(14, call_tree.line)
+
+    # Method 4
+    method = methods[4]
+    assert_equal('AliasTest::TestMe#some_method_original', method.full_name)
+    assert_equal(8, method.line)
+    refute(method.recursive?)
+
+    assert_equal(1, method.call_trees.callers.count)
+    call_tree = method.call_trees.callers[0]
+    assert_equal('AliasTest::TestMe#some_method', call_tree.parent.target.full_name)
+    assert_equal(14, call_tree.line)
+
+    assert_equal(1, method.call_trees.callees.count)
+    call_tree = method.call_trees.callees[0]
+    assert_equal('Kernel#sleep', call_tree.target.full_name)
+    assert_equal(9, call_tree.line)
+
+    # Method 5
+    method = methods[5]
+    assert_equal('Kernel#sleep', method.full_name)
+    assert_equal(0, method.line)
+    refute(method.recursive?)
+
+    assert_equal(1, method.call_trees.callers.count)
+    call_tree = method.call_trees.callers[0]
+    assert_equal('AliasTest::TestMe#some_method_original', call_tree.parent.target.full_name)
+    assert_equal(9, call_tree.line)
+
+    assert_equal(0, method.call_trees.callees.count)
   end
 end

data/test/duplicate_names_test.rb

@@ -3,18 +3,18 @@
 
 require File.expand_path('../test_helper', __FILE__)
 
-class DuplicateNames < TestCase
+class DuplicateNamesTest < TestCase
   def test_names
     result = RubyProf::profile do
       str = %{module Foo; class Bar; def foo; end end end}
 
       eval str
       Foo::Bar.new.foo
-      DuplicateNames.class_eval {remove_const :Foo}
+      DuplicateNamesTest.class_eval {remove_const :Foo}
 
       eval str
       Foo::Bar.new.foo
-      DuplicateNames.class_eval {remove_const :Foo}
+      DuplicateNamesTest.class_eval {remove_const :Foo}
 
       eval str
       Foo::Bar.new.foo
@@ -24,7 +24,7 @@ class DuplicateNames < TestCase
     methods = result.threads.first.methods.sort.reverse
 
     methods = methods.select do |method|
-      method.full_name == 'DuplicateNames::Foo::Bar#foo'
+      method.full_name == 'DuplicateNamesTest::Foo::Bar#foo'
     end
 
     assert_equal(3, methods.length)

data/test/dynamic_method_test.rb

@@ -39,15 +39,29 @@ class DynamicMethodTest < TestCase
     end
 
     methods = result.threads.first.methods.sort.reverse
-    expected_method_names = %w(
-      DynamicMethodTest#test_dynamic_method
-      Kernel#sleep
-      DynamicMethodTest::FruitMedley#peach
-      DynamicMethodTest::FruitMedley#banana
-      DynamicMethodTest::FruitMedley#orange
-      DynamicMethodTest::FruitMedley#apple
-      Symbol#to_s
-    )
+
+    if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('3.1')
+      expected_method_names = %w(
+        DynamicMethodTest#test_dynamic_method
+        Kernel#sleep
+        DynamicMethodTest::FruitMedley#peach
+        DynamicMethodTest::FruitMedley#banana
+        DynamicMethodTest::FruitMedley#orange
+        DynamicMethodTest::FruitMedley#apple
+        Symbol#to_s
+      )
+    else
+      expected_method_names = %w(
+        DynamicMethodTest#test_dynamic_method
+        Kernel#sleep
+        DynamicMethodTest::FruitMedley#peach
+        DynamicMethodTest::FruitMedley#banana
+        DynamicMethodTest::FruitMedley#orange
+        DynamicMethodTest::FruitMedley#apple
+        Integer#==
+      )
+    end
+
     assert_equal expected_method_names.join("\n"), methods.map(&:full_name).join("\n")
   end
 end

data/test/marshal_test.rb

@@ -5,6 +5,8 @@ require File.expand_path("../test_helper", __FILE__)
 class MarshalTest < TestCase
   def verify_profile(profile_1, profile_2)
     verify_threads(profile_1.threads, profile_2.threads)
+    assert_equal(profile_1.measure_mode, profile_2.measure_mode)
+    assert_equal(profile_1.track_allocations?, profile_2.track_allocations?)
   end
 
   def verify_threads(threads_1, threads_2)
@@ -108,8 +110,19 @@ class MarshalTest < TestCase
     assert_equal(measurement_1.called, measurement_2.called)
   end
 
-  def test_marshal
-    profile_1 = RubyProf.profile do
+  def test_marshal_1
+    profile_1 = RubyProf.profile(:measure_mode => RubyProf::WALL_TIME) do
+      1.times { RubyProf::C1.new.sleep_wait }
+    end
+
+    data = Marshal.dump(profile_1)
+    profile_2 = Marshal.load(data)
+
+    verify_profile(profile_1, profile_2)
+  end
+
+  def test_marshal_2
+    profile_1 = RubyProf.profile(:measure_mode => RubyProf::PROCESS_TIME, :track_allocations => true) do
       1.times { RubyProf::C1.new.sleep_wait }
     end
 

data/test/measure_allocations.rb

@@ -18,13 +18,9 @@ class Allocator
     String.new(b_string)
   end
 
-  def internal_run
+  def run
     make_arrays
     make_hashes
     make_strings
   end
-
-  def run
-    internal_run
-  end
 end