From 852dc6d663a934aa30b4b526dcbb60394ae7d50d Mon Sep 17 00:00:00 2001
From: ryan <ryan@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 30 Sep 2008 06:57:34 +0000
Subject: Updated miniunit to 4257. This cleans all my tests when run in
 isolation. I still have failures when run with everything else

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19639 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                   |  4 ++--
 lib/mini/mock.rb            |  6 +++---
 lib/mini/test.rb            | 14 +++++++-------
 test/mini/test_mini_test.rb | 20 +++++++++++++++-----
 4 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 015232c5f7..76f389041c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,8 +5,8 @@ Tue Sep 30 13:19:01 2008  Eric Hodel  <drbrain@segment7.net>
 
 Tue Sep 30 13:04:11 2008  Ryan Davis  <ryand-ruby@zenspider.com>
 
-	* lib/mini/test.rb: Updated to 1.3.0 r4256.
-	* test/mini/*: added from r4255.
+	* lib/mini/test.rb: Updated to 1.3.0 r4257.
+	* test/mini/*: added from r4257.
 
 Tue Sep 30 07:46:07 2008  Eric Hodel  <drbrain@segment7.net>
 
diff --git a/lib/mini/mock.rb b/lib/mini/mock.rb
index 7276125408..1b79146cb3 100644
--- a/lib/mini/mock.rb
+++ b/lib/mini/mock.rb
@@ -17,9 +17,9 @@ class Mini::Mock
   def expect(name, retval, args=[])
     n, r, a = name, retval, args # for the closure below
     @expected_calls[name] = { :retval => retval, :args => args }
-    self.class.__send__(:define_method, name) { |*a|
-      raise ArgumentError unless @expected_calls[n][:args].size == a.size
-      @actual_calls[n] << { :retval => r, :args => a }
+    self.class.__send__(:define_method, name) { |*x|
+      raise ArgumentError unless @expected_calls[n][:args].size == x.size
+      @actual_calls[n] << { :retval => r, :args => x }
       retval
     }
     self
diff --git a/lib/mini/test.rb b/lib/mini/test.rb
index 1d76b40974..35a8df4a34 100644
--- a/lib/mini/test.rb
+++ b/lib/mini/test.rb
@@ -14,13 +14,15 @@ module Mini
   class Assertion < Exception; end
   class Skip < Assertion; end
 
-  file = if __FILE__ =~ /^[^\.]/ then # OMG ruby 1.9 is so lame (rubinius too)
+  file = if RUBY_VERSION =~ /^1\.9/ then  # bt's expanded, but __FILE__ isn't :(
+           File.expand_path __FILE__
+         elsif  __FILE__ =~ /^[^\.]/ then # assume both relative
            require 'pathname'
-           pwd = Pathname.new(Dir.pwd)
-           pn = Pathname.new(File.expand_path(__FILE__))
+           pwd = Pathname.new Dir.pwd
+           pn = Pathname.new File.expand_path(__FILE__)
            pn = File.join(".", pn.relative_path_from(pwd)) unless pn.relative?
            pn.to_s
-         else
+         else                             # assume both are expanded
            __FILE__
          end
 
@@ -36,10 +38,8 @@ module Mini
       new_bt << line
     end
 
-    new_bt = bt.reject { |line| line.rindex(MINI_DIR, 0) } if
-      new_bt.empty?
+    new_bt = bt.reject { |line| line.rindex(MINI_DIR, 0) } if new_bt.empty?
     new_bt = bt.dup if new_bt.empty?
-
     new_bt
   end
 
diff --git a/test/mini/test_mini_test.rb b/test/mini/test_mini_test.rb
index 661c2965a2..b7071f55af 100644
--- a/test/mini/test_mini_test.rb
+++ b/test/mini/test_mini_test.rb
@@ -9,11 +9,6 @@ require 'mini/test'
 
 Mini::Test.autorun
 
-class Mini::Test
-  attr_accessor :test_count
-  attr_accessor :assertion_count
-end
-
 class TestMiniTest < Mini::Test::TestCase
 
   def setup
@@ -47,13 +42,25 @@ class TestMiniTest < Mini::Test::TestCase
           BT_MIDDLE +
           ["./lib/mini/test.rb:29",
            "test/test_autotest.rb:422"])
+    bt = util_expand_bt bt
+
     ex = ["lib/autotest.rb:571:in `add_exception'",
           "test/test_autotest.rb:62:in `test_add_exception'"]
+    ex = util_expand_bt ex
+
     fu = Mini::filter_backtrace(bt)
 
     assert_equal ex, fu
   end
 
+  def util_expand_bt bt
+    if RUBY_VERSION =~ /^1\.9/ then
+      bt.map { |f| (f =~ /^\./) ? File.expand_path(f) : f }
+    else
+      bt
+    end
+  end
+
   def test_filter_backtrace_all_unit
     bt = (["./lib/mini/test.rb:165:in `__send__'"] +
           BT_MIDDLE +
@@ -68,6 +75,9 @@ class TestMiniTest < Mini::Test::TestCase
           BT_MIDDLE +
           ["./lib/mini/test.rb:29",
            "-e:1"])
+
+    bt = util_expand_bt bt
+
     ex = ["-e:1"]
     fu = Mini::filter_backtrace(bt)
     assert_equal ex, fu
-- 
cgit v1.2.3