diff test/unit/lib/redmine/scm/adapters/filesystem_adapter_test.rb @ 523:0b6c82dead28 luisf

Merge from branch "cannam"

--- a/test/unit/lib/redmine/scm/adapters/filesystem_adapter_test.rb	Mon Mar 28 18:17:06 2011 +0100
+++ b/test/unit/lib/redmine/scm/adapters/filesystem_adapter_test.rb	Mon Jul 25 14:23:37 2011 +0100
@@ -1,42 +1,53 @@
 
-require File.dirname(__FILE__) + '/../../../../../test_helper'
-
+require File.expand_path('../../../../../../test_helper', __FILE__)
 
 class FilesystemAdapterTest < ActiveSupport::TestCase
-  
-  REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/filesystem_repository'  
-  
-  if File.directory?(REPOSITORY_PATH)    
+
+  REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/filesystem_repository'
+
+  if File.directory?(REPOSITORY_PATH)
     def setup
       @adapter = Redmine::Scm::Adapters::FilesystemAdapter.new(REPOSITORY_PATH)
     end
-    
+
     def test_entries
-      assert_equal 2, @adapter.entries.size
-      assert_equal ["dir", "test"], @adapter.entries.collect(&:name)
-      assert_equal ["dir", "test"], @adapter.entries(nil).collect(&:name)
-      assert_equal ["dir", "test"], @adapter.entries("/").collect(&:name)
+      assert_equal 3, @adapter.entries.size
+      assert_equal ["dir", "japanese", "test"], @adapter.entries.collect(&:name)
+      assert_equal ["dir", "japanese", "test"], @adapter.entries(nil).collect(&:name)
+      assert_equal ["dir", "japanese", "test"], @adapter.entries("/").collect(&:name)
       ["dir", "/dir", "/dir/", "dir/"].each do |path|
         assert_equal ["subdir", "dirfile"], @adapter.entries(path).collect(&:name)
       end
       # If y try to use "..", the path is ignored
       ["/../","dir/../", "..", "../", "/..", "dir/.."].each do |path|
-        assert_equal ["dir", "test"], @adapter.entries(path).collect(&:name), ".. must be ignored in path argument"
+        assert_equal ["dir", "japanese", "test"], @adapter.entries(path).collect(&:name),
+             ".. must be ignored in path argument"
       end
     end
-    
+
     def test_cat
       assert_equal "TEST CAT\n", @adapter.cat("test")
       assert_equal "TEST CAT\n", @adapter.cat("/test")
       # Revision number is ignored
       assert_equal "TEST CAT\n", @adapter.cat("/test", 1)
     end
-    
+
+    def test_path_encoding_default_utf8
+      adpt1 = Redmine::Scm::Adapters::FilesystemAdapter.new(
+                                  REPOSITORY_PATH
+                                )
+      assert_equal "UTF-8", adpt1.path_encoding
+      adpt2 = Redmine::Scm::Adapters::FilesystemAdapter.new(
+                                  REPOSITORY_PATH,
+                                  nil,
+                                  nil,
+                                  nil,
+                                  ""
+                                )
+      assert_equal "UTF-8", adpt2.path_encoding
+    end
   else
     puts "Filesystem test repository NOT FOUND. Skipping unit tests !!! See doc/RUNNING_TESTS."
     def test_fake; assert true end
   end
-  
 end
-
-