jro_apps/redmine Commit - r5812:9fa4fff48ae2

scm: bazaar: update test repository (#2799, #4741, #8030)....

Toshi MARUYAMA -

r5812:9fa4fff48ae2

parent child

Context file:

r5812:9fa4fff48ae2

Collapse all files

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

NO CONTENT: modified file, binary diff hidden

test/functional/repositories_bazaar_controller_test.rb +2 -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 RepositoriesBazaarControllerTest < 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/bazaar_repository'
+              REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') +
+                                     '/tmp/test/bazaar_repository/trunk'
               PRJ_ID = 3
               def setup
                 @controller = RepositoriesController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 User.current = nil
                 @project = Project.find(PRJ_ID)
                 @repository = Repository::Bazaar.create(
                                 :project      => @project,
                                 :url          => REPOSITORY_PATH,
                                 :log_encoding => 'UTF-8')
                 assert @repository
               end
               if File.directory?(REPOSITORY_PATH)
                 def test_browse_root
                   get :show, :id => PRJ_ID
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entries)
                   assert_equal 2, assigns(:entries).size
                   assert assigns(:entries).detect {|e| e.name == 'directory' && e.kind == 'dir'}
                   assert assigns(:entries).detect {|e| e.name == 'doc-mkdir.txt' && e.kind == 'file'}
                 end
                 def test_browse_directory
                   get :show, :id => PRJ_ID, :path => ['directory']
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entries)
                   assert_equal ['doc-ls.txt', 'document.txt', '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 'directory/edit.png', entry.path
                 end
                 def test_browse_at_given_revision
                   get :show, :id => PRJ_ID, :path => [], :rev => 3
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entries)
                   assert_equal ['directory', 'doc-deleted.txt', 'doc-ls.txt', 'doc-mkdir.txt'],
                                assigns(:entries).collect(&:name)
                 end
                 def test_changes
                   get :changes, :id => PRJ_ID, :path => ['doc-mkdir.txt']
                   assert_response :success
                   assert_template 'changes'
                   assert_tag :tag => 'h2', :content => 'doc-mkdir.txt'
                 end
                 def test_entry_show
                   get :entry, :id => PRJ_ID, :path => ['directory', 'doc-ls.txt']
                   assert_response :success
                   assert_template 'entry'
                   # Line 19
                   assert_tag :tag => 'th',
                              :content => /29/,
                              :attributes => { :class => /line-num/ },
                              :sibling => { :tag => 'td', :content => /Show help message/ }
                 end
                 def test_entry_download
                   get :entry, :id => PRJ_ID, :path => ['directory', 'doc-ls.txt'], :format => 'raw'
                   assert_response :success
                   # File content
                   assert @response.body.include?('Show help message')
                 end
                 def test_directory_entry
                   get :entry, :id => PRJ_ID, :path => ['directory']
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entry)
                   assert_equal 'directory', assigns(:entry).name
                 end
                 def test_diff
                   # Full diff of changeset 3
                   get :diff, :id => PRJ_ID, :rev => 3
                   assert_response :success
                   assert_template 'diff'
                   # Line 11 removed
                   assert_tag :tag => 'th',
                              :content => /11/,
                              :sibling => { :tag => 'td',
                                            :attributes => { :class => /diff_out/ },
                                            :content => /Display more information/ }
                 end
                 def test_annotate
                   get :annotate, :id => PRJ_ID, :path => ['doc-mkdir.txt']
                   assert_response :success
                   assert_template 'annotate'
                   assert_tag :tag => 'th', :content => '2',
                              :sibling => {
                                 :tag => 'td',
                                 :child => {
                                    :tag => 'a',
                                    :content => /3/
                                    }
                                 },
                              :sibling => { :tag => 'td', :content => /jsmith/ }
                   assert_tag :tag => 'th', :content => '2',
                              :sibling => {
                                 :tag => 'td',
                                 :child => {
                                    :tag => 'a',
                                    :content => /3/
                                    }
                                 },
                              :sibling => { :tag => 'td', :content => /Main purpose/ }
                 end
               else
                 puts "Bazaar test repository NOT FOUND. Skipping functional tests !!!"
                 def test_fake; assert true end
               end
             end

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

             require File.expand_path('../../../../../../test_helper', __FILE__)
             begin
               require 'mocha'
               class BazaarAdapterTest < ActiveSupport::TestCase
-                REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/bazaar_repository'
+                REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') +
+                                    '/tmp/test/bazaar_repository/trunk'
                 REPOSITORY_PATH.gsub!(/\/+/, '/')
                 if File.directory?(REPOSITORY_PATH)
                   def setup
                     @adapter = Redmine::Scm::Adapters::BazaarAdapter.new(REPOSITORY_PATH)
                   end
                   def test_scm_version
                     to_test = { "Bazaar (bzr) 2.1.2\n"             => [2,1,2],
                                 "2.1.1\n1.7\n1.8"                  => [2,1,1],
                                 "2.0.1\r\n1.8.1\r\n1.9.1"          => [2,0,1]}
                     to_test.each do |s, v|
                       test_scm_version_for(s, v)
                     end
                   end
                   def test_cat
                     cat = @adapter.cat('directory/document.txt')
                     assert cat =~ /Write the contents of a file as of a given revision to standard output/
                   end
                   def test_cat_path_invalid
                     assert_nil @adapter.cat('invalid')
                   end
                   def test_cat_revision_invalid
                     assert_nil @adapter.cat('doc-mkdir.txt', '12345678')
                   end
                   def test_diff_path_invalid
                     assert_equal [], @adapter.diff('invalid', 1)
                   end
                   def test_diff_revision_invalid
                     assert_equal [], @adapter.diff(nil, 12345678)
                     assert_equal [], @adapter.diff(nil, 12345678, 87654321)
                   end
                   def test_annotate
                     annotate = @adapter.annotate('doc-mkdir.txt')
                     assert_equal 17, annotate.lines.size
                     assert_equal '1', annotate.revisions[0].identifier
                     assert_equal 'jsmith@', annotate.revisions[0].author
                     assert_equal 'mkdir', annotate.lines[0]
                   end
                   def test_annotate_path_invalid
                     assert_nil @adapter.annotate('invalid')
                   end
                   def test_annotate_revision_invalid
                     assert_nil @adapter.annotate('doc-mkdir.txt', '12345678')
                   end
                   def test_branch_conf_path
                     p = "c:\\test\\test\\"
                     bcp = Redmine::Scm::Adapters::BazaarAdapter.branch_conf_path(p)
                     assert_equal File.join("c:\\test\\test", ".bzr", "branch", "branch.conf"), bcp
                     p = "c:\\test\\test\\.bzr"
                     bcp = Redmine::Scm::Adapters::BazaarAdapter.branch_conf_path(p)
                     assert_equal File.join("c:\\test\\test", ".bzr", "branch", "branch.conf"), bcp
                     p = "c:\\test\\test\\.bzr\\"
                     bcp = Redmine::Scm::Adapters::BazaarAdapter.branch_conf_path(p)
                     assert_equal File.join("c:\\test\\test", ".bzr", "branch", "branch.conf"), bcp
                     p = "c:\\test\\test"
                     bcp = Redmine::Scm::Adapters::BazaarAdapter.branch_conf_path(p)
                     assert_equal File.join("c:\\test\\test", ".bzr", "branch", "branch.conf"), bcp
                     p = "\\\\server\\test\\test\\"
                     bcp = Redmine::Scm::Adapters::BazaarAdapter.branch_conf_path(p)
                     assert_equal File.join("\\\\server\\test\\test", ".bzr", "branch", "branch.conf"), bcp
                   end
                   def test_append_revisions_only
-                    assert_equal false, @adapter.append_revisions_only
+                    assert_equal true, @adapter.append_revisions_only
                   end
                   def test_info_not_nil
                     assert_not_nil @adapter.info
                   end
                   def test_info_nil
                     adpt = Redmine::Scm::Adapters::BazaarAdapter.new(
                               "/invalid/invalid/"
                               )
                     assert_nil adpt.info
                   end
                   def test_info
                     info = @adapter.info
                     assert_equal 4, info.lastrev.identifier.to_i
                   end
                   def test_entries_path_invalid
                     assert_equal [], @adapter.entries('invalid')
                   end
                   def test_entries_revision_invalid
                     assert_nil @adapter.entries(nil, 12345678)
                   end
                   def test_revisions_path_invalid
                     assert_nil @adapter.revisions('invalid')
                   end
                   def test_revisions_revision_invalid
                     assert_nil @adapter.revisions(nil, 12345678)
                     assert_nil @adapter.revisions(nil, 12345678, 87654321)
                   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 "Bazaar test repository NOT FOUND. Skipping unit tests !!!"
                   def test_fake; assert true end
                 end
               end
             rescue LoadError
               class BazaarMochaFake < ActiveSupport::TestCase
                 def test_fake; assert(false, "Requires mocha to run those tests")  end
               end
             end

test/unit/repository_bazaar_test.rb +2 -1

             # 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 RepositoryBazaarTest < ActiveSupport::TestCase
               fixtures :projects
               # No '..' in the repository path
-              REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/bazaar_repository'
+              REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') +
+                                     '/tmp/test/bazaar_repository/trunk'
               REPOSITORY_PATH.gsub!(/\/+/, '/')
               def setup
                 @project = Project.find(3)
                 @repository = Repository::Bazaar.create(
                           :project => @project, :url => "file:///#{REPOSITORY_PATH}",
                           :log_encoding => 'UTF-8')
                 assert @repository
               end
               if File.directory?(REPOSITORY_PATH)
                 def test_fetch_changesets_from_scratch
                   @repository.fetch_changesets
                   @repository.reload
                   assert_equal 4, @repository.changesets.count
                   assert_equal 9, @repository.changes.count
                   assert_equal 'Initial import', @repository.changesets.find_by_revision('1').comments
                 end
                 def test_fetch_changesets_incremental
                   @repository.fetch_changesets
                   # Remove changesets with revision > 5
                   @repository.changesets.find(:all).each {|c| c.destroy if c.revision.to_i > 2}
                   @repository.reload
                   assert_equal 2, @repository.changesets.count
                   @repository.fetch_changesets
                   assert_equal 4, @repository.changesets.count
                 end
                 def test_entries
                   entries = @repository.entries
                   assert_equal 2, entries.size
                   assert_equal 'dir', entries[0].kind
                   assert_equal 'directory', entries[0].name
                   assert_equal 'file', entries[1].kind
                   assert_equal 'doc-mkdir.txt', entries[1].name
                 end
                 def test_entries_in_subdirectory
                   entries = @repository.entries('directory')
                   assert_equal 3, entries.size
                   assert_equal 'file', entries.last.kind
                   assert_equal 'edit.png', entries.last.name
                 end
                 def test_previous
                   @repository.fetch_changesets
                   @repository.reload
                   changeset = @repository.find_changeset_by_name('3')
                   assert_equal @repository.find_changeset_by_name('2'), changeset.previous
                 end
                 def test_previous_nil
                   @repository.fetch_changesets
                   @repository.reload
                   changeset = @repository.find_changeset_by_name('1')
                   assert_nil changeset.previous
                 end
                 def test_next
                   @repository.fetch_changesets
                   @repository.reload
                   changeset = @repository.find_changeset_by_name('2')
                   assert_equal @repository.find_changeset_by_name('3'), changeset.next
                 end
                 def test_next_nil
                   @repository.fetch_changesets
                   @repository.reload
                   changeset = @repository.find_changeset_by_name('4')
                   assert_nil changeset.next
                 end
               else
                 puts "Bazaar 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