annotate .svn/pristine/c3/c3a64cc995ecf5031ca7af6e71034d712ca5328d.svn-base @ 1628:9c5f8e24dadc live tip

Quieten this cron script
author Chris Cannam
date Tue, 25 Aug 2020 11:38:49 +0100
parents e248c7af89ec
children
rev   line source
Chris@1494 1 # Redmine - project management software
Chris@1494 2 # Copyright (C) 2006-2014 Jean-Philippe Lang
Chris@1494 3 #
Chris@1494 4 # This program is free software; you can redistribute it and/or
Chris@1494 5 # modify it under the terms of the GNU General Public License
Chris@1494 6 # as published by the Free Software Foundation; either version 2
Chris@1494 7 # of the License, or (at your option) any later version.
Chris@1494 8 #
Chris@1494 9 # This program is distributed in the hope that it will be useful,
Chris@1494 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
Chris@1494 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
Chris@1494 12 # GNU General Public License for more details.
Chris@1494 13 #
Chris@1494 14 # You should have received a copy of the GNU General Public License
Chris@1494 15 # along with this program; if not, write to the Free Software
Chris@1494 16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
Chris@1494 17
Chris@1494 18 require File.expand_path('../../../../test_helper', __FILE__)
Chris@1494 19
Chris@1494 20 class Redmine::UnifiedDiffTest < ActiveSupport::TestCase
Chris@1494 21 def test_subversion_diff
Chris@1494 22 diff = Redmine::UnifiedDiff.new(read_diff_fixture('subversion.diff'))
Chris@1494 23 # number of files
Chris@1494 24 assert_equal 4, diff.size
Chris@1494 25 assert diff.detect {|file| file.file_name =~ %r{^config/settings.yml}}
Chris@1494 26 end
Chris@1494 27
Chris@1494 28 def test_truncate_diff
Chris@1494 29 diff = Redmine::UnifiedDiff.new(read_diff_fixture('subversion.diff'), :max_lines => 20)
Chris@1494 30 assert_equal 2, diff.size
Chris@1494 31 end
Chris@1494 32
Chris@1494 33 def test_inline_partials
Chris@1494 34 diff = Redmine::UnifiedDiff.new(read_diff_fixture('partials.diff'))
Chris@1494 35 assert_equal 1, diff.size
Chris@1494 36 diff = diff.first
Chris@1494 37 assert_equal 43, diff.size
Chris@1494 38
Chris@1494 39 assert_equal [51, -1], diff[0].offsets
Chris@1494 40 assert_equal [51, -1], diff[1].offsets
Chris@1494 41 assert_equal 'Lorem ipsum dolor sit amet, consectetur adipiscing <span>elit</span>', diff[0].html_line
Chris@1494 42 assert_equal 'Lorem ipsum dolor sit amet, consectetur adipiscing <span>xx</span>', diff[1].html_line
Chris@1494 43
Chris@1494 44 assert_nil diff[2].offsets
Chris@1494 45 assert_equal 'Praesent et sagittis dui. Vivamus ac diam diam', diff[2].html_line
Chris@1494 46
Chris@1494 47 assert_equal [0, -14], diff[3].offsets
Chris@1494 48 assert_equal [0, -14], diff[4].offsets
Chris@1494 49 assert_equal '<span>Ut sed</span> auctor justo', diff[3].html_line
Chris@1494 50 assert_equal '<span>xxx</span> auctor justo', diff[4].html_line
Chris@1494 51
Chris@1494 52 assert_equal [13, -19], diff[6].offsets
Chris@1494 53 assert_equal [13, -19], diff[7].offsets
Chris@1494 54
Chris@1494 55 assert_equal [24, -8], diff[9].offsets
Chris@1494 56 assert_equal [24, -8], diff[10].offsets
Chris@1494 57
Chris@1494 58 assert_equal [37, -1], diff[12].offsets
Chris@1494 59 assert_equal [37, -1], diff[13].offsets
Chris@1494 60
Chris@1494 61 assert_equal [0, -38], diff[15].offsets
Chris@1494 62 assert_equal [0, -38], diff[16].offsets
Chris@1494 63 end
Chris@1494 64
Chris@1494 65 def test_side_by_side_partials
Chris@1494 66 diff = Redmine::UnifiedDiff.new(read_diff_fixture('partials.diff'), :type => 'sbs')
Chris@1494 67 assert_equal 1, diff.size
Chris@1494 68 diff = diff.first
Chris@1494 69 assert_equal 32, diff.size
Chris@1494 70
Chris@1494 71 assert_equal [51, -1], diff[0].offsets
Chris@1494 72 assert_equal 'Lorem ipsum dolor sit amet, consectetur adipiscing <span>elit</span>', diff[0].html_line_left
Chris@1494 73 assert_equal 'Lorem ipsum dolor sit amet, consectetur adipiscing <span>xx</span>', diff[0].html_line_right
Chris@1494 74
Chris@1494 75 assert_nil diff[1].offsets
Chris@1494 76 assert_equal 'Praesent et sagittis dui. Vivamus ac diam diam', diff[1].html_line_left
Chris@1494 77 assert_equal 'Praesent et sagittis dui. Vivamus ac diam diam', diff[1].html_line_right
Chris@1494 78
Chris@1494 79 assert_equal [0, -14], diff[2].offsets
Chris@1494 80 assert_equal '<span>Ut sed</span> auctor justo', diff[2].html_line_left
Chris@1494 81 assert_equal '<span>xxx</span> auctor justo', diff[2].html_line_right
Chris@1494 82
Chris@1494 83 assert_equal [13, -19], diff[4].offsets
Chris@1494 84 assert_equal [24, -8], diff[6].offsets
Chris@1494 85 assert_equal [37, -1], diff[8].offsets
Chris@1494 86 assert_equal [0, -38], diff[10].offsets
Chris@1494 87
Chris@1494 88 end
Chris@1494 89
Chris@1494 90 def test_partials_with_html_entities
Chris@1494 91 raw = <<-DIFF
Chris@1494 92 --- test.orig.txt Wed Feb 15 16:10:39 2012
Chris@1494 93 +++ test.new.txt Wed Feb 15 16:11:25 2012
Chris@1494 94 @@ -1,5 +1,5 @@
Chris@1494 95 Semicolons were mysteriously appearing in code diffs in the repository
Chris@1494 96
Chris@1494 97 -void DoSomething(std::auto_ptr<MyClass> myObj)
Chris@1494 98 +void DoSomething(const MyClass& myObj)
Chris@1494 99
Chris@1494 100 DIFF
Chris@1494 101
Chris@1494 102 diff = Redmine::UnifiedDiff.new(raw, :type => 'sbs')
Chris@1494 103 assert_equal 1, diff.size
Chris@1494 104 assert_equal 'void DoSomething(<span>std::auto_ptr&lt;MyClass&gt;</span> myObj)', diff.first[2].html_line_left
Chris@1494 105 assert_equal 'void DoSomething(<span>const MyClass&amp;</span> myObj)', diff.first[2].html_line_right
Chris@1494 106
Chris@1494 107 diff = Redmine::UnifiedDiff.new(raw, :type => 'inline')
Chris@1494 108 assert_equal 1, diff.size
Chris@1494 109 assert_equal 'void DoSomething(<span>std::auto_ptr&lt;MyClass&gt;</span> myObj)', diff.first[2].html_line
Chris@1494 110 assert_equal 'void DoSomething(<span>const MyClass&amp;</span> myObj)', diff.first[3].html_line
Chris@1494 111 end
Chris@1494 112
Chris@1494 113 def test_line_starting_with_dashes
Chris@1494 114 diff = Redmine::UnifiedDiff.new(<<-DIFF
Chris@1494 115 --- old.txt Wed Nov 11 14:24:58 2009
Chris@1494 116 +++ new.txt Wed Nov 11 14:25:02 2009
Chris@1494 117 @@ -1,8 +1,4 @@
Chris@1494 118 -Lines that starts with dashes:
Chris@1494 119 -
Chris@1494 120 -------------------------
Chris@1494 121 --- file.c
Chris@1494 122 -------------------------
Chris@1494 123 +A line that starts with dashes:
Chris@1494 124
Chris@1494 125 and removed.
Chris@1494 126
Chris@1494 127 @@ -23,4 +19,4 @@
Chris@1494 128
Chris@1494 129
Chris@1494 130
Chris@1494 131 -Another chunk of change
Chris@1494 132 +Another chunk of changes
Chris@1494 133
Chris@1494 134 DIFF
Chris@1494 135 )
Chris@1494 136 assert_equal 1, diff.size
Chris@1494 137 end
Chris@1494 138
Chris@1494 139 def test_one_line_new_files
Chris@1494 140 diff = Redmine::UnifiedDiff.new(<<-DIFF
Chris@1494 141 diff -r 000000000000 -r ea98b14f75f0 README1
Chris@1494 142 --- /dev/null
Chris@1494 143 +++ b/README1
Chris@1494 144 @@ -0,0 +1,1 @@
Chris@1494 145 +test1
Chris@1494 146 diff -r 000000000000 -r ea98b14f75f0 README2
Chris@1494 147 --- /dev/null
Chris@1494 148 +++ b/README2
Chris@1494 149 @@ -0,0 +1,1 @@
Chris@1494 150 +test2
Chris@1494 151 diff -r 000000000000 -r ea98b14f75f0 README3
Chris@1494 152 --- /dev/null
Chris@1494 153 +++ b/README3
Chris@1494 154 @@ -0,0 +1,3 @@
Chris@1494 155 +test4
Chris@1494 156 +test5
Chris@1494 157 +test6
Chris@1494 158 diff -r 000000000000 -r ea98b14f75f0 README4
Chris@1494 159 --- /dev/null
Chris@1494 160 +++ b/README4
Chris@1494 161 @@ -0,0 +1,3 @@
Chris@1494 162 +test4
Chris@1494 163 +test5
Chris@1494 164 +test6
Chris@1494 165 DIFF
Chris@1494 166 )
Chris@1494 167 assert_equal 4, diff.size
Chris@1494 168 assert_equal "README1", diff[0].file_name
Chris@1494 169 end
Chris@1494 170
Chris@1494 171 def test_both_git_diff
Chris@1494 172 diff = Redmine::UnifiedDiff.new(<<-DIFF
Chris@1494 173 # HG changeset patch
Chris@1494 174 # User test
Chris@1494 175 # Date 1348014182 -32400
Chris@1494 176 # Node ID d1c871b8ef113df7f1c56d41e6e3bfbaff976e1f
Chris@1494 177 # Parent 180b6605936cdc7909c5f08b59746ec1a7c99b3e
Chris@1494 178 modify test1.txt
Chris@1494 179
Chris@1494 180 diff -r 180b6605936c -r d1c871b8ef11 test1.txt
Chris@1494 181 --- a/test1.txt
Chris@1494 182 +++ b/test1.txt
Chris@1494 183 @@ -1,1 +1,1 @@
Chris@1494 184 -test1
Chris@1494 185 +modify test1
Chris@1494 186 DIFF
Chris@1494 187 )
Chris@1494 188 assert_equal 1, diff.size
Chris@1494 189 assert_equal "test1.txt", diff[0].file_name
Chris@1494 190 end
Chris@1494 191
Chris@1494 192 def test_include_a_b_slash
Chris@1494 193 diff = Redmine::UnifiedDiff.new(<<-DIFF
Chris@1494 194 --- test1.txt
Chris@1494 195 +++ b/test02.txt
Chris@1494 196 @@ -1 +0,0 @@
Chris@1494 197 -modify test1
Chris@1494 198 DIFF
Chris@1494 199 )
Chris@1494 200 assert_equal 1, diff.size
Chris@1494 201 assert_equal "b/test02.txt", diff[0].file_name
Chris@1494 202
Chris@1494 203 diff = Redmine::UnifiedDiff.new(<<-DIFF
Chris@1494 204 --- a/test1.txt
Chris@1494 205 +++ a/test02.txt
Chris@1494 206 @@ -1 +0,0 @@
Chris@1494 207 -modify test1
Chris@1494 208 DIFF
Chris@1494 209 )
Chris@1494 210 assert_equal 1, diff.size
Chris@1494 211 assert_equal "a/test02.txt", diff[0].file_name
Chris@1494 212
Chris@1494 213 diff = Redmine::UnifiedDiff.new(<<-DIFF
Chris@1494 214 --- a/test1.txt
Chris@1494 215 +++ test02.txt
Chris@1494 216 @@ -1 +0,0 @@
Chris@1494 217 -modify test1
Chris@1494 218 DIFF
Chris@1494 219 )
Chris@1494 220 assert_equal 1, diff.size
Chris@1494 221 assert_equal "test02.txt", diff[0].file_name
Chris@1494 222 end
Chris@1494 223
Chris@1494 224 def test_utf8_ja
Chris@1494 225 ja = " text_tip_issue_end_day: "
Chris@1494 226 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@1494 227 ja.force_encoding('UTF-8') if ja.respond_to?(:force_encoding)
Chris@1494 228 with_settings :repositories_encodings => '' do
Chris@1494 229 diff = Redmine::UnifiedDiff.new(read_diff_fixture('issue-12641-ja.diff'), :type => 'inline')
Chris@1494 230 assert_equal 1, diff.size
Chris@1494 231 assert_equal 12, diff.first.size
Chris@1494 232 assert_equal ja, diff.first[4].html_line_left
Chris@1494 233 end
Chris@1494 234 end
Chris@1494 235
Chris@1494 236 def test_utf8_ru
Chris@1494 237 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@1494 238 ru.force_encoding('UTF-8') if ru.respond_to?(:force_encoding)
Chris@1494 239 with_settings :repositories_encodings => '' do
Chris@1494 240 diff = Redmine::UnifiedDiff.new(read_diff_fixture('issue-12641-ru.diff'), :type => 'inline')
Chris@1494 241 assert_equal 1, diff.size
Chris@1494 242 assert_equal 8, diff.first.size
Chris@1494 243 assert_equal ru, diff.first[3].html_line_left
Chris@1494 244 end
Chris@1494 245 end
Chris@1494 246
Chris@1494 247 def test_offset_range_ascii_1
Chris@1494 248 raw = <<-DIFF
Chris@1494 249 --- a.txt 2013-04-05 14:19:39.000000000 +0900
Chris@1494 250 +++ b.txt 2013-04-05 14:19:51.000000000 +0900
Chris@1494 251 @@ -1,3 +1,3 @@
Chris@1494 252 aaaa
Chris@1494 253 -abc
Chris@1494 254 +abcd
Chris@1494 255 bbbb
Chris@1494 256 DIFF
Chris@1494 257 diff = Redmine::UnifiedDiff.new(raw, :type => 'sbs')
Chris@1494 258 assert_equal 1, diff.size
Chris@1494 259 assert_equal 3, diff.first.size
Chris@1494 260 assert_equal "abc<span></span>", diff.first[1].html_line_left
Chris@1494 261 assert_equal "abc<span>d</span>", diff.first[1].html_line_right
Chris@1494 262 end
Chris@1494 263
Chris@1494 264 def test_offset_range_ascii_2
Chris@1494 265 raw = <<-DIFF
Chris@1494 266 --- a.txt 2013-04-05 14:19:39.000000000 +0900
Chris@1494 267 +++ b.txt 2013-04-05 14:19:51.000000000 +0900
Chris@1494 268 @@ -1,3 +1,3 @@
Chris@1494 269 aaaa
Chris@1494 270 -abc
Chris@1494 271 +zabc
Chris@1494 272 bbbb
Chris@1494 273 DIFF
Chris@1494 274 diff = Redmine::UnifiedDiff.new(raw, :type => 'sbs')
Chris@1494 275 assert_equal 1, diff.size
Chris@1494 276 assert_equal 3, diff.first.size
Chris@1494 277 assert_equal "<span></span>abc", diff.first[1].html_line_left
Chris@1494 278 assert_equal "<span>z</span>abc", diff.first[1].html_line_right
Chris@1494 279 end
Chris@1494 280
Chris@1494 281 def test_offset_range_japanese_1
Chris@1494 282 ja1 = "\xe6\x97\xa5\xe6\x9c\xac<span></span>"
Chris@1494 283 ja1.force_encoding('UTF-8') if ja1.respond_to?(:force_encoding)
Chris@1494 284 ja2 = "\xe6\x97\xa5\xe6\x9c\xac<span>\xe8\xaa\x9e</span>"
Chris@1494 285 ja2.force_encoding('UTF-8') if ja2.respond_to?(:force_encoding)
Chris@1494 286 with_settings :repositories_encodings => '' do
Chris@1494 287 diff = Redmine::UnifiedDiff.new(
Chris@1494 288 read_diff_fixture('issue-13644-1.diff'), :type => 'sbs')
Chris@1494 289 assert_equal 1, diff.size
Chris@1494 290 assert_equal 3, diff.first.size
Chris@1494 291 assert_equal ja1, diff.first[1].html_line_left
Chris@1494 292 assert_equal ja2, diff.first[1].html_line_right
Chris@1494 293 end
Chris@1494 294 end
Chris@1494 295
Chris@1494 296 def test_offset_range_japanese_2
Chris@1494 297 ja1 = "<span></span>\xe6\x97\xa5\xe6\x9c\xac"
Chris@1494 298 ja1.force_encoding('UTF-8') if ja1.respond_to?(:force_encoding)
Chris@1494 299 ja2 = "<span>\xe3\x81\xab\xe3\x81\xa3\xe3\x81\xbd\xe3\x82\x93</span>\xe6\x97\xa5\xe6\x9c\xac"
Chris@1494 300 ja2.force_encoding('UTF-8') if ja2.respond_to?(:force_encoding)
Chris@1494 301 with_settings :repositories_encodings => '' do
Chris@1494 302 diff = Redmine::UnifiedDiff.new(
Chris@1494 303 read_diff_fixture('issue-13644-2.diff'), :type => 'sbs')
Chris@1494 304 assert_equal 1, diff.size
Chris@1494 305 assert_equal 3, diff.first.size
Chris@1494 306 assert_equal ja1, diff.first[1].html_line_left
Chris@1494 307 assert_equal ja2, diff.first[1].html_line_right
Chris@1494 308 end
Chris@1494 309 end
Chris@1494 310
Chris@1494 311 def test_offset_range_japanese_3
Chris@1494 312 # UTF-8 The 1st byte differs.
Chris@1494 313 ja1 = "\xe6\x97\xa5\xe6\x9c\xac<span>\xe8\xa8\x98</span>"
Chris@1494 314 ja1.force_encoding('UTF-8') if ja1.respond_to?(:force_encoding)
Chris@1494 315 ja2 = "\xe6\x97\xa5\xe6\x9c\xac<span>\xe5\xa8\x98</span>"
Chris@1494 316 ja2.force_encoding('UTF-8') if ja2.respond_to?(:force_encoding)
Chris@1494 317 with_settings :repositories_encodings => '' do
Chris@1494 318 diff = Redmine::UnifiedDiff.new(
Chris@1494 319 read_diff_fixture('issue-13644-3.diff'), :type => 'sbs')
Chris@1494 320 assert_equal 1, diff.size
Chris@1494 321 assert_equal 3, diff.first.size
Chris@1494 322 assert_equal ja1, diff.first[1].html_line_left
Chris@1494 323 assert_equal ja2, diff.first[1].html_line_right
Chris@1494 324 end
Chris@1494 325 end
Chris@1494 326
Chris@1494 327 def test_offset_range_japanese_4
Chris@1494 328 # UTF-8 The 2nd byte differs.
Chris@1494 329 ja1 = "\xe6\x97\xa5\xe6\x9c\xac<span>\xe8\xa8\x98</span>"
Chris@1494 330 ja1.force_encoding('UTF-8') if ja1.respond_to?(:force_encoding)
Chris@1494 331 ja2 = "\xe6\x97\xa5\xe6\x9c\xac<span>\xe8\xaa\x98</span>"
Chris@1494 332 ja2.force_encoding('UTF-8') if ja2.respond_to?(:force_encoding)
Chris@1494 333 with_settings :repositories_encodings => '' do
Chris@1494 334 diff = Redmine::UnifiedDiff.new(
Chris@1494 335 read_diff_fixture('issue-13644-4.diff'), :type => 'sbs')
Chris@1494 336 assert_equal 1, diff.size
Chris@1494 337 assert_equal 3, diff.first.size
Chris@1494 338 assert_equal ja1, diff.first[1].html_line_left
Chris@1494 339 assert_equal ja2, diff.first[1].html_line_right
Chris@1494 340 end
Chris@1494 341 end
Chris@1494 342
Chris@1494 343 def test_offset_range_japanese_5
Chris@1494 344 # UTF-8 The 2nd byte differs.
Chris@1494 345 ja1 = "\xe6\x97\xa5\xe6\x9c\xac<span>\xe8\xa8\x98</span>ok"
Chris@1494 346 ja1.force_encoding('UTF-8') if ja1.respond_to?(:force_encoding)
Chris@1494 347 ja2 = "\xe6\x97\xa5\xe6\x9c\xac<span>\xe8\xaa\x98</span>ok"
Chris@1494 348 ja2.force_encoding('UTF-8') if ja2.respond_to?(:force_encoding)
Chris@1494 349 with_settings :repositories_encodings => '' do
Chris@1494 350 diff = Redmine::UnifiedDiff.new(
Chris@1494 351 read_diff_fixture('issue-13644-5.diff'), :type => 'sbs')
Chris@1494 352 assert_equal 1, diff.size
Chris@1494 353 assert_equal 3, diff.first.size
Chris@1494 354 assert_equal ja1, diff.first[1].html_line_left
Chris@1494 355 assert_equal ja2, diff.first[1].html_line_right
Chris@1494 356 end
Chris@1494 357 end
Chris@1494 358
Chris@1494 359 private
Chris@1494 360
Chris@1494 361 def read_diff_fixture(filename)
Chris@1494 362 File.new(File.join(File.dirname(__FILE__), '/../../../fixtures/diffs', filename)).read
Chris@1494 363 end
Chris@1494 364 end