ruby-prof 0.10.8 → 0.11.0.rc1

data/test/method_elimination_test.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
+# encoding: UTF-8
 
-require 'test/unit'
-require 'ruby-prof'
+require File.expand_path('../test_helper', __FILE__)
 require 'tmpdir'
 
 # Test data

data/test/module_test.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
-require 'test/unit'
-require 'ruby-prof'
+# encoding: UTF-8
+
+require File.expand_path('../test_helper', __FILE__)
 
 # Need to use wall time for this test due to the sleep calls
 RubyProf::measure_mode = RubyProf::WALL_TIME

data/test/multi_printer_test.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
+# encoding: UTF-8
 
-require 'test/unit'
-require 'ruby-prof'
+require File.expand_path('../test_helper', __FILE__)
 require 'tmpdir'
 
 # Test data

data/test/no_method_class_test.rb

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
-require 'ruby-prof'
+# encoding: UTF-8
+
+require File.expand_path('../test_helper', __FILE__)
 
 # Make sure this works with no class or method
 result = RubyProf.profile do

data/test/prime_test.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
-require 'test/unit'
-require 'ruby-prof'
-require 'prime'
+# encoding: UTF-8
+
+require File.expand_path('../test_helper', __FILE__)
 
 # --  Tests ----
 class PrimeTest< Test::Unit::TestCase

data/test/printers_test.rb

@@ -1,10 +1,9 @@
 #!/usr/bin/env ruby
-require 'test/unit'
-require 'ruby-prof'
-require File.dirname(__FILE__) + '/prime'
+# encoding: UTF-8
+
+require File.expand_path('../test_helper', __FILE__)
 require 'stringio'
 require 'fileutils'
-require 'rubygems'
 
 # --  Tests ----
 class PrintersTest < Test::Unit::TestCase
@@ -45,12 +44,12 @@ class PrintersTest < Test::Unit::TestCase
       printer = RubyProf::CallTreePrinter.new(@result)
       printer.print(output)
       output_dir = 'examples2'
-      
+
       if ENV['SAVE_NEW_PRINTER_EXAMPLES']
         output_dir = 'examples'
       end
       FileUtils.mkdir_p output_dir
-      
+
       printer = RubyProf::DotPrinter.new(@result)
       File.open("#{output_dir}/graph.dot", "w") {|f| printer.print(f)}
 
@@ -135,7 +134,6 @@ class PrintersTest < Test::Unit::TestCase
   end
 
   def test_all_with_small_percentiles
-
     result = RubyProf.profile do
       sleep 2
       do_nothing
@@ -147,12 +145,112 @@ class PrintersTest < Test::Unit::TestCase
     for klass in [ RubyProf::GraphPrinter, RubyProf::GraphHtmlPrinter]
       printer = klass.new(result)
       out = ''
-      output = printer.print(out, :min_percent => 0.00000001 )
+      printer.print(out, :min_percent => 0.00000001 )
       assert_match(/do_nothing/, out)
     end
 
   end
 
+  def test_flat_result_sorting_by_self_time_is_default
+    printer = RubyProf::FlatPrinter.new(@result)
+
+    printer.print(output = '')
+    self_times = flat_output_nth_column_values(output, 3)
+
+    assert_sorted self_times
+  end
+
+  def test_flat_result_sorting
+    printer = RubyProf::FlatPrinter.new(@result)
+
+    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
+    end
+  end
+
+  def test_flat_result_with_line_numbers_sorting_by_self_time_is_default
+    printer = RubyProf::FlatPrinterWithLineNumbers.new(@result)
+
+    printer.print(output = '')
+    self_times = flat_output_nth_column_values(output, 3)
+
+    assert_sorted self_times
+  end
+
+  def test_flat_with_line_numbers_result_sorting
+    printer = RubyProf::FlatPrinterWithLineNumbers.new(@result)
+
+    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
+    end
+  end
+
+  def test_graph_result_sorting_by_total_time_is_default
+    printer = RubyProf::GraphPrinter.new(@result)
+    printer.print(output = '')
+    total_times = graph_output_nth_column_values(output, 3)
 
+    assert_sorted total_times
+  end
 
+  def test_graph_results_sorting
+    printer = RubyProf::GraphPrinter.new(@result)
+
+    sort_method_with_column_number = {:total_time => 3, :self_time => 4, :wait_time => 5, :children_time => 6}
+
+    sort_method_with_column_number.each_pair do |sort_method, n|
+      printer.print(output = '', :sort_method => sort_method)
+      times = graph_output_nth_column_values(output, n)
+      assert_sorted times
+    end
+  end
+
+  def test_graph_html_result_sorting_by_total_time_is_default
+    printer = RubyProf::GraphHtmlPrinter.new(@result)
+    printer.print(output = '')
+    total_times = graph_html_output_nth_column_values(output, 3)
+
+    assert_sorted total_times
+  end
+
+  def test_graph_html_result_sorting
+    printer = RubyProf::GraphHtmlPrinter.new(@result)
+
+    sort_method_with_column_number = {:total_time => 3, :self_time => 4, :wait_time => 5, :children_time => 6}
+
+    sort_method_with_column_number.each_pair do |sort_method, n|
+      printer.print(output = '', :sort_method => sort_method)
+      times = graph_html_output_nth_column_values(output, n)
+      assert_sorted times
+    end
+  end
+
+  private
+  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] }
+  end
+
+  def graph_output_nth_column_values(output, n)
+    only_root_calls = output.split("\n").select { |line| line =~ /^ +[\d\.]+%/ }
+    only_root_calls.collect { |line| line.split(/ +/)[n] }
+  end
+
+  def graph_html_output_nth_column_values(output, n)
+    only_root_calls = output.split('<tr class="method">')
+    only_root_calls.delete_at(0)
+    only_root_calls.collect {|line| line.scan(/[\d\.]+/)[n - 1] }
+  end
+
+  def assert_sorted array
+    assert_equal array, array.sort.reverse, "Array #{array.inspect} is not sorted"
+  end
 end

data/test/recursive_test.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
-require 'test/unit'
-require 'ruby-prof'
+# encoding: UTF-8
+
+require File.expand_path('../test_helper', __FILE__)
 
 def simple(n)
   sleep(1)
@@ -57,10 +58,10 @@ class RecursiveTest < Test::Unit::TestCase
     method = methods[1]
     assert_equal('Object#simple', method.full_name)
     assert_equal(2, method.called)
-    assert_in_delta(2, method.total_time, 0.02)
-    assert_in_delta(0, method.self_time, 0.02)
-    assert_in_delta(0, method.wait_time, 0.02)
-    assert_in_delta(2, method.children_time, 0.02)
+    assert_in_delta(2, method.total_time, 0.05)
+    assert_in_delta(0, method.self_time, 0.05)
+    assert_in_delta(0, method.wait_time, 0.05)
+    assert_in_delta(2, method.children_time, 0.05)
 
     assert_equal(2, method.call_infos.length)
     call_info = method.call_infos[0]

data/test/singleton_test.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
+# encoding: UTF-8
 
-require 'test/unit'
-require 'ruby-prof'
+require File.expand_path('../test_helper', __FILE__)
 require 'timeout'
 
 # --  Test for bug [#5657]

data/test/stack_printer_test.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
+# encoding: UTF-8
 
-require 'test/unit'
-require 'ruby-prof'
+require File.expand_path('../test_helper', __FILE__)
 require 'tmpdir'
 
 # Test data
@@ -45,7 +45,6 @@ class StackPrinterTest < Test::Unit::TestCase
     assert_nothing_raised { file_contents = print(result) }
     assert file_contents =~ /Thread: (\d+) \(100\.00% ~ ([.0-9]+)\)/
     actual_time = $2.to_f
-    difference = (expected_time-actual_time).abs
     assert_in_delta(expected_time, actual_time, 0.01)
   end
 

data/test/stack_test.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
+# encoding: UTF-8
 
-require 'test/unit'
-require 'ruby-prof'
+require File.expand_path('../test_helper', __FILE__)
 
 # Test data
 #     A

data/test/start_stop_test.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
+# encoding: UTF-8
 
-require 'test/unit'
-require 'ruby-prof'
+require File.expand_path('../test_helper', __FILE__)
 
 class StartStopTest < Test::Unit::TestCase
   def setup

data/test/test_helper.rb

@@ -0,0 +1,81 @@
+# encoding: UTF-8
+
+# Make RubyMine happy
+if ENV["RM_INFO"] || ENV["TEAMCITY_VERSION"]
+  gem 'win32console'
+  gem 'minitest-reporters'
+  require 'minitest/reporters'
+  MiniTest::Unit.runner = MiniTest::SuiteRunner.new
+  MiniTest::Unit.runner.reporters << MiniTest::Reporters::RubyMineReporter.new
+end
+
+# To make testing/debugging easier, test within this source tree versus an installed gem
+
+dir = File.dirname(__FILE__)
+root = File.expand_path(File.join(dir, '..'))
+lib = File.expand_path(File.join(root, 'lib'))
+ext = File.expand_path(File.join(root, 'ext', 'ruby_prof'))
+
+$LOAD_PATH << lib
+$LOAD_PATH << ext
+
+require 'ruby-prof'
+require 'test/unit'
+require File.expand_path('../prime', __FILE__)
+
+# Some classes used in measurement tests
+module RubyProf
+  class C1
+    def C1.hello
+      sleep(0.1)
+    end
+
+    def hello
+      sleep(0.2)
+    end
+  end
+
+  module M1
+    def hello
+      sleep(0.3)
+    end
+  end
+
+  class C2
+    include M1
+    extend M1
+  end
+
+  class C3
+    def hello
+      sleep(0.4)
+    end
+  end
+
+  module M4
+    def hello
+      sleep(0.5)
+    end
+  end
+
+  module M5
+    include M4
+    def goodbye
+      hello
+    end
+  end
+
+  class C6
+    include M5
+    def test
+      goodbye
+    end
+  end
+  
+  if RUBY_VERSION < '1.9'
+    PARENT = Object
+  else
+    PARENT = BasicObject
+  end
+
+end

data/test/test_suite.rb

@@ -1,32 +1,37 @@
-begin
-  require 'rubygems'
-  require 'redgreen'
-rescue LoadError
-end
+# encoding: utf-8
+
+require File.expand_path("../test_helper", __FILE__)
 
-require 'test/unit'
+%w(aggregate_test
+   basic_test
+   duplicate_names_test
+   dynamic_method_test
+   enumerable_test
+   exceptions_test
+   exclude_threads_test
+   line_number_test
 
-require 'aggregate_test'
-require 'basic_test'
-require 'duplicate_names_test'
-require 'exceptions_test'
-require 'line_number_test'
-require 'measurement_test'
-require 'module_test'
-require 'no_method_class_test'
-require 'prime_test'
-require 'printers_test'
-require 'recursive_test'
-require 'singleton_test'
-require 'stack_test'
-require 'start_stop_test'
-require 'thread_test'
-require 'unique_call_path_test'
-require 'stack_printer_test'
-require 'multi_printer_test'
-require 'method_elimination_test'
+   measure_allocations_test
+   measure_cpu_time_test
+   measure_gc_runs_test
+   measure_gc_time_test
+   measure_memory_test
+   measure_process_time_test
+   measure_wall_time_test
+
+   method_elimination_test
+   module_test
+   multi_printer_test
+   no_method_class_test
+   prime_test
+   printers_test
+   recursive_test
+   singleton_test
+   stack_test
+   stack_printer_test
+   start_stop_test
+   thread_test
+   unique_call_path_test).each do |test|
+  require File.expand_path("../#{test}", __FILE__)
+end
 
-# Can't use this one here cause it breaks
-# the rest of the unit tets (Ruby Prof gets
-# started twice).
-#require 'profile_unit_test'

data/test/thread_test.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
-require 'test/unit'
-require 'ruby-prof'
+# encoding: UTF-8
+
+require File.expand_path('../test_helper', __FILE__)
 require 'timeout'
 
 # --  Tests ----
@@ -65,9 +66,9 @@ class ThreadTest < Test::Unit::TestCase
     assert_equal('ThreadTest#test_thread_timings', method.full_name)
     assert_equal(1, method.called)
     assert_in_delta(1, method.total_time, 0.05)
-    assert_in_delta(0, method.self_time, 0.01)
-    assert_in_delta(0, method.wait_time, 0.01)
-    assert_in_delta(1, method.children_time, 0.01)
+    assert_in_delta(0, method.self_time, 0.05)
+    assert_in_delta(0, method.wait_time, 0.05)
+    assert_in_delta(1, method.children_time, 0.05)
     assert_equal(1, method.call_infos.length)
     call_info = method.call_infos[0]
     assert_equal('ThreadTest#test_thread_timings', call_info.call_sequence)
@@ -76,10 +77,10 @@ class ThreadTest < Test::Unit::TestCase
     method = methods[1]
     assert_equal('Kernel#sleep', method.full_name)
     assert_equal(2, method.called)
-    assert_in_delta(1, method.total_time, 0.01)
-    assert_in_delta(1.0, method.self_time, 0.01)
-    assert_in_delta(0, method.wait_time, 0.01)
-    assert_in_delta(0, method.children_time, 0.01)
+    assert_in_delta(1, method.total_time, 0.05)
+    assert_in_delta(1.0, method.self_time, 0.05)
+    assert_in_delta(0, method.wait_time, 0.05)
+    assert_in_delta(0, method.children_time, 0.05)
 
     assert_equal(1, method.call_infos.length)
     call_info = method.call_infos[0]
@@ -97,10 +98,10 @@ class ThreadTest < Test::Unit::TestCase
     # cause the parent frame to be created for method #test_thread_timings, which means a +1 when it's popped in the end
     # xxxx a test that shows it the other way, too (never creates parent frame--if that's even possible)
     assert_equal(1, method.called)
-    assert_in_delta(1, method.total_time, 0.01)
+    assert_in_delta(1, method.total_time, 0.05)
     assert_in_delta(0, method.self_time, 0.05)
     assert_in_delta(0, method.wait_time, 0.05)
-    assert_in_delta(1, method.children_time, 0.01)
+    assert_in_delta(1, method.children_time, 0.05)
 
     assert_equal(1, method.call_infos.length)
     call_info = method.call_infos[0]
@@ -110,10 +111,10 @@ class ThreadTest < Test::Unit::TestCase
     method = methods[1]
     assert_equal('Thread#join', method.full_name)
     assert_equal(1, method.called)
-    assert_in_delta(1, method.total_time, 0.01)
-    assert_in_delta(0, method.self_time, 0.01)
-    assert_in_delta(1.0, method.wait_time, 0.01)
-    assert_in_delta(0, method.children_time, 0.01)
+    assert_in_delta(1, method.total_time, 0.05)
+    assert_in_delta(0, method.self_time, 0.05)
+    assert_in_delta(1.0, method.wait_time, 0.05)
+    assert_in_delta(0, method.children_time, 0.05)
 
     assert_equal(1, method.call_infos.length)
     call_info = method.call_infos[0]
@@ -123,10 +124,10 @@ class ThreadTest < Test::Unit::TestCase
     method = methods[2]
     assert_equal('<Class::Thread>#new', method.full_name)
     assert_equal(1, method.called)
-    assert_in_delta(0, method.total_time, 0.01)
-    assert_in_delta(0, method.self_time, 0.01)
-    assert_in_delta(0, method.wait_time, 0.01)
-    assert_in_delta(0, method.children_time, 0.01)
+    assert_in_delta(0, method.total_time, 0.05)
+    assert_in_delta(0, method.self_time, 0.05)
+    assert_in_delta(0, method.wait_time, 0.05)
+    assert_in_delta(0, method.children_time, 0.05)
 
     assert_equal(1, method.call_infos.length)
     call_info = method.call_infos[0]
@@ -136,10 +137,10 @@ class ThreadTest < Test::Unit::TestCase
     method = methods[3]
     assert_equal('Thread#initialize', method.full_name)
     assert_equal(1, method.called)
-    assert_in_delta(0, method.total_time, 0.01)
-    assert_in_delta(0, method.self_time, 0.01)
-    assert_in_delta(0, method.wait_time, 0.01)
-    assert_in_delta(0, method.children_time, 0.01)
+    assert_in_delta(0, method.total_time, 0.05)
+    assert_in_delta(0, method.self_time, 0.05)
+    assert_in_delta(0, method.wait_time, 0.05)
+    assert_in_delta(0, method.children_time, 0.05)
 
     assert_equal(1, method.call_infos.length)
     call_info = method.call_infos[0]