jro_apps/redmine Commit - r4906:3a56e1eeab0f

scm: git: update test repository for path encoding (#5251)....

Toshi MARUYAMA -

r4906:3a56e1eeab0f

parent child

Context file:

r4906:3a56e1eeab0f

Collapse all files

test/fixtures/repositories/git_repository.tar.gz binary modified 0 0

NO CONTENT: modified file, binary diff hidden

test/unit/lib/redmine/scm/adapters/git_adapter_test.rb +3 -2

             # encoding: utf-8
             # This file includes UTF-8 "Felix Schäfer".
             # We need to consider Ruby 1.9 compatibility.
             require File.expand_path('../../../../../../test_helper', __FILE__)
             begin
               require 'mocha'
               class GitAdapterTest < ActiveSupport::TestCase
                 REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/git_repository'
                 FELIX_UTF8 = "Felix Schäfer"
                 FELIX_HEX  = "Felix Sch\xC3\xA4fer"
                 if File.directory?(REPOSITORY_PATH)
                   def setup
                     @adapter = Redmine::Scm::Adapters::GitAdapter.new(REPOSITORY_PATH)
                   end
                   def test_scm_version
                     to_test = { "git version 1.7.3.4\n"             => [1,7,3,4],
                                 "1.6.1\n1.7\n1.8"                   => [1,6,1],
                                 "1.6.2\r\n1.8.1\r\n1.9.1"           => [1,6,2]}
                     to_test.each do |s, v|
                       test_scm_version_for(s, v)
                     end
                   end
                   def test_branches
-                    assert_equal @adapter.branches, ['master', 'test-latin-1', 'test_branch']
+                    assert_equal  ['latin-1-path-encoding', 'master', 'test-latin-1', 'test_branch'],
+                                  @adapter.branches
                   end
                   def test_getting_all_revisions
-                    assert_equal 16, @adapter.revisions('',nil,nil,:all => true).length
+                    assert_equal 21, @adapter.revisions('',nil,nil,:all => true).length
                   end
                   def test_getting_certain_revisions
                     assert_equal 1, @adapter.revisions('','899a15d^','899a15d').length
                   end
                   def test_getting_revisions_with_spaces_in_filename
                     assert_equal 1, @adapter.revisions("filemane with spaces.txt",
                                                        nil, nil, :all => true).length
                   end
                   def test_getting_revisions_with_leading_and_trailing_spaces_in_filename
                     assert_equal " filename with a leading space.txt ",
                        @adapter.revisions(" filename with a leading space.txt ",
                                            nil, nil, :all => true)[0].paths[0][:path]
                   end
                   def test_getting_entries_with_leading_and_trailing_spaces_in_filename
                     assert_equal " filename with a leading space.txt ",
                        @adapter.entries('',
                                '83ca5fd546063a3c7dc2e568ba3355661a9e2b2c')[3].name
                   end
                   def test_annotate
                     annotate = @adapter.annotate('sources/watchers_controller.rb')
                     assert_kind_of Redmine::Scm::Adapters::Annotate, annotate
                     assert_equal 41, annotate.lines.size
                     assert_equal "# This program is free software; you can redistribute it and/or", annotate.lines[4].strip
                     assert_equal "7234cb2750b63f47bff735edc50a1c0a433c2518",
                                   annotate.revisions[4].identifier
                     assert_equal "jsmith", annotate.revisions[4].author
                   end
                   def test_annotate_moved_file
                     annotate = @adapter.annotate('renamed_test.txt')
                     assert_kind_of Redmine::Scm::Adapters::Annotate, annotate
                     assert_equal 2, annotate.lines.size
                   end
                   def test_last_rev
                     last_rev = @adapter.lastrev("README",
                                                 "4f26664364207fa8b1af9f8722647ab2d4ac5d43")
                     assert_equal "4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8", last_rev.scmid
                     assert_equal "4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8", last_rev.identifier
                     assert_equal "Adam Soltys <asoltys@gmail.com>", last_rev.author
                     assert_equal "2009-06-24 05:27:38".to_time, last_rev.time
                   end
                   def test_last_rev_with_spaces_in_filename
                     last_rev = @adapter.lastrev("filemane with spaces.txt",
                                                 "ed5bb786bbda2dee66a2d50faf51429dbc043a7b")
                     str_felix_utf8 = FELIX_UTF8
                     str_felix_hex  = FELIX_HEX
                     last_rev_author = last_rev.author
                     if last_rev_author.respond_to?(:force_encoding)
                       last_rev_author.force_encoding('UTF-8')
                     end
                     assert_equal "ed5bb786bbda2dee66a2d50faf51429dbc043a7b", last_rev.scmid
                     assert_equal "ed5bb786bbda2dee66a2d50faf51429dbc043a7b", last_rev.identifier
                     assert_equal "#{str_felix_utf8} <felix@fachschaften.org>",
                                    last_rev.author
                     assert_equal "#{str_felix_hex} <felix@fachschaften.org>",
                                    last_rev.author
                     assert_equal "2010-09-18 19:59:46".to_time, last_rev.time
                   end
                   private
                   def test_scm_version_for(scm_command_version, version)
                     @adapter.class.expects(:scm_version_from_command_line).returns(scm_command_version)
                     assert_equal version, @adapter.class.scm_command_version
                   end
                 else
                   puts "Git test repository NOT FOUND. Skipping unit tests !!!"
                   def test_fake; assert true end
                 end
               end
             rescue LoadError
               class GitMochaFake < ActiveSupport::TestCase
                 def test_fake; assert(false, "Requires mocha to run those tests")  end
               end
             end

test/unit/repository_git_test.rb +4 -4

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.expand_path('../../test_helper', __FILE__)
             class RepositoryGitTest < ActiveSupport::TestCase
               fixtures :projects, :repositories, :enabled_modules, :users, :roles
               # No '..' in the repository path
               REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/git_repository'
               REPOSITORY_PATH.gsub!(/\//, "\\") if Redmine::Platform.mswin?
               FELIX_HEX  = "Felix Sch\xC3\xA4fer"
               def setup
                 Setting.commit_logs_encoding = 'UTF-8'
                 @project = Project.find(3)
                 @repository = Repository::Git.create(:project => @project, :url => REPOSITORY_PATH)
                 assert @repository
               end
               if File.directory?(REPOSITORY_PATH)
                 def test_fetch_changesets_from_scratch
                   @repository.fetch_changesets
                   @repository.reload
-                  assert_equal 16, @repository.changesets.count
+                  assert_equal 21, @repository.changesets.count
-                  assert_equal 25, @repository.changes.count
+                  assert_equal 31, @repository.changes.count
                   commit = @repository.changesets.find(:first, :order => 'committed_on ASC')
                   assert_equal "Initial import.\nThe repository contains 3 files.", commit.comments
                   assert_equal "jsmith <jsmith@foo.bar>", commit.committer
                   assert_equal User.find_by_login('jsmith'), commit.user
                   # TODO: add a commit with commit time <> author time to the test repository
                   assert_equal "2007-12-14 09:22:52".to_time, commit.committed_on
                   assert_equal "2007-12-14".to_date, commit.commit_date
                   assert_equal "7234cb2750b63f47bff735edc50a1c0a433c2518", commit.revision
                   assert_equal "7234cb2750b63f47bff735edc50a1c0a433c2518", commit.scmid
                   assert_equal 3, commit.changes.count
                   change = commit.changes.sort_by(&:path).first
                   assert_equal "README", change.path
                   assert_equal "A", change.action
                 end
                 def test_fetch_changesets_incremental
                   @repository.fetch_changesets
                   # Remove the 3 latest changesets
-                  @repository.changesets.find(:all, :order => 'committed_on DESC', :limit => 3).each(&:destroy)
+                  @repository.changesets.find(:all, :order => 'committed_on DESC', :limit => 8).each(&:destroy)
                   @repository.reload
                   cs1 = @repository.changesets
                   assert_equal 13, cs1.count
                   rev_a_commit = @repository.changesets.find(:first, :order => 'committed_on DESC')
                   assert_equal '4f26664364207fa8b1af9f8722647ab2d4ac5d43', rev_a_commit.revision
                   # Mon Jul 5 22:34:26 2010 +0200
                   rev_a_committed_on = Time.gm(2010, 7, 5, 20, 34, 26)
                   assert_equal '4f26664364207fa8b1af9f8722647ab2d4ac5d43', rev_a_commit.scmid
                   assert_equal rev_a_committed_on, rev_a_commit.committed_on
                   latest_rev = @repository.latest_changeset
                   assert_equal rev_a_committed_on, latest_rev.committed_on
                   @repository.fetch_changesets
-                  assert_equal 16, @repository.changesets.count
+                  assert_equal 21, @repository.changesets.count
                 end
                 def test_find_changeset_by_name
                   @repository.fetch_changesets
                   @repository.reload
                   ['7234cb2750b63f47bff735edc50a1c0a433c2518', '7234cb2750b'].each do |r|
                     assert_equal '7234cb2750b63f47bff735edc50a1c0a433c2518',
                                  @repository.find_changeset_by_name(r).revision
                   end
                 end
                 def test_find_changeset_by_empty_name
                   @repository.fetch_changesets
                   @repository.reload
                   ['', ' ', nil].each do |r|
                     assert_nil @repository.find_changeset_by_name(r)
                   end
                 end
                 def test_identifier
                   @repository.fetch_changesets
                   @repository.reload
                   c = @repository.changesets.find_by_revision('7234cb2750b63f47bff735edc50a1c0a433c2518')
                   assert_equal c.scmid, c.identifier
                 end
                 def test_format_identifier
                   @repository.fetch_changesets
                   @repository.reload
                   c = @repository.changesets.find_by_revision('7234cb2750b63f47bff735edc50a1c0a433c2518')
                   assert_equal '7234cb27', c.format_identifier
                 end
                 def test_activities
                   c = Changeset.new(:repository => @repository,
                                     :committed_on => Time.now,
                                     :revision => 'abc7234cb2750b63f47bff735edc50a1c0a433c2',
                                     :scmid    => 'abc7234cb2750b63f47bff735edc50a1c0a433c2',
                                     :comments => 'test')
                   assert c.event_title.include?('abc7234c:')
                   assert_equal 'abc7234cb2750b63f47bff735edc50a1c0a433c2', c.event_url[:rev]
                 end
                 def test_log_utf8
                   @repository.fetch_changesets
                   @repository.reload
                   str_felix_hex  = FELIX_HEX
                   if str_felix_hex.respond_to?(:force_encoding)
                       str_felix_hex.force_encoding('UTF-8')
                   end
                   c = @repository.changesets.find_by_revision('ed5bb786bbda2dee66a2d50faf51429dbc043a7b')
                   assert_equal "#{str_felix_hex} <felix@fachschaften.org>", c.committer
                 end
               else
                 puts "Git test repository NOT FOUND. Skipping unit tests !!!"
                 def test_fake; assert true end
               end
             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