From c10b7435f61a463d3582359579c5a682bbf012a0 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 23 Sep 2013 01:34:01 +0000
Subject: test_module.rb: use assertions for messages

* test/ruby/test_module.rb (TestModule#assert_top_method_is_private):
  use assert_separately and assert_raise_with_message for better
  messages.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43018 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/ruby/test_module.rb | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

(limited to 'test')

diff --git a/test/ruby/test_module.rb b/test/ruby/test_module.rb
index f6212f9349..f8cf3c028b 100644
--- a/test/ruby/test_module.rb
+++ b/test/ruby/test_module.rb
@@ -1800,18 +1800,6 @@ class TestModule < Test::Unit::TestCase
     assert_equal :bar, retvals[1]
   end
 
-  private
-
-  def assert_top_method_is_private(method)
-    top = eval("self", TOPLEVEL_BINDING)
-    methods = top.singleton_class.private_instance_methods(false)
-    assert(methods.include?(method), "#{method} should be private")
-
-    assert_in_out_err([], <<-INPUT, [], /private method `#{method}' called for main:Object \(NoMethodError\)/)
-      self.#{method}
-    INPUT
-  end
-
   def test_prepend_gc
     assert_separately [], %{
       module Foo
@@ -1827,4 +1815,17 @@ class TestModule < Test::Unit::TestCase
       1_000_000.times{''} # cause GC
     }
   end
+
+  private
+
+  def assert_top_method_is_private(method)
+    assert_separately [], %{
+      methods = singleton_class.private_instance_methods(false)
+      assert_include(methods, :#{method}, ":#{method} should be private")
+
+      assert_raise_with_message(NoMethodError, "private method `#{method}' called for main:Object") {
+        self.#{method}
+      }
+    }
+  end
 end
-- 
cgit v1.2.3