From 03da71a9ae194cb2b47318b85b47c6b1001fe1b0 Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 30 Apr 2014 07:45:49 +0000
Subject: revert r45747 because it introduced severe incompatibility.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45755 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/ruby/envutil.rb  | 23 -----------------------
 test/test_delegate.rb | 36 ------------------------------------
 2 files changed, 59 deletions(-)

(limited to 'test')

diff --git a/test/ruby/envutil.rb b/test/ruby/envutil.rb
index cfc16d1d86..948cbc25bc 100644
--- a/test/ruby/envutil.rb
+++ b/test/ruby/envutil.rb
@@ -379,29 +379,6 @@ eom
         AssertFile
       end
 
-      def assert_raise_with_message(exception, expected, msg = nil, &block)
-        case expected
-        when String
-          assert = :assert_equal
-        when Regexp
-          assert = :assert_match
-        else
-          raise TypeError, "Expected #{expected.inspect} to be a kind of String or Regexp, not #{expected.class}"
-        end
-
-        ex = assert_raise(exception, *msg) {yield}
-        msg = message(msg, "") {"Expected Exception(#{exception}) was raised, but the message doesn't match"}
-
-        if assert == :assert_equal
-          assert_equal(expected, ex.message, msg)
-        else
-          msg = message(msg) { "Expected #{mu_pp expected} to match #{mu_pp ex.message}" }
-          assert expected =~ ex.message, msg
-          block.binding.eval("proc{|_|$~=_}").call($~)
-        end
-        ex
-      end
-
       class << (AssertFile = Struct.new(:message).new)
         include Assertions
         def assert_file_predicate(predicate, *args)
diff --git a/test/test_delegate.rb b/test/test_delegate.rb
index dfe9f1db10..a09451b88f 100644
--- a/test/test_delegate.rb
+++ b/test/test_delegate.rb
@@ -1,6 +1,5 @@
 require 'test/unit'
 require 'delegate'
-require_relative 'ruby/envutil'
 
 class TestDelegateClass < Test::Unit::TestCase
   module M
@@ -134,39 +133,4 @@ class TestDelegateClass < Test::Unit::TestCase
     assert_raise(NoMethodError, '[ruby-dev:40314]#4') {d.delegate_test_private}
     assert_raise(NoMethodError, '[ruby-dev:40314]#5') {d.send(:delegate_test_private)}
   end
-
-  def test_global_function
-    klass = Class.new do
-      def open
-      end
-    end
-    obj = klass.new
-    d = SimpleDelegator.new(obj)
-    assert_nothing_raised(ArgumentError) {obj.open}
-    assert_nothing_raised(ArgumentError) {d.open}
-    assert_nothing_raised(ArgumentError) {d.send(:open)}
-  end
-
-  def test_send_method_in_delegator
-    d = Class.new(SimpleDelegator) do
-      def foo
-        "foo"
-      end
-    end.new(Object.new)
-    assert_equal("foo", d.send(:foo))
-  end
-
-  def test_unset_simple_delegator
-    d = SimpleDelegator.allocate
-    assert_raise_with_message(ArgumentError, /not delegated/) {
-      d.__getobj__
-    }
-  end
-
-  def test_unset_delegate_class
-    d = IV.allocate
-    assert_raise_with_message(ArgumentError, /not delegated/) {
-      d.__getobj__
-    }
-  end
 end
-- 
cgit v1.2.3