diff options
| -rw-r--r-- | test/ruby/envutil.rb | 16 | ||||
| -rw-r--r-- | test/ruby/test_module.rb | 10 |
2 files changed, 18 insertions, 8 deletions
diff --git a/test/ruby/envutil.rb b/test/ruby/envutil.rb index 2e9ebbbca2..6ef0eb6245 100644 --- a/test/ruby/envutil.rb +++ b/test/ruby/envutil.rb @@ -157,6 +157,22 @@ module EnvUtil end module_function :with_default_internal + def labeled_module(name, &block) + Module.new do + singleton_class.class_eval {define_method(:to_s) {name}; alias inspect to_s} + class_eval(&block) if block + end + end + module_function :labeled_module + + def labeled_class(name, superclass = Object, &block) + Class.new(superclass) do + singleton_class.class_eval {define_method(:to_s) {name}; alias inspect to_s} + class_eval(&block) if block + end + end + module_function :labeled_class + if /darwin/ =~ RUBY_PLATFORM DIAGNOSTIC_REPORTS_PATH = File.expand_path("~/Library/Logs/DiagnosticReports") DIAGNOSTIC_REPORTS_TIMEFORMAT = '%Y-%m-%d-%H%M%S' diff --git a/test/ruby/test_module.rb b/test/ruby/test_module.rb index 5eb0457496..02739dd520 100644 --- a/test/ruby/test_module.rb +++ b/test/ruby/test_module.rb @@ -1564,17 +1564,11 @@ class TestModule < Test::Unit::TestCase end def labeled_module(name, &block) - Module.new do - singleton_class.class_eval {define_method(:to_s) {name}; alias inspect to_s} - class_eval(&block) if block - end + EnvUtil.labeled_module(name, &block) end def labeled_class(name, superclass = Object, &block) - Class.new(superclass) do - singleton_class.class_eval {define_method(:to_s) {name}; alias inspect to_s} - class_eval(&block) if block - end + EnvUtil.labeled_class(name, superclass, &block) end def test_prepend_instance_methods_false |