comparison test/unit/repository_git_test.rb @ 909:cbb26bc654de redmine-1.3

Update to Redmine 1.3-stable branch (Redmine SVN rev 8964)

 require File.expand_path('../../test_helper', __FILE__)
 
 class RepositoryGitTest < ActiveSupport::TestCase
   fixtures :projects, :repositories, :enabled_modules, :users, :roles
 
-  # No '..' in the repository path
-  REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/git_repository'
+  REPOSITORY_PATH = Rails.root.join('tmp/test/git_repository').to_s
   REPOSITORY_PATH.gsub!(/\//, "\\") if Redmine::Platform.mswin?
+
+  NUM_REV = 21
 
   FELIX_HEX  = "Felix Sch\xC3\xA4fer"
   CHAR_1_HEX = "\xc3\x9c"
 
   ## Ruby uses ANSI api to fork a process on Windows.
   ## Japanese Shift_JIS and Traditional Chinese Big5 have 0x5c(backslash) problem
   ## and these are incompatible with ASCII.
   # WINDOWS_PASS = Redmine::Platform.mswin?
   WINDOWS_PASS = false
+
+  ## Git, Mercurial and CVS path encodings are binary.
+  ## Subversion supports URL encoding for path.
+  ## Redmine Mercurial adapter and extension use URL encoding.
+  ## Git accepts only binary path in command line parameter.
+  ## So, there is no way to use binary command line parameter in JRuby.
+  JRUBY_SKIP     = (RUBY_PLATFORM == 'java')
+  JRUBY_SKIP_STR = "TODO: This test fails in JRuby"
 
   if File.directory?(REPOSITORY_PATH)
     def setup
       klass = Repository::Git
       assert_equal "Git", klass.scm_name

     end
 
     def test_fetch_changesets_from_scratch
       assert_nil @repository.extra_info
 
-      @repository.fetch_changesets
-      @repository.reload
-
-      assert_equal 21, @repository.changesets.count
+      assert_equal 0, @repository.changesets.count
+      @repository.fetch_changesets
+      @project.reload
+
+      assert_equal NUM_REV, @repository.changesets.count
       assert_equal 33, @repository.changes.count
 
       commit = @repository.changesets.find(:first, :order => 'committed_on ASC')
       assert_equal "Initial import.\nThe repository contains 3 files.", commit.comments
       assert_equal "jsmith <[e-mail]>", commit.committer

 
       assert_equal 4, @repository.extra_info["branches"].size
     end
 
     def test_fetch_changesets_incremental
-      @repository.fetch_changesets
-      @repository.reload
-      assert_equal 21, @repository.changesets.count
+      assert_equal 0, @repository.changesets.count
+      @repository.fetch_changesets
+      @project.reload
+      assert_equal NUM_REV, @repository.changesets.count
       assert_equal 33, @repository.changes.count
       extra_info_db = @repository.extra_info["branches"]
       assert_equal 4, extra_info_db.size
       assert_equal "1ca7f5ed374f3cb31a93ae5215c2e25cc6ec5127",
                     extra_info_db["latin-1-path-encoding"]["last_scmid"]

           "7e61ac704deecde634b51e59daa8110435dcb3da",
          ]
       @repository.changesets.each do |rev|
         rev.destroy if del_revs.detect {|r| r == rev.scmid.to_s }
       end
-      @repository.reload
+      @project.reload
       cs1 = @repository.changesets
       assert_equal 15, cs1.count
       h = @repository.extra_info.dup
       h["branches"]["master"]["last_scmid"] =
             "4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8"
       @repository.merge_extra_info(h)
       @repository.save
-      @repository.reload
+      @project.reload
       extra_info_db_1 = @repository.extra_info["branches"]
       assert_equal "4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8",
                     extra_info_db_1["master"]["last_scmid"]
 
       @repository.fetch_changesets
-      assert_equal 21, @repository.changesets.count
+      @project.reload
+      assert_equal NUM_REV, @repository.changesets.count
     end
 
     def test_fetch_changesets_invalid_rev
-      @repository.fetch_changesets
-      @repository.reload
-      assert_equal 21, @repository.changesets.count
-      assert_equal 33, @repository.changes.count
+      assert_equal 0, @repository.changesets.count
+      @repository.fetch_changesets
+      @project.reload
+      assert_equal NUM_REV, @repository.changesets.count
       extra_info_db = @repository.extra_info["branches"]
       assert_equal 4, extra_info_db.size
       assert_equal "1ca7f5ed374f3cb31a93ae5215c2e25cc6ec5127",
                     extra_info_db["latin-1-path-encoding"]["last_scmid"]
       assert_equal "83ca5fd546063a3c7dc2e568ba3355661a9e2b2c",

           "7e61ac704deecde634b51e59daa8110435dcb3da",
          ]
       @repository.changesets.each do |rev|
         rev.destroy if del_revs.detect {|r| r == rev.scmid.to_s }
       end
-      @repository.reload
+      @project.reload
       cs1 = @repository.changesets
       assert_equal 15, cs1.count
       h = @repository.extra_info.dup
       h["branches"]["master"]["last_scmid"] =
             "abcd1234efgh"
       @repository.merge_extra_info(h)
       @repository.save
-      @repository.reload
+      @project.reload
       extra_info_db_1 = @repository.extra_info["branches"]
       assert_equal "abcd1234efgh",
                     extra_info_db_1["master"]["last_scmid"]
 
       @repository.fetch_changesets
+      @project.reload
       assert_equal 15, @repository.changesets.count
+    end
+
+    def test_parents
+      assert_equal 0, @repository.changesets.count
+      @repository.fetch_changesets
+      @project.reload
+      assert_equal NUM_REV, @repository.changesets.count
+      r1 = @repository.find_changeset_by_name("7234cb2750b63")
+      assert_equal [], r1.parents
+      r2 = @repository.find_changeset_by_name("899a15dba03a3")
+      assert_equal 1, r2.parents.length
+      assert_equal "7234cb2750b63f47bff735edc50a1c0a433c2518",
+                   r2.parents[0].identifier
+      r3 = @repository.find_changeset_by_name("32ae898b720c2")
+      assert_equal 2, r3.parents.length
+      r4 = [r3.parents[0].identifier, r3.parents[1].identifier].sort
+      assert_equal "4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8", r4[0]
+      assert_equal "7e61ac704deecde634b51e59daa8110435dcb3da", r4[1]
     end
 
     def test_db_consistent_ordering_init
       assert_nil @repository.extra_info
-      @repository.fetch_changesets
-      @repository.reload
+      assert_equal 0, @repository.changesets.count
+      @repository.fetch_changesets
+      @project.reload
       assert_equal 1, @repository.extra_info["db_consistent"]["ordering"]
     end
 
     def test_db_consistent_ordering_before_1_2
       assert_nil @repository.extra_info
-      @repository.fetch_changesets
-      @repository.reload
-      assert_equal 21, @repository.changesets.count
+      assert_equal 0, @repository.changesets.count
+      @repository.fetch_changesets
+      @project.reload
+      assert_equal NUM_REV, @repository.changesets.count
       assert_not_nil @repository.extra_info
       @repository.write_attribute(:extra_info, nil)
       @repository.save
       assert_nil @repository.extra_info
-      assert_equal 21, @repository.changesets.count
-      @repository.fetch_changesets
-      @repository.reload
+      assert_equal NUM_REV, @repository.changesets.count
+      @repository.fetch_changesets
+      @project.reload
       assert_equal 0, @repository.extra_info["db_consistent"]["ordering"]
 
       del_revs = [
           "83ca5fd546063a3c7dc2e568ba3355661a9e2b2c",
           "ed5bb786bbda2dee66a2d50faf51429dbc043a7b",

           "7e61ac704deecde634b51e59daa8110435dcb3da",
          ]
       @repository.changesets.each do |rev|
         rev.destroy if del_revs.detect {|r| r == rev.scmid.to_s }
       end
-      @repository.reload
+      @project.reload
       cs1 = @repository.changesets
       assert_equal 15, cs1.count
       assert_equal 0, @repository.extra_info["db_consistent"]["ordering"]
       h = @repository.extra_info.dup
       h["branches"]["master"]["last_scmid"] =
             "4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8"
       @repository.merge_extra_info(h)
       @repository.save
-      @repository.reload
+      @project.reload
       extra_info_db_1 = @repository.extra_info["branches"]
       assert_equal "4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8",
                     extra_info_db_1["master"]["last_scmid"]
 
       @repository.fetch_changesets
-      assert_equal 21, @repository.changesets.count
+      assert_equal NUM_REV, @repository.changesets.count
       assert_equal 0, @repository.extra_info["db_consistent"]["ordering"]
     end
 
     def test_latest_changesets
-      @repository.fetch_changesets
-      @repository.reload
+      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 2, changesets.size
 
       # with path

       assert_equal [
               '713f4944648826f558cf548222f813dabe7cbb04',
               '61b685fbe55ab05b5ac68402d5720c1a6ac973d1',
           ], changesets.collect(&:revision)
 
-      # latin-1 encoding path
-      changesets = @repository.latest_changesets(
-                    "latin-1-dir/test-#{@char_1}-2.txt", '64f1f3e89')
-      assert_equal [
+      if JRUBY_SKIP
+        puts JRUBY_SKIP_STR
+      else
+        # latin-1 encoding path
+        changesets = @repository.latest_changesets(
+                      "latin-1-dir/test-#{@char_1}-2.txt", '64f1f3e89')
+        assert_equal [
               '64f1f3e89ad1cb57976ff0ad99a107012ba3481d',
               '4fc55c43bf3d3dc2efb66145365ddc17639ce81e',
           ], changesets.collect(&:revision)
 
-      changesets = @repository.latest_changesets(
+        changesets = @repository.latest_changesets(
                     "latin-1-dir/test-#{@char_1}-2.txt", '64f1f3e89', 1)
-      assert_equal [
+        assert_equal [
               '64f1f3e89ad1cb57976ff0ad99a107012ba3481d',
           ], changesets.collect(&:revision)
+      end
     end
 
     def test_latest_changesets_latin_1_dir
       if WINDOWS_PASS
         #
+      elsif JRUBY_SKIP
+        puts JRUBY_SKIP_STR
       else
+        assert_equal 0, @repository.changesets.count
         @repository.fetch_changesets
-        @repository.reload
+        @project.reload
+        assert_equal NUM_REV, @repository.changesets.count
         changesets = @repository.latest_changesets(
                     "latin-1-dir/test-#{@char_1}-subdir", '1ca7f5ed')
         assert_equal [
               '1ca7f5ed374f3cb31a93ae5215c2e25cc6ec5127',
           ], changesets.collect(&:revision)
       end
     end
 
     def test_find_changeset_by_name
-      @repository.fetch_changesets
-      @repository.reload
+      assert_equal 0, @repository.changesets.count
+      @repository.fetch_changesets
+      @project.reload
+      assert_equal NUM_REV, @repository.changesets.count
       ['7234cb2750b63f47bff735edc50a1c0a433c2518', '7234cb2750b'].each do |r|
         assert_equal '7234cb2750b63f47bff735edc50a1c0a433c2518',
                      @repository.find_changeset_by_name(r).revision
       end
     end
 
     def test_find_changeset_by_empty_name
-      @repository.fetch_changesets
-      @repository.reload
+      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_identifier
-      @repository.fetch_changesets
-      @repository.reload
+      assert_equal 0, @repository.changesets.count
+      @repository.fetch_changesets
+      @project.reload
+      assert_equal NUM_REV, @repository.changesets.count
       c = @repository.changesets.find_by_revision(
                           '7234cb2750b63f47bff735edc50a1c0a433c2518')
       assert_equal c.scmid, c.identifier
     end
 
     def test_format_identifier
-      @repository.fetch_changesets
-      @repository.reload
+      assert_equal 0, @repository.changesets.count
+      @repository.fetch_changesets
+      @project.reload
+      assert_equal NUM_REV, @repository.changesets.count
       c = @repository.changesets.find_by_revision(
                           '7234cb2750b63f47bff735edc50a1c0a433c2518')
       assert_equal '7234cb27', c.format_identifier
     end
 

       assert c.event_title.include?('abc7234c:')
       assert_equal 'abc7234cb2750b63f47bff735edc50a1c0a433c2', c.event_url[:rev]
     end
 
     def test_log_utf8
-      @repository.fetch_changesets
-      @repository.reload
+      assert_equal 0, @repository.changesets.count
+      @repository.fetch_changesets
+      @project.reload
+      assert_equal NUM_REV, @repository.changesets.count
       str_felix_hex  = FELIX_HEX.dup
       if str_felix_hex.respond_to?(:force_encoding)
           str_felix_hex.force_encoding('UTF-8')
       end
       c = @repository.changesets.find_by_revision(
                         'ed5bb786bbda2dee66a2d50faf51429dbc043a7b')
       assert_equal "#{str_felix_hex} <[e-mail]>", c.committer
     end
 
     def test_previous
-      @repository.fetch_changesets
-      @repository.reload
+      assert_equal 0, @repository.changesets.count
+      @repository.fetch_changesets
+      @project.reload
+      assert_equal NUM_REV, @repository.changesets.count
       %w|1ca7f5ed374f3cb31a93ae5215c2e25cc6ec5127 1ca7f5ed|.each do |r1|
         changeset = @repository.find_changeset_by_name(r1)
         %w|64f1f3e89ad1cb57976ff0ad99a107012ba3481d 64f1f3e89ad1|.each do |r2|
           assert_equal @repository.find_changeset_by_name(r2), changeset.previous
         end
       end
     end
 
     def test_previous_nil
-      @repository.fetch_changesets
-      @repository.reload
+      assert_equal 0, @repository.changesets.count
+      @repository.fetch_changesets
+      @project.reload
+      assert_equal NUM_REV, @repository.changesets.count
       %w|7234cb2750b63f47bff735edc50a1c0a433c2518 7234cb2|.each do |r1|
         changeset = @repository.find_changeset_by_name(r1)
         assert_nil changeset.previous
       end
     end
 
     def test_next
-      @repository.fetch_changesets
-      @repository.reload
+      assert_equal 0, @repository.changesets.count
+      @repository.fetch_changesets
+      @project.reload
+      assert_equal NUM_REV, @repository.changesets.count
       %w|64f1f3e89ad1cb57976ff0ad99a107012ba3481d 64f1f3e89ad1|.each do |r2|
         changeset = @repository.find_changeset_by_name(r2)
         %w|1ca7f5ed374f3cb31a93ae5215c2e25cc6ec5127 1ca7f5ed|.each do |r1|
         assert_equal @repository.find_changeset_by_name(r1), changeset.next
         end
       end
     end
 
     def test_next_nil
-      @repository.fetch_changesets
-      @repository.reload
+      assert_equal 0, @repository.changesets.count
+      @repository.fetch_changesets
+      @project.reload
+      assert_equal NUM_REV, @repository.changesets.count
       %w|67e7792ce20ccae2e4bb73eed09bb397819c8834 67e7792ce20cca|.each do |r1|
         changeset = @repository.find_changeset_by_name(r1)
         assert_nil changeset.next
       end
     end