diff --git a/ChangeLog b/ChangeLog
index 4afe69c3ea..c94482e1ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Aug  8 21:28:13 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* test/ruby/test_fnmatch.rb: separated from test_file.rb.
+
 Mon Aug  8 20:40:35 2005  NAKAMURA, Hiroshi  <nakahiro@sarion.co.jp>
 
 	* test/ruby/test_method.rb: added.  [ruby-dev:26761]
diff --git a/test/ruby/test_file.rb b/test/ruby/test_file.rb
index 5589e1236d..cdeceeb03d 100644
--- a/test/ruby/test_file.rb
+++ b/test/ruby/test_file.rb
@@ -35,197 +35,6 @@ class TestFile < Test::Unit::TestCase
 
   include TestEOF::Seek
 
-  def test_fnmatch
-    # from [ruby-dev:22815] and [ruby-dev:22819]
-    assert(File.fnmatch('\[1\]' , '[1]'))
-    assert(File.fnmatch('*?', 'a'))
-    assert(File.fnmatch('*/', 'a/'))
-    assert(File.fnmatch('\[1\]' , '[1]', File::FNM_PATHNAME))
-    assert(File.fnmatch('*?', 'a', File::FNM_PATHNAME))
-    assert(File.fnmatch('*/', 'a/', File::FNM_PATHNAME))
-    # text
-    assert(File.fnmatch('cat', 'cat'))
-    assert(!File.fnmatch('cat', 'category'))
-    assert(!File.fnmatch('cat', 'wildcat'))
-    # '?' matches any one character
-    assert(File.fnmatch('?at', 'cat'))
-    assert(File.fnmatch('c?t', 'cat'))
-    assert(File.fnmatch('ca?', 'cat'))
-    assert(File.fnmatch('?a?', 'cat'))
-    assert(!File.fnmatch('c??t', 'cat'))
-    assert(!File.fnmatch('??at', 'cat'))
-    assert(!File.fnmatch('ca??', 'cat'))
-    # '*' matches any number (including 0) of any characters
-    assert(File.fnmatch('c*', 'cats'))
-    assert(File.fnmatch('c*ts', 'cats'))
-    assert(File.fnmatch('*ts', 'cats'))
-    assert(File.fnmatch('*c*a*t*s*', 'cats'))
-    assert(!File.fnmatch('c*t', 'cats'))
-    assert(!File.fnmatch('*abc', 'abcabz'))
-    assert(File.fnmatch('*abz', 'abcabz'))
-    assert(!File.fnmatch('a*abc', 'abc'))
-    assert(File.fnmatch('a*bc', 'abc'))
-    assert(!File.fnmatch('a*bc', 'abcd'))
-    # matches any character listed between bracket
-    assert(File.fnmatch('ca[np]', 'can'))
-    assert(File.fnmatch('ca[np]', 'cap'))
-    assert(!File.fnmatch('ca[np]', 'cat'))
-    assert(File.fnmatch('ca[a-or-z]', 'can'))
-    assert(!File.fnmatch('ca[a-or-z]', 'cap'))
-    assert(File.fnmatch('ca[a-or-z]', 'cat'))
-    s = "[bd-gikl-mosv-x]"
-    assert(!File.fnmatch(s, 'a'))
-    assert(File.fnmatch(s, 'b'))
-    assert(!File.fnmatch(s, 'c'))
-    assert(File.fnmatch(s, 'd'))
-    assert(File.fnmatch(s, 'e'))
-    assert(File.fnmatch(s, 'f'))
-    assert(File.fnmatch(s, 'g'))
-    assert(!File.fnmatch(s, 'h'))
-    assert(File.fnmatch(s, 'i'))
-    assert(!File.fnmatch(s, 'j'))
-    assert(File.fnmatch(s, 'k'))
-    assert(File.fnmatch(s, 'l'))
-    assert(File.fnmatch(s, 'm'))
-    assert(!File.fnmatch(s, 'n'))
-    assert(File.fnmatch(s, 'o'))
-    assert(!File.fnmatch(s, 'p'))
-    assert(!File.fnmatch(s, 'q'))
-    assert(!File.fnmatch(s, 'r'))
-    assert(File.fnmatch(s, 's'))
-    assert(!File.fnmatch(s, 't'))
-    assert(!File.fnmatch(s, 'u'))
-    assert(File.fnmatch(s, 'v'))
-    assert(File.fnmatch(s, 'w'))
-    assert(File.fnmatch(s, 'x'))
-    assert(!File.fnmatch(s, 'y'))
-    assert(!File.fnmatch(s, 'z'))
-    # matches any character except those listed between bracket
-    assert(File.fnmatch('ca[!pt]', 'can'))
-    assert(!File.fnmatch('ca[!pt]', 'cap'))
-    assert(!File.fnmatch('ca[!pt]', 'cat'))
-    assert(!File.fnmatch('ca[!a-or-z]', 'can'))
-    assert(File.fnmatch('ca[!a-or-z]', 'cap'))
-    assert(!File.fnmatch('ca[!a-or-z]', 'cat'))
-    assert(File.fnmatch('ca[^pt]', 'can'))
-    assert(!File.fnmatch('ca[^pt]', 'cap'))
-    assert(!File.fnmatch('ca[^pt]', 'cat'))
-    assert(!File.fnmatch('ca[^a-or-z]', 'can'))
-    assert(File.fnmatch('ca[^a-or-z]', 'cap'))
-    assert(!File.fnmatch('ca[^a-or-z]', 'cat'))
-    s = "[^bd-gikl-mosv-x]"
-    assert(File.fnmatch(s, 'a'))
-    assert(!File.fnmatch(s, 'b'))
-    assert(File.fnmatch(s, 'c'))
-    assert(!File.fnmatch(s, 'd'))
-    assert(!File.fnmatch(s, 'e'))
-    assert(!File.fnmatch(s, 'f'))
-    assert(!File.fnmatch(s, 'g'))
-    assert(File.fnmatch(s, 'h'))
-    assert(!File.fnmatch(s, 'i'))
-    assert(File.fnmatch(s, 'j'))
-    assert(!File.fnmatch(s, 'k'))
-    assert(!File.fnmatch(s, 'l'))
-    assert(!File.fnmatch(s, 'm'))
-    assert(File.fnmatch(s, 'n'))
-    assert(!File.fnmatch(s, 'o'))
-    assert(File.fnmatch(s, 'p'))
-    assert(File.fnmatch(s, 'q'))
-    assert(File.fnmatch(s, 'r'))
-    assert(!File.fnmatch(s, 's'))
-    assert(File.fnmatch(s, 't'))
-    assert(File.fnmatch(s, 'u'))
-    assert(!File.fnmatch(s, 'v'))
-    assert(!File.fnmatch(s, 'w'))
-    assert(!File.fnmatch(s, 'x'))
-    assert(File.fnmatch(s, 'y'))
-    assert(File.fnmatch(s, 'z'))
-    s = "[!bd-gikl-mosv-x]"
-    assert(File.fnmatch(s, 'a'))
-    assert(!File.fnmatch(s, 'b'))
-    assert(File.fnmatch(s, 'c'))
-    assert(!File.fnmatch(s, 'd'))
-    assert(!File.fnmatch(s, 'e'))
-    assert(!File.fnmatch(s, 'f'))
-    assert(!File.fnmatch(s, 'g'))
-    assert(File.fnmatch(s, 'h'))
-    assert(!File.fnmatch(s, 'i'))
-    assert(File.fnmatch(s, 'j'))
-    assert(!File.fnmatch(s, 'k'))
-    assert(!File.fnmatch(s, 'l'))
-    assert(!File.fnmatch(s, 'm'))
-    assert(File.fnmatch(s, 'n'))
-    assert(!File.fnmatch(s, 'o'))
-    assert(File.fnmatch(s, 'p'))
-    assert(File.fnmatch(s, 'q'))
-    assert(File.fnmatch(s, 'r'))
-    assert(!File.fnmatch(s, 's'))
-    assert(File.fnmatch(s, 't'))
-    assert(File.fnmatch(s, 'u'))
-    assert(!File.fnmatch(s, 'v'))
-    assert(!File.fnmatch(s, 'w'))
-    assert(!File.fnmatch(s, 'x'))
-    assert(File.fnmatch(s, 'y'))
-    assert(File.fnmatch(s, 'z'))
-    # escaping character
-    assert(File.fnmatch('\?', '?'))
-    assert(!File.fnmatch('\?', '\?'))
-    assert(!File.fnmatch('\?', 'a'))
-    assert(!File.fnmatch('\?', '\a'))
-    assert(File.fnmatch('\*', '*'))
-    assert(!File.fnmatch('\*', '\*'))
-    assert(!File.fnmatch('\*', 'cats'))
-    assert(!File.fnmatch('\*', '\cats'))
-    assert(File.fnmatch('\a', 'a'))
-    assert(!File.fnmatch('\a', '\a'))
-    assert(File.fnmatch('[a\-c]', 'a'))
-    assert(File.fnmatch('[a\-c]', '-'))
-    assert(File.fnmatch('[a\-c]', 'c'))
-    assert(!File.fnmatch('[a\-c]', 'b'))
-    assert(!File.fnmatch('[a\-c]', '\\'))
-    # escaping character loses its meaning if FNM_NOESCAPE is set
-    assert(!File.fnmatch('\?', '?', File::FNM_NOESCAPE))
-    assert(File.fnmatch('\?', '\?', File::FNM_NOESCAPE))
-    assert(!File.fnmatch('\?', 'a', File::FNM_NOESCAPE))
-    assert(File.fnmatch('\?', '\a', File::FNM_NOESCAPE))
-    assert(!File.fnmatch('\*', '*', File::FNM_NOESCAPE))
-    assert(File.fnmatch('\*', '\*', File::FNM_NOESCAPE))
-    assert(!File.fnmatch('\*', 'cats', File::FNM_NOESCAPE))
-    assert(File.fnmatch('\*', '\cats', File::FNM_NOESCAPE))
-    assert(!File.fnmatch('\a', 'a', File::FNM_NOESCAPE))
-    assert(File.fnmatch('\a', '\a', File::FNM_NOESCAPE))
-    assert(File.fnmatch('[a\-c]', 'a', File::FNM_NOESCAPE))
-    assert(!File.fnmatch('[a\-c]', '-', File::FNM_NOESCAPE))
-    assert(File.fnmatch('[a\-c]', 'c', File::FNM_NOESCAPE))
-    assert(File.fnmatch('[a\-c]', 'b', File::FNM_NOESCAPE)) # '\\' < 'b' < 'c'
-    assert(File.fnmatch('[a\-c]', '\\', File::FNM_NOESCAPE))
-    # case is ignored if FNM_CASEFOLD is set
-    assert(!File.fnmatch('cat', 'CAT'))
-    assert(File.fnmatch('cat', 'CAT', File::FNM_CASEFOLD))
-    assert(!File.fnmatch('[a-z]', 'D'))
-    assert(File.fnmatch('[a-z]', 'D', File::FNM_CASEFOLD))
-    # wildcard doesn't match '/' if FNM_PATHNAME is set
-    assert(File.fnmatch('foo?boo', 'foo/boo'))
-    assert(File.fnmatch('foo*', 'foo/boo'))
-    assert(!File.fnmatch('foo?boo', 'foo/boo', File::FNM_PATHNAME))
-    assert(!File.fnmatch('foo*', 'foo/boo', File::FNM_PATHNAME))
-    # wildcard matches leading period if FNM_DOTMATCH is set
-    assert(!File.fnmatch('*', '.profile'))
-    assert(File.fnmatch('*', '.profile', File::FNM_DOTMATCH))
-    assert(File.fnmatch('.*', '.profile'))
-    assert(File.fnmatch('*', 'dave/.profile'))
-    assert(File.fnmatch('*/*', 'dave/.profile'))
-    assert(!File.fnmatch('*/*', 'dave/.profile', File::FNM_PATHNAME))
-    assert(File.fnmatch('*/*', 'dave/.profile', File::FNM_PATHNAME | File::FNM_DOTMATCH))
-    # recursive matching
-    assert(File.fnmatch('**/foo', 'a/b/c/foo', File::FNM_PATHNAME))
-    assert(File.fnmatch('**/foo', '/foo', File::FNM_PATHNAME))
-    assert(!File.fnmatch('**/foo', 'a/.b/c/foo', File::FNM_PATHNAME))
-    assert(File.fnmatch('**/foo', 'a/.b/c/foo', File::FNM_PATHNAME | File::FNM_DOTMATCH))
-    assert(File.fnmatch('**/foo', '/root/foo', File::FNM_PATHNAME))
-    assert(File.fnmatch('**/foo', 'c:/root/foo', File::FNM_PATHNAME))
-  end
-
   def test_truncate_wbuf # [ruby-dev:24191]
     f = Tempfile.new("test-truncate")
     f.print "abc"
diff --git a/test/ruby/test_fnmatch.rb b/test/ruby/test_fnmatch.rb
new file mode 100644
index 0000000000..7e378b911d
--- /dev/null
+++ b/test/ruby/test_fnmatch.rb
@@ -0,0 +1,105 @@
+require 'test/unit'
+
+class TestFnmatch < Test::Unit::TestCase
+
+  def bracket_test(s, t) # `s' should start with neither '!' nor '^'
+    0x21.upto(0x7E) do |i|
+      assert_equal(t.include?(i), File.fnmatch("[#{s}]", i.chr, File::FNM_DOTMATCH))
+      assert_equal(t.include?(i), !File.fnmatch("[^#{s}]", i.chr, File::FNM_DOTMATCH))
+      assert_equal(t.include?(i), !File.fnmatch("[!#{s}]", i.chr, File::FNM_DOTMATCH))
+    end
+  end
+  def test_fnmatch
+    # from [ruby-dev:22815] and [ruby-dev:22819]
+    assert(File.fnmatch('\[1\]' , '[1]'))
+    assert(File.fnmatch('*?', 'a'))
+    assert(File.fnmatch('*/', 'a/'))
+    assert(File.fnmatch('\[1\]' , '[1]', File::FNM_PATHNAME))
+    assert(File.fnmatch('*?', 'a', File::FNM_PATHNAME))
+    assert(File.fnmatch('*/', 'a/', File::FNM_PATHNAME))
+    # text
+    assert(File.fnmatch('cat', 'cat'))
+    assert(!File.fnmatch('cat', 'category'))
+    assert(!File.fnmatch('cat', 'wildcat'))
+    # '?' matches any one character
+    assert(File.fnmatch('?at', 'cat'))
+    assert(File.fnmatch('c?t', 'cat'))
+    assert(File.fnmatch('ca?', 'cat'))
+    assert(File.fnmatch('?a?', 'cat'))
+    assert(!File.fnmatch('c??t', 'cat'))
+    assert(!File.fnmatch('??at', 'cat'))
+    assert(!File.fnmatch('ca??', 'cat'))
+    # '*' matches any number (including 0) of any characters
+    assert(File.fnmatch('c*', 'cats'))
+    assert(File.fnmatch('c*ts', 'cats'))
+    assert(File.fnmatch('*ts', 'cats'))
+    assert(File.fnmatch('*c*a*t*s*', 'cats'))
+    assert(!File.fnmatch('c*t', 'cats'))
+    assert(!File.fnmatch('*abc', 'abcabz'))
+    assert(File.fnmatch('*abz', 'abcabz'))
+    assert(!File.fnmatch('a*abc', 'abc'))
+    assert(File.fnmatch('a*bc', 'abc'))
+    assert(!File.fnmatch('a*bc', 'abcd'))
+    # [seq] : matches any character listed between bracket
+    # [!seq] or [^seq] : matches any character except those listed between bracket
+    bracket_test("bd-gikl-mosv-x", "bdefgiklmosvwx")
+    # escaping character
+    assert(File.fnmatch('\?', '?'))
+    assert(!File.fnmatch('\?', '\?'))
+    assert(!File.fnmatch('\?', 'a'))
+    assert(!File.fnmatch('\?', '\a'))
+    assert(File.fnmatch('\*', '*'))
+    assert(!File.fnmatch('\*', '\*'))
+    assert(!File.fnmatch('\*', 'cats'))
+    assert(!File.fnmatch('\*', '\cats'))
+    assert(File.fnmatch('\a', 'a'))
+    assert(!File.fnmatch('\a', '\a'))
+    assert(File.fnmatch('[a\-c]', 'a'))
+    assert(File.fnmatch('[a\-c]', '-'))
+    assert(File.fnmatch('[a\-c]', 'c'))
+    assert(!File.fnmatch('[a\-c]', 'b'))
+    assert(!File.fnmatch('[a\-c]', '\\'))
+    # escaping character loses its meaning if FNM_NOESCAPE is set
+    assert(!File.fnmatch('\?', '?', File::FNM_NOESCAPE))
+    assert(File.fnmatch('\?', '\?', File::FNM_NOESCAPE))
+    assert(!File.fnmatch('\?', 'a', File::FNM_NOESCAPE))
+    assert(File.fnmatch('\?', '\a', File::FNM_NOESCAPE))
+    assert(!File.fnmatch('\*', '*', File::FNM_NOESCAPE))
+    assert(File.fnmatch('\*', '\*', File::FNM_NOESCAPE))
+    assert(!File.fnmatch('\*', 'cats', File::FNM_NOESCAPE))
+    assert(File.fnmatch('\*', '\cats', File::FNM_NOESCAPE))
+    assert(!File.fnmatch('\a', 'a', File::FNM_NOESCAPE))
+    assert(File.fnmatch('\a', '\a', File::FNM_NOESCAPE))
+    assert(File.fnmatch('[a\-c]', 'a', File::FNM_NOESCAPE))
+    assert(!File.fnmatch('[a\-c]', '-', File::FNM_NOESCAPE))
+    assert(File.fnmatch('[a\-c]', 'c', File::FNM_NOESCAPE))
+    assert(File.fnmatch('[a\-c]', 'b', File::FNM_NOESCAPE)) # '\\' < 'b' < 'c'
+    assert(File.fnmatch('[a\-c]', '\\', File::FNM_NOESCAPE))
+    # case is ignored if FNM_CASEFOLD is set
+    assert(!File.fnmatch('cat', 'CAT'))
+    assert(File.fnmatch('cat', 'CAT', File::FNM_CASEFOLD))
+    assert(!File.fnmatch('[a-z]', 'D'))
+    assert(File.fnmatch('[a-z]', 'D', File::FNM_CASEFOLD))
+    # wildcard doesn't match '/' if FNM_PATHNAME is set
+    assert(File.fnmatch('foo?boo', 'foo/boo'))
+    assert(File.fnmatch('foo*', 'foo/boo'))
+    assert(!File.fnmatch('foo?boo', 'foo/boo', File::FNM_PATHNAME))
+    assert(!File.fnmatch('foo*', 'foo/boo', File::FNM_PATHNAME))
+    # wildcard matches leading period if FNM_DOTMATCH is set
+    assert(!File.fnmatch('*', '.profile'))
+    assert(File.fnmatch('*', '.profile', File::FNM_DOTMATCH))
+    assert(File.fnmatch('.*', '.profile'))
+    assert(File.fnmatch('*', 'dave/.profile'))
+    assert(File.fnmatch('*/*', 'dave/.profile'))
+    assert(!File.fnmatch('*/*', 'dave/.profile', File::FNM_PATHNAME))
+    assert(File.fnmatch('*/*', 'dave/.profile', File::FNM_PATHNAME | File::FNM_DOTMATCH))
+    # recursive matching
+    assert(File.fnmatch('**/foo', 'a/b/c/foo', File::FNM_PATHNAME))
+    assert(File.fnmatch('**/foo', '/foo', File::FNM_PATHNAME))
+    assert(!File.fnmatch('**/foo', 'a/.b/c/foo', File::FNM_PATHNAME))
+    assert(File.fnmatch('**/foo', 'a/.b/c/foo', File::FNM_PATHNAME | File::FNM_DOTMATCH))
+    assert(File.fnmatch('**/foo', '/root/foo', File::FNM_PATHNAME))
+    assert(File.fnmatch('**/foo', 'c:/root/foo', File::FNM_PATHNAME))
+  end
+
+end