jro_apps/redmine Commit - r4733:671b16f89884

scm: mercurial: add instance value flag of whether "hg diff -c" supports at tests (#7518)....

Toshi MARUYAMA -

r4733:671b16f89884

parent child

Context file:

r4733:671b16f89884

Collapse all files

test/functional/repositories_mercurial_controller_test.rb +2 -1

             # redMine - project management software
             # Copyright (C) 2006-2008  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
               # No '..' in the repository path
               REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/mercurial_repository'
               def setup
                 @controller = RepositoriesController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 User.current = nil
                 @repository = Repository::Mercurial.create(:project => Project.find(3), :url => REPOSITORY_PATH)
                 assert @repository
+                @diff_c_support = @repository.scm.class.client_version_above?([1, 2])
               end
               if File.directory?(REPOSITORY_PATH)
                 def test_show
                   get :show, :id => 3
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entries)
                   assert_not_nil assigns(:changesets)
                 end
                 def test_show_root
                   get :show, :id => 3
                   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'}
                 end
                 def test_show_directory
                   get :show, :id => 3, :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
                 end
                 def test_show_at_given_revision
                   [0, '0', '0885933ad4f6'].each do |r1|
                     get :show, :id => 3, :path => ['images'], :rev => r1
                     assert_response :success
                     assert_template 'show'
                     assert_not_nil assigns(:entries)
                     assert_equal ['delete.png'], assigns(:entries).collect(&:name)
                   end
                 end
                 def test_show_directory_sql_escape_percent
                   [13, '13', '3a330eb32958'].each do |r1|
                     get :show, :id => 3, :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)
                     ## This is not yet implemented.
                     # assert_not_nil changesets
                     # assert_equal %w(13 11 10 9), changesets.collect(&:revision)
                   end
                 end
                 def test_changes
                   get :changes, :id => 3, :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 => 3, :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_download
                   get :entry, :id => 3, :path => ['sources', 'watchers_controller.rb'], :format => 'raw'
                   assert_response :success
                   # File content
                   assert @response.body.include?('WITHOUT ANY WARRANTY')
                 end
                 def test_directory_entry
                   get :entry, :id => 3, :path => ['sources']
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entry)
                   assert_equal 'sources', assigns(:entry).name
                 end
                 def test_diff
                   @repository.fetch_changesets
                   @repository.reload
                   [4, '4', 'def6d2f1254a'].each do |r1|
                     # Full diff of changeset 4
                     get :diff, :id => 3, :rev => r1
                     assert_response :success
                     assert_template 'diff'
-                    if @repository.scm.class.client_version_above?([1, 2])
+                    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
                 def test_diff_two_revs
                   @repository.fetch_changesets
                   @repository.reload
                   [2, '400bb8672109', '400', 400].each do |r1|
                     [4, 'def6d2f1254a'].each do |r2|
                       get :diff, :id => 3, :rev    => r1,
                                            :rev_to => r2
                       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
                 def test_annotate
                   get :annotate, :id => 3, :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_at_given_revision
                   @repository.fetch_changesets
                   @repository.reload
                   [2, '400bb8672109', '400', 400].each do |r1|
                     get :annotate, :id => 3, :rev => r1, :path => ['sources', 'watchers_controller.rb']
                     assert_response :success
                     assert_template 'annotate'
                     assert_tag :tag => 'h2', :content => /@ 2:400bb8672109/
                   end
                 end
                 def test_empty_revision
                   @repository.fetch_changesets
                   @repository.reload
                   ['', ' ', nil].each do |r|
                     get :revision, :id => 3, :rev => r
                     assert_response 404
                     assert_error_tag :content => /was not found/
                   end
                 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 +3 -2

             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.gsub(%r{config\/\.\.}, '') + '/tmp/test/mercurial_repository'
                 if File.directory?(REPOSITORY_PATH)
                   def setup
                     @adapter = Redmine::Scm::Adapters::MercurialAdapter.new(REPOSITORY_PATH)
+                    @diff_c_support = @adapter.class.client_version_above?([1, 2])
                   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 = { [0,9,5]  => "0.9.5",
                                 [1,0]    => "1.0",
                                 []       => "1.0",
                                 [1,0,1]  => "1.0",
                                 [1,7]    => "1.0",
                                 [1,7,1]  => "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)
                       assert_equal REPOSITORY_PATH, adp.info.root_url
                       assert_equal '16', adp.info.lastrev.revision
                       assert_equal '4cddb4e45f52',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 @adapter.class.client_version_above?([1, 2])
+                      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 @adapter.class.client_version_above?([1, 2])
+                    if @diff_c_support
                       [16, '16', '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
                   # TODO filesize etc.
                   def test_entries
                     assert_nil @adapter.entries(nil, '100000')
                     [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
                       assert_equal 'README', entries1[2].name
                       assert_equal 'README', entries1[2].path
                       assert_equal 'file', entries1[2].kind
                       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_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
                   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

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