jro_apps/redmine Commit - r7542:476c3d54b711

scm: mercurial: update test repository (#5501)...

Toshi MARUYAMA -

r7542:476c3d54b711

parent child

Context file:

r7542:476c3d54b711

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

             # Redmine - project management software
             # Copyright (C) 2006-2011  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__)
             require 'repositories_controller'
             # Re-raise errors caught by the controller.
             class RepositoriesController; def rescue_action(e) raise e end; end
             class RepositoriesMercurialControllerTest < ActionController::TestCase
               fixtures :projects, :users, :roles, :members, :member_roles,
                        :repositories, :enabled_modules
               REPOSITORY_PATH = Rails.root.join('tmp/test/mercurial_repository').to_s
               CHAR_1_HEX = "\xc3\x9c"
               PRJ_ID     = 3
-              NUM_REV    = 29
+              NUM_REV    = 32
               ruby19_non_utf8_pass =
                  (RUBY_VERSION >= '1.9' && Encoding.default_external.to_s != 'UTF-8')
               def setup
                 @controller = RepositoriesController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 User.current = nil
                 @project    = Project.find(PRJ_ID)
                 @repository = Repository::Mercurial.create(
                                   :project => @project,
                                   :url     => REPOSITORY_PATH,
                                   :path_encoding => 'ISO-8859-1'
                                   )
                 assert @repository
                 @diff_c_support = true
                 @char_1        = CHAR_1_HEX.dup
                 @tag_char_1    = "tag-#{CHAR_1_HEX}-00"
                 @branch_char_0 = "branch-#{CHAR_1_HEX}-00"
                 @branch_char_1 = "branch-#{CHAR_1_HEX}-01"
                 if @char_1.respond_to?(:force_encoding)
                   @char_1.force_encoding('UTF-8')
                   @tag_char_1.force_encoding('UTF-8')
                   @branch_char_0.force_encoding('UTF-8')
                   @branch_char_1.force_encoding('UTF-8')
                 end
               end
               if ruby19_non_utf8_pass
                 puts "TODO: Mercurial functional test fails in Ruby 1.9 " +
                      "and Encoding.default_external is not UTF-8. " +
                      "Current value is '#{Encoding.default_external.to_s}'"
                 def test_fake; assert true end
               elsif File.directory?(REPOSITORY_PATH)
                 def test_show_root
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   get :show, :id => PRJ_ID
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entries)
                   assert_equal 4, assigns(:entries).size
                   assert assigns(:entries).detect {|e| e.name == 'images'  && e.kind == 'dir'}
                   assert assigns(:entries).detect {|e| e.name == 'sources' && e.kind == 'dir'}
                   assert assigns(:entries).detect {|e| e.name == 'README'  && e.kind == 'file'}
                   assert_not_nil assigns(:changesets)
                   assert assigns(:changesets).size > 0
                 end
                 def test_show_directory
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   get :show, :id => PRJ_ID, :path => ['images']
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entries)
                   assert_equal ['delete.png', 'edit.png'], assigns(:entries).collect(&:name)
                   entry = assigns(:entries).detect {|e| e.name == 'edit.png'}
                   assert_not_nil entry
                   assert_equal 'file', entry.kind
                   assert_equal 'images/edit.png', entry.path
                   assert_not_nil assigns(:changesets)
                   assert assigns(:changesets).size > 0
                 end
                 def test_show_at_given_revision
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   [0, '0', '0885933ad4f6'].each do |r1|
                     get :show, :id => PRJ_ID, :path => ['images'], :rev => r1
                     assert_response :success
                     assert_template 'show'
                     assert_not_nil assigns(:entries)
                     assert_equal ['delete.png'], assigns(:entries).collect(&:name)
                     assert_not_nil assigns(:changesets)
                     assert assigns(:changesets).size > 0
                   end
                 end
                 def test_show_directory_sql_escape_percent
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   [13, '13', '3a330eb32958'].each do |r1|
                     get :show, :id => PRJ_ID, :path => ['sql_escape', 'percent%dir'],
                         :rev => r1
                     assert_response :success
                     assert_template 'show'
                     assert_not_nil assigns(:entries)
                     assert_equal ['percent%file1.txt', 'percentfile1.txt'],
                                  assigns(:entries).collect(&:name)
                     changesets = assigns(:changesets)
                     assert_not_nil changesets
                     assert assigns(:changesets).size > 0
                     assert_equal %w(13 11 10 9), changesets.collect(&:revision)
                   end
                 end
                 def test_show_directory_latin_1_path
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   [21, '21', 'adf805632193'].each do |r1|
                     get :show, :id => PRJ_ID, :path => ['latin-1-dir'], :rev => r1
                     assert_response :success
                     assert_template 'show'
                     assert_not_nil assigns(:entries)
                     assert_equal ["make-latin-1-file.rb",
                                   "test-#{@char_1}-1.txt",
                                   "test-#{@char_1}-2.txt",
                                   "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)
                   end
                 end
                 def test_show_branch
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                    [
                       'default',
                       @branch_char_1,
                       'branch (1)[2]&,%.-3_4',
                       @branch_char_0,
                       'test_branch.latin-1',
                       'test-branch-00',
                   ].each do |bra|
                     get :show, :id => PRJ_ID, :rev => bra
                     assert_response :success
                     assert_template 'show'
                     assert_not_nil assigns(:entries)
                     assert assigns(:entries).size > 0
                     assert_not_nil assigns(:changesets)
                     assert assigns(:changesets).size > 0
                   end
                 end
                 def test_show_tag
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                    [
                     @tag_char_1,
                     'tag_test.00',
                     'tag-init-revision'
                   ].each do |tag|
                     get :show, :id => PRJ_ID, :rev => tag
                     assert_response :success
                     assert_template 'show'
                     assert_not_nil assigns(:entries)
                     assert assigns(:entries).size > 0
                     assert_not_nil assigns(:changesets)
                     assert assigns(:changesets).size > 0
                   end
                 end
                 def test_changes
                   get :changes, :id => PRJ_ID, :path => ['images', 'edit.png']
                   assert_response :success
                   assert_template 'changes'
                   assert_tag :tag => 'h2', :content => 'edit.png'
                 end
                 def test_entry_show
                   get :entry, :id => PRJ_ID, :path => ['sources', 'watchers_controller.rb']
                   assert_response :success
                   assert_template 'entry'
                   # Line 10
                   assert_tag :tag => 'th',
                              :content => '10',
                              :attributes => { :class => 'line-num' },
                              :sibling => { :tag => 'td', :content => /WITHOUT ANY WARRANTY/ }
                 end
                 def test_entry_show_latin_1_path
                   [21, '21', 'adf805632193'].each do |r1|
                     get :entry, :id => PRJ_ID,
                         :path => ['latin-1-dir', "test-#{@char_1}-2.txt"], :rev => r1
                     assert_response :success
                     assert_template 'entry'
                     assert_tag :tag => 'th',
                              :content => '1',
                              :attributes => { :class => 'line-num' },
                              :sibling => { :tag => 'td',
                                            :content => /Mercurial is a distributed version control system/ }
                   end
                 end
                 def test_entry_show_latin_1_contents
                   with_settings :repositories_encodings => 'UTF-8,ISO-8859-1' do
                     [27, '27', '7bbf4c738e71'].each do |r1|
                       get :entry, :id => PRJ_ID,
                           :path => ['latin-1-dir', "test-#{@char_1}.txt"], :rev => r1
                       assert_response :success
                       assert_template 'entry'
                       assert_tag :tag => 'th',
                              :content => '1',
                              :attributes => { :class => 'line-num' },
                              :sibling => { :tag => 'td',
                                            :content => /test-#{@char_1}.txt/ }
                     end
                   end
                 end
                 def test_entry_download
                   get :entry, :id => PRJ_ID,
                       :path => ['sources', 'watchers_controller.rb'], :format => 'raw'
                   assert_response :success
                   # File content
                   assert @response.body.include?('WITHOUT ANY WARRANTY')
                 end
                 def test_entry_binary_force_download
                   get :entry, :id => PRJ_ID, :rev => 1, :path => ['images', 'edit.png']
                   assert_response :success
                   assert_equal 'image/png', @response.content_type
                 end
                 def test_directory_entry
                   get :entry, :id => PRJ_ID, :path => ['sources']
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entry)
                   assert_equal 'sources', assigns(:entry).name
                 end
                 def test_diff
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   [4, '4', 'def6d2f1254a'].each do |r1|
                     # Full diff of changeset 4
                     ['inline', 'sbs'].each do |dt|
                       get :diff, :id => PRJ_ID, :rev => r1, :type => dt
                       assert_response :success
                       assert_template 'diff'
                       if @diff_c_support
                         # Line 22 removed
                         assert_tag :tag => 'th',
                                    :content => '22',
                                    :sibling => { :tag => 'td',
                                                  :attributes => { :class => /diff_out/ },
                                                  :content => /def remove/ }
                         assert_tag :tag => 'h2', :content => /4:def6d2f1254a/
                       end
                     end
                   end
                 end
                 def test_diff_two_revs
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   [2, '400bb8672109', '400', 400].each do |r1|
                     [4, 'def6d2f1254a'].each do |r2|
                       ['inline', 'sbs'].each do |dt|
                         get :diff,
                             :id     => PRJ_ID,
                             :rev    => r1,
                             :rev_to => r2,
                             :type => dt
                         assert_response :success
                         assert_template 'diff'
                         diff = assigns(:diff)
                         assert_not_nil diff
                         assert_tag :tag => 'h2',
                                    :content => /4:def6d2f1254a 2:400bb8672109/
                       end
                     end
                   end
                 end
                 def test_diff_latin_1_path
                   with_settings :repositories_encodings => 'UTF-8,ISO-8859-1' do
                     [21, 'adf805632193'].each do |r1|
                       ['inline', 'sbs'].each do |dt|
                         get :diff, :id => PRJ_ID, :rev => r1, :type => dt
                         assert_response :success
                         assert_template 'diff'
                         assert_tag :tag => 'thead',
                                    :descendant => {
                                      :tag => 'th',
                                      :attributes => { :class => 'filename' } ,
                                      :content => /latin-1-dir\/test-#{@char_1}-2.txt/ ,
                                     },
                                    :sibling => {
                                      :tag => 'tbody',
                                      :descendant => {
                                         :tag => 'td',
                                         :attributes => { :class => /diff_in/ },
                                         :content => /It is written in Python/
                                      }
                                    }
                       end
                     end
                   end
                 end
                 def test_annotate
                   get :annotate, :id => PRJ_ID, :path => ['sources', 'watchers_controller.rb']
                   assert_response :success
                   assert_template 'annotate'
                   # Line 23, revision 4:def6d2f1254a
                   assert_tag :tag => 'th',
                              :content => '23',
                              :attributes => { :class => 'line-num' },
                              :sibling =>
                                    {
                                      :tag => 'td',
                                      :attributes => { :class => 'revision' },
                                      :child => { :tag => 'a', :content => '4:def6d2f1254a' }
                                    }
                   assert_tag :tag => 'th',
                              :content => '23',
                              :attributes => { :class => 'line-num' },
                              :sibling =>
                                    {
                                       :tag     => 'td'    ,
                                       :content => 'jsmith' ,
                                       :attributes => { :class   => 'author' },
                                     }
                   assert_tag :tag => 'th',
                              :content => '23',
                              :attributes => { :class => 'line-num' },
                              :sibling => { :tag => 'td', :content => /watcher =/ }
                 end
                 def test_annotate_not_in_tip
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   get :annotate, :id => PRJ_ID,
                       :path => ['sources', 'welcome_controller.rb']
                   assert_response 404
                   assert_error_tag :content => /was not found/
                 end
                 def test_annotate_at_given_revision
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   [2, '400bb8672109', '400', 400].each do |r1|
                     get :annotate, :id => PRJ_ID, :rev => r1,
                         :path => ['sources', 'watchers_controller.rb']
                     assert_response :success
                     assert_template 'annotate'
                     assert_tag :tag => 'h2', :content => /@ 2:400bb8672109/
                   end
                 end
                 def test_annotate_latin_1_path
                   [21, '21', 'adf805632193'].each do |r1|
                     get :annotate, :id => PRJ_ID,
                         :path => ['latin-1-dir', "test-#{@char_1}-2.txt"], :rev => r1
                     assert_response :success
                     assert_template 'annotate'
                     assert_tag :tag => 'th',
                              :content => '1',
                              :attributes => { :class => 'line-num' },
                              :sibling =>
                                    {
                                      :tag => 'td',
                                      :attributes => { :class => 'revision' },
                                      :child => { :tag => 'a', :content => '20:709858aafd1b' }
                                    }
                     assert_tag :tag => 'th',
                              :content => '1',
                              :attributes => { :class => 'line-num' },
                              :sibling =>
                                    {
                                       :tag     => 'td'    ,
                                       :content => 'jsmith' ,
                                       :attributes => { :class   => 'author' },
                                     }
                     assert_tag :tag => 'th',
                              :content => '1',
                              :attributes => { :class => 'line-num' },
                              :sibling => { :tag => 'td',
                                            :content => /Mercurial is a distributed version control system/ }
                   end
                 end
                 def test_annotate_latin_1_contents
                   with_settings :repositories_encodings => 'UTF-8,ISO-8859-1' do
                     [27, '7bbf4c738e71'].each do |r1|
                       get :annotate, :id => PRJ_ID,
                           :path => ['latin-1-dir', "test-#{@char_1}.txt"], :rev => r1
                       assert_tag :tag => 'th',
                                  :content => '1',
                                  :attributes => { :class => 'line-num' },
                                  :sibling => { :tag => 'td',
                                                :content => /test-#{@char_1}.txt/ }
                     end
                   end
                 end
                 def test_empty_revision
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   ['', ' ', nil].each do |r|
                     get :revision, :id => PRJ_ID, :rev => r
                     assert_response 404
                     assert_error_tag :content => /was not found/
                   end
                 end
                 def test_destroy_valid_repository
                   @request.session[:user_id] = 1 # admin
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   get :destroy, :id => PRJ_ID
                   assert_response 302
                   @project.reload
                   assert_nil @project.repository
                 end
                 def test_destroy_invalid_repository
                   @request.session[:user_id] = 1 # admin
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   get :destroy, :id => PRJ_ID
                   assert_response 302
                   @project.reload
                   assert_nil @project.repository
                   @repository = Repository::Mercurial.create(
                                   :project => Project.find(PRJ_ID),
                                   :url     => "/invalid",
                                   :path_encoding => 'ISO-8859-1'
                                   )
                   assert @repository
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal 0, @repository.changesets.count
                   get :destroy, :id => PRJ_ID
                   assert_response 302
                   @project.reload
                   assert_nil @project.repository
                 end
               else
                 puts "Mercurial test repository NOT FOUND. Skipping functional tests !!!"
                 def test_fake; assert true end
               end
             end

test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb +5 -3

             require File.expand_path('../../../../../../test_helper', __FILE__)
             begin
               require 'mocha'
               class MercurialAdapterTest < ActiveSupport::TestCase
                 HELPERS_DIR        = Redmine::Scm::Adapters::MercurialAdapter::HELPERS_DIR
                 TEMPLATE_NAME      = Redmine::Scm::Adapters::MercurialAdapter::TEMPLATE_NAME
                 TEMPLATE_EXTENSION = Redmine::Scm::Adapters::MercurialAdapter::TEMPLATE_EXTENSION
                 REPOSITORY_PATH = Rails.root.join('tmp/test/mercurial_repository').to_s
                 CHAR_1_HEX = "\xc3\x9c"
                 if File.directory?(REPOSITORY_PATH)
                   def setup
                     adapter_class = Redmine::Scm::Adapters::MercurialAdapter
                     assert adapter_class
                     assert adapter_class.client_command
                     assert_equal true, adapter_class.client_available
                     assert_equal true, adapter_class.client_version_above?([0, 9, 5])
                     @adapter = Redmine::Scm::Adapters::MercurialAdapter.new(
                                           REPOSITORY_PATH,
                                           nil,
                                           nil,
                                           nil,
                                          'ISO-8859-1')
                     @diff_c_support = true
                     @char_1        = CHAR_1_HEX.dup
                     @tag_char_1    = "tag-#{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)
                       @char_1.force_encoding('UTF-8')
                       @tag_char_1.force_encoding('UTF-8')
                       @branch_char_0.force_encoding('UTF-8')
                       @branch_char_1.force_encoding('UTF-8')
                     end
                   end
                   def test_hgversion
                     to_test = { "Mercurial Distributed SCM (version 0.9.5)\n"  => [0,9,5],
                                 "Mercurial Distributed SCM (1.0)\n"            => [1,0],
                                 "Mercurial Distributed SCM (1e4ddc9ac9f7+20080325)\n" => nil,
                                 "Mercurial Distributed SCM (1.0.1+20080525)\n" => [1,0,1],
                                 "Mercurial Distributed SCM (1916e629a29d)\n"   => nil,
                                 "Mercurial SCM Distribuito (versione 0.9.5)\n" => [0,9,5],
                                 "(1.6)\n(1.7)\n(1.8)"                          => [1,6],
                                 "(1.7.1)\r\n(1.8.1)\r\n(1.9.1)"                => [1,7,1]}
                     to_test.each do |s, v|
                       test_hgversion_for(s, v)
                     end
                   end
                   def test_template_path
                     to_test = {
                                 [1,2]    => "1.0",
                                 []       => "1.0",
                                 [1,2,1]  => "1.0",
                                 [1,7]    => "1.0",
                                 [1,7,1]  => "1.0",
                                 [2,0]    => "1.0",
                                }
                     to_test.each do |v, template|
                       test_template_path_for(v, template)
                     end
                   end
                   def test_info
                     [REPOSITORY_PATH, REPOSITORY_PATH + "/",
                          REPOSITORY_PATH + "//"].each do |repo|
                       adp = Redmine::Scm::Adapters::MercurialAdapter.new(repo)
                       repo_path =  adp.info.root_url.gsub(/\\/, "/")
                       assert_equal REPOSITORY_PATH, repo_path
-                      assert_equal '28', adp.info.lastrev.revision
+                      assert_equal '31', adp.info.lastrev.revision
-                      assert_equal '3ae45e2d177d',adp.info.lastrev.scmid
+                      assert_equal '31eeee7395c8',adp.info.lastrev.scmid
                     end
                   end
                   def test_revisions
                     revisions = @adapter.revisions(nil, 2, 4)
                     assert_equal 3, revisions.size
                     assert_equal '2', revisions[0].revision
                     assert_equal '400bb8672109', revisions[0].scmid
                     assert_equal '4', revisions[2].revision
                     assert_equal 'def6d2f1254a', revisions[2].scmid
                     revisions = @adapter.revisions(nil, 2, 4, {:limit => 2})
                     assert_equal 2, revisions.size
                     assert_equal '2', revisions[0].revision
                     assert_equal '400bb8672109', revisions[0].scmid
                   end
                   def test_diff
                     if @adapter.class.client_version_above?([1, 2])
                       assert_nil @adapter.diff(nil, '100000')
                     end
                     assert_nil @adapter.diff(nil, '100000', '200000')
                     [2, '400bb8672109', '400', 400].each do |r1|
                       diff1 = @adapter.diff(nil, r1)
                       if @diff_c_support
                         assert_equal 28, diff1.size
                         buf = diff1[24].gsub(/\r\n|\r|\n/, "")
                         assert_equal "+    return true unless klass.respond_to?('watched_by')", buf
                       else
                         assert_equal 0, diff1.size
                       end
                       [4, 'def6d2f1254a'].each do |r2|
                         diff2 = @adapter.diff(nil,r1,r2)
                         assert_equal 49, diff2.size
                         buf =  diff2[41].gsub(/\r\n|\r|\n/, "")
                         assert_equal "+class WelcomeController < ApplicationController", buf
                         diff3 = @adapter.diff('sources/watchers_controller.rb', r1, r2)
                         assert_equal 20, diff3.size
                         buf =  diff3[12].gsub(/\r\n|\r|\n/, "")
                         assert_equal "+    @watched.remove_watcher(user)", buf
                       end
                     end
                   end
                   def test_diff_made_by_revision
                     if @diff_c_support
                       [24, '24', '4cddb4e45f52'].each do |r1|
                         diff1 = @adapter.diff(nil, r1)
                         assert_equal 5, diff1.size
                         buf = diff1[4].gsub(/\r\n|\r|\n/, "")
                         assert_equal '+0885933ad4f68d77c2649cd11f8311276e7ef7ce tag-init-revision', buf
                       end
                     end
                   end
                   def test_cat
                     [2, '400bb8672109', '400', 400].each do |r|
                       buf = @adapter.cat('sources/welcome_controller.rb', r)
                       assert buf
                       lines = buf.split("\r\n")
                       assert_equal 25, lines.length
                       assert_equal 'class WelcomeController < ApplicationController', lines[17]
                     end
                     assert_nil @adapter.cat('sources/welcome_controller.rb')
                   end
                   def test_annotate
                     assert_equal [], @adapter.annotate("sources/welcome_controller.rb").lines
                     [2, '400bb8672109', '400', 400].each do |r|
                       ann = @adapter.annotate('sources/welcome_controller.rb', r)
                       assert ann
                       assert_equal '1', ann.revisions[17].revision
                       assert_equal '9d5b5b004199', ann.revisions[17].identifier
                       assert_equal 'jsmith', ann.revisions[0].author
                       assert_equal 25, ann.lines.length
                       assert_equal 'class WelcomeController < ApplicationController', ann.lines[17]
                     end
                   end
                   def test_entries
                     assert_nil @adapter.entries(nil, '100000')
                     assert_equal 1, @adapter.entries("sources", 3).size
                     assert_equal 1, @adapter.entries("sources", 'b3a615152df8').size
                     [2, '400bb8672109', '400', 400].each do |r|
                       entries1 = @adapter.entries(nil, r)
                       assert entries1
                       assert_equal 3, entries1.size
                       assert_equal 'sources', entries1[1].name
                       assert_equal 'sources', entries1[1].path
                       assert_equal 'dir', entries1[1].kind
                       readme = entries1[2]
                       assert_equal 'README', readme.name
                       assert_equal 'README', readme.path
                       assert_equal 'file', readme.kind
                       assert_equal 27, readme.size
                       assert_equal '1', readme.lastrev.revision
                       assert_equal '9d5b5b004199', readme.lastrev.identifier
                       # 2007-12-14 10:24:01 +0100
                       assert_equal Time.gm(2007, 12, 14, 9, 24, 1), readme.lastrev.time
                       entries2 = @adapter.entries('sources', r)
                       assert entries2
                       assert_equal 2, entries2.size
                       assert_equal 'watchers_controller.rb', entries2[0].name
                       assert_equal 'sources/watchers_controller.rb', entries2[0].path
                       assert_equal 'file', entries2[0].kind
                       assert_equal 'welcome_controller.rb', entries2[1].name
                       assert_equal 'sources/welcome_controller.rb', entries2[1].path
                       assert_equal 'file', entries2[1].kind
                     end
                   end
                   def test_entries_tag
                     entries1 = @adapter.entries(nil, 'tag_test.00')
                     assert entries1
                     assert_equal 3, entries1.size
                     assert_equal 'sources', entries1[1].name
                     assert_equal 'sources', entries1[1].path
                     assert_equal 'dir', entries1[1].kind
                     readme = entries1[2]
                     assert_equal 'README', readme.name
                     assert_equal 'README', readme.path
                     assert_equal 'file', readme.kind
                     assert_equal 21, readme.size
                     assert_equal '0', readme.lastrev.revision
                     assert_equal '0885933ad4f6', readme.lastrev.identifier
                     # 2007-12-14 10:22:52 +0100
                     assert_equal Time.gm(2007, 12, 14, 9, 22, 52), readme.lastrev.time
                   end
                   def test_entries_branch
                     entries1 = @adapter.entries(nil, 'test-branch-00')
                     assert entries1
                     assert_equal 5, entries1.size
                     assert_equal 'sql_escape', entries1[2].name
                     assert_equal 'sql_escape', entries1[2].path
                     assert_equal 'dir', entries1[2].kind
                     readme = entries1[4]
                     assert_equal 'README', readme.name
                     assert_equal 'README', readme.path
                     assert_equal 'file', readme.kind
                     assert_equal 365, readme.size
                     assert_equal '8', readme.lastrev.revision
                     assert_equal 'c51f5bb613cd', readme.lastrev.identifier
                     # 2001-02-01 00:00:00 -0900
                     assert_equal Time.gm(2001, 2, 1, 9, 0, 0), readme.lastrev.time
                   end
                   def test_locate_on_outdated_repository
                     assert_equal 1, @adapter.entries("images", 0).size
                     assert_equal 2, @adapter.entries("images").size
                     assert_equal 2, @adapter.entries("images", 2).size
                   end
                   def test_access_by_nodeid
                     path = 'sources/welcome_controller.rb'
                     assert_equal @adapter.cat(path, 2), @adapter.cat(path, '400bb8672109')
                   end
                   def test_access_by_fuzzy_nodeid
                     path = 'sources/welcome_controller.rb'
                     # falls back to nodeid
                     assert_equal @adapter.cat(path, 2), @adapter.cat(path, '400')
                   end
                   def test_tags
                     assert_equal [@tag_char_1, 'tag_test.00', 'tag-init-revision'], @adapter.tags
                   end
                   def test_tagmap
                     tm = {
                       @tag_char_1         => 'adf805632193',
                       'tag_test.00'       => '6987191f453a',
                       'tag-init-revision' => '0885933ad4f6',
                       }
                     assert_equal tm, @adapter.tagmap
                   end
                   def test_branches
                     assert_equal [
                         'default',
+                        'test-branch-01',
                         @branch_char_1,
                         'branch (1)[2]&,%.-3_4',
                         @branch_char_0,
                         'test_branch.latin-1',
                         'test-branch-00',
                       ], @adapter.branches
                   end
                   def test_branchmap
                     bm = {
-                       'default'               => '3ae45e2d177d',
+                       'default'               => '31eeee7395c8',
                        'test_branch.latin-1'   => 'c2ffe7da686a',
                        'branch (1)[2]&,%.-3_4' => 'afc61e85bde7',
                        'test-branch-00'        => '3a330eb32958',
+                       "test-branch-01"        => 'ad4dc4f80284',
                        @branch_char_0          => 'c8d3e4887474',
                        @branch_char_1          => '7bbf4c738e71',
                      }
                     assert_equal bm, @adapter.branchmap
                   end
                   def test_path_space
                     p = 'README (1)[2]&,%.-3_4'
                     [15, '933ca60293d7'].each do |r1|
                       assert @adapter.diff(p, r1)
                       assert @adapter.cat(p, r1)
                       assert_equal 1, @adapter.annotate(p, r1).lines.length
                       [25, 'afc61e85bde7'].each do |r2|
                         assert @adapter.diff(p, r1, r2)
                       end
                     end
                   end
                   def test_tag_non_ascii
                     p = "latin-1-dir/test-#{@char_1}-1.txt"
                     assert @adapter.cat(p, @tag_char_1)
                     assert_equal 1, @adapter.annotate(p, @tag_char_1).lines.length
                   end
                   def test_branch_non_ascii
                     p = "latin-1-dir/test-#{@char_1}-subdir/test-#{@char_1}-1.txt"
                     assert @adapter.cat(p, @branch_char_1)
                     assert_equal 1, @adapter.annotate(p, @branch_char_1).lines.length
                   end
                   def test_nodes_in_branch
                      [
                         'default',
                         @branch_char_1,
                         'branch (1)[2]&,%.-3_4',
                         @branch_char_0,
                         'test_branch.latin-1',
                         'test-branch-00',
                            ].each do |bra|
                       nib0 = @adapter.nodes_in_branch(bra)
                       assert nib0
                       nib1 = @adapter.nodes_in_branch(bra, :limit => 1)
                       assert_equal 1, nib1.size
                       case bra
                         when 'branch (1)[2]&,%.-3_4'
                           if @adapter.class.client_version_above?([1, 6])
                             assert_equal 3, nib0.size
                             assert_equal nib0[0], 'afc61e85bde7'
                             nib2 = @adapter.nodes_in_branch(bra, :limit => 2)
                             assert_equal 2, nib2.size
                             assert_equal nib2[1], '933ca60293d7'
                           end
                         when @branch_char_1
                           if @adapter.class.client_version_above?([1, 6])
                             assert_equal 2, nib0.size
                             assert_equal nib0[1], '08ff3227303e'
                             nib2 = @adapter.nodes_in_branch(bra, :limit => 1)
                             assert_equal 1, nib2.size
                             assert_equal nib2[0], '7bbf4c738e71'
                           end
                       end
                     end
                   end
                   def test_path_encoding_default_utf8
                     adpt1 = Redmine::Scm::Adapters::MercurialAdapter.new(
                                               REPOSITORY_PATH
                                             )
                     assert_equal "UTF-8", adpt1.path_encoding
                     adpt2 = Redmine::Scm::Adapters::MercurialAdapter.new(
                                               REPOSITORY_PATH,
                                               nil,
                                               nil,
                                               nil,
                                               ""
                                             )
                     assert_equal "UTF-8", adpt2.path_encoding
                   end
                   private
                   def test_hgversion_for(hgversion, version)
                     @adapter.class.expects(:hgversion_from_command_line).returns(hgversion)
                     assert_equal version, @adapter.class.hgversion
                   end
                   def test_template_path_for(version, template)
                     assert_equal "#{HELPERS_DIR}/#{TEMPLATE_NAME}-#{template}.#{TEMPLATE_EXTENSION}",
                                  @adapter.class.template_path_for(version)
                     assert File.exist?(@adapter.class.template_path_for(version))
                   end
                 else
                   puts "Mercurial test repository NOT FOUND. Skipping unit tests !!!"
                   def test_fake; assert true end
                 end
               end
             rescue LoadError
               class MercurialMochaFake < ActiveSupport::TestCase
                 def test_fake; assert(false, "Requires mocha to run those tests")  end
               end
             end

test/unit/repository_mercurial_test.rb +9 -9

             # Redmine - project management software
             # Copyright (C) 2006-2011  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 RepositoryMercurialTest < ActiveSupport::TestCase
               fixtures :projects
               REPOSITORY_PATH = Rails.root.join('tmp/test/mercurial_repository').to_s
-              NUM_REV = 29
+              NUM_REV = 32
               CHAR_1_HEX = "\xc3\x9c"
               if File.directory?(REPOSITORY_PATH)
                 def setup
                   klass = Repository::Mercurial
                   assert_equal "Mercurial", klass.scm_name
                   assert klass.scm_adapter_class
                   assert_not_equal "", klass.scm_command
                   assert_equal true, klass.scm_available
                   @project    = Project.find(3)
                   @repository = Repository::Mercurial.create(
                                   :project => @project,
                                   :url     => REPOSITORY_PATH,
                                   :path_encoding => 'ISO-8859-1'
                                   )
                   assert @repository
                   @char_1        = CHAR_1_HEX.dup
                   @tag_char_1    = "tag-#{CHAR_1_HEX}-00"
                   @branch_char_0 = "branch-#{CHAR_1_HEX}-00"
                   @branch_char_1 = "branch-#{CHAR_1_HEX}-01"
                   if @char_1.respond_to?(:force_encoding)
                     @char_1.force_encoding('UTF-8')
                     @tag_char_1.force_encoding('UTF-8')
                     @branch_char_0.force_encoding('UTF-8')
                     @branch_char_1.force_encoding('UTF-8')
                   end
                 end
                 def test_fetch_changesets_from_scratch
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
-                  assert_equal 37, @repository.changes.count
+                  assert_equal 46, @repository.changes.count
                   assert_equal "Initial import.\nThe repository contains 3 files.",
                                @repository.changesets.find_by_revision('0').comments
                 end
                 def test_fetch_changesets_incremental
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   # Remove changesets with revision > 2
                   @repository.changesets.find(:all).each {|c| c.destroy if c.revision.to_i > 2}
                   @project.reload
                   assert_equal 3, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                 end
                 def test_isodatesec
                   # Template keyword 'isodatesec' supported in Mercurial 1.0 and higher
                   if @repository.scm.class.client_version_above?([1, 0])
                     assert_equal 0, @repository.changesets.count
                     @repository.fetch_changesets
                     @project.reload
                     assert_equal NUM_REV, @repository.changesets.count
                     rev0_committed_on = Time.gm(2007, 12, 14, 9, 22, 52)
                     assert_equal @repository.changesets.find_by_revision('0').committed_on, rev0_committed_on
                   end
                 end
                 def test_changeset_order_by_revision
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   c0 = @repository.latest_changeset
                   c1 = @repository.changesets.find_by_revision('0')
                   # sorted by revision (id), not by date
                   assert c0.revision.to_i > c1.revision.to_i
                   assert c0.committed_on  < c1.committed_on
                 end
                 def test_latest_changesets
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   # with_limit
                   changesets = @repository.latest_changesets('', nil, 2)
-                  assert_equal %w|28 27|, changesets.collect(&:revision)
+                  assert_equal %w|31 30|, changesets.collect(&:revision)
                   # with_filepath
                   changesets = @repository.latest_changesets(
                                   '/sql_escape/percent%dir/percent%file1.txt', nil)
-                  assert_equal %w|11 10 9|, changesets.collect(&:revision)
+                  assert_equal %w|30 11 10 9|, changesets.collect(&:revision)
                   changesets = @repository.latest_changesets(
                                   '/sql_escape/underscore_dir/understrike_file.txt', nil)
-                  assert_equal %w|12 9|, changesets.collect(&:revision)
+                  assert_equal %w|30 12 9|, changesets.collect(&:revision)
                   changesets = @repository.latest_changesets('README', nil)
-                  assert_equal %w|28 17 8 6 1 0|, changesets.collect(&:revision)
+                  assert_equal %w|31 30 28 17 8 6 1 0|, changesets.collect(&:revision)
                   changesets = @repository.latest_changesets('README','8')
                   assert_equal %w|8 6 1 0|, changesets.collect(&:revision)
                   changesets = @repository.latest_changesets('README','8', 2)
                   assert_equal %w|8 6|, changesets.collect(&:revision)
                   # with_dirpath
                   changesets = @repository.latest_changesets('images', nil)
                   assert_equal %w|1 0|, changesets.collect(&:revision)
                   path = 'sql_escape/percent%dir'
                   changesets = @repository.latest_changesets(path, nil)
-                  assert_equal %w|13 11 10 9|, changesets.collect(&:revision)
+                  assert_equal %w|30 13 11 10 9|, changesets.collect(&:revision)
                   changesets = @repository.latest_changesets(path, '11')
                   assert_equal %w|11 10 9|, changesets.collect(&:revision)
                   changesets = @repository.latest_changesets(path, '11', 2)
                   assert_equal %w|11 10|, changesets.collect(&:revision)
                   path = 'sql_escape/underscore_dir'
                   changesets = @repository.latest_changesets(path, nil)
-                  assert_equal %w|13 12 9|, changesets.collect(&:revision)
+                  assert_equal %w|30 13 12 9|, changesets.collect(&:revision)
                   changesets = @repository.latest_changesets(path, '12')
                   assert_equal %w|12 9|, changesets.collect(&:revision)
                   changesets = @repository.latest_changesets(path, '12', 1)
                   assert_equal %w|12|, changesets.collect(&:revision)
                   # tag
                   changesets = @repository.latest_changesets('', 'tag_test.00')
                   assert_equal %w|5 4 3 2 1 0|, changesets.collect(&:revision)
                   changesets = @repository.latest_changesets('', 'tag_test.00', 2)
                   assert_equal %w|5 4|, changesets.collect(&:revision)
                   changesets = @repository.latest_changesets('sources', 'tag_test.00')
                   assert_equal %w|4 3 2 1 0|, changesets.collect(&:revision)
                   changesets = @repository.latest_changesets('sources', 'tag_test.00', 2)
                   assert_equal %w|4 3|, changesets.collect(&:revision)
                   # named branch
                   if @repository.scm.class.client_version_above?([1, 6])
                     changesets = @repository.latest_changesets('', @branch_char_1)
                     assert_equal %w|27 26|, changesets.collect(&:revision)
                   end
                   changesets = @repository.latest_changesets("latin-1-dir/test-#{@char_1}-subdir", @branch_char_1)
                   assert_equal %w|27|, changesets.collect(&:revision)
                 end
                 def test_copied_files
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   cs1 = @repository.changesets.find_by_revision('13')
                   assert_not_nil cs1
                   c1  = cs1.changes.sort_by(&:path)
                   assert_equal 2, c1.size
                   assert_equal 'A', c1[0].action
                   assert_equal '/sql_escape/percent%dir/percentfile1.txt',  c1[0].path
                   assert_equal '/sql_escape/percent%dir/percent%file1.txt', c1[0].from_path
                   assert_equal '3a330eb32958', c1[0].from_revision
                   assert_equal 'A', c1[1].action
                   assert_equal '/sql_escape/underscore_dir/understrike-file.txt', c1[1].path
                   assert_equal '/sql_escape/underscore_dir/understrike_file.txt', c1[1].from_path
                   cs2 = @repository.changesets.find_by_revision('15')
                   c2  = cs2.changes
                   assert_equal 1, c2.size
                   assert_equal 'A', c2[0].action
                   assert_equal '/README (1)[2]&,%.-3_4', c2[0].path
                   assert_equal '/README', c2[0].from_path
                   assert_equal '933ca60293d7', c2[0].from_revision
                   cs3 = @repository.changesets.find_by_revision('19')
                   c3  = cs3.changes
                   assert_equal 1, c3.size
                   assert_equal 'A', c3[0].action
                   assert_equal "/latin-1-dir/test-#{@char_1}-1.txt",  c3[0].path
                   assert_equal "/latin-1-dir/test-#{@char_1}.txt",    c3[0].from_path
                   assert_equal '5d9891a1b425', c3[0].from_revision
                 end
                 def test_find_changeset_by_name
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   %w|2 400bb8672109 400|.each do |r|
                     assert_equal '2', @repository.find_changeset_by_name(r).revision
                   end
                 end
                 def test_find_changeset_by_invalid_name
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   assert_nil @repository.find_changeset_by_name('100000')
                 end
                 def test_identifier
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   c = @repository.changesets.find_by_revision('2')
                   assert_equal c.scmid, c.identifier
                 end
                 def test_format_identifier
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   c = @repository.changesets.find_by_revision('2')
                   assert_equal '2:400bb8672109', c.format_identifier
                 end
                 def test_find_changeset_by_empty_name
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   ['', ' ', nil].each do |r|
                     assert_nil @repository.find_changeset_by_name(r)
                   end
                 end
                 def test_activities
                   c = Changeset.new(:repository   => @repository,
                                     :committed_on => Time.now,
                                     :revision     => '123',
                                     :scmid        => 'abc400bb8672',
                                     :comments     => 'test')
                   assert c.event_title.include?('123:abc400bb8672:')
                   assert_equal 'abc400bb8672', c.event_url[:rev]
                 end
                 def test_previous
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   %w|28 3ae45e2d177d 3ae45|.each do |r1|
                     changeset = @repository.find_changeset_by_name(r1)
                     %w|27 7bbf4c738e71 7bbf|.each do |r2|
                       assert_equal @repository.find_changeset_by_name(r2), changeset.previous
                     end
                   end
                 end
                 def test_previous_nil
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   %w|0 0885933ad4f6 0885|.each do |r1|
                     changeset = @repository.find_changeset_by_name(r1)
                     assert_nil changeset.previous
                   end
                 end
                 def test_next
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   %w|27 7bbf4c738e71 7bbf|.each do |r2|
                     changeset = @repository.find_changeset_by_name(r2)
                     %w|28 3ae45e2d177d 3ae45|.each do |r1|
                     assert_equal @repository.find_changeset_by_name(r1), changeset.next
                     end
                   end
                 end
                 def test_next_nil
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
-                  %w|28 3ae45e2d177d 3ae45|.each do |r1|
+                  %w|31 31eeee7395c8 31eee|.each do |r1|
                     changeset = @repository.find_changeset_by_name(r1)
                     assert_nil changeset.next
                   end
                 end
               else
                 puts "Mercurial 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