jro_apps/redmine Commit - r4939:d5b268129c26

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

Toshi MARUYAMA -

r4939:d5b268129c26

parent child

Context file:

r4939:d5b268129c26

Collapse all files

test/fixtures/repositories/mercurial_repository.hg binary modified 0 0

NO CONTENT: modified file, binary diff hidden

test/functional/repositories_mercurial_controller_test.rb +1 -1

                                   "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

test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb +8 -4

                     @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
                       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
                   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
                        '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

test/unit/repository_mercurial_test.rb +9 -9

                 def test_fetch_changesets_from_scratch
                   @repository.fetch_changesets
                   @repository.reload
-                  assert_equal 27, @repository.changesets.count
+                  assert_equal 29, @repository.changesets.count
-                  assert_equal 34, @repository.changes.count
+                  assert_equal 37, @repository.changes.count
                   assert_equal "Initial import.\nThe repository contains 3 files.",
                                @repository.changesets.find_by_revision('0').comments
                 end
                   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
                   @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)
                 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
                 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
                 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

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages