Should return "." for File.extname("file.") also on Windows

But not changes another cases, such as "file.rb."
[Bug #15267]

2 files changed, 4 insertions, 8 deletions

diff --git a/test/ruby/test_file_exhaustive.rb b/test/ruby/test_file_exhaustive.rb
index 975bcb6bc2..de4c21e5ca 100644
--- a/test/ruby/test_file_exhaustive.rb
+++ b/test/ruby/test_file_exhaustive.rb
@@ -1268,19 +1268,19 @@ class TestFileExhaustive < Test::Unit::TestCase
     infixes2 = infixes + [".ext "]
     appendixes = [""]
     if NTFS
-      appendixes << " " << "." << "::$DATA" << "::$DATA.bar"
+      appendixes << " " << [".", ".", ""] << "::$DATA" << "::$DATA.bar"
     else
       appendixes << [".", "."]
     end
     prefixes.each do |prefix|
-      appendixes.each do |appendix, ext = ""|
+      appendixes.each do |appendix, ext = "", ext2 = ext|
         infixes.each do |infix|
           path = "#{prefix}foo#{infix}#{appendix}"
           assert_equal(ext, File.extname(path), "File.extname(#{path.inspect})")
         end
         infixes2.each do |infix|
           path = "#{prefix}foo#{infix}.ext#{appendix}"
-          assert_equal(ext.empty? ? ".ext" : appendix, File.extname(path), "File.extname(#{path.inspect})")
+          assert_equal(ext2.empty? ? ".ext" : appendix, File.extname(path), "File.extname(#{path.inspect})")
         end
       end
     end
diff --git a/test/ruby/test_path.rb b/test/ruby/test_path.rb
index b35e942a2a..64111ee805 100644
--- a/test/ruby/test_path.rb
+++ b/test/ruby/test_path.rb
@@ -239,11 +239,7 @@ class TestPath < Test::Unit::TestCase
       ext = '.'
     end
     assert_equal(ext, File.extname('a.rb.'))
-    if /mswin|bccwin|mingw/ =~ RUBY_PLATFORM
-      # trailing spaces and dots are ignored on NTFS.
-      ext = ''
-    end
-    assert_equal(ext, File.extname('a.'))
+    assert_equal('.', File.extname('a.'))
     assert_equal('', File.extname('.x'))
     assert_equal('', File.extname('..x'))
   end