ruby-prof 1.7.1 → 2.0.0

data/test/call_tree_builder.rb

@@ -1,126 +1,126 @@
-# frozen_string_literal: true
-
-require File.expand_path('../test_helper', __FILE__)
-require 'base64'
-
-# Create a DummyClass with methods so we can create call trees in the test_merge method below
-class DummyClass
-  %i[root a b aa ab ba bb].each do |method_name|
-    define_method(method_name) do
-    end
-  end
-end
-
-def create_call_tree(method_name)
-  method_info = RubyProf::MethodInfo.new(DummyClass, method_name)
-  RubyProf::CallTree.new(method_info)
-end
-
-def build_call_tree(tree_hash)
-  # tree_hash is a hash keyed on the parent method_name whose values are
-  # child methods. Example:
-  #
-  # tree_hash = {:root => [:a, :b],
-  #              :a => [:aa, :ab],
-  #              :b => [:bb]}
-  #
-  # Note this is a simplified structure for testing. It assumes methods
-  # are only called from one call_tree.
-
-  call_trees = Hash.new
-  tree_hash.each do |method_name, children|
-    parent = call_trees[method_name] ||= create_call_tree(method_name)
-    children.each do |child_method_name|
-      child = call_trees[child_method_name] ||= create_call_tree(child_method_name)
-      parent.add_child(child)
-    end
-  end
-
-  call_trees
-end
-
-def create_call_tree_1
-  #
-  #          root    
-  #        /     \   
-  #       a       b  
-  #     /  \       \ 
-  #   aa   ab      bb
-  #
-
-  # ------ Call Trees 1 -------------
-  tree_hash = {:root => [:a, :b],
-               :a => [:aa, :ab],
-               :b => [:bb]}
-
-  call_trees = build_call_tree(tree_hash)
-
-  # Setup times
-  call_trees[:aa].measurement.total_time = 1.5
-  call_trees[:aa].measurement.self_time = 1.5
-  call_trees[:ab].measurement.total_time = 2.2
-  call_trees[:ab].measurement.self_time = 2.2
-  call_trees[:a].measurement.total_time = 3.7
-
-  call_trees[:aa].target.measurement.total_time = 1.5
-  call_trees[:aa].target.measurement.self_time = 1.5
-  call_trees[:ab].target.measurement.total_time = 2.2
-  call_trees[:ab].target.measurement.self_time = 2.2
-  call_trees[:a].target.measurement.total_time = 3.7
-
-  call_trees[:bb].measurement.total_time = 4.3
-  call_trees[:bb].measurement.self_time = 4.3
-  call_trees[:b].measurement.total_time = 4.3
-
-  call_trees[:bb].target.measurement.total_time = 4.3
-  call_trees[:bb].target.measurement.self_time = 4.3
-  call_trees[:b].target.measurement.total_time = 4.3
-
-  call_trees[:root].measurement.total_time = 8.0
-  call_trees[:root].target.measurement.total_time = 8.0
-
-  call_trees[:root]
-end
-
-def create_call_tree_2
-  #
-  #      root
-  #    /     \
-  #   a       b
-  #    \     / \
-  #    ab  ba  bb
-
-  tree_hash = {:root => [:a, :b],
-               :a => [:ab],
-               :b => [:ba, :bb]}
-
-  call_trees = build_call_tree(tree_hash)
-
-  # Setup times
-  call_trees[:ab].measurement.total_time = 0.4
-  call_trees[:ab].measurement.self_time = 0.4
-  call_trees[:a].measurement.total_time = 0.4
-
-  call_trees[:ab].target.measurement.total_time = 0.4
-  call_trees[:ab].target.measurement.self_time = 0.4
-  call_trees[:a].target.measurement.total_time = 0.4
-
-  call_trees[:ba].measurement.total_time = 0.9
-  call_trees[:ba].measurement.self_time = 0.7
-  call_trees[:ba].measurement.wait_time = 0.2
-  call_trees[:bb].measurement.total_time = 2.3
-  call_trees[:bb].measurement.self_time = 2.3
-  call_trees[:b].measurement.total_time = 3.2
-
-  call_trees[:ba].target.measurement.total_time = 0.9
-  call_trees[:ba].target.measurement.self_time = 0.7
-  call_trees[:ba].target.measurement.wait_time = 0.2
-  call_trees[:bb].target.measurement.total_time = 2.3
-  call_trees[:bb].target.measurement.self_time = 2.3
-  call_trees[:b].target.measurement.total_time = 3.2
-
-  call_trees[:root].measurement.total_time = 3.6
-  call_trees[:root].target.measurement.total_time = 3.6
-
-  call_trees[:root]
-end
+# frozen_string_literal: true
+
+require File.expand_path('../test_helper', __FILE__)
+require 'base64'
+
+# Create a DummyClass with methods so we can create call trees in the test_merge method below
+class DummyClass
+  %i[root a b aa ab ba bb].each do |method_name|
+    define_method(method_name) do
+    end
+  end
+end
+
+def create_call_tree(method_name)
+  method_info = RubyProf::MethodInfo.new(DummyClass, method_name)
+  RubyProf::CallTree.new(method_info)
+end
+
+def build_call_tree(tree_hash)
+  # tree_hash is a hash keyed on the parent method_name whose values are
+  # child methods. Example:
+  #
+  # tree_hash = {root: [:a, :b],
+  #              a: [:aa, :ab],
+  #              b: [:bb]}
+  #
+  # Note this is a simplified structure for testing. It assumes methods
+  # are only called from one call_tree.
+
+  call_trees = Hash.new
+  tree_hash.each do |method_name, children|
+    parent = call_trees[method_name] ||= create_call_tree(method_name)
+    children.each do |child_method_name|
+      child = call_trees[child_method_name] ||= create_call_tree(child_method_name)
+      parent.add_child(child)
+    end
+  end
+
+  call_trees
+end
+
+def create_call_tree_1
+  #
+  #          root    
+  #        /     \   
+  #       a       b  
+  #     /  \       \ 
+  #   aa   ab      bb
+  #
+
+  # ------ Call Trees 1 -------------
+  tree_hash = {root: [:a, :b],
+               a: [:aa, :ab],
+               b: [:bb]}
+
+  call_trees = build_call_tree(tree_hash)
+
+  # Setup times
+  call_trees[:aa].measurement.total_time = 1.5
+  call_trees[:aa].measurement.self_time = 1.5
+  call_trees[:ab].measurement.total_time = 2.2
+  call_trees[:ab].measurement.self_time = 2.2
+  call_trees[:a].measurement.total_time = 3.7
+
+  call_trees[:aa].target.measurement.total_time = 1.5
+  call_trees[:aa].target.measurement.self_time = 1.5
+  call_trees[:ab].target.measurement.total_time = 2.2
+  call_trees[:ab].target.measurement.self_time = 2.2
+  call_trees[:a].target.measurement.total_time = 3.7
+
+  call_trees[:bb].measurement.total_time = 4.3
+  call_trees[:bb].measurement.self_time = 4.3
+  call_trees[:b].measurement.total_time = 4.3
+
+  call_trees[:bb].target.measurement.total_time = 4.3
+  call_trees[:bb].target.measurement.self_time = 4.3
+  call_trees[:b].target.measurement.total_time = 4.3
+
+  call_trees[:root].measurement.total_time = 8.0
+  call_trees[:root].target.measurement.total_time = 8.0
+
+  call_trees[:root]
+end
+
+def create_call_tree_2
+  #
+  #      root
+  #    /     \
+  #   a       b
+  #    \     / \
+  #    ab  ba  bb
+
+  tree_hash = {root: [:a, :b],
+               a: [:ab],
+               b: [:ba, :bb]}
+
+  call_trees = build_call_tree(tree_hash)
+
+  # Setup times
+  call_trees[:ab].measurement.total_time = 0.4
+  call_trees[:ab].measurement.self_time = 0.4
+  call_trees[:a].measurement.total_time = 0.4
+
+  call_trees[:ab].target.measurement.total_time = 0.4
+  call_trees[:ab].target.measurement.self_time = 0.4
+  call_trees[:a].target.measurement.total_time = 0.4
+
+  call_trees[:ba].measurement.total_time = 0.9
+  call_trees[:ba].measurement.self_time = 0.7
+  call_trees[:ba].measurement.wait_time = 0.2
+  call_trees[:bb].measurement.total_time = 2.3
+  call_trees[:bb].measurement.self_time = 2.3
+  call_trees[:b].measurement.total_time = 3.2
+
+  call_trees[:ba].target.measurement.total_time = 0.9
+  call_trees[:ba].target.measurement.self_time = 0.7
+  call_trees[:ba].target.measurement.wait_time = 0.2
+  call_trees[:bb].target.measurement.total_time = 2.3
+  call_trees[:bb].target.measurement.self_time = 2.3
+  call_trees[:b].target.measurement.total_time = 3.2
+
+  call_trees[:root].measurement.total_time = 3.6
+  call_trees[:root].target.measurement.total_time = 3.6
+
+  call_trees[:root]
+end

data/test/call_tree_visitor_test.rb

@@ -1,27 +1,27 @@
-#!/usr/bin/env ruby
-# encoding: UTF-8
-
-require File.expand_path('../test_helper', __FILE__)
-require_relative './measure_times'
-
-class CallTreeVisitorTest < TestCase
-  def test_visit
-    result = RubyProf::Profile.profile(measure_mode: RubyProf::WALL_TIME) do
-      RubyProf::C1.sleep_wait
-    end
-
-    visitor = RubyProf::CallTreeVisitor.new(result.threads.first.call_tree)
-
-    method_names = Array.new
-
-    visitor.visit do |call_tree, event|
-      method_names << call_tree.target.full_name if event == :enter
-    end
-
-    assert_equal(3, method_names.length)
-    assert_equal("CallTreeVisitorTest#test_visit", method_names[0])
-    assert_equal("<Class::RubyProf::C1>#sleep_wait", method_names[1])
-    assert_equal("Kernel#sleep", method_names[2])
-  end
-end
-
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+require File.expand_path('../test_helper', __FILE__)
+require_relative './measure_times'
+
+class CallTreeVisitorTest < TestCase
+  def test_visit
+    result = RubyProf::Profile.profile(measure_mode: RubyProf::WALL_TIME) do
+      RubyProf::C1.sleep_wait
+    end
+
+    visitor = RubyProf::CallTreeVisitor.new(result.threads.first.call_tree)
+
+    method_names = Array.new
+
+    visitor.visit do |call_tree, event|
+      method_names << call_tree.target.full_name if event == :enter
+    end
+
+    assert_equal(3, method_names.length)
+    assert_equal("CallTreeVisitorTest#test_visit", method_names[0])
+    assert_equal("<Class::RubyProf::C1>#sleep_wait", method_names[1])
+    assert_equal("Kernel#sleep", method_names[2])
+  end
+end
+

data/test/call_trees_test.rb

@@ -1,66 +1,66 @@
-#!/usr/bin/env ruby
-# encoding: UTF-8
-
-require File.expand_path('../test_helper', __FILE__)
-
-# --  Tests ----
-class CallTreesTest < TestCase
-  def some_method_1
-    some_method_2
-  end
-
-  def some_method_2
-  end
-
-  def test_call_infos
-    result = RubyProf::Profile.profile do
-      some_method_1
-    end
-
-    thread = result.threads.first
-    assert_equal(3, thread.methods.length)
-
-    method = thread.methods[0]
-    assert_equal('CallTreesTest#test_call_infos', method.full_name)
-
-    call_trees = method.call_trees
-    assert_empty(call_trees.callers)
-    assert_equal(1, call_trees.callees.length)
-    assert_kind_of(RubyProf::CallTree, call_trees.callees[0])
-    assert_equal('CallTreesTest#some_method_1', call_trees.callees[0].target.full_name)
-
-    method = thread.methods[1]
-    assert_equal('CallTreesTest#some_method_1', method.full_name)
-
-    call_trees = method.call_trees
-    assert_equal(1, call_trees.callers.length)
-    assert_kind_of(RubyProf::CallTree, call_trees.callers[0])
-    assert_equal('CallTreesTest#test_call_infos', call_trees.callers[0].parent.target.full_name)
-    assert_equal(1, call_trees.callees.length)
-    assert_kind_of(RubyProf::CallTree, call_trees.callees[0])
-    assert_equal('CallTreesTest#some_method_2', call_trees.callees[0].target.full_name)
-
-    method = thread.methods[2]
-    assert_equal('CallTreesTest#some_method_2', method.full_name)
-
-    call_trees = method.call_trees
-    assert_equal(1, call_trees.callers.length)
-    assert_kind_of(RubyProf::CallTree, call_trees.callers[0])
-    assert_equal('CallTreesTest#some_method_1', call_trees.callers[0].parent.target.full_name)
-    assert_empty(call_trees.callees)
-  end
-
-  def test_gc
-    result = RubyProf::Profile.profile do
-      some_method_1
-    end
-
-    method = result.threads.first.methods[1]
-
-    100.times do |i|
-      method.call_trees.callers
-      GC.start
-    end
-    assert(true)
-  end
-end
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+require File.expand_path('../test_helper', __FILE__)
+
+# --  Tests ----
+class CallTreesTest < TestCase
+  def some_method_1
+    some_method_2
+  end
+
+  def some_method_2
+  end
+
+  def test_call_infos
+    result = RubyProf::Profile.profile do
+      some_method_1
+    end
+
+    thread = result.threads.first
+    assert_equal(3, thread.methods.length)
+
+    method = thread.methods[0]
+    assert_equal('CallTreesTest#test_call_infos', method.full_name)
+
+    call_trees = method.call_trees
+    assert_empty(call_trees.callers)
+    assert_equal(1, call_trees.callees.length)
+    assert_kind_of(RubyProf::CallTree, call_trees.callees[0])
+    assert_equal('CallTreesTest#some_method_1', call_trees.callees[0].target.full_name)
+
+    method = thread.methods[1]
+    assert_equal('CallTreesTest#some_method_1', method.full_name)
+
+    call_trees = method.call_trees
+    assert_equal(1, call_trees.callers.length)
+    assert_kind_of(RubyProf::CallTree, call_trees.callers[0])
+    assert_equal('CallTreesTest#test_call_infos', call_trees.callers[0].parent.target.full_name)
+    assert_equal(1, call_trees.callees.length)
+    assert_kind_of(RubyProf::CallTree, call_trees.callees[0])
+    assert_equal('CallTreesTest#some_method_2', call_trees.callees[0].target.full_name)
+
+    method = thread.methods[2]
+    assert_equal('CallTreesTest#some_method_2', method.full_name)
+
+    call_trees = method.call_trees
+    assert_equal(1, call_trees.callers.length)
+    assert_kind_of(RubyProf::CallTree, call_trees.callers[0])
+    assert_equal('CallTreesTest#some_method_1', call_trees.callers[0].parent.target.full_name)
+    assert_empty(call_trees.callees)
+  end
+
+  def test_gc
+    result = RubyProf::Profile.profile do
+      some_method_1
+    end
+
+    method = result.threads.first.methods[1]
+
+    100.times do |i|
+      method.call_trees.callers
+      GC.start
+    end
+    assert(true)
+  end
+end

data/test/duplicate_names_test.rb

@@ -1,32 +1,32 @@
-#!/usr/bin/env ruby
-# encoding: UTF-8
-
-require File.expand_path('../test_helper', __FILE__)
-
-class DuplicateNamesTest < TestCase
-  def test_names
-    result = RubyProf::Profile.profile do
-      str = %{module Foo; class Bar; def foo; end end end}
-
-      eval str
-      Foo::Bar.new.foo
-      DuplicateNamesTest.class_eval {remove_const :Foo}
-
-      eval str
-      Foo::Bar.new.foo
-      DuplicateNamesTest.class_eval {remove_const :Foo}
-
-      eval str
-      Foo::Bar.new.foo
-    end
-
-    # There should be 3 foo methods
-    methods = result.threads.first.methods.sort.reverse
-
-    methods = methods.select do |method|
-      method.full_name == 'DuplicateNamesTest::Foo::Bar#foo'
-    end
-
-    assert_equal(3, methods.length)
-  end
-end
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+require File.expand_path('../test_helper', __FILE__)
+
+class DuplicateNamesTest < TestCase
+  def test_names
+    result = RubyProf::Profile.profile do
+      str = %{module Foo; class Bar; def foo; end end end}
+
+      eval str
+      Foo::Bar.new.foo
+      DuplicateNamesTest.class_eval {remove_const :Foo}
+
+      eval str
+      Foo::Bar.new.foo
+      DuplicateNamesTest.class_eval {remove_const :Foo}
+
+      eval str
+      Foo::Bar.new.foo
+    end
+
+    # There should be 3 foo methods
+    methods = result.threads.first.methods.sort.reverse
+
+    methods = methods.select do |method|
+      method.full_name == 'DuplicateNamesTest::Foo::Bar#foo'
+    end
+
+    assert_equal(3, methods.length)
+  end
+end

data/test/dynamic_method_test.rb

@@ -1,62 +1,50 @@
-#!/usr/bin/env ruby
-# encoding: UTF-8
-
-require File.expand_path("../test_helper", __FILE__)
-
-class DynamicMethodTest < TestCase
-
-  class FruitMedley
-    define_method(:apple) do
-      sleep(0.1)
-      "I'm a peach"
-    end
-
-    define_method(:orange) do
-      sleep(0.2)
-      "I'm an orange"
-    end
-
-    [:banana, :peach].each_with_index do |fruit,i|
-      define_method(fruit) do
-        sleep(i == 0 ? 0.3 : 0.4)
-        "I'm a #{fruit}"
-      end
-    end
-  end
-
-  def test_dynamic_method
-    medley = FruitMedley.new
-    result = RubyProf::Profile.profile(measure_mode: RubyProf::WALL_TIME) do
-      medley.apple
-      medley.orange
-      medley.banana
-      medley.peach
-    end
-
-    methods = result.threads.first.methods.sort.reverse
-
-    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
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+require File.expand_path("../test_helper", __FILE__)
+
+class DynamicMethodTest < TestCase
+
+  class FruitMedley
+    define_method(:apple) do
+      sleep(0.1)
+      "I'm a peach"
+    end
+
+    define_method(:orange) do
+      sleep(0.2)
+      "I'm an orange"
+    end
+
+    [:banana, :peach].each_with_index do |fruit,i|
+      define_method(fruit) do
+        sleep(i == 0 ? 0.3 : 0.4)
+        "I'm a #{fruit}"
+      end
+    end
+  end
+
+  def test_dynamic_method
+    medley = FruitMedley.new
+    result = RubyProf::Profile.profile(measure_mode: RubyProf::WALL_TIME) do
+      medley.apple
+      medley.orange
+      medley.banana
+      medley.peach
+    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
+      Integer#==
+    )
+
+    assert_equal expected_method_names.join("\n"), methods.map(&:full_name).join("\n")
+  end
+end

data/test/enumerable_test.rb

@@ -1,21 +1,23 @@
-#!/usr/bin/env ruby
-# encoding: UTF-8
-
-require File.expand_path('../test_helper', __FILE__)
-
-# --  Test for bug
-# http://github.com/rdp/ruby-prof/issues#issue/12
-
-class EnumerableTest < TestCase
-  def test_enumerable
-    result = RubyProf::Profile.profile do
-      3.times {  [1,2,3].any? {|n| n} }
-    end
-    methods = if RUBY_VERSION >= "3.3.0"
-                %w(EnumerableTest#test_enumerable Integer#times Kernel#block_given? Integer#< Array#any? Integer#succ)
-              else
-                %w(EnumerableTest#test_enumerable Integer#times Array#any?)
-              end
-    assert_equal(methods, result.threads.first.methods.map(&:full_name))
-  end
-end
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+require File.expand_path('../test_helper', __FILE__)
+
+# --  Test for bug
+# http://github.com/rdp/ruby-prof/issues#issue/12
+
+class EnumerableTest < TestCase
+  def test_enumerable
+    result = RubyProf::Profile.profile do
+      3.times {  [1,2,3].any? {|n| n} }
+    end
+    methods = if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('3.3')
+                %w(EnumerableTest#test_enumerable Integer#times Array#any?)
+              elsif Gem::Version.new(RUBY_VERSION) < Gem::Version.new('3.4')
+                %w(EnumerableTest#test_enumerable Integer#times Kernel#block_given? Integer#< Array#any? Integer#succ)
+              else
+                %w(EnumerableTest#test_enumerable Integer#times Integer#< Array#any? Integer#succ)
+              end
+    assert_equal(methods, result.threads.first.methods.map(&:full_name))
+  end
+end