scm: mercurial: add latin-1 encoding directory to test repository (#2664).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5059 e93f8b46-1217-0410-a6f0-8f06a7374b81

4 files changed, 18 insertions, 14 deletions

diff --git a/test/fixtures/repositories/mercurial_repository.hg b/test/fixtures/repositories/mercurial_repository.hg
index ef65dfeee..54a8c2ef7 100644
--- a/test/fixtures/repositories/mercurial_repository.hg
+++ b/test/fixtures/repositories/mercurial_repository.hg
diff --git a/test/functional/repositories_mercurial_controller_test.rb b/test/functional/repositories_mercurial_controller_test.rb
index 15c621673..a29c46ae0 100644
--- a/test/functional/repositories_mercurial_controller_test.rb
+++ b/test/functional/repositories_mercurial_controller_test.rb
@@ -126,7 +126,7 @@ class RepositoriesMercurialControllerTest < ActionController::TestCase
                       "test-#{@char_1}.txt"], assigns(:entries).collect(&:name)
         changesets = assigns(:changesets)
         assert_not_nil changesets
-        assert_equal %w(21 20 19 18 17), changesets.collect(&:revision)
+        assert_equal %w(27 21 20 19 18 17), changesets.collect(&:revision)
       end
     end
 
diff --git a/test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb b/test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb
index b89caa5b9..6c9bdd580 100644
--- a/test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb
+++ b/test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb
@@ -18,9 +18,11 @@ begin
         @diff_c_support = true
 
         @tag_char_1    = "tag-#{CHAR_1_HEX}-00"
-        @branch_char_1 = "branch-#{CHAR_1_HEX}-00"
+        @branch_char_0 = "branch-#{CHAR_1_HEX}-00"
+        @branch_char_1 = "branch-#{CHAR_1_HEX}-01"
         if @tag_char_1.respond_to?(:force_encoding)
           @tag_char_1.force_encoding('UTF-8')
+          @branch_char_0.force_encoding('UTF-8')
           @branch_char_1.force_encoding('UTF-8')
         end
       end
@@ -58,7 +60,7 @@ begin
           adp = Redmine::Scm::Adapters::MercurialAdapter.new(repo)
           repo_path =  adp.info.root_url.gsub(/\\/, "/")
           assert_equal REPOSITORY_PATH, repo_path
-          assert_equal '26', adp.info.lastrev.revision
+          assert_equal '28', adp.info.lastrev.revision
           assert_equal '3ae45e2d177d',adp.info.lastrev.scmid
         end
       end
@@ -243,8 +245,9 @@ begin
       def test_branches
         assert_equal [
             'default',
-            'branch (1)[2]&,%.-3_4',
             @branch_char_1,
+            'branch (1)[2]&,%.-3_4',
+            @branch_char_0,
             'test_branch.latin-1',
             'test-branch-00',
           ], @adapter.branches
@@ -256,7 +259,8 @@ begin
            'test_branch.latin-1'   => 'c2ffe7da686a',
            'branch (1)[2]&,%.-3_4' => 'afc61e85bde7',
            'test-branch-00'        => '3a330eb32958',
-           @branch_char_1          => 'c8d3e4887474',
+           @branch_char_0          => 'c8d3e4887474',
+           @branch_char_1          => '7bbf4c738e71',
          }
         assert_equal bm, @adapter.branchmap
       end
diff --git a/test/unit/repository_mercurial_test.rb b/test/unit/repository_mercurial_test.rb
index 6e7938f6c..7bb839046 100644
--- a/test/unit/repository_mercurial_test.rb
+++ b/test/unit/repository_mercurial_test.rb
@@ -43,8 +43,8 @@ class RepositoryMercurialTest < ActiveSupport::TestCase
     def test_fetch_changesets_from_scratch
       @repository.fetch_changesets
       @repository.reload
-      assert_equal 27, @repository.changesets.count
-      assert_equal 34, @repository.changes.count
+      assert_equal 29, @repository.changesets.count
+      assert_equal 37, @repository.changes.count
       assert_equal "Initial import.\nThe repository contains 3 files.",
                    @repository.changesets.find_by_revision('0').comments
     end
@@ -57,7 +57,7 @@ class RepositoryMercurialTest < ActiveSupport::TestCase
       assert_equal 3, @repository.changesets.count
       
       @repository.fetch_changesets
-      assert_equal 27, @repository.changesets.count
+      assert_equal 29, @repository.changesets.count
     end
 
     def test_isodatesec
@@ -187,7 +187,7 @@ class RepositoryMercurialTest < ActiveSupport::TestCase
       @repository.fetch_changesets
       @repository.reload
       changesets = @repository.latest_changesets('README', nil)
-      assert_equal %w|26 17 8 6 1 0|, changesets.collect(&:revision)
+      assert_equal %w|28 17 8 6 1 0|, changesets.collect(&:revision)
 
       path = 'sql_escape/percent%dir/percent%file1.txt'
       changesets = @repository.latest_changesets(path, nil)
@@ -216,9 +216,9 @@ class RepositoryMercurialTest < ActiveSupport::TestCase
     def test_previous
       @repository.fetch_changesets
       @repository.reload
-      %w|26 3ae45e2d177d 3ae4|.each do |r1|
+      %w|28 3ae45e2d177d 3ae45|.each do |r1|
         changeset = @repository.find_changeset_by_name(r1)
-        %w|25 afc61e85bde7 afc6|.each do |r2|
+        %w|27 7bbf4c738e71 7bbf|.each do |r2|
           assert_equal @repository.find_changeset_by_name(r2), changeset.previous
         end
       end
@@ -236,9 +236,9 @@ class RepositoryMercurialTest < ActiveSupport::TestCase
     def test_next
       @repository.fetch_changesets
       @repository.reload
-      %w|25 afc61e85bde7 afc6|.each do |r2|
+      %w|27 7bbf4c738e71 7bbf|.each do |r2|
         changeset = @repository.find_changeset_by_name(r2)
-        %w|26 3ae45e2d177d 3ae4|.each do |r1|
+        %w|28 3ae45e2d177d 3ae45|.each do |r1|
         assert_equal @repository.find_changeset_by_name(r1), changeset.next
         end
       end
@@ -247,7 +247,7 @@ class RepositoryMercurialTest < ActiveSupport::TestCase
     def test_next_nil
       @repository.fetch_changesets
       @repository.reload
-      %w|26 3ae45e2d177d 3ae4|.each do |r1|
+      %w|28 3ae45e2d177d 3ae45|.each do |r1|
         changeset = @repository.find_changeset_by_name(r1)
         assert_nil changeset.next
       end