ruby-prof 0.8.1-x86-mingw32 → 0.11.0.rc1-x86-mingw32

data/test/basic_test.rb

@@ -1,54 +1,7 @@
 #!/usr/bin/env ruby
+# encoding: UTF-8
 
-require 'test/unit'
-require 'ruby-prof'
-
-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
+require File.expand_path('../test_helper', __FILE__)
 
 class BasicTest < Test::Unit::TestCase
   def setup
@@ -69,12 +22,6 @@ class BasicTest < Test::Unit::TestCase
     assert_raise(RuntimeError) do
       RubyProf.start
     end
-
-    assert_raise(RuntimeError) do
-      RubyProf.profile do
-        puts 1
-      end
-    end
     RubyProf.stop
   end
 
@@ -84,201 +31,6 @@ class BasicTest < Test::Unit::TestCase
     end
   end
 
-  def test_class_methods
-    result = RubyProf.profile do
-      C1.hello
-    end
-
-    # Length should be 3:
-    #   BasicTest#test_class_methods
-    #   <Class::C1>#hello
-    #   Kernel#sleep
-
-    methods = result.threads.values.first.sort.reverse
-    assert_equal(3, methods.length)
-
-    # Check the names
-    assert_equal('BasicTest#test_class_methods', methods[0].full_name)
-    assert_equal('<Class::C1>#hello', methods[1].full_name)
-    assert_equal('Kernel#sleep', methods[2].full_name)
-
-    # Check times
-    assert_in_delta(0.1, methods[0].total_time, 0.01)
-    assert_in_delta(0, methods[0].wait_time, 0.01)
-    assert_in_delta(0, methods[0].self_time, 0.01)
-
-    assert_in_delta(0.1, methods[1].total_time, 0.01)
-    assert_in_delta(0, methods[1].wait_time, 0.01)
-    assert_in_delta(0, methods[1].self_time, 0.01)
-
-    assert_in_delta(0.1, methods[2].total_time, 0.01)
-    assert_in_delta(0, methods[2].wait_time, 0.01)
-    assert_in_delta(0.1, methods[2].self_time, 0.01)
-  end
-  
-  if RUBY_VERSION < '1.9'
-    PARENT = Object
-  else
-    PARENT = BasicObject
-  end
-
-  def test_instance_methods
-    result = RubyProf.profile do
-      C1.new.hello
-    end
-
-    # Methods called
-    #   BasicTest#test_instance_methods
-    #   Class.new
-    #   Class:Object#allocate
-    #   for Object#initialize
-    #   C1#hello
-    #   Kernel#sleep
-
-    methods = result.threads.values.first.sort.reverse
-    assert_equal(6, methods.length)
-    names = methods.map(&:full_name)
-    assert_equal('BasicTest#test_instance_methods', names[0])
-    assert_equal('C1#hello', names[1])
-    assert_equal('Kernel#sleep', names[2])
-    assert_equal('Class#new', names[3])
-    # order can differ
-    assert(names.include?("<Class::#{PARENT}>#allocate"))
-    assert(names.include?("#{PARENT}#initialize"))
-
-    # Check times
-    assert_in_delta(0.2, methods[0].total_time, 0.02)
-    assert_in_delta(0, methods[0].wait_time, 0.02)
-    assert_in_delta(0, methods[0].self_time, 0.02)
-
-    assert_in_delta(0.2, methods[1].total_time, 0.02)
-    assert_in_delta(0, methods[1].wait_time, 0.02)
-    assert_in_delta(0, methods[1].self_time, 0.02)
-
-    assert_in_delta(0.2, methods[2].total_time, 0.02)
-    assert_in_delta(0, methods[2].wait_time, 0.02)
-    assert_in_delta(0.2, methods[2].self_time, 0.02)
-
-    assert_in_delta(0, methods[3].total_time, 0.01)
-    assert_in_delta(0, methods[3].wait_time, 0.01)
-    assert_in_delta(0, methods[3].self_time, 0.01)
-
-    assert_in_delta(0, methods[4].total_time, 0.01)
-    assert_in_delta(0, methods[4].wait_time, 0.01)
-    assert_in_delta(0, methods[4].self_time, 0.01)
-
-    assert_in_delta(0, methods[5].total_time, 0.01)
-    assert_in_delta(0, methods[5].wait_time, 0.01)
-    assert_in_delta(0, methods[5].self_time, 0.01)
-  end
-
-  def test_module_methods
-    result = RubyProf.profile do
-      C2.hello
-    end
-
-    # Methods:
-    #   BasicTest#test_module_methods
-    #   M1#hello
-    #   Kernel#sleep
-
-    methods = result.threads.values.first.sort.reverse
-    assert_equal(3, methods.length)
-
-    assert_equal('BasicTest#test_module_methods', methods[0].full_name)
-    assert_equal('M1#hello', methods[1].full_name)
-    assert_equal('Kernel#sleep', methods[2].full_name)
-
-    # Check times
-    assert_in_delta(0.3, methods[0].total_time, 0.1)
-    assert_in_delta(0, methods[0].wait_time, 0.02)
-    assert_in_delta(0, methods[0].self_time, 0.02)
-
-    assert_in_delta(0.3, methods[1].total_time, 0.1)
-    assert_in_delta(0, methods[1].wait_time, 0.02)
-    assert_in_delta(0, methods[1].self_time, 0.02)
-
-    assert_in_delta(0.3, methods[2].total_time, 0.1)
-    assert_in_delta(0, methods[2].wait_time, 0.02)
-    assert_in_delta(0.3, methods[2].self_time, 0.1)
-  end
-
-  def test_module_instance_methods
-    result = RubyProf.profile do
-      C2.new.hello
-    end
-
-    # Methods:
-    #   BasicTest#test_module_instance_methods
-    #   Class#new
-    #   <Class::Object>#allocate
-    #   Object#initialize
-    #   M1#hello
-    #   Kernel#sleep
-
-    methods = result.threads.values.first.sort.reverse
-    assert_equal(6, methods.length)
-    names = methods.map(&:full_name)
-    assert_equal('BasicTest#test_module_instance_methods', names[0])
-    assert_equal('M1#hello', names[1])
-    assert_equal('Kernel#sleep', names[2])
-    assert_equal('Class#new', names[3])
-    assert(names.include?("<Class::#{PARENT}>#allocate"))
-    assert(names.include?("#{PARENT}#initialize"))
-    
-    # Check times
-    assert_in_delta(0.3, methods[0].total_time, 0.1)
-    assert_in_delta(0, methods[0].wait_time, 0.1)
-    assert_in_delta(0, methods[0].self_time, 0.1)
-
-    assert_in_delta(0.3, methods[1].total_time, 0.02)
-    assert_in_delta(0, methods[1].wait_time, 0.01)
-    assert_in_delta(0, methods[1].self_time, 0.01)
-
-    assert_in_delta(0.3, methods[2].total_time, 0.02)
-    assert_in_delta(0, methods[2].wait_time, 0.01)
-    assert_in_delta(0.3, methods[2].self_time, 0.02)
-
-    assert_in_delta(0, methods[3].total_time, 0.01)
-    assert_in_delta(0, methods[3].wait_time, 0.01)
-    assert_in_delta(0, methods[3].self_time, 0.01)
-
-    assert_in_delta(0, methods[4].total_time, 0.01)
-    assert_in_delta(0, methods[4].wait_time, 0.01)
-    assert_in_delta(0, methods[4].self_time, 0.01)
-
-    assert_in_delta(0, methods[5].total_time, 0.01)
-    assert_in_delta(0, methods[5].wait_time, 0.01)
-    assert_in_delta(0, methods[5].self_time, 0.01)
-  end
-
-  def test_singleton
-    c3 = C3.new
-
-    class << c3
-      def hello
-      end
-    end
-
-    result = RubyProf.profile do
-      c3.hello
-    end
-
-    methods = result.threads.values.first.sort.reverse
-    assert_equal(2, methods.length)
-
-    assert_equal('BasicTest#test_singleton', methods[0].full_name)
-    assert_equal('<Object::C3>#hello', methods[1].full_name)
-
-    assert_in_delta(0, methods[0].total_time, 0.01)
-    assert_in_delta(0, methods[0].wait_time, 0.01)
-    assert_in_delta(0, methods[0].self_time, 0.01)
-
-    assert_in_delta(0, methods[1].total_time, 0.01)
-    assert_in_delta(0, methods[1].wait_time, 0.01)
-    assert_in_delta(0, methods[1].self_time, 0.01)
-  end
-
   def test_traceback
     RubyProf.start
     assert_raise(NoMethodError) do
@@ -287,4 +39,4 @@ class BasicTest < Test::Unit::TestCase
 
     RubyProf.stop
   end
-end
+end

data/test/bug_test.rb

@@ -0,0 +1,6 @@
+50000.times do
+  begin
+    raise "error"
+  rescue
+  end
+end

data/test/duplicate_names_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 DuplicateNames < Test::Unit::TestCase
   def test_names
@@ -19,10 +19,10 @@ class DuplicateNames < Test::Unit::TestCase
       eval str
       Foo::Bar.new.foo
     end
-    
+
     # There should be 3 foo methods
     methods = result.threads.values.first.sort.reverse
-    
+
     methods = methods.select do |method|
       method.full_name == 'DuplicateNames::Foo::Bar#foo'
     end

data/test/dynamic_method_test.rb

@@ -0,0 +1,61 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+require File.expand_path("../test_helper", __FILE__)
+
+
+class DynamicMethodTest < Test::Unit::TestCase
+  def test_dynamic_method
+    result = RubyProf.profile do
+      1.times {RubyProf::C1.new.hello}
+    end
+
+    # Methods called
+    #  Kernel#sleep
+    #  <Class::BasicObject>#allocate
+    #  BasicObject#initialize
+    #  RubyProf::C1#hello
+    #  Class#new
+    #  Integer#times
+    #  DynamicMethodTest#test_dynamic_method
+
+    methods = result.threads.values.first.sort.reverse
+    assert_equal(7, methods.length)
+
+    # Check times
+    assert_equal("DynamicMethodTest#test_dynamic_method", methods[0].full_name)
+    assert_in_delta(0.2, methods[0].total_time, 0.02)
+    assert_in_delta(0.0, methods[0].wait_time, 0.02)
+    assert_in_delta(0.0, methods[0].self_time, 0.02)
+
+    assert_equal("Integer#times", methods[1].full_name)
+    assert_in_delta(0.2, methods[1].total_time, 0.02)
+    assert_in_delta(0.0, methods[1].wait_time, 0.02)
+    assert_in_delta(0.0, methods[1].self_time, 0.02)
+
+    assert_equal("RubyProf::C1#hello", methods[2].full_name)
+    assert_in_delta(0.2, methods[2].total_time, 0.02)
+    assert_in_delta(0.0, methods[2].wait_time, 0.02)
+    assert_in_delta(0.0, methods[2].self_time, 0.02)
+
+    assert_equal("Kernel#sleep", methods[3].full_name)
+    assert_in_delta(0.2, methods[3].total_time, 0.01)
+    assert_in_delta(0.0, methods[3].wait_time, 0.01)
+    assert_in_delta(0.2, methods[3].self_time, 0.01)
+
+    assert_equal("Class#new", methods[4].full_name)
+    assert_in_delta(0.0, methods[4].total_time, 0.01)
+    assert_in_delta(0.0, methods[4].wait_time, 0.01)
+    assert_in_delta(0.0, methods[4].self_time, 0.01)
+
+    assert_equal("<Class::#{RubyProf::PARENT}>#allocate", methods[5].full_name)
+    assert_in_delta(0.0, methods[5].total_time, 0.01)
+    assert_in_delta(0.0, methods[5].wait_time, 0.01)
+    assert_in_delta(0.0, methods[5].self_time, 0.01)
+
+    assert_equal("#{RubyProf::PARENT}#initialize", methods[6].full_name)
+    assert_in_delta(0.0, methods[5].total_time, 0.01)
+    assert_in_delta(0.0, methods[5].wait_time, 0.01)
+    assert_in_delta(0.0, methods[5].self_time, 0.01)
+  end
+end

data/test/enumerable_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 for bug
 # http://github.com/rdp/ruby-prof/issues#issue/12
@@ -11,6 +11,6 @@ class EnumerableTest < Test::Unit::TestCase
     result = RubyProf.profile do
       3.times {  [1,2,3].any? {|n| n} }
     end
-    assert result.threads.to_a.first[1].length == 4    
+    assert result.threads.to_a.first[1].length == 4
   end
-end
+end

data/test/exceptions_test.rb

@@ -1,15 +1,16 @@
 #!/usr/bin/env ruby
-require 'test/unit'
-require 'ruby-prof'
+# encoding: UTF-8
+
+require File.expand_path('../test_helper', __FILE__)
 
 class ExceptionsTest < Test::Unit::TestCase
   def test_profile
     result = begin
-      RubyProf.profile do 
+      RubyProf.profile do
         raise(RuntimeError, 'Test error')
       end
-    rescue => e
-    end    
+    rescue
+    end
     assert_not_nil(result)
   end
 end

data/test/exclude_threads_test.rb

@@ -1,54 +1,54 @@
 #!/usr/bin/env ruby
+# encoding: UTF-8
 
-require 'test/unit'
-require 'ruby-prof'
+require File.expand_path('../test_helper', __FILE__)
 
 
 # --  Tests ----
 class ExcludeThreadsTest < Test::Unit::TestCase
-  def test_exclude_threads
-
-    def thread1_proc
-      sleep(0.5)
-      sleep(2)
-    end
-
-    def thread2_proc
-      sleep(0.5)
-      sleep(2)
-    end
-        
-    thread1 = Thread.new do 
-      thread1_proc
-    end
-
-    thread2 = Thread.new do
-      thread2_proc
-    end
-
-    RubyProf::exclude_threads = [ thread2 ]
- 
-    RubyProf.start
-
-    thread1.join
-    thread2.join
-
-    result = RubyProf.stop
-
-    RubyProf::exclude_threads = nil
-
-    assert_equal(2, result.threads.length)
-
-    output = Array.new
-    result.threads.each do | thread_id, methods |
-      methods.each do | m |
-        if m.full_name.index("ExcludeThreadsTest#thread") == 0
-          output.push(m.full_name)
-        end
-      end
-    end
-
-    assert_equal(1, output.length)
-    assert_equal("ExcludeThreadsTest#thread1_proc", output[0])
+  def test_exclude_threads
+
+    def thread1_proc
+      sleep(0.5)
+      sleep(2)
+    end
+
+    def thread2_proc
+      sleep(0.5)
+      sleep(2)
+    end
+
+    thread1 = Thread.new do
+      thread1_proc
+    end
+
+    thread2 = Thread.new do
+      thread2_proc
+    end
+
+    RubyProf::exclude_threads = [ thread2 ]
+
+    RubyProf.start
+
+    thread1.join
+    thread2.join
+
+    result = RubyProf.stop
+
+    RubyProf::exclude_threads = nil
+
+    assert_equal(2, result.threads.length)
+
+    output = Array.new
+    result.threads.each do | thread_id, methods |
+      methods.each do | m |
+        if m.full_name.index("ExcludeThreadsTest#thread") == 0
+          output.push(m.full_name)
+        end
+      end
+    end
+
+    assert_equal(1, output.length)
+    assert_equal("ExcludeThreadsTest#thread1_proc", output[0])
   end
-end
+end