ZenTest 3.11.1 → 4.0.0

data/lib/zentest.rb

@@ -20,14 +20,10 @@ end
 $ZENTEST = true
 $TESTING = true
 
-require 'test/unit/testcase' # helps required modules
-
 class Module
-
   def zentest
     at_exit { ZenTest.autotest(self) }
   end
-
 end
 
 ##
@@ -56,7 +52,7 @@ end
 
 class ZenTest
 
-  VERSION = '3.11.1'
+  VERSION = '4.0.0'
 
   include ZenTestMapping
 
@@ -120,7 +116,7 @@ class ZenTest
   end
 
   # Get the public instance, class and singleton methods for
-  # class klass. If full is true, include the methods from 
+  # class klass. If full is true, include the methods from
   # Kernel and other modules that get included.  The methods
   # suite, new, pretty_print, pretty_print_cycle will not
   # be included in the resuting array.
@@ -207,7 +203,7 @@ class ZenTest
     return name
   end
 
-  # Does all the work of finding a class by name, 
+  # Does all the work of finding a class by name,
   # obtaining its methods and those of its superclass.
   # The full parameter determines if all the methods
   # including those of Object and mixed in modules
@@ -422,7 +418,7 @@ class ZenTest
     end # @klasses[klassname]
   end
 
-  def test_to_normal(name, klassname=nil)
+  def test_to_normal(_name, klassname=nil)
     super do |name|
       if defined? @inherited_methods then
         known_methods = (@inherited_methods[klassname] || {}).keys.sort.reverse
@@ -449,7 +445,7 @@ class ZenTest
     meth.push indentunit*indent + "end"
     return meth
   end
-   
+
   # Walk each known class and test that each method has
   # a test method
   # Then do it in the other direction...

data/test/test_autotest.rb

@@ -2,8 +2,9 @@
 
 $TESTING = true
 
-require 'test/unit/testcase'
-require 'test/unit' if $0 == __FILE__
+require 'rubygems'
+require 'minitest/autorun'
+
 require 'stringio'
 require 'autotest'
 
@@ -25,7 +26,7 @@ class Autotest
   end
 end
 
-class TestAutotest < Test::Unit::TestCase
+class TestAutotest < MiniTest::Unit::TestCase
 
   def deny test, msg=nil
     if msg then
@@ -296,7 +297,7 @@ test_error2(#{@test_class}):
     assert_equal empty, @a.files_to_test
 
     s3 = '
-/opt/bin/ruby -I.:lib:test -rtest/unit -e "%w[#{@test}].each { |f| require f }" | unit_diff -u
+/opt/bin/ruby -I.:lib:test -rubygems -e "%w[test/unit #{@test}].each { |f| require f }" | unit_diff -u
 -e:1:in `require\': ./#{@test}:23: parse error, unexpected tIDENTIFIER, expecting \'}\' (SyntaxError)
     settings_fields.each {|e| assert_equal e, version.send e.intern}
                                                             ^   from -e:1
@@ -357,7 +358,7 @@ test_error2(#{@test_class}):
       'test/test_fooby.rb' => [ 'test_something1', 'test_something2' ]
     }
 
-    expected = [ "#{RUBY} -I.:lib:test -rtest/unit -e \"%w[#{@test}].each { |f| require f }\" | unit_diff -u",
+    expected = [ "#{RUBY} -I.:lib:test -rubygems -e \"%w[test/unit #{@test}].each { |f| require f }\" | unit_diff -u",
                  "#{RUBY} -I.:lib:test test/test_fooby.rb -n \"/^(test_something1|test_something2)$/\" | unit_diff -u" ].join("; ")
 
     result = @a.make_test_cmd f
@@ -402,6 +403,16 @@ test_error2(#{@test_class}):
     assert_equal [], @a.test_files_for('test_unknown.rb')
   end
 
+  def test_testlib
+    assert_equal "test/unit", @a.testlib
+
+    @a.testlib = "MONKEY"
+    assert_equal "MONKEY", @a.testlib
+
+    f = { @test => [], "test/test_fooby.rb" => %w(first second) }
+    assert_match @a.testlib, @a.make_test_cmd(f)
+  end
+
   def util_exceptions
     @a.exception_list.sort_by { |r| r.to_s }
   end

data/test/test_focus.rb

@@ -0,0 +1,35 @@
+require 'rubygems'
+require 'minitest/autorun'
+require 'focus'
+
+class TestFocus < MiniTest::Unit::TestCase
+  def setup
+    @x = 1
+  end
+
+  def teardown
+    assert_equal 2, @x
+  end
+
+  def test_focus
+    @x += 1
+  end
+
+  def test_ignore1
+    flunk "ignore me!"
+  end
+
+  def test_ignore2
+    flunk "ignore me!"
+  end
+
+  def test_ignore3
+    flunk "ignore me!"
+  end
+
+  def test_focus2
+    @x += 1
+  end
+
+  focus :test_focus, :test_focus2
+end

data/test/test_unit_diff.rb

@@ -1,13 +1,15 @@
 #!/usr/local/bin/ruby -w
 
-require 'test/unit'
+require 'rubygems'
+require 'minitest/autorun'
+
 require 'stringio'
 
 $TESTING = true
 
 require 'unit_diff'
 
-class TestUnitDiff < Test::Unit::TestCase
+class TestUnitDiff < MiniTest::Unit::TestCase
 
   def setup
     @diff = UnitDiff.new

data/test/test_zentest.rb

@@ -1,14 +1,13 @@
 #!/usr/local/bin/ruby -w
 
-if defined? RUBY_ENGINE then
-  warn "rubinius does not support features required by zentest. Skipping tests"
-  return
-end
-
-require 'test/unit' unless defined? $ZENTEST and $ZENTEST
+abort "rubinius does not support features required by zentest" if
+  defined?(RUBY_ENGINE) && RUBY_ENGINE =~ /rbx/
 
 $TESTING = true
 
+require 'rubygems'
+require 'minitest/autorun'
+
 # I do this so I can still run ZenTest against the tests and itself...
 require 'zentest' unless defined? $ZENTEST
 
@@ -140,12 +139,7 @@ end
 
 class TestTrueClass; end
 
-class TestZenTest < Test::Unit::TestCase
-  unless defined? Mini then
-    alias :refute_nil :assert_not_nil
-  end
-
-
+class TestZenTest < MiniTest::Unit::TestCase
   def setup
     @tester = ZenTest.new()
   end

data/test/test_zentest_mapping.rb

@@ -1,7 +1,8 @@
-require 'test/unit' unless defined? $ZENTEST and $ZENTEST
-
 $TESTING = true
 
+require 'rubygems'
+require 'minitest/autorun'
+
 require 'zentest_mapping' unless defined? $ZENTEST
 
 class Dummy
@@ -9,7 +10,7 @@ class Dummy
   include ZenTestMapping
 end
 
-class TestZentestMapping < Test::Unit::TestCase
+class TestZentestMapping < MiniTest::Unit::TestCase
   def setup
     @tester = Dummy.new
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ZenTest
 version: !ruby/object:Gem::Version 
-  version: 3.11.1
+  version: 4.0.0
 platform: ruby
 authors: 
 - Ryan Davis
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-20 00:00:00 -08:00
+date: 2009-03-02 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,7 +21,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.2
+        version: 1.9.0
     version: 
 description: "ZenTest provides 4 different tools and 1 library: zentest, unit_diff, autotest, multiruby, and Test::Rails.  ZenTest scans your target and unit-test code and writes your missing code based on simple naming rules, enabling XP at a much quicker pace. ZenTest only works with Ruby and Test::Unit.  unit_diff is a command-line filter to diff expected results from actual results and allow you to quickly see exactly what is wrong.  autotest is a continous testing facility meant to be used during development. As soon as you save a file, autotest will run the corresponding dependent tests.  multiruby runs anything you want on multiple versions of ruby. Great for compatibility checking! Use multiruby_setup to manage your installed versions.  Test::Rails helps you build industrial-strength Rails code."
 email: 
@@ -29,9 +29,9 @@ email:
 - drbrain@segment7.net
 executables: 
 - autotest
+- multigem
 - multiruby
 - multiruby_setup
-- rails_test_audit
 - unit_diff
 - zentest
 extensions: []
@@ -43,6 +43,7 @@ extra_rdoc_files:
 - articles/how_to_use_zentest.txt
 - example.txt
 files: 
+- .autotest
 - History.txt
 - Manifest.txt
 - README.txt
@@ -51,9 +52,9 @@ files:
 - articles/getting_started_with_autotest.html
 - articles/how_to_use_zentest.txt
 - bin/autotest
+- bin/multigem
 - bin/multiruby
 - bin/multiruby_setup
-- bin/rails_test_audit
 - bin/unit_diff
 - bin/zentest
 - example.txt
@@ -82,35 +83,19 @@ files:
 - lib/autotest/rcov.rb
 - lib/autotest/redgreen.rb
 - lib/autotest/restart.rb
-- lib/autotest/screen.rb
 - lib/autotest/shame.rb
 - lib/autotest/snarl.rb
 - lib/autotest/timestamp.rb
+- lib/focus.rb
 - lib/functional_test_matrix.rb
 - lib/multiruby.rb
-- lib/test/rails.rb
-- lib/test/rails/controller_test_case.rb
-- lib/test/rails/functional_test_case.rb
-- lib/test/rails/helper_test_case.rb
-- lib/test/rails/ivar_proxy.rb
-- lib/test/rails/pp_html_document.rb
-- lib/test/rails/rake_tasks.rb
-- lib/test/rails/render_tree.rb
-- lib/test/rails/test_case.rb
-- lib/test/rails/view_test_case.rb
-- lib/test/zentest_assertions.rb
 - lib/unit_diff.rb
 - lib/zentest.rb
 - lib/zentest_mapping.rb
 - test/test_autotest.rb
-- test/test_help.rb
-- test/test_rails_autotest.rb
-- test/test_rails_controller_test_case.rb
-- test/test_rails_helper_test_case.rb
-- test/test_rails_view_test_case.rb
+- test/test_focus.rb
 - test/test_unit_diff.rb
 - test/test_zentest.rb
-- test/test_zentest_assertions.rb
 - test/test_zentest_mapping.rb
 has_rdoc: true
 homepage: http://www.zenspider.com/ZSS/Products/ZenTest/
@@ -141,12 +126,7 @@ specification_version: 2
 summary: "ZenTest provides 4 different tools and 1 library: zentest, unit_diff, autotest, multiruby, and Test::Rails"
 test_files: 
 - test/test_autotest.rb
-- test/test_help.rb
-- test/test_rails_autotest.rb
-- test/test_rails_controller_test_case.rb
-- test/test_rails_helper_test_case.rb
-- test/test_rails_view_test_case.rb
+- test/test_focus.rb
 - test/test_unit_diff.rb
 - test/test_zentest.rb
-- test/test_zentest_assertions.rb
 - test/test_zentest_mapping.rb

data/bin/rails_test_audit

@@ -1,80 +0,0 @@
-#!/usr/local/bin/ruby -w
-
-# TODO: Probably has dup code with ZenTest.
-# TODO: Map controller assert_assigns to view test ivar assignments.
-# TODO: Make this a rake task, rake test:audit.
-
-# test_cases[test_case][test][ivar] = value
-def build_test_cases(type)
-  test_cases = Hash.new { |h,k|
-    h[k] = Hash.new { |h,k|
-      h[k] = Hash.new { |h,k|
-        h[k] = {} } } }
-
-  test_case = nil
-  test = nil
-
-  fixtures = Hash.new { |h,k| h[k] = [] }
-
-  Dir["test/#{type}/*rb"].each do |test|
-    File.open test do |fp|
-      fp.each_line do |line|
-        case line
-        when /^class (.*)(View|Controller)Test </
-          test_case = $1
-        when /^\s+def (test_\S+)/
-          test = $1
-        when /^\s+controller\[(.+?)\] = (.*)$/,
-             /^\s+assert_assigned (.*?), (.*)/
-          ivar = $1
-          value = $2
-          test_cases[test_case][test][ivar] = value
-        when /fixtures (.*)/ then
-          fixtures[test_case].push(*$1.split(', '))
-        end
-      end
-    end
-  end
-
-  return test_cases, fixtures
-end
-
-view_test_cases, view_fixtures = build_test_cases 'views'
-controller_test_cases, controller_fixtures = build_test_cases 'controller'
-
-out = []
-
-view_test_cases.sort_by { |tc,_| tc }.each do |test_case, tests|
-  out << "require 'test/test_helper'"
-  out << nil
-  out << "class #{test_case}ControllerTest < Test::Rails::ControllerTestCase"
-  out << nil
-
-  fixtures = controller_fixtures[test_case] - view_fixtures[test_case]
-
-  unless fixtures.empty? then
-    fixtures.each do |fixture|
-      out << "  fixtures #{fixture}"
-    end
-    out << nil
-  end
-
-  tests.sort_by { |t,_| t }.each do |test, ivars|
-    ivars = view_test_cases[test_case][test].keys -
-            controller_test_cases[test_case][test].keys
-
-    next if ivars.empty?
-
-    out << "  def #{test}"
-    ivars.sort.each do |ivar|
-      value = view_test_cases[test_case][test][ivar]
-      out << "    assert_assigned #{ivar}, #{value}"
-    end
-    out << "  end"
-    out << nil
-  end
-  out << "end"
-  out << nil
-end
-
-puts out.join("\n")

data/lib/autotest/screen.rb

@@ -1,73 +0,0 @@
-##
-# Autotest::Screen is test result notify GNU Screen's statusline.
-#
-# === screenshots
-# * <img src="http://f.hatena.ne.jp/images/fotolife/s/secondlife/20061109/20061109015543.png" />
-# * <img src="http://f.hatena.ne.jp/images/fotolife/s/secondlife/20061109/20061109015522.png" />
-#
-# == SYNOPSIS
-#   require 'autotest/screen'
-#   # Autotest::Screen.statusline = '%H %`%-w%{=b bw}%n %t%{-}%+w (your statusline)'
-#
-
-class Autotest::Screen
-  DEFAULT_STATUSLINE = '%H %`%-w%{=b bw}%n %t%{-}%+w'
-  DEFAULT_SCREEN_CMD = 'screen'
-
-  SCREEN_COLOR = {
-    :black => 'dd',
-    :green => 'gk',
-    :red   => 'rw',
-  }
-
-  def self.message(msg, color = :black)
-    col = SCREEN_COLOR[color]
-    msg = %Q[ %{=b #{col}} #{msg} %{-}]
-    send_cmd(msg)
-  end
-
-  def self.clear
-    send_cmd('')
-  end
-
-  def self.run_screen_session?
-    str = `#{screen_cmd} -ls`
-    str.match(/(\d+) Socket/) && ($1.to_i > 0)
-  end
-
-  def self.execute?
-    !($TESTING || !run_screen_session?)
-  end
-
-  @statusline, @screen_cmd = nil
-  def self.statusline; @statusline || DEFAULT_STATUSLINE.dup; end
-  def self.statusline=(a); @statusline = a; end
-  def self.screen_cmd; @screen_cmd || DEFAULT_SCREEN_CMD.dup; end
-  def self.screen_cmd=(a); @screen_cmd = a; end
-
-  def self.send_cmd(msg)
-    cmd = %(#{screen_cmd} -X eval 'hardstatus alwayslastline "#{(statusline + msg).gsub('"', '\"')}"') #' stupid ruby-mode
-    system cmd
-  end
-
-  Autotest.add_hook :run do  |at|
-    message 'Run Tests' if execute?
-  end
-
-  Autotest.add_hook :quit do |at|
-    clear if execute?
-  end
-
-  Autotest.add_hook :ran_command do |at|
-    if execute? then
-      output = at.results.join
-      failed = output.scan(/^\s+\d+\) (?:Failure|Error):\n(.*?)\((.*?)\)/)
-      if failed.size == 0 then
-        message "All Green", :green
-      else
-        f,e = failed.partition { |s| s =~ /Failure/ }
-        message "Red F:#{f.size} E:#{e.size}", :red
-      end
-    end
-  end
-end