1 files changed, 5 insertions, 16 deletions
diff --git a/test/fileutils/test_dryrun.rb b/test/fileutils/test_dryrun.rb
index f4672779a1..03f6bed387 100644
--- a/test/fileutils/test_dryrun.rb
+++ b/test/fileutils/test_dryrun.rb
@@ -2,27 +2,16 @@
 
 require 'fileutils'
 require 'test/unit'
-require_relative 'clobber'
+require_relative 'visibility_tests'
 
 class TestFileUtilsDryRun < Test::Unit::TestCase
 
   include FileUtils::DryRun
-  include TestFileUtils::Clobber
+  include TestFileUtils::Visibility
 
-  FileUtils::METHODS.each do |m|
-    define_method "test_singleton_visibility_#{m}" do
-      assert_equal true, FileUtils::DryRun.respond_to?(m, true),
-                   "FileUtils::DryRun.#{m} not defined"
-      assert_equal true, FileUtils::DryRun.respond_to?(m, false),
-                   "FileUtils::DryRun.#{m} not public"
-    end
-
-    define_method "test_instance_visibility_#{m}" do
-      assert_equal true, respond_to?(m, true),
-                   "FileUtils::DryRun\##{m} is not defined"
-      assert_equal true, FileUtils::DryRun.private_method_defined?(m),
-                   "FileUtils::DryRun\##{m} is not private"
-    end
+  def setup
+    super
+    @fu_module = FileUtils::DryRun
   end
 
 end