@@ -13,13 +13,17 @@ module Benchmark times1 = [] times2 = [] + teardown1 = @options[:teardown1] + teardown2 = @options[:teardown2] (1..@options[ :iterations ]).each do |iteration| if @options[ :verbose ] $stdout.print "."; $stdout.flush end times1 << Benchmark.realtime { @block1.call( iteration ) } + teardown1.call if teardown1.respond_to?(:call) times2 << Benchmark.realtime { block2.call( iteration ) } + teardown2.call if teardown2.respond_to?(:call) end r = RSRuby.instance lib/better-benchmark/better-benchmark.rb @@ -0,0 +1,41 @@ +require 'rubygems' +require 'test/unit' +require 'lib/better-benchmark' + +class TestBetterBenchmark < Test::Unit::TestCase + + def test_teardowns_are_invoked + teardown_check = 2 + teardown1 = Proc.new { + teardown_check = 1 + } + teardown2 = Proc.new { + teardown_check = 2 + } + + result = Benchmark.compare_realtime( + :iterations => 10, + :verbose => true, + :teardown1 => teardown1, + :teardown2 => teardown2 + ) { |iteration| + assert_equal 2, teardown_check + }.with { |iteration| + assert_equal 1, teardown_check + } + assert_equal 2, teardown_check + end + + def test_absence_of_teardowns_does_not_cause_error + assert_nothing_raised { + result = Benchmark.compare_realtime( + :iterations => 10, + :verbose => true + ) { |iteration| + # nothing + }.with { |iteration| + # nothing + } + } + end +end \ No newline at end of file test/test_better-benchmark.rb 277a2774ae154d67bf9acc4b566f7c65bb3dadad John Trupiano john@john-trupianos-macbook-pro.local http://github.com/jtrupiano/better-benchmark/commit/2bc4a9f29aa94cf1603031c1a588213cb8495cc5 2bc4a9f29aa94cf1603031c1a588213cb8495cc5 2008-10-14T09:29:17-07:00 2008-10-14T09:29:17-07:00 Added :teardown1 and :teardown2 as options to the ComparisonPartial options parameter. These options take Proc's (or objects that respond to call()). :teardown1 follows block1, and :teardown2 follows block2 on each iteration. This is helpful if you need to clean up state or otherwise execute transactional code in your benchmark. b70de1e0ba5d02da81dfe5219b9428209ee6e159 John Trupiano john@john-trupianos-macbook-pro.local