From 711b655f38b200cd127c2626679a8d41b0415411 Mon Sep 17 00:00:00 2001
From: seki <seki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 31 Jul 2005 16:19:42 +0000
Subject: use private_methods and protected_methods instead of respond_to? to
 check method visibility. [ruby-dev:26616]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8872 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/drb/drbtest.rb | 24 +++++++++++++++++++++---
 test/drb/ut_drb.rb  | 13 +++++++++++++
 2 files changed, 34 insertions(+), 3 deletions(-)

(limited to 'test')

diff --git a/test/drb/drbtest.rb b/test/drb/drbtest.rb
index 432c7a78bb..410a33c7e1 100644
--- a/test/drb/drbtest.rb
+++ b/test/drb/drbtest.rb
@@ -176,24 +176,42 @@ module DRbCore
     end
   end
 
-  def test_07_public_private
+  def test_07_public_private_protected_missing
     assert_nothing_raised() {
       begin
 	@there.method_missing(:eval)
-      rescue NameError
+      rescue NoMethodError
 	assert_match(/^private method \`eval\'/, $!.message)
       end
     }
+    assert_nothing_raised() {
+      begin
+        @there.call_private_method
+      rescue NoMethodError
+        assert_equal(NoMethodError, $!.class)
+	assert_match(/^private method \`call_private_method\'/, $!.message)
+      end
+    }
+    assert_nothing_raised() {
+      begin
+        @there.call_protected_method
+      rescue NoMethodError
+        assert_equal(NoMethodError, $!.class)
+	assert_match(/^protected method \`call_protected_method\'/, $!.message)
+      end
+    }
     assert_nothing_raised() {
       begin
 	@there.method_missing(:undefined_method_test)
-      rescue NameError
+      rescue NoMethodError
+        assert_equal(NoMethodError, $!.class)
 	assert_match(/^undefined method \`undefined_method_test\'/, $!.message)
       end
     }
     assert_raises(SecurityError) do
       @there.method_missing(:__send__, :to_s)
     end
+    assert_equal(true, @there.missing)
   end
 
   def test_08_here
diff --git a/test/drb/ut_drb.rb b/test/drb/ut_drb.rb
index 93ac1d83fe..f5720cfca2 100644
--- a/test/drb/ut_drb.rb
+++ b/test/drb/ut_drb.rb
@@ -126,10 +126,23 @@ class DRbEx
     [self]
   end
 
+  def method_missing(msg, *a, &b)
+    if msg == :missing
+      return true
+    else
+      super(msg, *a, &b)
+    end
+  end
+
   private
   def call_private_method
     true
   end
+
+  protected
+  def call_protected_method
+    true
+  end
 end
 
 if __FILE__ == $0
-- 
cgit v1.2.3