1 files changed, 22 insertions, 73 deletions

diff --git a/activesupport/lib/active_support/testing/performance.rb b/activesupport/lib/active_support/testing/performance.rb
index dd23f8d82d..2bea0f991a 100644
--- a/activesupport/lib/active_support/testing/performance.rb
+++ b/activesupport/lib/active_support/testing/performance.rb
@@ -13,12 +13,6 @@ module ActiveSupport
       included do
         superclass_delegating_accessor :profile_options
         self.profile_options = {}
-
-        if defined?(MiniTest::Assertions) && TestCase < MiniTest::Assertions
-          include ForMiniTest
-        else
-          include ForClassicTestUnit
-        end
       end
 
       # each implementation should define metrics and freeze the defaults
@@ -41,82 +35,38 @@ module ActiveSupport
         "#{self.class.name}##{method_name}"
       end
 
-      module ForMiniTest
-        def run(runner)
-          @runner = runner
+      def run(runner)
+        @runner = runner
 
-          run_warmup
-          if full_profile_options && metrics = full_profile_options[:metrics]
-            metrics.each do |metric_name|
-              if klass = Metrics[metric_name.to_sym]
-                run_profile(klass.new)
-              end
+        run_warmup
+        if full_profile_options && metrics = full_profile_options[:metrics]
+          metrics.each do |metric_name|
+            if klass = Metrics[metric_name.to_sym]
+              run_profile(klass.new)
             end
           end
-
-          return
         end
 
-        def run_test(metric, mode)
-          result = '.'
-          begin
-            run_callbacks :setup
-            setup
-            metric.send(mode) { __send__ method_name }
-          rescue Exception => e
-            result = @runner.puke(self.class, method_name, e)
-          ensure
-            begin
-              teardown
-              run_callbacks :teardown, :enumerator => :reverse_each
-            rescue Exception => e
-              result = @runner.puke(self.class, method_name, e)
-            end
-          end
-          result
-        end
+        return
       end
 
-      module ForClassicTestUnit
-        def run(result)
-          return if method_name =~ /^default_test$/
-
-          yield(self.class::STARTED, name)
-          @_result = result
-
-          run_warmup
-          if full_profile_options && metrics = full_profile_options[:metrics]
-            metrics.each do |metric_name|
-              if klass = Metrics[metric_name.to_sym]
-                run_profile(klass.new)
-                result.add_run
-              else
-                puts '%20s: unsupported' % metric_name
-              end
-            end
-          end
-
-          yield(self.class::FINISHED, name)
-        end
-
-        def run_test(metric, mode)
+      def run_test(metric, mode)
+        result = '.'
+        begin
           run_callbacks :setup
           setup
-          metric.send(mode) { __send__ @method_name }
-        rescue ::Test::Unit::AssertionFailedError => e
-        add_failure(e.message, e.backtrace)
-        rescue StandardError, ScriptError => e
-          add_error(e)
+          metric.send(mode) { __send__ method_name }
+        rescue Exception => e
+          result = @runner.puke(self.class, method_name, e)
         ensure
           begin
             teardown
-            run_callbacks :teardown, :enumerator => :reverse_each
-          rescue ::Test::Unit::AssertionFailedError => e
-            add_failure(e.message, e.backtrace)
-          rescue StandardError, ScriptError => e
-            add_error(e)
+            run_callbacks :teardown
+          rescue Exception => e
+            result = @runner.puke(self.class, method_name, e)
           end
         end
+        result
       end
 
       protected
@@ -176,7 +126,7 @@ module ActiveSupport
         def record; end
       end
 
-      class Benchmarker < Performer     
+      class Benchmarker < Performer
         def initialize(*args)
           super
           @supported = @metric.respond_to?('measure')
@@ -208,8 +158,7 @@ module ActiveSupport
               end
             end
 
-            ruby = defined?(RUBY_ENGINE) ? RUBY_ENGINE : 'ruby'
-            ruby += "-#{RUBY_VERSION}.#{RUBY_PATCHLEVEL}"
+            ruby = "#{RUBY_ENGINE}-#{RUBY_VERSION}.#{RUBY_PATCHLEVEL}"
 
             @env = [app, rails, ruby, RUBY_PLATFORM] * ','
           end
@@ -247,6 +196,7 @@ module ActiveSupport
 
         class Base
           include ActionView::Helpers::NumberHelper
+          include ActionView::Helpers::OutputSafetyHelper
 
           attr_reader :total
 
@@ -258,7 +208,7 @@ module ActiveSupport
             @name ||= self.class.name.demodulize.underscore
           end
 
-          def benchmark            
+          def benchmark
             with_gc_stats do
               before = measure
               yield
@@ -306,7 +256,6 @@ module ActiveSupport
   end
 end
 
-RUBY_ENGINE = 'ruby' unless defined?(RUBY_ENGINE) # mri 1.8
 case RUBY_ENGINE
   when 'ruby'   then require 'active_support/testing/performance/ruby'
   when 'rbx'    then require 'active_support/testing/performance/rubinius'