Chris@1296: # Redmine - project management software
Chris@1296: # Copyright (C) 2006-2012  Jean-Philippe Lang
Chris@1296: #
Chris@1296: # This program is free software; you can redistribute it and/or
Chris@1296: # modify it under the terms of the GNU General Public License
Chris@1296: # as published by the Free Software Foundation; either version 2
Chris@1296: # of the License, or (at your option) any later version.
Chris@1296: #
Chris@1296: # This program is distributed in the hope that it will be useful,
Chris@1296: # but WITHOUT ANY WARRANTY; without even the implied warranty of
Chris@1296: # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
Chris@1296: # GNU General Public License for more details.
Chris@1296: #
Chris@1296: # You should have received a copy of the GNU General Public License
Chris@1296: # along with this program; if not, write to the Free Software
Chris@1296: # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
Chris@1296: 
Chris@1296: require File.expand_path('../../../../test_helper', __FILE__)
Chris@1296: 
Chris@1296: class Redmine::UnifiedDiffTest < ActiveSupport::TestCase
Chris@1296:   def test_subversion_diff
Chris@1296:     diff = Redmine::UnifiedDiff.new(read_diff_fixture('subversion.diff'))
Chris@1296:     # number of files
Chris@1296:     assert_equal 4, diff.size
Chris@1296:     assert diff.detect {|file| file.file_name =~ %r{^config/settings.yml}}
Chris@1296:   end
Chris@1296: 
Chris@1296:   def test_truncate_diff
Chris@1296:     diff = Redmine::UnifiedDiff.new(read_diff_fixture('subversion.diff'), :max_lines => 20)
Chris@1296:     assert_equal 2, diff.size
Chris@1296:   end
Chris@1296: 
Chris@1296:   def test_inline_partials
Chris@1296:     diff = Redmine::UnifiedDiff.new(read_diff_fixture('partials.diff'))
Chris@1296:     assert_equal 1, diff.size
Chris@1296:     diff = diff.first
Chris@1296:     assert_equal 43, diff.size
Chris@1296: 
Chris@1296:     assert_equal [51, -1], diff[0].offsets
Chris@1296:     assert_equal [51, -1], diff[1].offsets
Chris@1296:     assert_equal 'Lorem ipsum dolor sit amet, consectetur adipiscing <span>elit</span>', diff[0].html_line
Chris@1296:     assert_equal 'Lorem ipsum dolor sit amet, consectetur adipiscing <span>xx</span>', diff[1].html_line
Chris@1296: 
Chris@1296:     assert_nil diff[2].offsets
Chris@1296:     assert_equal 'Praesent et sagittis dui. Vivamus ac diam diam', diff[2].html_line
Chris@1296: 
Chris@1296:     assert_equal [0, -14], diff[3].offsets
Chris@1296:     assert_equal [0, -14], diff[4].offsets
Chris@1296:     assert_equal '<span>Ut sed</span> auctor justo', diff[3].html_line
Chris@1296:     assert_equal '<span>xxx</span> auctor justo', diff[4].html_line
Chris@1296: 
Chris@1296:     assert_equal [13, -19], diff[6].offsets
Chris@1296:     assert_equal [13, -19], diff[7].offsets
Chris@1296: 
Chris@1296:     assert_equal [24, -8], diff[9].offsets
Chris@1296:     assert_equal [24, -8], diff[10].offsets
Chris@1296: 
Chris@1296:     assert_equal [37, -1], diff[12].offsets
Chris@1296:     assert_equal [37, -1], diff[13].offsets
Chris@1296: 
Chris@1296:     assert_equal [0, -38], diff[15].offsets
Chris@1296:     assert_equal [0, -38], diff[16].offsets
Chris@1296:   end
Chris@1296: 
Chris@1296:   def test_side_by_side_partials
Chris@1296:     diff = Redmine::UnifiedDiff.new(read_diff_fixture('partials.diff'), :type => 'sbs')
Chris@1296:     assert_equal 1, diff.size
Chris@1296:     diff = diff.first
Chris@1296:     assert_equal 32, diff.size
Chris@1296: 
Chris@1296:     assert_equal [51, -1], diff[0].offsets
Chris@1296:     assert_equal 'Lorem ipsum dolor sit amet, consectetur adipiscing <span>elit</span>', diff[0].html_line_left
Chris@1296:     assert_equal 'Lorem ipsum dolor sit amet, consectetur adipiscing <span>xx</span>', diff[0].html_line_right
Chris@1296: 
Chris@1296:     assert_nil diff[1].offsets
Chris@1296:     assert_equal 'Praesent et sagittis dui. Vivamus ac diam diam', diff[1].html_line_left
Chris@1296:     assert_equal 'Praesent et sagittis dui. Vivamus ac diam diam', diff[1].html_line_right
Chris@1296: 
Chris@1296:     assert_equal [0, -14], diff[2].offsets
Chris@1296:     assert_equal '<span>Ut sed</span> auctor justo', diff[2].html_line_left
Chris@1296:     assert_equal '<span>xxx</span> auctor justo', diff[2].html_line_right
Chris@1296: 
Chris@1296:     assert_equal [13, -19], diff[4].offsets
Chris@1296:     assert_equal [24, -8], diff[6].offsets
Chris@1296:     assert_equal [37, -1], diff[8].offsets
Chris@1296:     assert_equal [0, -38], diff[10].offsets
Chris@1296: 
Chris@1296:   end
Chris@1296: 
Chris@1296:   def test_partials_with_html_entities
Chris@1296:     raw = <<-DIFF
Chris@1296: --- test.orig.txt Wed Feb 15 16:10:39 2012
Chris@1296: +++ test.new.txt  Wed Feb 15 16:11:25 2012
Chris@1296: @@ -1,5 +1,5 @@
Chris@1296:  Semicolons were mysteriously appearing in code diffs in the repository
Chris@1296:  
Chris@1296: -void DoSomething(std::auto_ptr<MyClass> myObj)
Chris@1296: +void DoSomething(const MyClass& myObj)
Chris@1296:  
Chris@1296: DIFF
Chris@1296: 
Chris@1296:     diff = Redmine::UnifiedDiff.new(raw, :type => 'sbs')
Chris@1296:     assert_equal 1, diff.size
Chris@1296:     assert_equal 'void DoSomething(<span>std::auto_ptr&lt;MyClass&gt;</span> myObj)', diff.first[2].html_line_left
Chris@1296:     assert_equal 'void DoSomething(<span>const MyClass&amp;</span> myObj)', diff.first[2].html_line_right
Chris@1296: 
Chris@1296:     diff = Redmine::UnifiedDiff.new(raw, :type => 'inline')
Chris@1296:     assert_equal 1, diff.size
Chris@1296:     assert_equal 'void DoSomething(<span>std::auto_ptr&lt;MyClass&gt;</span> myObj)', diff.first[2].html_line
Chris@1296:     assert_equal 'void DoSomething(<span>const MyClass&amp;</span> myObj)', diff.first[3].html_line
Chris@1296:   end
Chris@1296: 
Chris@1296:   def test_line_starting_with_dashes
Chris@1296:     diff = Redmine::UnifiedDiff.new(<<-DIFF
Chris@1296: --- old.txt Wed Nov 11 14:24:58 2009
Chris@1296: +++ new.txt Wed Nov 11 14:25:02 2009
Chris@1296: @@ -1,8 +1,4 @@
Chris@1296: -Lines that starts with dashes:
Chris@1296: -
Chris@1296: -------------------------
Chris@1296: --- file.c
Chris@1296: -------------------------
Chris@1296: +A line that starts with dashes:
Chris@1296:  
Chris@1296:  and removed.
Chris@1296:  
Chris@1296: @@ -23,4 +19,4 @@
Chris@1296:  
Chris@1296:  
Chris@1296:  
Chris@1296: -Another chunk of change
Chris@1296: +Another chunk of changes
Chris@1296: 
Chris@1296: DIFF
Chris@1296:     )
Chris@1296:     assert_equal 1, diff.size
Chris@1296:   end
Chris@1296: 
Chris@1296:   def test_one_line_new_files
Chris@1296:     diff = Redmine::UnifiedDiff.new(<<-DIFF
Chris@1296: diff -r 000000000000 -r ea98b14f75f0 README1
Chris@1296: --- /dev/null
Chris@1296: +++ b/README1
Chris@1296: @@ -0,0 +1,1 @@
Chris@1296: +test1
Chris@1296: diff -r 000000000000 -r ea98b14f75f0 README2
Chris@1296: --- /dev/null
Chris@1296: +++ b/README2
Chris@1296: @@ -0,0 +1,1 @@
Chris@1296: +test2
Chris@1296: diff -r 000000000000 -r ea98b14f75f0 README3
Chris@1296: --- /dev/null
Chris@1296: +++ b/README3
Chris@1296: @@ -0,0 +1,3 @@
Chris@1296: +test4
Chris@1296: +test5
Chris@1296: +test6
Chris@1296: diff -r 000000000000 -r ea98b14f75f0 README4
Chris@1296: --- /dev/null
Chris@1296: +++ b/README4
Chris@1296: @@ -0,0 +1,3 @@
Chris@1296: +test4
Chris@1296: +test5
Chris@1296: +test6
Chris@1296: DIFF
Chris@1296:     )
Chris@1296:     assert_equal 4, diff.size
Chris@1296:     assert_equal "README1", diff[0].file_name
Chris@1296:   end
Chris@1296: 
Chris@1296:   def test_both_git_diff
Chris@1296:     diff = Redmine::UnifiedDiff.new(<<-DIFF
Chris@1296: # HG changeset patch
Chris@1296: # User test
Chris@1296: # Date 1348014182 -32400
Chris@1296: # Node ID d1c871b8ef113df7f1c56d41e6e3bfbaff976e1f
Chris@1296: # Parent  180b6605936cdc7909c5f08b59746ec1a7c99b3e
Chris@1296: modify test1.txt
Chris@1296: 
Chris@1296: diff -r 180b6605936c -r d1c871b8ef11 test1.txt
Chris@1296: --- a/test1.txt
Chris@1296: +++ b/test1.txt
Chris@1296: @@ -1,1 +1,1 @@
Chris@1296: -test1
Chris@1296: +modify test1
Chris@1296: DIFF
Chris@1296:     )
Chris@1296:     assert_equal 1, diff.size
Chris@1296:     assert_equal "test1.txt", diff[0].file_name
Chris@1296:   end
Chris@1296: 
Chris@1296:   def test_include_a_b_slash
Chris@1296:     diff = Redmine::UnifiedDiff.new(<<-DIFF
Chris@1296: --- test1.txt
Chris@1296: +++ b/test02.txt
Chris@1296: @@ -1 +0,0 @@
Chris@1296: -modify test1
Chris@1296: DIFF
Chris@1296:     )
Chris@1296:     assert_equal 1, diff.size
Chris@1296:     assert_equal "b/test02.txt", diff[0].file_name
Chris@1296: 
Chris@1296:     diff = Redmine::UnifiedDiff.new(<<-DIFF
Chris@1296: --- a/test1.txt
Chris@1296: +++ a/test02.txt
Chris@1296: @@ -1 +0,0 @@
Chris@1296: -modify test1
Chris@1296: DIFF
Chris@1296:     )
Chris@1296:     assert_equal 1, diff.size
Chris@1296:     assert_equal "a/test02.txt", diff[0].file_name
Chris@1296: 
Chris@1296:     diff = Redmine::UnifiedDiff.new(<<-DIFF
Chris@1296: --- a/test1.txt
Chris@1296: +++ test02.txt
Chris@1296: @@ -1 +0,0 @@
Chris@1296: -modify test1
Chris@1296: DIFF
Chris@1296:     )
Chris@1296:     assert_equal 1, diff.size
Chris@1296:     assert_equal "test02.txt", diff[0].file_name
Chris@1296:   end
Chris@1296: 
Chris@1296:   private
Chris@1296: 
Chris@1296:   def read_diff_fixture(filename)
Chris@1296:     File.new(File.join(File.dirname(__FILE__), '/../../../fixtures/diffs', filename)).read
Chris@1296:   end
Chris@1296: end