annotate test/unit/lib/redmine/unified_diff_test.rb @ 1469:c77ab1edff6b bug_563

Close obsolete branch bug_563
author Chris Cannam
date Wed, 23 Jan 2013 14:12:47 +0000
parents 5f33065ddc4b
children 433d4f72a19b
rev   line source
Chris@0 1 # Redmine - project management software
Chris@441 2 # Copyright (C) 2006-2011 Jean-Philippe Lang
Chris@0 3 #
Chris@0 4 # This program is free software; you can redistribute it and/or
Chris@0 5 # modify it under the terms of the GNU General Public License
Chris@0 6 # as published by the Free Software Foundation; either version 2
Chris@0 7 # of the License, or (at your option) any later version.
Chris@909 8 #
Chris@0 9 # This program is distributed in the hope that it will be useful,
Chris@0 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
Chris@0 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
Chris@0 12 # GNU General Public License for more details.
Chris@909 13 #
Chris@0 14 # You should have received a copy of the GNU General Public License
Chris@0 15 # along with this program; if not, write to the Free Software
Chris@0 16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
Chris@0 17
Chris@119 18 require File.expand_path('../../../../test_helper', __FILE__)
Chris@0 19
Chris@0 20 class Redmine::UnifiedDiffTest < ActiveSupport::TestCase
Chris@909 21
Chris@0 22 def setup
Chris@0 23 end
Chris@0 24
Chris@0 25 def test_subversion_diff
Chris@0 26 diff = Redmine::UnifiedDiff.new(read_diff_fixture('subversion.diff'))
Chris@0 27 # number of files
Chris@0 28 assert_equal 4, diff.size
Chris@0 29 assert diff.detect {|file| file.file_name =~ %r{^config/settings.yml}}
Chris@0 30 end
Chris@909 31
Chris@0 32 def test_truncate_diff
Chris@0 33 diff = Redmine::UnifiedDiff.new(read_diff_fixture('subversion.diff'), :max_lines => 20)
Chris@0 34 assert_equal 2, diff.size
Chris@0 35 end
Chris@909 36
Chris@441 37 def test_inline_partials
Chris@441 38 diff = Redmine::UnifiedDiff.new(read_diff_fixture('partials.diff'))
Chris@441 39 assert_equal 1, diff.size
Chris@441 40 diff = diff.first
Chris@441 41 assert_equal 43, diff.size
Chris@909 42
Chris@441 43 assert_equal [51, -1], diff[0].offsets
Chris@441 44 assert_equal [51, -1], diff[1].offsets
Chris@441 45 assert_equal 'Lorem ipsum dolor sit amet, consectetur adipiscing <span>elit</span>', diff[0].html_line
Chris@441 46 assert_equal 'Lorem ipsum dolor sit amet, consectetur adipiscing <span>xx</span>', diff[1].html_line
Chris@909 47
Chris@441 48 assert_nil diff[2].offsets
Chris@441 49 assert_equal 'Praesent et sagittis dui. Vivamus ac diam diam', diff[2].html_line
Chris@909 50
Chris@441 51 assert_equal [0, -14], diff[3].offsets
Chris@441 52 assert_equal [0, -14], diff[4].offsets
Chris@441 53 assert_equal '<span>Ut sed</span> auctor justo', diff[3].html_line
Chris@441 54 assert_equal '<span>xxx</span> auctor justo', diff[4].html_line
Chris@909 55
Chris@441 56 assert_equal [13, -19], diff[6].offsets
Chris@441 57 assert_equal [13, -19], diff[7].offsets
Chris@909 58
Chris@441 59 assert_equal [24, -8], diff[9].offsets
Chris@441 60 assert_equal [24, -8], diff[10].offsets
Chris@909 61
Chris@441 62 assert_equal [37, -1], diff[12].offsets
Chris@441 63 assert_equal [37, -1], diff[13].offsets
Chris@909 64
Chris@441 65 assert_equal [0, -38], diff[15].offsets
Chris@441 66 assert_equal [0, -38], diff[16].offsets
Chris@441 67 end
Chris@909 68
Chris@441 69 def test_side_by_side_partials
Chris@441 70 diff = Redmine::UnifiedDiff.new(read_diff_fixture('partials.diff'), :type => 'sbs')
Chris@441 71 assert_equal 1, diff.size
Chris@441 72 diff = diff.first
Chris@441 73 assert_equal 32, diff.size
Chris@909 74
Chris@441 75 assert_equal [51, -1], diff[0].offsets
Chris@441 76 assert_equal 'Lorem ipsum dolor sit amet, consectetur adipiscing <span>elit</span>', diff[0].html_line_left
Chris@441 77 assert_equal 'Lorem ipsum dolor sit amet, consectetur adipiscing <span>xx</span>', diff[0].html_line_right
Chris@909 78
Chris@441 79 assert_nil diff[1].offsets
Chris@441 80 assert_equal 'Praesent et sagittis dui. Vivamus ac diam diam', diff[1].html_line_left
Chris@441 81 assert_equal 'Praesent et sagittis dui. Vivamus ac diam diam', diff[1].html_line_right
Chris@909 82
Chris@441 83 assert_equal [0, -14], diff[2].offsets
Chris@441 84 assert_equal '<span>Ut sed</span> auctor justo', diff[2].html_line_left
Chris@441 85 assert_equal '<span>xxx</span> auctor justo', diff[2].html_line_right
Chris@441 86
Chris@441 87 assert_equal [13, -19], diff[4].offsets
Chris@441 88 assert_equal [24, -8], diff[6].offsets
Chris@441 89 assert_equal [37, -1], diff[8].offsets
Chris@441 90 assert_equal [0, -38], diff[10].offsets
Chris@909 91
Chris@441 92 end
Chris@909 93
Chris@929 94 def test_partials_with_html_entities
Chris@929 95 raw = <<-DIFF
Chris@929 96 --- test.orig.txt Wed Feb 15 16:10:39 2012
Chris@929 97 +++ test.new.txt Wed Feb 15 16:11:25 2012
Chris@929 98 @@ -1,5 +1,5 @@
Chris@929 99 Semicolons were mysteriously appearing in code diffs in the repository
Chris@929 100
Chris@929 101 -void DoSomething(std::auto_ptr<MyClass> myObj)
Chris@929 102 +void DoSomething(const MyClass& myObj)
Chris@929 103
Chris@929 104 DIFF
Chris@929 105
Chris@929 106 diff = Redmine::UnifiedDiff.new(raw, :type => 'sbs')
Chris@929 107 assert_equal 1, diff.size
Chris@929 108 assert_equal 'void DoSomething(<span>std::auto_ptr&lt;MyClass&gt;</span> myObj)', diff.first[2].html_line_left
Chris@929 109 assert_equal 'void DoSomething(<span>const MyClass&amp;</span> myObj)', diff.first[2].html_line_right
Chris@929 110
Chris@929 111 diff = Redmine::UnifiedDiff.new(raw, :type => 'inline')
Chris@929 112 assert_equal 1, diff.size
Chris@929 113 assert_equal 'void DoSomething(<span>std::auto_ptr&lt;MyClass&gt;</span> myObj)', diff.first[2].html_line
Chris@929 114 assert_equal 'void DoSomething(<span>const MyClass&amp;</span> myObj)', diff.first[3].html_line
Chris@929 115 end
Chris@929 116
Chris@0 117 def test_line_starting_with_dashes
Chris@0 118 diff = Redmine::UnifiedDiff.new(<<-DIFF
Chris@0 119 --- old.txt Wed Nov 11 14:24:58 2009
Chris@0 120 +++ new.txt Wed Nov 11 14:25:02 2009
Chris@0 121 @@ -1,8 +1,4 @@
Chris@0 122 -Lines that starts with dashes:
Chris@0 123 -
Chris@0 124 -------------------------
Chris@0 125 --- file.c
Chris@0 126 -------------------------
Chris@0 127 +A line that starts with dashes:
Chris@0 128
Chris@0 129 and removed.
Chris@0 130
Chris@0 131 @@ -23,4 +19,4 @@
Chris@0 132
Chris@0 133
Chris@0 134
Chris@0 135 -Another chunk of change
Chris@0 136 +Another chunk of changes
Chris@0 137
Chris@0 138 DIFF
Chris@0 139 )
Chris@0 140 assert_equal 1, diff.size
Chris@0 141 end
Chris@0 142
Chris@245 143 def test_one_line_new_files
Chris@245 144 diff = Redmine::UnifiedDiff.new(<<-DIFF
Chris@245 145 diff -r 000000000000 -r ea98b14f75f0 README1
Chris@245 146 --- /dev/null
Chris@245 147 +++ b/README1
Chris@245 148 @@ -0,0 +1,1 @@
Chris@245 149 +test1
Chris@245 150 diff -r 000000000000 -r ea98b14f75f0 README2
Chris@245 151 --- /dev/null
Chris@245 152 +++ b/README2
Chris@245 153 @@ -0,0 +1,1 @@
Chris@245 154 +test2
Chris@245 155 diff -r 000000000000 -r ea98b14f75f0 README3
Chris@245 156 --- /dev/null
Chris@245 157 +++ b/README3
Chris@245 158 @@ -0,0 +1,3 @@
Chris@245 159 +test4
Chris@245 160 +test5
Chris@245 161 +test6
Chris@245 162 diff -r 000000000000 -r ea98b14f75f0 README4
Chris@245 163 --- /dev/null
Chris@245 164 +++ b/README4
Chris@245 165 @@ -0,0 +1,3 @@
Chris@245 166 +test4
Chris@245 167 +test5
Chris@245 168 +test6
Chris@245 169 DIFF
Chris@245 170 )
Chris@245 171 assert_equal 4, diff.size
Chris@245 172 end
Chris@245 173
Chris@0 174 private
Chris@245 175
Chris@0 176 def read_diff_fixture(filename)
Chris@0 177 File.new(File.join(File.dirname(__FILE__), '/../../../fixtures/diffs', filename)).read
Chris@0 178 end
Chris@0 179 end