basic_test.rb in ruby-prof-1.0.0

- old
+ new

@@ -1,19 +1,20 @@
 #!/usr/bin/env ruby
 # encoding: UTF-8
 
 require File.expand_path('../test_helper', __FILE__)
+require_relative './measure_times'
 
 class BasicTest < TestCase
   def setup
     # Need to use wall time for this test due to the sleep calls
     RubyProf::measure_mode = RubyProf::WALL_TIME
   end
 
   def start
     RubyProf.start
-    RubyProf::C1.hello
+    RubyProf::C1.sleep_wait
   end
 
   def test_running
     assert(!RubyProf.running?)
     RubyProf.start
@@ -51,78 +52,78 @@
     profile = RubyProf.stop
 
     assert_equal(1, profile.threads.count)
 
     thread = profile.threads.first
-    assert_in_delta(0.25, thread.total_time, 0.015)
+    assert_in_delta(0.25, thread.total_time, 0.05)
 
-    top_methods = thread.top_methods.sort
-    assert_equal(2, top_methods.count)
-    assert_equal("BasicTest#start", top_methods[0].full_name)
-    assert_equal("BasicTest#test_leave_method", top_methods[1].full_name)
+    root_methods = thread.root_methods.sort
+    assert_equal(2, root_methods.count)
+    assert_equal("BasicTest#start", root_methods[0].full_name)
+    assert_equal("BasicTest#test_leave_method", root_methods[1].full_name)
 
     assert_equal(4, thread.methods.length)
     methods = profile.threads.first.methods.sort
 
     # Check times
-    assert_equal("<Class::RubyProf::C1>#hello", methods[0].full_name)
-    assert_in_delta(0.1, methods[0].total_time, 0.015)
-    assert_in_delta(0.0,  methods[0].wait_time, 0.015)
-    assert_in_delta(0.0,  methods[0].self_time, 0.015)
+    assert_equal("<Class::RubyProf::C1>#sleep_wait", methods[0].full_name)
+    assert_in_delta(0.1, methods[0].total_time, 0.05)
+    assert_in_delta(0.0,  methods[0].wait_time, 0.05)
+    assert_in_delta(0.0,  methods[0].self_time, 0.05)
 
     assert_equal("BasicTest#start", methods[1].full_name)
-    assert_in_delta(0.1, methods[1].total_time, 0.015)
-    assert_in_delta(0.0, methods[1].wait_time, 0.015)
-    assert_in_delta(0.0, methods[1].self_time, 0.015)
+    assert_in_delta(0.1, methods[1].total_time, 0.05)
+    assert_in_delta(0.0, methods[1].wait_time, 0.05)
+    assert_in_delta(0.0, methods[1].self_time, 0.05)
 
     assert_equal("BasicTest#test_leave_method", methods[2].full_name)
-    assert_in_delta(0.15, methods[2].total_time, 0.015)
-    assert_in_delta(0.0, methods[2].wait_time, 0.015)
-    assert_in_delta(0.0, methods[2].self_time, 0.015)
+    assert_in_delta(0.15, methods[2].total_time, 0.05)
+    assert_in_delta(0.0, methods[2].wait_time, 0.05)
+    assert_in_delta(0.0, methods[2].self_time, 0.05)
 
     assert_equal("Kernel#sleep", methods[3].full_name)
-    assert_in_delta(0.25, methods[3].total_time, 0.015)
-    assert_in_delta(0.0, methods[3].wait_time, 0.015)
-    assert_in_delta(0.25, methods[3].self_time, 0.015)
+    assert_in_delta(0.25, methods[3].total_time, 0.05)
+    assert_in_delta(0.0, methods[3].wait_time, 0.05)
+    assert_in_delta(0.25, methods[3].self_time, 0.05)
   end
 
   def test_leave_method_2
     start
-    RubyProf::C1.hello
-    RubyProf::C1.hello
+    RubyProf::C1.sleep_wait
+    RubyProf::C1.sleep_wait
     profile = RubyProf.stop
 
     assert_equal(1, profile.threads.count)
 
     thread = profile.threads.first
-    assert_in_delta(0.3, thread.total_time, 0.015)
+    assert_in_delta(0.3, thread.total_time, 0.05)
 
-    top_methods = thread.top_methods.sort
-    assert_equal(2, top_methods.count)
-    assert_equal("BasicTest#start", top_methods[0].full_name)
-    assert_equal("BasicTest#test_leave_method_2", top_methods[1].full_name)
+    root_methods = thread.root_methods.sort
+    assert_equal(2, root_methods.count)
+    assert_equal("BasicTest#start", root_methods[0].full_name)
+    assert_equal("BasicTest#test_leave_method_2", root_methods[1].full_name)
 
     assert_equal(4, thread.methods.length)
     methods = profile.threads.first.methods.sort
 
     # Check times
     assert_equal("BasicTest#start", methods[0].full_name)
-    assert_in_delta(0.1, methods[0].total_time, 0.015)
-    assert_in_delta(0.0, methods[0].wait_time, 0.015)
-    assert_in_delta(0.0, methods[0].self_time, 0.015)
+    assert_in_delta(0.1, methods[0].total_time, 0.05)
+    assert_in_delta(0.0, methods[0].wait_time, 0.05)
+    assert_in_delta(0.0, methods[0].self_time, 0.05)
 
     assert_equal("BasicTest#test_leave_method_2", methods[1].full_name)
-    assert_in_delta(0.2, methods[1].total_time, 0.015)
-    assert_in_delta(0.0, methods[1].wait_time, 0.015)
-    assert_in_delta(0.0, methods[1].self_time, 0.015)
+    assert_in_delta(0.2, methods[1].total_time, 0.05)
+    assert_in_delta(0.0, methods[1].wait_time, 0.05)
+    assert_in_delta(0.0, methods[1].self_time, 0.05)
 
     assert_equal("Kernel#sleep", methods[2].full_name)
-    assert_in_delta(0.3, methods[2].total_time, 0.015)
-    assert_in_delta(0.0, methods[2].wait_time, 0.015)
-    assert_in_delta(0.3, methods[2].self_time, 0.015)
+    assert_in_delta(0.3, methods[2].total_time, 0.05)
+    assert_in_delta(0.0, methods[2].wait_time, 0.05)
+    assert_in_delta(0.3, methods[2].self_time, 0.05)
 
-    assert_equal("<Class::RubyProf::C1>#hello", methods[3].full_name)
-    assert_in_delta(0.3, methods[3].total_time, 0.015)
-    assert_in_delta(0.0, methods[3].wait_time, 0.015)
-    assert_in_delta(0.0, methods[3].self_time, 0.015)
+    assert_equal("<Class::RubyProf::C1>#sleep_wait", methods[3].full_name)
+    assert_in_delta(0.3, methods[3].total_time, 0.05)
+    assert_in_delta(0.0, methods[3].wait_time, 0.05)
+    assert_in_delta(0.0, methods[3].self_time, 0.05)
   end
 end