ruby-prof 1.1.0-x64-mingw32 → 1.4.2-x64-mingw32

data/test/printer_flat_test.rb

@@ -2,67 +2,98 @@
 # encoding: UTF-8
 
 require File.expand_path('../test_helper', __FILE__)
-require 'stringio'
 require 'fileutils'
+require 'stringio'
 require 'tmpdir'
 require_relative 'prime'
 
 # --  Tests ----
 class PrinterFlatTest < TestCase
-  def setup
-    # WALL_TIME so we can use sleep in our test and get same measurements on linux and windows
-    RubyProf::measure_mode = RubyProf::WALL_TIME
-    @result = RubyProf.profile do
+  def run_profile
+    RubyProf.profile(:measure_mode => RubyProf::WALL_TIME) do
       run_primes(1000, 5000)
     end
   end
 
   def flat_output_nth_column_values(output, n)
-    only_method_calls = output.split("\n").select { |line| line =~ /^ +\d+/ }
-    only_method_calls.collect { |line| line.split(/ +/)[n] }
+    only_method_calls = output.split("\n").select { |line| line =~ /^\s+\d+/ }
+    only_method_calls.collect { |line| line.split(/\s+/)[n] }
   end
 
-  def assert_sorted array
-    array = array.map{|n| n.to_f} # allow for > 10s times to sort right, since lexographically 4.0 > 10.0
-    assert_equal array, array.sort.reverse, "Array #{array.inspect} is not sorted"
+  def helper_test_flat_string(klass)
+    output = StringIO.new
+
+    printer = klass.new(self.run_profile)
+    printer.print(output)
+
+    assert_match(/Thread ID: -?\d+/i, output.string)
+    assert_match(/Fiber ID: -?\d+/i, output.string)
+    assert_match(/Total: \d+\.\d+/i, output.string)
+    assert_match(/Object#run_primes/i, output.string)
+    output.string
   end
 
+  def assert_sorted(array)
+    array = array.map(&:to_f) # allow for > 10s times to sort right, since lexographically 4.0 > 10.0
+    assert_equal(array, array.sort.reverse)
+  end
+  
   def test_flat_string
     output = helper_test_flat_string(RubyProf::FlatPrinter)
     assert_match(/prime.rb/, output)
   end
 
-  def helper_test_flat_string(klass)
-    output = ''
-
-    printer = klass.new(@result)
-    printer.print(output)
-
-    assert_match(/Thread ID: -?\d+/i, output)
-    assert_match(/Fiber ID: -?\d+/i, output)
-    assert_match(/Total: \d+\.\d+/i, output)
-    assert_match(/Object#run_primes/i, output)
-    output
-  end
-
   def test_flat_result_sorting_by_self_time_is_default
-    printer = RubyProf::FlatPrinter.new(@result)
+    printer = RubyProf::FlatPrinter.new(self.run_profile)
 
-    printer.print(output = '')
-    self_times = flat_output_nth_column_values(output, 3)
+    output = StringIO.new
+    printer.print(output)
+    self_times = flat_output_nth_column_values(output.string, 3)
 
     assert_sorted self_times
   end
 
   def test_flat_result_sorting
-    printer = RubyProf::FlatPrinter.new(@result)
+    printer = RubyProf::FlatPrinter.new(self.run_profile)
 
     sort_method_with_column_number = {:total_time => 2, :self_time => 3, :wait_time => 4, :children_time => 5}
 
     sort_method_with_column_number.each_pair do |sort_method, n|
-      printer.print(output = '', :sort_method => sort_method)
-      times = flat_output_nth_column_values(output, n)
-      assert_sorted times
+      output = StringIO.new
+      printer.print(output, :sort_method => sort_method)
+
+      times = flat_output_nth_column_values(output.string, n)
+      assert_sorted(times)
     end
   end
+
+  def test_flat_result_max_percent
+    printer = RubyProf::FlatPrinter.new(self.run_profile)
+
+    output = StringIO.new
+    printer.print(output, max_percent: 1)
+    self_percents = flat_output_nth_column_values(output.string, 1).map(&:to_f)
+
+    assert self_percents.max < 1
+  end
+
+  def test_flat_result_filter_by_total_time
+    printer = RubyProf::FlatPrinter.new(self.run_profile)
+
+    output = StringIO.new
+    printer.print(output, filter_by: :total_time, min_percent: 50)
+    total_times = flat_output_nth_column_values(output.string, 2).map(&:to_f)
+
+    assert (total_times.min / total_times.max) >= 0.5
+  end
+
+  def test_flat_result_filter_by_self_time
+    printer = RubyProf::FlatPrinter.new(self.run_profile)
+
+    output = StringIO.new
+    printer.print(output, filter_by: :self_time, min_percent: 0.1)
+    self_percents = flat_output_nth_column_values(output.string, 1).map(&:to_f)
+
+    assert self_percents.min >= 0.1
+  end
 end

data/test/printer_graph_html_test.rb

@@ -2,7 +2,6 @@
 # encoding: UTF-8
 
 require File.expand_path('../test_helper', __FILE__)
-require 'stringio'
 require 'fileutils'
 require 'tmpdir'
 require_relative 'prime'

data/test/printer_graph_test.rb

@@ -2,7 +2,6 @@
 # encoding: UTF-8
 
 require File.expand_path('../test_helper', __FILE__)
-require 'stringio'
 require 'fileutils'
 require 'tmpdir'
 require_relative 'prime'
@@ -22,9 +21,9 @@ class PrinterGraphTest < TestCase
     only_root_calls.collect { |line| line.split(/ +/)[n] }
   end
 
-  def assert_sorted array
-    array = array.map{|n| n.to_f} # allow for > 10s times to sort right, since lexographically 4.0 > 10.0
-    assert_equal array, array.sort.reverse, "Array #{array.inspect} is not sorted"
+  def assert_sorted(array)
+    array = array.map {|n| n.to_f} # allow for > 10s times to sort right, since lexographically 4.0 > 10.0
+    assert_equal(array, array.sort.reverse, "Array #{array.inspect} is not sorted")
   end
 
   def test_graph_results_sorting

data/test/printers_test.rb

@@ -2,8 +2,8 @@
 # encoding: UTF-8
 
 require File.expand_path('../test_helper', __FILE__)
-require 'stringio'
 require 'fileutils'
+require 'stringio'
 require 'tmpdir'
 require_relative 'prime'
 
@@ -20,7 +20,7 @@ class PrintersTest < TestCase
   def test_printers
     output = ENV['SHOW_RUBY_PROF_PRINTER_OUTPUT'] == "1" ? STDOUT : StringIO.new('')
 
-    printer = RubyProf::CallInfoPrinter.new(@result)
+    printer = RubyProf::CallStackPrinter.new(@result)
     printer.print(output)
 
     printer = RubyProf::CallTreePrinter.new(@result)

data/test/printing_recursive_graph_test.rb

@@ -2,8 +2,8 @@
 # encoding: UTF-8
 
 require File.expand_path('../test_helper', __FILE__)
-require 'stringio'
 require 'fileutils'
+require 'stringio'
 
 # --- code to be tested ---
 module PRGT

data/test/profile_test.rb

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+require File.expand_path('../test_helper', __FILE__)
+
+class ProfileTest < TestCase
+  def test_measure_mode
+    profile = RubyProf::Profile.new(:measure_mode => RubyProf::PROCESS_TIME)
+    assert_equal(RubyProf::PROCESS_TIME, profile.measure_mode)
+  end
+
+  def test_measure_mode_string
+    profile = RubyProf::Profile.new(:measure_mode => RubyProf::PROCESS_TIME)
+    assert_equal("process_time", profile.measure_mode_string)
+  end
+end

data/test/rack_test.rb

@@ -24,16 +24,6 @@ module Rack
   end
 end
 
-module Rack
-  class RubyProf
-    attr_reader :_profiler
-
-    def public_delete_profiler!
-      delete_profiler!
-    end
-  end
-end
-
 class RackTest < TestCase
   def test_create_print_path
     path = Dir.mktmpdir
@@ -100,58 +90,4 @@ class RackTest < TestCase
     file_path = ::File.join(path, 'path-to-resource.json-dynamic.txt')
     assert(File.exist?(file_path))
   end
-
-  def test_works_for_multiple_requests
-    path = Dir.mktmpdir
-
-    adapter = Rack::RubyProf.new(FakeRackApp.new, :path => path, :max_requests => 2)
-
-    # make a 1st request, and check that this didn't create any files
-    adapter.call(:fake_env)
-    assert(Dir["#{path}/*"].empty?)
-
-    # now a second request should create all the expected files
-    adapter.call(:fake_env)
-    %w(flat.txt graph.txt graph.html call_stack.html).each do |base_name|
-      file_path = ::File.join(path, "multi-requests-2-#{base_name}")
-      assert(File.exist?(file_path))
-    end
-
-    # let's clean up
-    FileUtils.rm_rf(Dir["#{path}/*"])
-
-    # and do the same again for the next 2 requests
-    adapter.call(:fake_env)
-    assert(Dir["#{path}/*"].empty?)
-
-    adapter.call(:fake_env)
-    %w(flat.txt graph.txt graph.html call_stack.html).each do |base_name|
-      file_path = ::File.join(path, "multi-requests-2-#{base_name}")
-      assert(File.exist?(file_path))
-    end
-  end
-
-  def test_tries_to_print_results_if_shut_down_before_max_requests_reached
-    path = Dir.mktmpdir
-
-    adapter = Rack::RubyProf.new(FakeRackApp.new, :path => path, :max_requests => 100)
-
-    # make a 1st request, and check that this didn't create any files
-    adapter.call(:fake_env)
-    assert(Dir["#{path}/*"].empty?)
-
-    adapter.public_delete_profiler!
-
-    %w(flat.txt graph.txt graph.html call_stack.html).each do |base_name|
-      file_path = ::File.join(path, "multi-requests-1-#{base_name}")
-      assert(File.exist?(file_path))
-    end
-  end
-
-  def test_it_uses_separate_profilers_if_not_aggregating_multiple_requests
-    adapter1 = Rack::RubyProf.new(FakeRackApp.new)
-    adapter2 = Rack::RubyProf.new(FakeRackApp.new)
-
-    assert(adapter1.object_id != adapter2.object_id)
-  end
 end

data/test/recursive_test.rb

@@ -58,13 +58,11 @@ class RecursiveTest < TestCase
     assert_in_delta(0, method.wait_time, 0.01)
     assert_in_delta(2, method.children_time, 0.1)
 
-    assert_equal(1, method.callers.length)
-    call_info = method.callers[0]
-    assert_nil(call_info.parent)
+    assert_equal(0, method.call_trees.callers.length)
 
-    assert_equal(1, method.callees.length)
-    call_info = method.callees[0]
-    assert_equal('SimpleRecursion#simple', call_info.target.full_name)
+    assert_equal(1, method.call_trees.callees.length)
+    call_tree = method.call_trees.callees[0]
+    assert_equal('SimpleRecursion#simple', call_tree.target.full_name)
 
     # Method 1: SimpleRecursion#simple
     method = methods[1]
@@ -76,19 +74,19 @@ class RecursiveTest < TestCase
     assert_in_delta(0, method.wait_time, 0.1)
     assert_in_delta(2, method.children_time, 0.1)
 
-    assert_equal(2, method.callers.length)
-    call_info = method.callers[0]
-    assert_equal('RecursiveTest#test_simple', call_info.parent.full_name)
+    assert_equal(2, method.call_trees.callers.length)
+    call_tree = method.call_trees.callers[0]
+    assert_equal('RecursiveTest#test_simple', call_tree.parent.target.full_name)
 
-    call_info = method.callers[1]
-    assert_equal('SimpleRecursion#simple', call_info.parent.full_name)
+    call_tree = method.call_trees.callers[1]
+    assert_equal('SimpleRecursion#simple', call_tree.parent.target.full_name)
 
-    assert_equal(2, method.callees.length)
-    call_info = method.callees[0]
-    assert_equal('Kernel#sleep', call_info.target.full_name)
+    assert_equal(2, method.call_trees.callees.length)
+    call_tree = method.call_trees.callees[0]
+    assert_equal('Kernel#sleep', call_tree.target.full_name)
 
-    call_info = method.callees[1]
-    assert_equal('SimpleRecursion#simple', call_info.target.full_name)
+    call_tree = method.call_trees.callees[1]
+    assert_equal('SimpleRecursion#simple', call_tree.target.full_name)
 
     # Method 2: Kernel#sleep
     method = methods[2]
@@ -100,12 +98,12 @@ class RecursiveTest < TestCase
     assert_in_delta(0, method.wait_time, 0.1)
     assert_in_delta(0, method.children_time, 0.1)
 
-    assert_equal(1, method.callers.length)
-    call_info = method.callers[0]
-    assert_equal('SimpleRecursion#simple', call_info.parent.full_name)
-    assert_equal(0, method.callees.length)
+    assert_equal(1, method.call_trees.callers.length)
+    call_tree = method.call_trees.callers[0]
+    assert_equal('SimpleRecursion#simple', call_tree.parent.target.full_name)
+    assert_equal(0, method.call_trees.callees.length)
 
-    assert_equal(0, method.callees.length)
+    assert_equal(0, method.call_trees.callees.length)
   end
 
   def test_cycle
@@ -125,13 +123,11 @@ class RecursiveTest < TestCase
     assert_in_delta(0, method.wait_time, 0.01)
     assert_in_delta(5, method.children_time, 0.1)
 
-    assert_equal(1, method.callers.length)
-    call_info = method.callers[0]
-    assert_nil(call_info.parent)
+    assert_equal(0, method.call_trees.callers.length)
 
-    assert_equal(1, method.callees.length)
-    call_info = method.callees[0]
-    assert_equal('SimpleRecursion#render', call_info.target.full_name)
+    assert_equal(1, method.call_trees.callees.length)
+    call_tree = method.call_trees.callees[0]
+    assert_equal('SimpleRecursion#render', call_tree.target.full_name)
 
     method = methods[1]
     assert_equal('SimpleRecursion#render', method.full_name)
@@ -142,13 +138,13 @@ class RecursiveTest < TestCase
     assert_in_delta(0, method.wait_time, 0.01)
     assert_in_delta(5, method.children_time, 0.1)
 
-    assert_equal(1, method.callers.length)
-    call_info = method.callers[0]
-    assert_equal('RecursiveTest#test_cycle', call_info.parent.full_name)
+    assert_equal(1, method.call_trees.callers.length)
+    call_tree = method.call_trees.callers[0]
+    assert_equal('RecursiveTest#test_cycle', call_tree.parent.target.full_name)
 
-    assert_equal(1, method.callees.length)
-    call_info = method.callees[0]
-    assert_equal('Integer#times', call_info.target.full_name)
+    assert_equal(1, method.call_trees.callees.length)
+    call_tree = method.call_trees.callees[0]
+    assert_equal('Integer#times', call_tree.target.full_name)
 
     method = methods[2]
     assert_equal('Integer#times', method.full_name)
@@ -159,16 +155,16 @@ class RecursiveTest < TestCase
     assert_in_delta(0, method.wait_time, 0.1)
     assert_in_delta(5, method.children_time, 0.1)
 
-    assert_equal(2, method.callers.length)
-    call_info = method.callers[0]
-    assert_equal('SimpleRecursion#render', call_info.parent.full_name)
+    assert_equal(2, method.call_trees.callers.length)
+    call_tree = method.call_trees.callers[0]
+    assert_equal('SimpleRecursion#render', call_tree.parent.target.full_name)
 
-    call_info = method.callers[1]
-    assert_equal('SimpleRecursion#render_partial', call_info.parent.full_name)
+    call_tree = method.call_trees.callers[1]
+    assert_equal('SimpleRecursion#render_partial', call_tree.parent.target.full_name)
 
-    assert_equal(1, method.callees.length)
-    call_info = method.callees[0]
-    assert_equal('SimpleRecursion#render_partial', call_info.target.full_name)
+    assert_equal(1, method.call_trees.callees.length)
+    call_tree = method.call_trees.callees[0]
+    assert_equal('SimpleRecursion#render_partial', call_tree.target.full_name)
 
     method = methods[3]
     assert_equal('SimpleRecursion#render_partial', method.full_name)
@@ -179,22 +175,22 @@ class RecursiveTest < TestCase
     assert_in_delta(0, method.wait_time, 0.01)
     assert_in_delta(5, method.children_time, 0.05)
 
-    assert_equal(2, method.callers.length)
-    call_info = method.callers[0]
-    assert_equal('Integer#times', call_info.parent.full_name)
+    assert_equal(2, method.call_trees.callers.length)
+    call_tree = method.call_trees.callers[0]
+    assert_equal('Integer#times', call_tree.parent.target.full_name)
 
-    call_info = method.callers[1]
-    assert_equal('SimpleRecursion#render_partial', call_info.parent.full_name)
+    call_tree = method.call_trees.callers[1]
+    assert_equal('SimpleRecursion#render_partial', call_tree.parent.target.full_name)
 
-    assert_equal(3, method.callees.length)
-    call_info = method.callees[0]
-    assert_equal('Kernel#sleep', call_info.target.full_name)
+    assert_equal(3, method.call_trees.callees.length)
+    call_tree = method.call_trees.callees[0]
+    assert_equal('Kernel#sleep', call_tree.target.full_name)
 
-    call_info = method.callees[1]
-    assert_equal('SimpleRecursion#render_partial', call_info.target.full_name)
+    call_tree = method.call_trees.callees[1]
+    assert_equal('SimpleRecursion#render_partial', call_tree.target.full_name)
 
-    call_info = method.callees[2]
-    assert_equal('Integer#times', call_info.target.full_name)
+    call_tree = method.call_trees.callees[2]
+    assert_equal('Integer#times', call_tree.target.full_name)
 
     method = methods[4]
     assert_equal('Kernel#sleep', method.full_name)
@@ -205,6 +201,6 @@ class RecursiveTest < TestCase
     assert_in_delta(0, method.wait_time, 0.01)
     assert_in_delta(0, method.children_time, 0.01)
 
-    assert_equal(0, method.callees.length)
+    assert_equal(0, method.call_trees.callees.length)
   end
 end