miniunit 1.2.0 → 1.2.1

data/History.txt

@@ -1,3 +1,15 @@
+=== 1.2.1 / 2008-06-10
+
+* 7 minor enhancements:
+
+  * Added deprecations everywhere in test/unit.
+  * Added test_order to TestCase. :random on mini, :sorted on test/unit (for now).
+  * Big cleanup in test/unit for rails. Thanks Jeremy Kemper!
+  * Minor readability cleanup.
+  * Pushed setup/run/teardown down to testcase allowing specialized testcases.
+  * Removed pp. Tests run 2x faster. :/
+  * Renamed deprecation methods and moved to test/unit/deprecate.rb.
+
 === 1.2.0 / 2008-06-09
 
 * 2 major enhancements:

data/Manifest.txt

@@ -9,6 +9,7 @@ lib/mini/spec.rb
 lib/mini/test.rb
 lib/test/unit.rb
 lib/test/unit/assertions.rb
+lib/test/unit/deprecate.rb
 lib/test/unit/error.rb
 lib/test/unit/testcase.rb
 test/test_mini_mock.rb

data/lib/mini/spec.rb

@@ -32,7 +32,8 @@ class Module
 end
 
 Object.infect_with_assertions(:must, :wont,
-                              /^(must|wont)$|wont_(throw)|must_(block|not?_|nothing)/,
+                              /^(must|wont)$|wont_(throw)|
+                                 must_(block|not?_|nothing|raise$)/x,
                               /(must_throw)s/                 => '\1',
                               /(?!not)_same/                  => '_be_same_as',
                               /_in_/                          => '_be_within_',

data/lib/mini/test.rb

@@ -36,15 +36,8 @@ module Mini
   end
 
   module Assertions
-    begin
-      require 'pp'
-      def mu_pp(obj)
-        PP.pp(obj, '').chomp
-      end
-    rescue LoadError
-      def mu_pp(obj)
-        obj.inspect
-      end
+    def mu_pp(obj)
+      obj.inspect
     end
 
     def _assertions= n
@@ -284,7 +277,7 @@ module Mini
   end
 
   class Test
-    VERSION = "1.2.0"
+    VERSION = "1.2.1"
 
     attr_reader :report, :failures, :errors
 
@@ -366,19 +359,9 @@ module Mini
           inst = suite.new test
           inst._assertions = 0
           @@out.puts "\n#{test}: " if $DEBUG
-          result = '.'
-          begin
-            inst.setup
-            inst.__send__ test
-          rescue Exception => e
-            result = puke(suite, test, e)
-          ensure
-            begin
-              inst.teardown
-            rescue Exception => e
-              result = puke(suite, test, e)
-            end
-          end
+
+          result = inst.run(self)
+
           @@out.print result
           @@out.puts if $DEBUG
           @test_count += 1
@@ -392,6 +375,23 @@ module Mini
     class TestCase
       attr_reader :name
 
+      def run runner
+        result = '.'
+        begin
+          self.setup
+          self.__send__ self.name
+        rescue Exception => e
+          result = runner.puke(self.class, self.name, e)
+        ensure
+          begin
+            self.teardown
+          rescue Exception => e
+            result = runner.puke(self.class, self.name, e)
+          end
+        end
+        result
+      end
+
       def initialize name
         @name = name
       end
@@ -406,12 +406,25 @@ module Mini
         @@test_suites[klass] = true
       end
 
+      def self.test_order
+        :random
+      end
+
       def self.test_suites
         @@test_suites.keys.sort_by { |ts| ts.name }
       end
 
       def self.test_methods
-        public_instance_methods(true).grep(/^test/).sort.map { |m| m.to_s }
+        methods = public_instance_methods(true).grep(/^test/).map { |m|
+          m.to_s
+        }.sort
+
+        if self.test_order == :random then
+          max = methods.size
+          methods = methods.sort_by { rand(max) }
+        end
+
+        methods
       end
 
       def setup; end

data/lib/test/unit.rb

@@ -1,21 +1,4 @@
 require 'mini/test'
-
-module Test
-  module Unit # was ::Mini::Test, but rails' horrid code forced my hand
-    if defined? TestCase then
-      warn "ARGH! someone defined Test::Unit::TestCase rather than requiring"
-      remove_const :TestCase
-    end
-
-    TestCase             = ::Mini::Test::TestCase
-    AssertionFailedError = ::Mini::Assertion
-
-    class TestCase
-      alias :method_name :name # so lame
-    end
-  end
-end
-
-require 'test/unit/assertions' # brings in deprecated methods
+require 'test/unit/testcase' # pull in deprecated functionality
 
 Mini::Test.autorun

data/lib/test/unit/assertions.rb

@@ -1,15 +1,17 @@
 require 'mini/test'
-require 'test/unit'
+require 'test/unit/deprecate'
 
+module Test; end
 module Test::Unit # patch up bastards that that extend improperly.
   if defined? Assertions then
     warn "ARGH! someone defined Test::Unit::Assertions rather than requiring"
     CRAP_ASSERTIONS = Assertions
     remove_const :Assertions
 
+    # this will break on junit and rubinius... *sigh*
     ObjectSpace.each_object(Module) do |offender|
       offender.send :include, ::Mini::Assertions if offender < CRAP_ASSERTIONS
-    end rescue :fuck_you_then!
+    end rescue nil
 
     Test::Unit::TestCase.send :include, CRAP_ASSERTIONS
   end
@@ -17,55 +19,31 @@ module Test::Unit # patch up bastards that that extend improperly.
   Assertions = ::Mini::Assertions
 
   module Assertions
-    def self.included x
-      x.send :include, Test::Unit::CRAP_ASSERTIONS
+    def self.included mod
+      mod.send :include, Test::Unit::CRAP_ASSERTIONS
     end if defined? Test::Unit::CRAP_ASSERTIONS
   end
 end
 
-class Module # define deprecation api
-  DEPS = Hash.new { |h,k| h[k] = {} }
-
-  def deprecation_warning old, new = nil, kaller = nil
-    kaller ||= caller[1]
-    unless DEPS[old][kaller] then
-      msg = "#{self}##{old} deprecated. "
-      msg += new ? "Use ##{new}" : "No replacement is provided"
-      msg += ". From #{kaller}."
-      warn msg
-    end
-    DEPS[old][kaller] = true
-  end
-
-  def deprecate old, new
-    class_eval <<-EOM
-      def #{old} *args, &block
-        cls, clr = self.class, caller.first
-        self.class.deprecation_warning #{old.inspect}, #{new.inspect}, clr
-        #{new}(*args, &block)
-      end
-    EOM
-  end
-end
-
 module Test::Unit
   module Assertions # deprecations
-    deprecate :assert_nothing_thrown, :assert_nothing_raised # drop 2009-06-01
-    deprecate :assert_raise,          :assert_raises         # drop 2010-06-01
-    deprecate :assert_not_equal,      :refute_equal          # drop 2009-06-01
-    deprecate :assert_no_match,       :refute_match          # drop 2009-06-01
-    deprecate :assert_not_nil,        :refute_nil            # drop 2009-06-01
-    deprecate :assert_not_same,       :refute_same           # drop 2009-06-01
-
-    def assert_nothing_raised _ = :ignored                   # drop 2009-06-01
-      self.class.deprecation_warning :assert_nothing_raised
+    tu_deprecate :assert_nothing_thrown, :assert_nothing_raised # 2009-06-01
+    tu_deprecate :assert_raise,          :assert_raises         # 2010-06-01
+    tu_deprecate :assert_not_equal,      :refute_equal          # 2009-06-01
+    tu_deprecate :assert_no_match,       :refute_match          # 2009-06-01
+    tu_deprecate :assert_not_nil,        :refute_nil            # 2009-06-01
+    tu_deprecate :assert_not_same,       :refute_same           # 2009-06-01
+
+    def assert_nothing_raised _ = :ignored                      # 2009-06-01
+      self.class.tu_deprecation_warning :assert_nothing_raised
       self._assertions += 1
       yield
     rescue => e
       raise Mini::Assertion, exception_details(e, "Exception raised:")
     end
 
-    def build_message(user_message, template_message, *args) # drop 2009-06-01
+    def build_message(user_message, template_message, *args)    # 2009-06-01
+      self.class.tu_deprecation_warning :build_message
       user_message ||= ''
       user_message += ' ' unless user_message.empty?
       msg = template_message.split(/<\?>/).zip(args.map { |o| o.inspect })

data/lib/test/unit/deprecate.rb

@@ -0,0 +1,24 @@
+class Module # define deprecation api
+  DEPS = Hash.new { |h,k| h[k] = {} }
+
+  def tu_deprecation_warning old, new = nil, kaller = nil
+    kaller ||= caller[1]
+    unless DEPS[old][kaller] then
+      msg = "#{self}##{old} deprecated. "
+      msg += new ? "Use ##{new}" : "No replacement is provided"
+      msg += ". From #{kaller}."
+      warn msg
+    end
+    DEPS[old][kaller] = true
+  end
+
+  def tu_deprecate old, new
+    class_eval <<-EOM
+      def #{old} *args, &block
+        cls, clr = self.class, caller.first
+        self.class.tu_deprecation_warning #{old.inspect}, #{new.inspect}, clr
+        #{new}(*args, &block)
+      end
+    EOM
+  end
+end

data/lib/test/unit/error.rb

@@ -1,7 +1,10 @@
+require 'test/unit/deprecate'
+
 # rails currently needs this file and this one method.
 module Test::Unit
   class Error
     def message
+      self.class.tu_deprecation_warning :message # 2009-06-01
       "you're a loser"
     end
   end

data/lib/test/unit/testcase.rb

@@ -1,2 +1,25 @@
-# don't define anything, this is just so we don't get the real one
-warn "require 'test/unit/testcase' has been deprecated"
+require 'mini/test'
+require 'test/unit/deprecate'
+
+warn "require 'test/unit/testcase' has been deprecated" unless
+  caller.first =~ /test.unit.rb/
+
+module Test; end
+module Test::Unit # was ::Mini::Test, but rails' horrid code forced my hand
+  if defined? TestCase then
+    warn "ARGH! someone defined Test::Unit::TestCase rather than requiring"
+    remove_const :TestCase
+  end
+
+  AssertionFailedError = ::Mini::Assertion
+
+  class TestCase < ::Mini::Test::TestCase
+    tu_deprecate :method_name, :name # 2009-06-01
+
+    def self.test_order              # 2009-06-01
+      :sorted
+    end
+  end
+end
+
+require 'test/unit/assertions' # brings in deprecated methods

data/test/test_mini_test.rb

@@ -11,6 +11,7 @@ end
 class TestMiniTest < Mini::Test::TestCase
 
   def setup
+    srand 42
     Mini::Test::TestCase.reset
     @tu = Mini::Test.new
     @output = StringIO.new("")
@@ -162,6 +163,8 @@ Finished in 0.00
           assert true
         end
         #{if options[:failing]; "def test_failure; assert false; end"; end}
+
+        test_order = :sorted # helps the tests stay clean
       end
     CODE
   end
@@ -465,14 +468,6 @@ class TestMiniTestTestCase < Mini::Test::TestCase
     assert_equal "bye!\n", err
   end
 
-  def test_message
-    @assertion_count = 0
-
-    assert_equal "blah2.",         @tc.message(nil,     "blah2")
-    assert_equal "blah2.",         @tc.message("",      "blah2")
-    assert_equal "blah1.\nblah2.", @tc.message("blah1", "blah2")
-  end
-
   def test_flunk
     util_assert_triggered 'Epic Fail!' do
       @tc.flunk
@@ -485,21 +480,61 @@ class TestMiniTestTestCase < Mini::Test::TestCase
     end
   end
 
+  def test_message
+    @assertion_count = 0
+
+    assert_equal "blah2.",         @tc.message(nil,     "blah2")
+    assert_equal "blah2.",         @tc.message("",      "blah2")
+    assert_equal "blah1.\nblah2.", @tc.message("blah1", "blah2")
+  end
+
   def test_pass
     @tc.pass
   end
 
-  def test_test_methods
+  def test_test_methods_sorted
     @assertion_count = 0
 
-    # TODO: remove
     sample_test_case = util_test_case
+
+    class << sample_test_case
+      def test_order; :sorted end
+    end
+
     sample_test_case.instance_eval do
-      define_method :test_one_test do
-        assert "does not matter"
-      end
+      define_method :test_test3 do assert "does not matter" end
+      define_method :test_test2 do assert "does not matter" end
+      define_method :test_test1 do assert "does not matter" end
     end
-    assert_equal(%w(test_one_test), sample_test_case.test_methods)
+
+    expected = %w(test_test1 test_test2 test_test3)
+    assert_equal expected, sample_test_case.test_methods
+  end
+
+  def test_test_methods_random
+    @assertion_count = 0
+
+    sample_test_case = util_test_case
+
+    class << sample_test_case
+      def test_order; :random end
+    end
+
+    sample_test_case.instance_eval do
+      define_method :test_test1 do assert "does not matter" end
+      define_method :test_test2 do assert "does not matter" end
+      define_method :test_test3 do assert "does not matter" end
+    end
+
+    srand 42
+    expected = %w(test_test1 test_test2 test_test3)
+    max = expected.size
+    expected = expected.sort_by { rand(max) }
+
+    srand 42
+    result = sample_test_case.test_methods
+
+    assert_equal expected, result
   end
 
   def test_refute

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: miniunit
 version: !ruby/object:Gem::Version 
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors: 
 - Ryan Davis
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-09 00:00:00 -07:00
+date: 2008-06-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,6 +44,7 @@ files:
 - lib/mini/test.rb
 - lib/test/unit.rb
 - lib/test/unit/assertions.rb
+- lib/test/unit/deprecate.rb
 - lib/test/unit/error.rb
 - lib/test/unit/testcase.rb
 - test/test_mini_mock.rb