Merge pull request #392 from janx/master

Patch for performance test: make it run with ruby19/minitest

3 files changed, 117 insertions, 43 deletions

diff --git a/Gemfile b/Gemfile
index 935ecff355..a268db7929 100644
--- a/Gemfile
+++ b/Gemfile
@@ -21,6 +21,10 @@ group :doc do
   gem "RedCloth", "~> 4.2" if RUBY_VERSION < "1.9.3"
 end
 
+group :test do
+  gem "ruby-prof"
+end
+
 # AS
 gem "memcache-client", ">= 1.8.5"
 
diff --git a/activesupport/lib/active_support/testing/performance.rb b/activesupport/lib/active_support/testing/performance.rb
index 8c91a061fb..7cd9bfa947 100644
--- a/activesupport/lib/active_support/testing/performance.rb
+++ b/activesupport/lib/active_support/testing/performance.rb
@@ -3,12 +3,100 @@ begin
 
   require 'fileutils'
   require 'rails/version'
+  require 'active_support/concern'
   require 'active_support/core_ext/class/delegating_attributes'
   require 'active_support/core_ext/string/inflections'
 
   module ActiveSupport
     module Testing
       module Performance
+        extend ActiveSupport::Concern
+
+        included do
+          superclass_delegating_accessor :profile_options
+          self.profile_options = DEFAULTS
+
+          if defined?(MiniTest::Assertions) && TestCase < MiniTest::Assertions
+            include ForMiniTest
+          else
+            include ForClassicTestUnit
+          end
+        end
+
+        module ForMiniTest
+          def run(runner)
+            @runner = runner
+
+            run_warmup
+            if profile_options && metrics = profile_options[:metrics]
+              metrics.each do |metric_name|
+                if klass = Metrics[metric_name.to_sym]
+                  run_profile(klass.new)
+                end
+              end
+            end
+          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
+        end
+
+        module ForClassicTestUnit
+          def run(result)
+            return if method_name =~ /^default_test$/
+
+            yield(self.class::STARTED, name)
+            @_result = result
+
+            run_warmup
+            if profile_options && metrics = profile_options[:metrics]
+              metrics.each do |metric_name|
+                if klass = Metrics[metric_name.to_sym]
+                  run_profile(klass.new)
+                  result.add_run
+                end
+              end
+            end
+
+            yield(self.class::FINISHED, name)
+          end
+
+          def run_test(metric, mode)
+            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)
+          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)
+            end
+          end
+        end
+
         DEFAULTS =
           if benchmark = ARGV.include?('--benchmark')  # HAX for rake test
             { :benchmark => true,
@@ -24,53 +112,10 @@ begin
               :output => 'tmp/performance' }
           end.freeze
 
-        def self.included(base)
-          base.superclass_delegating_accessor :profile_options
-          base.profile_options = DEFAULTS
-        end
-
         def full_test_name
           "#{self.class.name}##{method_name}"
         end
 
-        def run(result)
-          return if method_name =~ /^default_test$/
-
-          yield(self.class::STARTED, name)
-          @_result = result
-
-          run_warmup
-          if profile_options && metrics = profile_options[:metrics]
-            metrics.each do |metric_name|
-              if klass = Metrics[metric_name.to_sym]
-                run_profile(klass.new)
-                result.add_run
-              end
-            end
-          end
-
-          yield(self.class::FINISHED, name)
-        end
-
-        def run_test(metric, mode)
-          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)
-        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)
-          end
-        end
-
         protected
           def run_warmup
             GC.start
diff --git a/railties/test/application/test_test.rb b/railties/test/application/test_test.rb
index 1fbbb40132..f96319f472 100644
--- a/railties/test/application/test_test.rb
+++ b/railties/test/application/test_test.rb
@@ -65,6 +65,31 @@ module ApplicationTests
       run_test 'integration/posts_test.rb'
     end
 
+    test "performance test" do
+      controller 'posts', <<-RUBY
+        class PostsController < ActionController::Base
+        end
+      RUBY
+
+      app_file 'app/views/posts/index.html.erb', <<-HTML
+        Posts#index
+      HTML
+
+      app_file 'test/performance/posts_test.rb', <<-RUBY
+        require 'test_helper'
+        require 'rails/performance_test_help'
+
+        class PostsTest < ActionDispatch::PerformanceTest
+          def test_index
+            get '/posts'
+            assert_response :success
+          end
+        end
+      RUBY
+
+      run_test 'performance/posts_test.rb'
+    end
+
     private
       def run_test(name)
         result = ruby '-Itest', "#{app_path}/test/#{name}"