timocratic-test_benchmark 0.4.2 → 0.4.3

data/lib/test_benchmark.rb

@@ -6,7 +6,8 @@ require 'test/unit/testcase'
 require 'test/unit/ui/console/testrunner'
 
 class Test::Unit::UI::Console::TestRunner
-  include Loggable if const_defined?(:Loggable)
+  DISPLAY_LIMIT = 15
+  SUITE_DISPLAY_LIMIT = 5
   
   alias attach_to_mediator_old attach_to_mediator
   # def attach_to_mediator_old
@@ -25,59 +26,83 @@ class Test::Unit::UI::Console::TestRunner
   alias started_old started
   def started(result)
     started_old(result)
-    @benchmark_times = {}
+    @test_benchmarks = {} 
+    @suite_benchmarks = {}
   end
   
   alias finished_old finished
   def finished(elapsed_time)
     finished_old(elapsed_time)
-    benchmarks = @benchmark_times.sort{|a, b| b[1] <=> a[1]}
-    output_benchmarks(benchmarks, true)
-    benchmarks = benchmarks.slice(0,10) unless ENV['BENCHMARK'] == 'full'
-    output_benchmarks(benchmarks)
+    output_benchmarks
+    output_benchmarks(:suite)
+    puts "\n"
   end
   
   alias test_started_old test_started
   def test_started(name)
     test_started_old(name)
-    @benchmark_times[name] = Time.now
+    @test_benchmarks[name] = Time.now
   end
   
   alias test_finished_old test_finished
   def test_finished(name)
     test_finished_old(name)
-    @benchmark_times[name] = Time.now - @benchmark_times[name]
+    @test_benchmarks[name] = Time.now - @test_benchmarks[name]
   end
   
-  def test_suite_started(name)
+  def test_suite_started(suite_name)
+    @suite_benchmarks[suite_name] = Time.now
   end
   
-  def test_suite_finished(name)
-    return unless ENV['BENCHMARK'] == 'full'
-    benchmarks = @benchmark_times.select{ |k,v| k.include?(name) }.sort{|a, b| b[1] <=> a[1]}
-    output_benchmarks(benchmarks, false, name) unless benchmarks.length == 0
+  def test_suite_finished(suite_name)
+    @suite_benchmarks[suite_name] = Time.now - @suite_benchmarks[suite_name]
+    output_benchmarks(suite_name) if full_output?
   end
   
-  def format_benchmark_row(tuple)
-    ("%0.3f" % tuple[1]) + " #{tuple[0]}"
+  @@format_benchmark_row = lambda {|tuple| ("%0.3f" % tuple[1]) + " #{tuple[0]}"}
+  @@sort_by_time = lambda { |a,b| b[1] <=> a[1] }
+
+private
+  def full_output?
+    ENV['BENCHMARK'] == 'full'
   end
-  
-  def output_benchmarks(benchmarks, use_logger=false, name=nil)
-    return if use_logger && !defined?(logger)
-    if name
-      header = "\nTest Benchmark Times: #{name}"
+
+  def select_by_suite_name(suite_name)
+    if suite_name == :suite
+      @suite_benchmarks.select{ |k,v| @test_benchmarks.detect{ |k1,v1| k1.include?(k) } }
+    elsif suite_name
+      @test_benchmarks.select{ |k,v| k.include?(suite_name) }
     else
-      header = "\nOVERALL TEST BENCHMARK TIMES"
+      @test_benchmarks
+    end
+  end
+
+  def prep_benchmarks(suite_name=nil)
+    benchmarks = select_by_suite_name(suite_name)
+    return if benchmarks.nil? || benchmarks.empty?
+    benchmarks = benchmarks.sort(&@@sort_by_time)
+    unless full_output?
+      cutoff = (suite_name == :suite) ? SUITE_DISPLAY_LIMIT : DISPLAY_LIMIT
+      benchmarks = benchmarks.slice(0, cutoff) 
     end
-    strings = benchmarks.map {|tuple| format_benchmark_row(tuple)}
-    if use_logger
-      logger.debug header
-      logger.debug strings.join("\n")
+    benchmarks.map(&@@format_benchmark_row)
+  end
+
+  def header(suite_name)
+    if suite_name == :suite
+      "\nTest Benchmark Times: Suite Totals:\n"
+    elsif suite_name
+      "\nTest Benchmark Times: #{suite_name}\n"
     else
-      puts header
-      puts strings
+      "\nTEST BENCHMARK TIMES: OVERALL\n"
     end
   end
+
+  def output_benchmarks(suite_name=nil)
+    benchmarks = prep_benchmarks(suite_name)
+    return if benchmarks.nil? || benchmarks.empty?
+    puts header(suite_name) + benchmarks.join("\n") + "\n"
+  end
 end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: timocratic-test_benchmark
 version: !ruby/object:Gem::Version 
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors: 
 - Tim Connor