Chris@0: # Redmine - project management software
Chris@1494: # Copyright (C) 2006-2014  Jean-Philippe Lang
Chris@0: #
Chris@0: # This program is free software; you can redistribute it and/or
Chris@0: # modify it under the terms of the GNU General Public License
Chris@0: # as published by the Free Software Foundation; either version 2
Chris@0: # of the License, or (at your option) any later version.
Chris@909: #
Chris@0: # This program is distributed in the hope that it will be useful,
Chris@0: # but WITHOUT ANY WARRANTY; without even the implied warranty of
Chris@0: # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
Chris@0: # GNU General Public License for more details.
Chris@909: #
Chris@0: # You should have received a copy of the GNU General Public License
Chris@0: # along with this program; if not, write to the Free Software
Chris@0: # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
Chris@0: 
Chris@119: require File.expand_path('../../../../test_helper', __FILE__)
Chris@0: 
Chris@0: class Redmine::UnifiedDiffTest < ActiveSupport::TestCase
Chris@0:   def test_subversion_diff
Chris@0:     diff = Redmine::UnifiedDiff.new(read_diff_fixture('subversion.diff'))
Chris@0:     # number of files
Chris@0:     assert_equal 4, diff.size
Chris@0:     assert diff.detect {|file| file.file_name =~ %r{^config/settings.yml}}
Chris@0:   end
Chris@909: 
Chris@0:   def test_truncate_diff
Chris@0:     diff = Redmine::UnifiedDiff.new(read_diff_fixture('subversion.diff'), :max_lines => 20)
Chris@0:     assert_equal 2, diff.size
Chris@0:   end
Chris@909: 
Chris@441:   def test_inline_partials
Chris@441:     diff = Redmine::UnifiedDiff.new(read_diff_fixture('partials.diff'))
Chris@441:     assert_equal 1, diff.size
Chris@441:     diff = diff.first
Chris@441:     assert_equal 43, diff.size
Chris@909: 
Chris@441:     assert_equal [51, -1], diff[0].offsets
Chris@441:     assert_equal [51, -1], diff[1].offsets
Chris@441:     assert_equal 'Lorem ipsum dolor sit amet, consectetur adipiscing <span>elit</span>', diff[0].html_line
Chris@441:     assert_equal 'Lorem ipsum dolor sit amet, consectetur adipiscing <span>xx</span>', diff[1].html_line
Chris@909: 
Chris@441:     assert_nil diff[2].offsets
Chris@441:     assert_equal 'Praesent et sagittis dui. Vivamus ac diam diam', diff[2].html_line
Chris@909: 
Chris@441:     assert_equal [0, -14], diff[3].offsets
Chris@441:     assert_equal [0, -14], diff[4].offsets
Chris@441:     assert_equal '<span>Ut sed</span> auctor justo', diff[3].html_line
Chris@441:     assert_equal '<span>xxx</span> auctor justo', diff[4].html_line
Chris@909: 
Chris@441:     assert_equal [13, -19], diff[6].offsets
Chris@441:     assert_equal [13, -19], diff[7].offsets
Chris@909: 
Chris@441:     assert_equal [24, -8], diff[9].offsets
Chris@441:     assert_equal [24, -8], diff[10].offsets
Chris@909: 
Chris@441:     assert_equal [37, -1], diff[12].offsets
Chris@441:     assert_equal [37, -1], diff[13].offsets
Chris@909: 
Chris@441:     assert_equal [0, -38], diff[15].offsets
Chris@441:     assert_equal [0, -38], diff[16].offsets
Chris@441:   end
Chris@909: 
Chris@441:   def test_side_by_side_partials
Chris@441:     diff = Redmine::UnifiedDiff.new(read_diff_fixture('partials.diff'), :type => 'sbs')
Chris@441:     assert_equal 1, diff.size
Chris@441:     diff = diff.first
Chris@441:     assert_equal 32, diff.size
Chris@909: 
Chris@441:     assert_equal [51, -1], diff[0].offsets
Chris@441:     assert_equal 'Lorem ipsum dolor sit amet, consectetur adipiscing <span>elit</span>', diff[0].html_line_left
Chris@441:     assert_equal 'Lorem ipsum dolor sit amet, consectetur adipiscing <span>xx</span>', diff[0].html_line_right
Chris@909: 
Chris@441:     assert_nil diff[1].offsets
Chris@441:     assert_equal 'Praesent et sagittis dui. Vivamus ac diam diam', diff[1].html_line_left
Chris@441:     assert_equal 'Praesent et sagittis dui. Vivamus ac diam diam', diff[1].html_line_right
Chris@909: 
Chris@441:     assert_equal [0, -14], diff[2].offsets
Chris@441:     assert_equal '<span>Ut sed</span> auctor justo', diff[2].html_line_left
Chris@441:     assert_equal '<span>xxx</span> auctor justo', diff[2].html_line_right
Chris@441: 
Chris@441:     assert_equal [13, -19], diff[4].offsets
Chris@441:     assert_equal [24, -8], diff[6].offsets
Chris@441:     assert_equal [37, -1], diff[8].offsets
Chris@441:     assert_equal [0, -38], diff[10].offsets
Chris@909: 
Chris@441:   end
Chris@909: 
Chris@929:   def test_partials_with_html_entities
Chris@929:     raw = <<-DIFF
Chris@929: --- test.orig.txt Wed Feb 15 16:10:39 2012
Chris@929: +++ test.new.txt  Wed Feb 15 16:11:25 2012
Chris@929: @@ -1,5 +1,5 @@
Chris@929:  Semicolons were mysteriously appearing in code diffs in the repository
Chris@929:  
Chris@929: -void DoSomething(std::auto_ptr<MyClass> myObj)
Chris@929: +void DoSomething(const MyClass& myObj)
Chris@929:  
Chris@929: DIFF
Chris@929: 
Chris@929:     diff = Redmine::UnifiedDiff.new(raw, :type => 'sbs')
Chris@929:     assert_equal 1, diff.size
Chris@929:     assert_equal 'void DoSomething(<span>std::auto_ptr&lt;MyClass&gt;</span> myObj)', diff.first[2].html_line_left
Chris@929:     assert_equal 'void DoSomething(<span>const MyClass&amp;</span> myObj)', diff.first[2].html_line_right
Chris@929: 
Chris@929:     diff = Redmine::UnifiedDiff.new(raw, :type => 'inline')
Chris@929:     assert_equal 1, diff.size
Chris@929:     assert_equal 'void DoSomething(<span>std::auto_ptr&lt;MyClass&gt;</span> myObj)', diff.first[2].html_line
Chris@929:     assert_equal 'void DoSomething(<span>const MyClass&amp;</span> myObj)', diff.first[3].html_line
Chris@929:   end
Chris@929: 
Chris@0:   def test_line_starting_with_dashes
Chris@0:     diff = Redmine::UnifiedDiff.new(<<-DIFF
Chris@0: --- old.txt Wed Nov 11 14:24:58 2009
Chris@0: +++ new.txt Wed Nov 11 14:25:02 2009
Chris@0: @@ -1,8 +1,4 @@
Chris@0: -Lines that starts with dashes:
Chris@0: -
Chris@0: -------------------------
Chris@0: --- file.c
Chris@0: -------------------------
Chris@0: +A line that starts with dashes:
Chris@0:  
Chris@0:  and removed.
Chris@0:  
Chris@0: @@ -23,4 +19,4 @@
Chris@0:  
Chris@0:  
Chris@0:  
Chris@0: -Another chunk of change
Chris@0: +Another chunk of changes
Chris@0: 
Chris@0: DIFF
Chris@0:     )
Chris@0:     assert_equal 1, diff.size
Chris@0:   end
Chris@0: 
Chris@245:   def test_one_line_new_files
Chris@245:     diff = Redmine::UnifiedDiff.new(<<-DIFF
Chris@245: diff -r 000000000000 -r ea98b14f75f0 README1
Chris@245: --- /dev/null
Chris@245: +++ b/README1
Chris@245: @@ -0,0 +1,1 @@
Chris@245: +test1
Chris@245: diff -r 000000000000 -r ea98b14f75f0 README2
Chris@245: --- /dev/null
Chris@245: +++ b/README2
Chris@245: @@ -0,0 +1,1 @@
Chris@245: +test2
Chris@245: diff -r 000000000000 -r ea98b14f75f0 README3
Chris@245: --- /dev/null
Chris@245: +++ b/README3
Chris@245: @@ -0,0 +1,3 @@
Chris@245: +test4
Chris@245: +test5
Chris@245: +test6
Chris@245: diff -r 000000000000 -r ea98b14f75f0 README4
Chris@245: --- /dev/null
Chris@245: +++ b/README4
Chris@245: @@ -0,0 +1,3 @@
Chris@245: +test4
Chris@245: +test5
Chris@245: +test6
Chris@245: DIFF
Chris@245:     )
Chris@245:     assert_equal 4, diff.size
Chris@1115:     assert_equal "README1", diff[0].file_name
Chris@1115:   end
Chris@1115: 
Chris@1115:   def test_both_git_diff
Chris@1115:     diff = Redmine::UnifiedDiff.new(<<-DIFF
Chris@1115: # HG changeset patch
Chris@1115: # User test
Chris@1115: # Date 1348014182 -32400
Chris@1115: # Node ID d1c871b8ef113df7f1c56d41e6e3bfbaff976e1f
Chris@1115: # Parent  180b6605936cdc7909c5f08b59746ec1a7c99b3e
Chris@1115: modify test1.txt
Chris@1115: 
Chris@1115: diff -r 180b6605936c -r d1c871b8ef11 test1.txt
Chris@1115: --- a/test1.txt
Chris@1115: +++ b/test1.txt
Chris@1115: @@ -1,1 +1,1 @@
Chris@1115: -test1
Chris@1115: +modify test1
Chris@1115: DIFF
Chris@1115:     )
Chris@1115:     assert_equal 1, diff.size
Chris@1115:     assert_equal "test1.txt", diff[0].file_name
Chris@1115:   end
Chris@1115: 
Chris@1115:   def test_include_a_b_slash
Chris@1115:     diff = Redmine::UnifiedDiff.new(<<-DIFF
Chris@1115: --- test1.txt
Chris@1115: +++ b/test02.txt
Chris@1115: @@ -1 +0,0 @@
Chris@1115: -modify test1
Chris@1115: DIFF
Chris@1115:     )
Chris@1115:     assert_equal 1, diff.size
Chris@1115:     assert_equal "b/test02.txt", diff[0].file_name
Chris@1115: 
Chris@1115:     diff = Redmine::UnifiedDiff.new(<<-DIFF
Chris@1115: --- a/test1.txt
Chris@1115: +++ a/test02.txt
Chris@1115: @@ -1 +0,0 @@
Chris@1115: -modify test1
Chris@1115: DIFF
Chris@1115:     )
Chris@1115:     assert_equal 1, diff.size
Chris@1115:     assert_equal "a/test02.txt", diff[0].file_name
Chris@1115: 
Chris@1115:     diff = Redmine::UnifiedDiff.new(<<-DIFF
Chris@1115: --- a/test1.txt
Chris@1115: +++ test02.txt
Chris@1115: @@ -1 +0,0 @@
Chris@1115: -modify test1
Chris@1115: DIFF
Chris@1115:     )
Chris@1115:     assert_equal 1, diff.size
Chris@1115:     assert_equal "test02.txt", diff[0].file_name
Chris@245:   end
Chris@245: 
Chris@1464:   def test_utf8_ja
Chris@1464:     ja = "  text_tip_issue_end_day: "
Chris@1464:     ja += "\xe3\x81\x93\xe3\x81\xae\xe6\x97\xa5\xe3\x81\xab\xe7\xb5\x82\xe4\xba\x86\xe3\x81\x99\xe3\x82\x8b<span>\xe3\x82\xbf\xe3\x82\xb9\xe3\x82\xaf</span>"
Chris@1464:     ja.force_encoding('UTF-8') if ja.respond_to?(:force_encoding)
Chris@1464:     with_settings :repositories_encodings => '' do
Chris@1464:       diff = Redmine::UnifiedDiff.new(read_diff_fixture('issue-12641-ja.diff'), :type => 'inline')
Chris@1464:       assert_equal 1, diff.size
Chris@1464:       assert_equal 12, diff.first.size
Chris@1464:       assert_equal ja, diff.first[4].html_line_left
Chris@1464:     end
Chris@1464:   end
Chris@1464: 
Chris@1464:   def test_utf8_ru
Chris@1464:     ru = "        other: &quot;\xd0\xbe\xd0\xba\xd0\xbe\xd0\xbb\xd0\xbe %{count} \xd1\x87\xd0\xb0\xd1\x81<span>\xd0\xb0</span>&quot;"
Chris@1464:     ru.force_encoding('UTF-8') if ru.respond_to?(:force_encoding)
Chris@1464:     with_settings :repositories_encodings => '' do
Chris@1464:       diff = Redmine::UnifiedDiff.new(read_diff_fixture('issue-12641-ru.diff'), :type => 'inline')
Chris@1464:       assert_equal 1, diff.size
Chris@1464:       assert_equal 8, diff.first.size
Chris@1464:       assert_equal ru, diff.first[3].html_line_left
Chris@1464:     end
Chris@1464:   end
Chris@1464: 
Chris@1464:   def test_offset_range_ascii_1
Chris@1464:     raw = <<-DIFF
Chris@1464: --- a.txt	2013-04-05 14:19:39.000000000 +0900
Chris@1464: +++ b.txt	2013-04-05 14:19:51.000000000 +0900
Chris@1464: @@ -1,3 +1,3 @@
Chris@1464:  aaaa
Chris@1464: -abc
Chris@1464: +abcd
Chris@1464:  bbbb
Chris@1464: DIFF
Chris@1464:     diff = Redmine::UnifiedDiff.new(raw, :type => 'sbs')
Chris@1464:     assert_equal 1, diff.size
Chris@1464:     assert_equal 3, diff.first.size
Chris@1464:     assert_equal "abc<span></span>", diff.first[1].html_line_left
Chris@1464:     assert_equal "abc<span>d</span>", diff.first[1].html_line_right
Chris@1464:   end
Chris@1464: 
Chris@1464:   def test_offset_range_ascii_2
Chris@1464:     raw = <<-DIFF
Chris@1464: --- a.txt	2013-04-05 14:19:39.000000000 +0900
Chris@1464: +++ b.txt	2013-04-05 14:19:51.000000000 +0900
Chris@1464: @@ -1,3 +1,3 @@
Chris@1464:  aaaa
Chris@1464: -abc
Chris@1464: +zabc
Chris@1464:  bbbb
Chris@1464: DIFF
Chris@1464:     diff = Redmine::UnifiedDiff.new(raw, :type => 'sbs')
Chris@1464:     assert_equal 1, diff.size
Chris@1464:     assert_equal 3, diff.first.size
Chris@1464:     assert_equal "<span></span>abc", diff.first[1].html_line_left
Chris@1464:     assert_equal "<span>z</span>abc", diff.first[1].html_line_right
Chris@1464:   end
Chris@1464: 
Chris@1464:   def test_offset_range_japanese_1
Chris@1464:     ja1 = "\xe6\x97\xa5\xe6\x9c\xac<span></span>"
Chris@1464:     ja1.force_encoding('UTF-8') if ja1.respond_to?(:force_encoding)
Chris@1464:     ja2 = "\xe6\x97\xa5\xe6\x9c\xac<span>\xe8\xaa\x9e</span>"
Chris@1464:     ja2.force_encoding('UTF-8') if ja2.respond_to?(:force_encoding)
Chris@1464:     with_settings :repositories_encodings => '' do
Chris@1464:       diff = Redmine::UnifiedDiff.new(
Chris@1464:                read_diff_fixture('issue-13644-1.diff'), :type => 'sbs')
Chris@1464:       assert_equal 1, diff.size
Chris@1464:       assert_equal 3, diff.first.size
Chris@1464:       assert_equal ja1, diff.first[1].html_line_left
Chris@1464:       assert_equal ja2, diff.first[1].html_line_right
Chris@1464:     end
Chris@1464:   end
Chris@1464: 
Chris@1464:   def test_offset_range_japanese_2
Chris@1464:     ja1 = "<span></span>\xe6\x97\xa5\xe6\x9c\xac"
Chris@1464:     ja1.force_encoding('UTF-8') if ja1.respond_to?(:force_encoding)
Chris@1464:     ja2 = "<span>\xe3\x81\xab\xe3\x81\xa3\xe3\x81\xbd\xe3\x82\x93</span>\xe6\x97\xa5\xe6\x9c\xac"
Chris@1464:     ja2.force_encoding('UTF-8') if ja2.respond_to?(:force_encoding)
Chris@1464:     with_settings :repositories_encodings => '' do
Chris@1464:       diff = Redmine::UnifiedDiff.new(
Chris@1464:                read_diff_fixture('issue-13644-2.diff'), :type => 'sbs')
Chris@1464:       assert_equal 1, diff.size
Chris@1464:       assert_equal 3, diff.first.size
Chris@1464:       assert_equal ja1, diff.first[1].html_line_left
Chris@1464:       assert_equal ja2, diff.first[1].html_line_right
Chris@1464:     end
Chris@1464:   end
Chris@1464: 
Chris@1464:   def test_offset_range_japanese_3
Chris@1464:     # UTF-8 The 1st byte differs.
Chris@1464:     ja1 = "\xe6\x97\xa5\xe6\x9c\xac<span>\xe8\xa8\x98</span>"
Chris@1464:     ja1.force_encoding('UTF-8') if ja1.respond_to?(:force_encoding)
Chris@1464:     ja2 = "\xe6\x97\xa5\xe6\x9c\xac<span>\xe5\xa8\x98</span>"
Chris@1464:     ja2.force_encoding('UTF-8') if ja2.respond_to?(:force_encoding)
Chris@1464:     with_settings :repositories_encodings => '' do
Chris@1464:       diff = Redmine::UnifiedDiff.new(
Chris@1464:                read_diff_fixture('issue-13644-3.diff'), :type => 'sbs')
Chris@1464:       assert_equal 1, diff.size
Chris@1464:       assert_equal 3, diff.first.size
Chris@1464:       assert_equal ja1, diff.first[1].html_line_left
Chris@1464:       assert_equal ja2, diff.first[1].html_line_right
Chris@1464:     end
Chris@1464:   end
Chris@1464: 
Chris@1464:   def test_offset_range_japanese_4
Chris@1464:     # UTF-8 The 2nd byte differs. 
Chris@1464:     ja1 = "\xe6\x97\xa5\xe6\x9c\xac<span>\xe8\xa8\x98</span>"
Chris@1464:     ja1.force_encoding('UTF-8') if ja1.respond_to?(:force_encoding)
Chris@1464:     ja2 = "\xe6\x97\xa5\xe6\x9c\xac<span>\xe8\xaa\x98</span>"
Chris@1464:     ja2.force_encoding('UTF-8') if ja2.respond_to?(:force_encoding)
Chris@1464:     with_settings :repositories_encodings => '' do
Chris@1464:       diff = Redmine::UnifiedDiff.new(
Chris@1464:                read_diff_fixture('issue-13644-4.diff'), :type => 'sbs')
Chris@1464:       assert_equal 1, diff.size
Chris@1464:       assert_equal 3, diff.first.size
Chris@1464:       assert_equal ja1, diff.first[1].html_line_left
Chris@1464:       assert_equal ja2, diff.first[1].html_line_right
Chris@1464:     end
Chris@1464:   end
Chris@1464: 
Chris@1464:   def test_offset_range_japanese_5
Chris@1464:     # UTF-8 The 2nd byte differs. 
Chris@1464:     ja1 = "\xe6\x97\xa5\xe6\x9c\xac<span>\xe8\xa8\x98</span>ok"
Chris@1464:     ja1.force_encoding('UTF-8') if ja1.respond_to?(:force_encoding)
Chris@1464:     ja2 = "\xe6\x97\xa5\xe6\x9c\xac<span>\xe8\xaa\x98</span>ok"
Chris@1464:     ja2.force_encoding('UTF-8') if ja2.respond_to?(:force_encoding)
Chris@1464:     with_settings :repositories_encodings => '' do
Chris@1464:       diff = Redmine::UnifiedDiff.new(
Chris@1464:                read_diff_fixture('issue-13644-5.diff'), :type => 'sbs')
Chris@1464:       assert_equal 1, diff.size
Chris@1464:       assert_equal 3, diff.first.size
Chris@1464:       assert_equal ja1, diff.first[1].html_line_left
Chris@1464:       assert_equal ja2, diff.first[1].html_line_right
Chris@1464:     end
Chris@1464:   end
Chris@1464: 
Chris@0:   private
Chris@245: 
Chris@0:   def read_diff_fixture(filename)
Chris@0:     File.new(File.join(File.dirname(__FILE__), '/../../../fixtures/diffs', filename)).read
Chris@0:   end
Chris@0: end