annotate test/unit/lib/redmine/unified_diff_test.rb @ 1466:834828a14f2b bug_598

Close obsolete branch bug_598
author Chris Cannam
date Fri, 21 Jun 2013 14:51:55 +0100
parents 433d4f72a19b
children 622f24f53b42 261b3d9a4903
rev   line source
Chris@0 1 # Redmine - project management software
Chris@1115 2 # Copyright (C) 2006-2012 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@0 21 def test_subversion_diff
Chris@0 22 diff = Redmine::UnifiedDiff.new(read_diff_fixture('subversion.diff'))
Chris@0 23 # number of files
Chris@0 24 assert_equal 4, diff.size
Chris@0 25 assert diff.detect {|file| file.file_name =~ %r{^config/settings.yml}}
Chris@0 26 end
Chris@909 27
Chris@0 28 def test_truncate_diff
Chris@0 29 diff = Redmine::UnifiedDiff.new(read_diff_fixture('subversion.diff'), :max_lines => 20)
Chris@0 30 assert_equal 2, diff.size
Chris@0 31 end
Chris@909 32
Chris@441 33 def test_inline_partials
Chris@441 34 diff = Redmine::UnifiedDiff.new(read_diff_fixture('partials.diff'))
Chris@441 35 assert_equal 1, diff.size
Chris@441 36 diff = diff.first
Chris@441 37 assert_equal 43, diff.size
Chris@909 38
Chris@441 39 assert_equal [51, -1], diff[0].offsets
Chris@441 40 assert_equal [51, -1], diff[1].offsets
Chris@441 41 assert_equal 'Lorem ipsum dolor sit amet, consectetur adipiscing <span>elit</span>', diff[0].html_line
Chris@441 42 assert_equal 'Lorem ipsum dolor sit amet, consectetur adipiscing <span>xx</span>', diff[1].html_line
Chris@909 43
Chris@441 44 assert_nil diff[2].offsets
Chris@441 45 assert_equal 'Praesent et sagittis dui. Vivamus ac diam diam', diff[2].html_line
Chris@909 46
Chris@441 47 assert_equal [0, -14], diff[3].offsets
Chris@441 48 assert_equal [0, -14], diff[4].offsets
Chris@441 49 assert_equal '<span>Ut sed</span> auctor justo', diff[3].html_line
Chris@441 50 assert_equal '<span>xxx</span> auctor justo', diff[4].html_line
Chris@909 51
Chris@441 52 assert_equal [13, -19], diff[6].offsets
Chris@441 53 assert_equal [13, -19], diff[7].offsets
Chris@909 54
Chris@441 55 assert_equal [24, -8], diff[9].offsets
Chris@441 56 assert_equal [24, -8], diff[10].offsets
Chris@909 57
Chris@441 58 assert_equal [37, -1], diff[12].offsets
Chris@441 59 assert_equal [37, -1], diff[13].offsets
Chris@909 60
Chris@441 61 assert_equal [0, -38], diff[15].offsets
Chris@441 62 assert_equal [0, -38], diff[16].offsets
Chris@441 63 end
Chris@909 64
Chris@441 65 def test_side_by_side_partials
Chris@441 66 diff = Redmine::UnifiedDiff.new(read_diff_fixture('partials.diff'), :type => 'sbs')
Chris@441 67 assert_equal 1, diff.size
Chris@441 68 diff = diff.first
Chris@441 69 assert_equal 32, diff.size
Chris@909 70
Chris@441 71 assert_equal [51, -1], diff[0].offsets
Chris@441 72 assert_equal 'Lorem ipsum dolor sit amet, consectetur adipiscing <span>elit</span>', diff[0].html_line_left
Chris@441 73 assert_equal 'Lorem ipsum dolor sit amet, consectetur adipiscing <span>xx</span>', diff[0].html_line_right
Chris@909 74
Chris@441 75 assert_nil diff[1].offsets
Chris@441 76 assert_equal 'Praesent et sagittis dui. Vivamus ac diam diam', diff[1].html_line_left
Chris@441 77 assert_equal 'Praesent et sagittis dui. Vivamus ac diam diam', diff[1].html_line_right
Chris@909 78
Chris@441 79 assert_equal [0, -14], diff[2].offsets
Chris@441 80 assert_equal '<span>Ut sed</span> auctor justo', diff[2].html_line_left
Chris@441 81 assert_equal '<span>xxx</span> auctor justo', diff[2].html_line_right
Chris@441 82
Chris@441 83 assert_equal [13, -19], diff[4].offsets
Chris@441 84 assert_equal [24, -8], diff[6].offsets
Chris@441 85 assert_equal [37, -1], diff[8].offsets
Chris@441 86 assert_equal [0, -38], diff[10].offsets
Chris@909 87
Chris@441 88 end
Chris@909 89
Chris@929 90 def test_partials_with_html_entities
Chris@929 91 raw = <<-DIFF
Chris@929 92 --- test.orig.txt Wed Feb 15 16:10:39 2012
Chris@929 93 +++ test.new.txt Wed Feb 15 16:11:25 2012
Chris@929 94 @@ -1,5 +1,5 @@
Chris@929 95 Semicolons were mysteriously appearing in code diffs in the repository
Chris@929 96
Chris@929 97 -void DoSomething(std::auto_ptr<MyClass> myObj)
Chris@929 98 +void DoSomething(const MyClass& myObj)
Chris@929 99
Chris@929 100 DIFF
Chris@929 101
Chris@929 102 diff = Redmine::UnifiedDiff.new(raw, :type => 'sbs')
Chris@929 103 assert_equal 1, diff.size
Chris@929 104 assert_equal 'void DoSomething(<span>std::auto_ptr&lt;MyClass&gt;</span> myObj)', diff.first[2].html_line_left
Chris@929 105 assert_equal 'void DoSomething(<span>const MyClass&amp;</span> myObj)', diff.first[2].html_line_right
Chris@929 106
Chris@929 107 diff = Redmine::UnifiedDiff.new(raw, :type => 'inline')
Chris@929 108 assert_equal 1, diff.size
Chris@929 109 assert_equal 'void DoSomething(<span>std::auto_ptr&lt;MyClass&gt;</span> myObj)', diff.first[2].html_line
Chris@929 110 assert_equal 'void DoSomething(<span>const MyClass&amp;</span> myObj)', diff.first[3].html_line
Chris@929 111 end
Chris@929 112
Chris@0 113 def test_line_starting_with_dashes
Chris@0 114 diff = Redmine::UnifiedDiff.new(<<-DIFF
Chris@0 115 --- old.txt Wed Nov 11 14:24:58 2009
Chris@0 116 +++ new.txt Wed Nov 11 14:25:02 2009
Chris@0 117 @@ -1,8 +1,4 @@
Chris@0 118 -Lines that starts with dashes:
Chris@0 119 -
Chris@0 120 -------------------------
Chris@0 121 --- file.c
Chris@0 122 -------------------------
Chris@0 123 +A line that starts with dashes:
Chris@0 124
Chris@0 125 and removed.
Chris@0 126
Chris@0 127 @@ -23,4 +19,4 @@
Chris@0 128
Chris@0 129
Chris@0 130
Chris@0 131 -Another chunk of change
Chris@0 132 +Another chunk of changes
Chris@0 133
Chris@0 134 DIFF
Chris@0 135 )
Chris@0 136 assert_equal 1, diff.size
Chris@0 137 end
Chris@0 138
Chris@245 139 def test_one_line_new_files
Chris@245 140 diff = Redmine::UnifiedDiff.new(<<-DIFF
Chris@245 141 diff -r 000000000000 -r ea98b14f75f0 README1
Chris@245 142 --- /dev/null
Chris@245 143 +++ b/README1
Chris@245 144 @@ -0,0 +1,1 @@
Chris@245 145 +test1
Chris@245 146 diff -r 000000000000 -r ea98b14f75f0 README2
Chris@245 147 --- /dev/null
Chris@245 148 +++ b/README2
Chris@245 149 @@ -0,0 +1,1 @@
Chris@245 150 +test2
Chris@245 151 diff -r 000000000000 -r ea98b14f75f0 README3
Chris@245 152 --- /dev/null
Chris@245 153 +++ b/README3
Chris@245 154 @@ -0,0 +1,3 @@
Chris@245 155 +test4
Chris@245 156 +test5
Chris@245 157 +test6
Chris@245 158 diff -r 000000000000 -r ea98b14f75f0 README4
Chris@245 159 --- /dev/null
Chris@245 160 +++ b/README4
Chris@245 161 @@ -0,0 +1,3 @@
Chris@245 162 +test4
Chris@245 163 +test5
Chris@245 164 +test6
Chris@245 165 DIFF
Chris@245 166 )
Chris@245 167 assert_equal 4, diff.size
Chris@1115 168 assert_equal "README1", diff[0].file_name
Chris@1115 169 end
Chris@1115 170
Chris@1115 171 def test_both_git_diff
Chris@1115 172 diff = Redmine::UnifiedDiff.new(<<-DIFF
Chris@1115 173 # HG changeset patch
Chris@1115 174 # User test
Chris@1115 175 # Date 1348014182 -32400
Chris@1115 176 # Node ID d1c871b8ef113df7f1c56d41e6e3bfbaff976e1f
Chris@1115 177 # Parent 180b6605936cdc7909c5f08b59746ec1a7c99b3e
Chris@1115 178 modify test1.txt
Chris@1115 179
Chris@1115 180 diff -r 180b6605936c -r d1c871b8ef11 test1.txt
Chris@1115 181 --- a/test1.txt
Chris@1115 182 +++ b/test1.txt
Chris@1115 183 @@ -1,1 +1,1 @@
Chris@1115 184 -test1
Chris@1115 185 +modify test1
Chris@1115 186 DIFF
Chris@1115 187 )
Chris@1115 188 assert_equal 1, diff.size
Chris@1115 189 assert_equal "test1.txt", diff[0].file_name
Chris@1115 190 end
Chris@1115 191
Chris@1115 192 def test_include_a_b_slash
Chris@1115 193 diff = Redmine::UnifiedDiff.new(<<-DIFF
Chris@1115 194 --- test1.txt
Chris@1115 195 +++ b/test02.txt
Chris@1115 196 @@ -1 +0,0 @@
Chris@1115 197 -modify test1
Chris@1115 198 DIFF
Chris@1115 199 )
Chris@1115 200 assert_equal 1, diff.size
Chris@1115 201 assert_equal "b/test02.txt", diff[0].file_name
Chris@1115 202
Chris@1115 203 diff = Redmine::UnifiedDiff.new(<<-DIFF
Chris@1115 204 --- a/test1.txt
Chris@1115 205 +++ a/test02.txt
Chris@1115 206 @@ -1 +0,0 @@
Chris@1115 207 -modify test1
Chris@1115 208 DIFF
Chris@1115 209 )
Chris@1115 210 assert_equal 1, diff.size
Chris@1115 211 assert_equal "a/test02.txt", diff[0].file_name
Chris@1115 212
Chris@1115 213 diff = Redmine::UnifiedDiff.new(<<-DIFF
Chris@1115 214 --- a/test1.txt
Chris@1115 215 +++ test02.txt
Chris@1115 216 @@ -1 +0,0 @@
Chris@1115 217 -modify test1
Chris@1115 218 DIFF
Chris@1115 219 )
Chris@1115 220 assert_equal 1, diff.size
Chris@1115 221 assert_equal "test02.txt", diff[0].file_name
Chris@245 222 end
Chris@245 223
Chris@0 224 private
Chris@245 225
Chris@0 226 def read_diff_fixture(filename)
Chris@0 227 File.new(File.join(File.dirname(__FILE__), '/../../../fixtures/diffs', filename)).read
Chris@0 228 end
Chris@0 229 end