ruby-changes:27446
From: nobu <ko1@a...>
Date: Tue, 26 Feb 2013 00:02:00 +0900 (JST)
Subject: [ruby-changes:27446] nobu:r39498 (trunk): * test/ruby/test_fnmatch.rb: use assert_file.
nobu 2013-02-25 23:59:24 +0900 (Mon, 25 Feb 2013) New Revision: 39498 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=39498 Log: * test/ruby/test_fnmatch.rb: use assert_file. Modified files: trunk/test/ruby/test_fnmatch.rb Index: test/ruby/test_fnmatch.rb =================================================================== --- test/ruby/test_fnmatch.rb (revision 39497) +++ test/ruby/test_fnmatch.rb (revision 39498) @@ -11,97 +11,97 @@ class TestFnmatch < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/ruby/test_fnmatch.rb#L11 end end def test_fnmatch - assert(File.fnmatch('\[1\]' , '[1]'), "[ruby-dev:22819]") - assert(File.fnmatch('*?', 'a'), "[ruby-dev:22815]") - 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)) + assert_file.for("[ruby-dev:22819]").fnmatch('\[1\]' , '[1]') + assert_file.for("[ruby-dev:22815]").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')) + assert_file.fnmatch('cat', 'cat') + assert_file.not_fnmatch('cat', 'category') + assert_file.not_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')) + assert_file.fnmatch('?at', 'cat') + assert_file.fnmatch('c?t', 'cat') + assert_file.fnmatch('ca?', 'cat') + assert_file.fnmatch('?a?', 'cat') + assert_file.not_fnmatch('c??t', 'cat') + assert_file.not_fnmatch('??at', 'cat') + assert_file.not_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')) + 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.not_fnmatch('c*t', 'cats') + assert_file.not_fnmatch('*abc', 'abcabz') + assert_file.fnmatch('*abz', 'abcabz') + assert_file.not_fnmatch('a*abc', 'abc') + assert_file.fnmatch('a*bc', 'abc') + assert_file.not_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]', '\\')) + assert_file.fnmatch('\?', '?') + assert_file.not_fnmatch('\?', '\?') + assert_file.not_fnmatch('\?', 'a') + assert_file.not_fnmatch('\?', '\a') + assert_file.fnmatch('\*', '*') + assert_file.not_fnmatch('\*', '\*') + assert_file.not_fnmatch('\*', 'cats') + assert_file.not_fnmatch('\*', '\cats') + assert_file.fnmatch('\a', 'a') + assert_file.not_fnmatch('\a', '\a') + assert_file.fnmatch('[a\-c]', 'a') + assert_file.fnmatch('[a\-c]', '-') + assert_file.fnmatch('[a\-c]', 'c') + assert_file.not_fnmatch('[a\-c]', 'b') + assert_file.not_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)) + assert_file.not_fnmatch('\?', '?', File::FNM_NOESCAPE) + assert_file.fnmatch('\?', '\?', File::FNM_NOESCAPE) + assert_file.not_fnmatch('\?', 'a', File::FNM_NOESCAPE) + assert_file.fnmatch('\?', '\a', File::FNM_NOESCAPE) + assert_file.not_fnmatch('\*', '*', File::FNM_NOESCAPE) + assert_file.fnmatch('\*', '\*', File::FNM_NOESCAPE) + assert_file.not_fnmatch('\*', 'cats', File::FNM_NOESCAPE) + assert_file.fnmatch('\*', '\cats', File::FNM_NOESCAPE) + assert_file.not_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.not_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)) - assert(!File.fnmatch('[abc]', 'B')) - assert(File.fnmatch('[abc]', 'B', File::FNM_CASEFOLD)) + assert_file.not_fnmatch('cat', 'CAT') + assert_file.fnmatch('cat', 'CAT', File::FNM_CASEFOLD) + assert_file.not_fnmatch('[a-z]', 'D') + assert_file.fnmatch('[a-z]', 'D', File::FNM_CASEFOLD) + assert_file.not_fnmatch('[abc]', 'B') + assert_file.fnmatch('[abc]', 'B', 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)) + assert_file.fnmatch('foo?boo', 'foo/boo') + assert_file.fnmatch('foo*', 'foo/boo') + assert_file.not_fnmatch('foo?boo', 'foo/boo', File::FNM_PATHNAME) + assert_file.not_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)) + assert_file.not_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.not_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)) + assert_file.fnmatch('**/foo', 'a/b/c/foo', File::FNM_PATHNAME) + assert_file.fnmatch('**/foo', '/foo', File::FNM_PATHNAME) + assert_file.not_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_extglob @@ -116,12 +116,12 @@ class TestFnmatch < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/ruby/test_fnmatch.rb#L116 pattern_ascii = 'a'.encode('US-ASCII') pattern_eucjp = path.encode('EUC-JP') assert_nothing_raised(ArgumentError, bug7911) do - assert(!File.fnmatch(pattern_ascii, path)) - assert(!File.fnmatch(pattern_eucjp, path)) - assert(!File.fnmatch(pattern_ascii, path, File::FNM_CASEFOLD)) - assert(!File.fnmatch(pattern_eucjp, path, File::FNM_CASEFOLD)) - assert(File.fnmatch("{*,#{pattern_ascii}}", path, File::FNM_EXTGLOB)) - assert(File.fnmatch("{*,#{pattern_eucjp}}", path, File::FNM_EXTGLOB)) + assert_file.not_fnmatch(pattern_ascii, path) + assert_file.not_fnmatch(pattern_eucjp, path) + assert_file.not_fnmatch(pattern_ascii, path, File::FNM_CASEFOLD) + assert_file.not_fnmatch(pattern_eucjp, path, File::FNM_CASEFOLD) + assert_file.fnmatch("{*,#{pattern_ascii}}", path, File::FNM_EXTGLOB) + assert_file.fnmatch("{*,#{pattern_eucjp}}", path, File::FNM_EXTGLOB) end end end -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/