turn 0.8.2 → 0.9.7

data/lib/turn/runners/isorunner.rb

@@ -19,14 +19,15 @@ module Turn
 
   private
 
-    def initialize(controller)
-      @controller = controller
-      @reporter   = controller.reporter
+    def initialize
+      @config = Turn.config
+
+      @reporter = @config.reporter
       #yield(self) if block_given?
-      @loadpath = controller.loadpath
-      @requires = controller.requires
-      @live     = controller.live?
-      @minitest = controller.framework == :minitest
+      @loadpath = @config.loadpath
+      @requires = @config.requires
+      @live     = @config.live?
+      @minitest = @config.framework == :minitest
     end
 
   public
@@ -36,7 +37,7 @@ module Turn
     #
     def start
       suite = TestSuite.new
-      testruns = @controller.files.collect do |file|
+      testruns = @config.files.collect do |file|
         name = file.sub(Dir.pwd+'/','')
         suite.new_case(name, file)
       end
@@ -79,6 +80,7 @@ module Turn
         #err = ''
 
         out, err = nil, nil
+#p cmd
         Open3.popen3(cmd) do |stdin, stdout, stderr|
           stdin.close
           out = stdout.read.chomp
@@ -95,7 +97,8 @@ module Turn
         files = kase.files
 
         # remove any unexpected output injected at the beginning
-        yaml = out[out.index(/^---/)..-1]
+        b = out.index(/^---/m)
+        yaml = out[b..-1]
         sub_suite = YAML.load(yaml)
 
         # TODO: How to handle pairs?
@@ -164,4 +167,3 @@ module Turn
   end#class IsoRunner
 
 end#module Turn
-

data/lib/turn/runners/minirunner.rb

@@ -1,76 +1,66 @@
 require 'stringio'
 
-# Becuase of some wierdness in MiniTest
-debug, $DEBUG = $DEBUG, false
-require 'minitest/unit'
-$DEBUG = debug
-
-Test = MiniTest
+# Because of some wierdness in MiniTest
+#debug, $DEBUG = $DEBUG, false
+#require 'minitest/unit'
+#$DEBUG = debug
 
 module Turn
 
-  # = MiniTest TestRunner
+  # Turn's MiniTest test runner class.
   #
   class MiniRunner < ::MiniTest::Unit
 
-    # Override initialize to take controller argument.
-    def initialize(controller)
-      @turn_controller = controller
-
-      controller.loadpath.each{ |path| $: << path } unless controller.live?
-      controller.requires.each{ |path| require(path) }
-
-      [controller.files].flatten.each{ |path| require(path) }
-
-      files = [controller.files].flatten
-      files.each{ |path| require(path) }   
-
-      # TODO: Better name ?
-      @turn_suite_name = files.map{ |path| File.dirname(path).sub(Dir.pwd+'/','') }.uniq.join(',')
+    #
+    def initialize
+      @turn_config = Turn.config
 
-      #sub_suites = []
-      #ObjectSpace.each_object(Class) do |klass|
-      #  if(Test::Unit::TestCase > klass)
-      #    sub_suites << klass.suite
-      #  end
-      #end
-      #suite = Test::Unit::TestSuite.new('')  # FIXME: Name?
-      #sub_suites.sort_by{|s|s.name}.each{|s| suite << s}
-
-      #suite.tests.each do |c|
-      #  pattern = controller.pattern
-      #  c.tests.reject! { |t| pattern !~ t.method_name }
-      #end
+      super()
 
-      @turn_logger = controller.reporter
+      # a stream we will use to route minitests traditional output
+      @out = ::StringIO.new
+    end
 
-      super()
+    # route minitests traditional output to nowhere
+    def output
+      @out
+    end
 
-      # route minitests traditional output to nowhere
-      # (instead of overriding #puts and #print)
-      @@out = ::StringIO.new
+    #
+    def turn_reporter
+      @turn_config.reporter
     end
 
     # Turn calls this method to start the test run.
     def start(args=[])
+      # minitest changed #run in 6023c879cf3d5169953e on April 6th, 2011
+      if ::MiniTest::Unit.respond_to?(:runner=)
+        ::MiniTest::Unit.runner = self
+      end
+      # FIXME: why isn't @test_count set?
       run(args)
       return @turn_suite
     end
 
     # Override #_run_suite to setup Turn.
     def _run_suites suites, type
-      @turn_suite = Turn::TestSuite.new(@turn_suite_name)
-      @turn_suite.size = ::MiniTest::Unit::TestCase.test_suites.size
+      # Someone want to explain to me why these are fucking here?
+      suites = suites - [MiniTest::Spec]
+      suites = suites - [Test::Unit::TestCase] if defined?(Test::Unit::TestCase)
+
+      @turn_suite = Turn::TestSuite.new(@turn_config.suite_name)
+      @turn_suite.size = suites.size  #::MiniTest::Unit::TestCase.test_suites.size
+      @turn_suite.seed = ::MiniTest::Unit.runner.options[:seed]
 
-      @turn_logger.start_suite(@turn_suite)
+      turn_reporter.start_suite(@turn_suite)
 
-      if @turn_controller.matchcase
-        suites = suites.select{ |suite| @turn_controller.matchcase =~ suite.name }
+      if @turn_config.matchcase
+        suites = suites.select{ |suite| @turn_config.matchcase =~ suite.name }
       end
 
       result = suites.map { |suite| _run_suite(suite, type) }
 
-      @turn_logger.finish_suite(@turn_suite)
+      turn_reporter.finish_suite(@turn_suite)
 
       return result
     end
@@ -80,20 +70,20 @@ module Turn
       # suites are cases in minitest
       @turn_case = @turn_suite.new_case(suite.name)
 
-      filter = @turn_controller.pattern || /./
+      filter = normalize_filter(@options[:filter]) || @turn_config.pattern || /./
 
-      suite.send("#{type}_methods").grep(filter).each do |test|
+      suite.send("#{type}_methods").grep(/#{filter}/).each do |test|
         @turn_case.new_test(test)
       end
 
-      @turn_logger.start_case(@turn_case)
+      turn_reporter.start_case(@turn_case)
 
       header = "#{type}_suite_header"
       puts send(header, suite) if respond_to? header
 
       assertions = @turn_case.tests.map do |test|
         @turn_test = test
-        @turn_logger.start_test(@turn_test)
+        turn_reporter.start_test(@turn_test)
 
         inst = suite.new(test.name) #method
         inst._assertions = 0
@@ -101,17 +91,17 @@ module Turn
         result = inst.run self
 
         if result == "."
-          @turn_logger.pass
+          turn_reporter.pass
         end
 
-        @turn_logger.finish_test(@turn_test)
+        turn_reporter.finish_test(@turn_test)
 
         inst._assertions
       end
 
       @turn_case.count_assertions = assertions.inject(0) { |sum, n| sum + n }
 
-      @turn_logger.finish_case(@turn_case)
+      turn_reporter.finish_case(@turn_case)
 
       return assertions.size, assertions.inject(0) { |sum, n| sum + n }
     end
@@ -120,44 +110,24 @@ module Turn
     def puke(klass, meth, err)
       case err
       when MiniTest::Skip
-        @turn_test.skip!
-        @turn_logger.skip #(e)
+        @turn_test.skip!(err)
+        turn_reporter.skip(err)
       when MiniTest::Assertion
         @turn_test.fail!(err)
-        @turn_logger.fail(err)
+        turn_reporter.fail(err)
       else
         @turn_test.error!(err)
-        @turn_logger.error(err)
+        turn_reporter.error(err)
       end
       super(klass, meth, err)
     end
 
-    # To maintain compatibility with old versions of MiniTest.
-    if ::MiniTest::Unit::VERSION < '2.0'
-
-      #attr_accessor :options
-
-      #
-      def run(args=[])
-        suites = ::MiniTest::Unit::TestCase.test_suites
-        return if suites.empty?
-
-        @test_count, @assertion_count = 0, 0
-        sync = @@out.respond_to? :"sync=" # stupid emacs
-        old_sync, @@out.sync = @@out.sync, true if sync
-
-        results = _run_suites suites, :test #type
-
-        @test_count      = results.inject(0) { |sum, (tc, _)| sum + tc }
-        @assertion_count = results.inject(0) { |sum, (_, ac)| sum + ac }
-
-        @@out.sync = old_sync if sync
-
-        return failures + errors if @test_count > 0 # or return nil...
-      rescue Interrupt
-        abort 'Interrupted'
-      end
+    private
 
+    # regex gets turned into a string literal with leading/trailing slashes
+    # so remove them
+    def normalize_filter(filter)
+      filter.sub(/^(\/)/, '').sub(/(\/)$/, '') if filter
     end
 
   end

data/lib/turn/runners/solorunner.rb

@@ -3,6 +3,5 @@ module Turn
 
   class SoloRunner < IsoRunner
   end
-
 end
 

data/lib/turn/runners/testrunner.rb

@@ -14,22 +14,20 @@ end
 
 module Turn
 
-  # = TestUnit TestRunner
+  # Turn's Test::Unit console test runner.
   #
   class TestRunner < ::Test::Unit::UI::Console::TestRunner
 
-    def initialize(controller)
-      output_level = 2 # 2-NORMAL 3-VERBOSE
+    #
+    def initialize(suite, output_level, stdout=$stdout)
+      turn_config = Turn.config
 
-      controller.loadpath.each{ |path| $: << path } unless controller.live?
-      controller.requires.each{ |path| require(path) }
+      #output_level = 2 # 2-NORMAL 3-VERBOSE
 
-      files = [controller.files].flatten
-      files.each{ |path| require(path) }   
-
-      # TODO: Better name ?
-      name = files.map{ |path| File.dirname(path).sub(Dir.pwd+'/','') }.uniq.join(',')
+      name = turn_config.suite_name
 
+      # TODO: instead of building up a new suite, filter the suite
+      # passed into initialize.
       sub_suites = []
       ObjectSpace.each_object(Class) do |klass|
         if(Test::Unit::TestCase > klass)
@@ -38,8 +36,8 @@ module Turn
       end
       suite = Test::Unit::TestSuite.new(name)
 
-      matchcase = controller.matchcase
-      pattern   = controller.pattern
+      matchcase = turn_config.matchcase
+      pattern   = turn_config.pattern
 
       if matchcase
         sub_suites = sub_suites.select{|s| matchcase =~ s.name}
@@ -50,9 +48,9 @@ module Turn
         c.tests.reject!{ |t| pattern !~ t.method_name }
       end
 
-      @t_reporter = controller.reporter
+      @t_reporter = turn_config.reporter
 
-      super(suite, output_level, $stdout)
+      super(suite, output_level, stdout)
     end
 
     # Is this needed?
@@ -168,4 +166,3 @@ module Turn
   end#class TestRunner
 
 end#module Turn
-

data/lib/turn/testunit.rb

@@ -0,0 +1,24 @@
+module Turn
+
+  # For TestUnit 1.x, completely outdated.
+  def self.bootstrap_legacy(autorun=false)
+    require 'fileutils'
+
+    require 'turn/version'
+    require 'turn/autoload'
+    require 'turn/configuration'
+    require 'turn/colorize'
+    require 'turn/components'
+    require 'turn/controller'
+
+    require 'test/unit'
+    require 'turn/runners/testrunner'
+
+    # need to turn this off unless autorun mode
+    Test::Unit.run = autorun
+  end
+
+end
+
+Turn.bootstrap_legacy(true)
+

data/lib/turn/version.rb

@@ -1,3 +1,3 @@
 module Turn
-  VERSION = "0.8.2"
+  VERSION = "0.9.7"
 end

data/lib/turn.rb

@@ -1,19 +1,14 @@
 module Turn
-  # Returns +true+ if the ruby version supports minitest.
-  # Otherwise, +false+ is returned.
-  def self.minitest?
-    RUBY_VERSION >= '1.9'
-  end
 end
 
-unless defined?(Turn::Command)
-  if Turn.minitest?
-    require 'turn/autorun/minitest'
-    MiniTest::Unit.autorun
-  else
-    require 'turn/autorun/testunit'
-  end
-  #autoload :Test,     'turn/autorun/testunit'
-  #autoload :MiniTest, 'turn/autorun/minitest'
-end
+require 'fileutils'
+
+require 'turn/version'
+require 'turn/autoload'
+require 'turn/configuration'
+require 'turn/colorize'
+require 'turn/components'
+require 'turn/controller'
+require 'turn/command'
+require 'turn/minitest'
 

data/test/helper.rb

@@ -1,19 +1,42 @@
+$:.unshift './lib'
+
+#require 'turn/colorize'
 require 'fileutils'
 
 if RUBY_VERSION < "1.9"
   require 'test/unit'
 else
+  gem 'minitest'
   require 'minitest/unit'
+  require 'test/unit'
 end
 
+require 'turn'
+
+#
+#Turn.config.format = :pretty
+
 #
 def turn(*args)
-  `ruby -Ilib bin/turn -Ilib #{args.join(' ')} 2>&1`
+  if RUBY_VERSION < '1.9'
+    `ruby1.8 -Ilib bin/turn -Ilib #{args.join(' ')} 2>&1`
+  else
+    `ruby -Ilib bin/turn -Ilib #{args.join(' ')} 2>&1`
+  end
 end
 
 #
 def turn2(*args)
-  `ruby -Ilib bin/turn -Ilib #{args.join(' ')}`
+  if RUBY_VERSION < '1.9'
+    `ruby1.8 -Ilib bin/turn -Ilib #{args.join(' ')}`
+  else
+    `ruby -Ilib bin/turn -Ilib #{args.join(' ')}`
+  end
+end
+
+#
+def turn_with_term(term, *args)
+  `TERM="#{term}" ruby -Ilib bin/turn -Ilib #{args.join(' ')} 2>&1`
 end
 
 #
@@ -30,10 +53,24 @@ end
   save_test(text, name)
 end
 
+#
+def setup_testunit(required=false, name=nil)
+  text = ''
+  text << "require '#{required}'\n" if required
+  text << <<-HERE
+class TestTest < Test::Unit::TestCase
+#{standard_test_body}
+end
+  HERE
+  #name = framwwork.downcase
+  #name = name + '_required' if requires
+  save_test(text, name)
+end
+
 #
 def save_test(text, name=nil)
   file = File.join('tmp', name || 'test.rb')
-  FileUtils.mkdir_p('tmp')
+  FileUtils.mkdir_p('tmp') unless File.directory?('tmp')
   File.open(file, 'w'){ |f| f << text }
   return file
 end
@@ -65,7 +102,7 @@ HERE
 end
 
 #
-def setup_outline_test
+def setup_testunit_outline
   text = <<-HERE
 class OutlineTest < Test::Unit::TestCase
   def test_sample_pass
@@ -81,11 +118,31 @@ end
   save_test(text, 'outline_test.rb')
 end
 
+def setup_minispec
+  text = <<-HERE
+require 'turn'
+require 'minitest/autorun'
+
+describe 'multiple tests' do
+  it 'should pass' do
+    assert true
+  end
+
+  it 'should fail' do
+    assert false
+  end
+end
+  HERE
+  save_test(text, 'minispec_test.rb')
+end
+
 #
 def setup_minitest_autorun
   text = <<-HERE
-require 'minitest/unit'
+require 'turn'
+MiniTest::Unit.runner = Turn::MiniRunner.new
 MiniTest::Unit.autorun
+#require 'minitest/unit'
 class TestTest < MiniTest::Unit::TestCase
   def test_sample_pass
     assert_equal(1,1)
@@ -95,3 +152,22 @@ end
   save_test(text, 'minitest_autorun_test.rb')
 end
 
+
+def setup_minitest_autorun_with_trace
+  text = <<-HERE
+#require 'minitest/unit'
+#require 'rubygems'
+require 'turn'
+MiniTest::Unit.runner = Turn::MiniRunner.new
+MiniTest::Unit.autorun
+Turn.config do |c|
+  c.trace = 1
+end
+class TestTest < MiniTest::Unit::TestCase
+  def test_sample_pass
+    assert_equal(0,1)
+  end
+end
+  HERE
+  save_test(text, 'minitest_autorun_test_with_fail.rb')
+end

data/test/reporter_test.rb

@@ -0,0 +1,35 @@
+require File.expand_path(File.dirname(__FILE__)) + '/helper.rb'
+require File.expand_path(File.dirname(__FILE__) + '/..') + '/lib/turn/reporter'
+
+class TestReporter < Turn::Reporter
+end
+
+class TestReporters < Test::Unit::TestCase
+  def test_unit_test_files_are_not_filtered_out_if_ending_in_test
+    reporter = TestReporter.new(nil)
+    
+    # If you follow the convention of naming your test files with _test.rb, do not filter that
+    # test file from the stack trace
+    filtered_lines = ["/Users/testman/.rvm/rubies/ruby-1.9.3-p0/lib/ruby/1.9.1/test/unit/assertions.rb:185:in `assert_equal'"]
+    unfiltered_lines = ["/Users/testman/source/campaign_manager/test/unit/omg_test.rb:145:in `block in <class:OmgTest>'", 
+      "/Users/testman/source/campaign_manager/app/models/omg.rb:145:in `in double_rainbows'" ]
+    stack_trace = filtered_lines + unfiltered_lines
+
+    assert_equal unfiltered_lines, reporter.send(:filter_backtrace, stack_trace)
+  end
+
+  def test_unit_test_files_are_not_filtered_out_if_file_name_starts_with_test_underscore
+    reporter = TestReporter.new(nil)
+    
+    # If you follow the convention of naming your test files with _test.rb, do not filter that
+    # test file from the stack trace
+    filtered_lines = ["/Users/testman/.rvm/rubies/ruby-1.9.3-p0/lib/ruby/1.9.1/test/unit/assertions.rb:185:in `assert_equal'"]
+    unfiltered_lines = ["/Users/testman/source/campaign_manager/test/unit/test_omgs.rb:145:in `block in <class:OmgTest>'", 
+      "/Users/testman/source/campaign_manager/app/models/omg.rb:145:in `in double_rainbows'" ]
+    stack_trace = filtered_lines + unfiltered_lines
+
+    assert_equal unfiltered_lines, reporter.send(:filter_backtrace, stack_trace)
+  end
+
+
+end