annotate .svn/pristine/03/03803ec02697cfe8f89b59eb47e58dc9312a0502.svn-base @ 929:5f33065ddc4b redmine-1.3

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