* test/iconv: Tests fixed.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@16860 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 5 insertions, 15 deletions

diff --git a/test/iconv/utils.rb b/test/iconv/utils.rb
index 99dce20837..bc75deb173 100644
--- a/test/iconv/utils.rb
+++ b/test/iconv/utils.rb
@@ -5,21 +5,7 @@ else
   require 'test/unit'
 end
 
-module TestIconv
-  if defined?(::Iconv)
-    def self.testcase(name, &block)
-      const_set(name, klass = Class.new(::Test::Unit::TestCase))
-      klass.name
-      klass.__send__(:include, self)
-      klass.class_eval(&block)
-    end
-  else
-    def self.testcase(name)
-    end
-  end
-end
-
-module TestIconv
+class TestIconv < ::Test::Unit::TestCase
   if defined?(::Encoding) and String.method_defined?(:force_encoding)
     def self.encode(str, enc)
       str.force_encoding(enc)
@@ -30,6 +16,10 @@ module TestIconv
     end
   end
 
+  def default_test
+    self.class == TestIconv or super
+  end
+
   ASCII = "ascii"
   EUCJ_STR = encode("\xa4\xa2\xa4\xa4\xa4\xa6\xa4\xa8\xa4\xaa", "EUC-JP").freeze
   SJIS_STR = encode("\x82\xa0\x82\xa2\x82\xa4\x82\xa6\x82\xa8", "Shift_JIS").freeze