jason-o-matic-deep_test 1.2.2.8 → 1.2.2.9

data/lib/deep_test/option.rb

@@ -66,5 +66,15 @@ module DeepTest
         a.split(File::PATH_SEPARATOR)
       end
     end
+    
+    module Symbol
+      def self.to_string(s)
+        s.to_s
+      end
+
+      def self.from_string(s)
+        s.to_sym
+      end
+    end
   end
 end

data/lib/deep_test/options.rb

@@ -13,6 +13,7 @@ module DeepTest
         Option.new(:worker_listener,    Option::String, "DeepTest::NullWorkerListener"),
         Option.new(:libs,               Option::Array, []),
         Option.new(:requires,           Option::Array, []),
+        Option.new(:test_collector,     Option::Symbol, :objectspace),
       ]
     end
 

data/lib/deep_test/test/collector/rails_ordered_object_space.rb

@@ -0,0 +1,57 @@
+require 'test/unit/collector/objectspace'
+module DeepTest
+  module Test
+    module Collector
+      
+      # This allows us to run tests in a similar order to how rails normal runs them
+      # (i.e. units, functionals, integration) without having to mintain the test file
+      # loading order and passing it down the line somehow.
+      class RailsOrderedObjectSpace < ::Test::Unit::Collector::ObjectSpace
+        
+        # this is like ::Test::Unit::AutoRunner::COLLECTORS[:objectspace] in standard Test::Unit
+        ::Test::Unit::AutoRunner::COLLECTORS[:rails_ordered_objectspace] = proc do |r|
+          c = DeepTest::Test::Collector::RailsOrderedObjectSpace.new
+          c.filter = r.filters
+          c.collect($0.sub(/\.rb\Z/, ''))
+        end
+
+        def sort(suites)
+          done = int = filter_and_sort_suites(suites, ActionController::IntegrationTest)
+          done += func = filter_and_sort_suites(suites - done, ActionController::TestCase)
+          done += others = filter_and_sort_suites(suites - done, ::Test::Unit::TestCase)
+          
+          ordered = others + func + int
+          if ordered.size == suites.size
+            ordered
+          else
+            oddballs = suites - ordered
+            
+            warn <<-STR
+
+WARNING:
+    Deep Test isn\'t sure it has preserved the standard test running order.
+    Tests that aren\'t of the standard rails unit, functional, or integration
+    classes will be run after those that are.
+
+The #{oddballs.uniq.size} oddballs are of classes: #{oddballs.map(&:name).uniq.inspect}
+
+oddballs:
+#{oddballs.inspect}
+
+STR
+            ordered + oddballs
+          end
+        end
+        
+        def filter_and_sort_suites(suites, klass)
+          suites.select {|s| s.name.constantize < klass}.sort_by {|s| suite_to_filename(s)}
+        end
+        
+        def suite_to_filename(s)
+          s.name.underscore + ".rb"
+        end
+        
+      end
+    end
+  end
+end

data/lib/deep_test/test/runner.rb

@@ -13,12 +13,14 @@ module DeepTest
       end
 
       def process_work_units(server)
-        suite = ::Test::Unit::AutoRunner::COLLECTORS[:objectspace].call NO_FILTERS
+        suite = ::Test::Unit::AutoRunner::COLLECTORS[@options.test_collector].call NO_FILTERS
         supervised_suite = DeepTest::Test::SupervisedTestSuite.new(suite, server)
         require 'test/unit/ui/console/testrunner'
         result = ::Test::Unit::UI::Console::TestRunner.run(supervised_suite, ::Test::Unit::UI::NORMAL)
         result.passed?
       end
+      
+      
     end
   end
 end

data/lib/deep_test.rb

@@ -90,3 +90,4 @@ require File.dirname(__FILE__) + "/deep_test/ui/console"
 require File.dirname(__FILE__) + "/deep_test/ui/null"
 
 require File.expand_path(File.dirname(__FILE__) + "/deep_test/drbfire.rb")
+require File.expand_path(File.dirname(__FILE__) + "/deep_test/test/collector/rails_ordered_object_space.rb")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jason-o-matic-deep_test
 version: !ruby/object:Gem::Version 
-  version: 1.2.2.8
+  version: 1.2.2.9
 platform: ruby
 authors: 
 - anonymous z, Dan Manges, David Vollbracht
@@ -23,6 +23,7 @@ extra_rdoc_files:
 - README.rdoc
 - CHANGELOG
 files: 
+- lib/deep_test/test/collector/rails_ordered_object_space.rb
 - lib/deep_test/drbfire.rb
 - lib/deep_test/database/mysql_setup_listener.rb
 - lib/deep_test/database/setup_listener.rb