diff --git a/test/unit/lib/redmine/unified_diff_test.rb b/test/unit/lib/redmine/unified_diff_test.rb index 13653e3a9..8d3e70497 100644 --- a/test/unit/lib/redmine/unified_diff_test.rb +++ b/test/unit/lib/redmine/unified_diff_test.rb @@ -5,12 +5,12 @@ # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. @@ -18,7 +18,7 @@ require File.expand_path('../../../../test_helper', __FILE__) class Redmine::UnifiedDiffTest < ActiveSupport::TestCase - + def setup end @@ -28,58 +28,58 @@ class Redmine::UnifiedDiffTest < ActiveSupport::TestCase assert_equal 4, diff.size assert diff.detect {|file| file.file_name =~ %r{^config/settings.yml}} end - + def test_truncate_diff diff = Redmine::UnifiedDiff.new(read_diff_fixture('subversion.diff'), :max_lines => 20) assert_equal 2, diff.size end - + def test_inline_partials diff = Redmine::UnifiedDiff.new(read_diff_fixture('partials.diff')) assert_equal 1, diff.size diff = diff.first assert_equal 43, diff.size - + assert_equal [51, -1], diff[0].offsets assert_equal [51, -1], diff[1].offsets assert_equal 'Lorem ipsum dolor sit amet, consectetur adipiscing elit', diff[0].html_line assert_equal 'Lorem ipsum dolor sit amet, consectetur adipiscing xx', diff[1].html_line - + assert_nil diff[2].offsets assert_equal 'Praesent et sagittis dui. Vivamus ac diam diam', diff[2].html_line - + assert_equal [0, -14], diff[3].offsets assert_equal [0, -14], diff[4].offsets assert_equal 'Ut sed auctor justo', diff[3].html_line assert_equal 'xxx auctor justo', diff[4].html_line - + assert_equal [13, -19], diff[6].offsets assert_equal [13, -19], diff[7].offsets - + assert_equal [24, -8], diff[9].offsets assert_equal [24, -8], diff[10].offsets - + assert_equal [37, -1], diff[12].offsets assert_equal [37, -1], diff[13].offsets - + assert_equal [0, -38], diff[15].offsets assert_equal [0, -38], diff[16].offsets end - + def test_side_by_side_partials diff = Redmine::UnifiedDiff.new(read_diff_fixture('partials.diff'), :type => 'sbs') assert_equal 1, diff.size diff = diff.first assert_equal 32, diff.size - + assert_equal [51, -1], diff[0].offsets assert_equal 'Lorem ipsum dolor sit amet, consectetur adipiscing elit', diff[0].html_line_left assert_equal 'Lorem ipsum dolor sit amet, consectetur adipiscing xx', diff[0].html_line_right - + assert_nil diff[1].offsets assert_equal 'Praesent et sagittis dui. Vivamus ac diam diam', diff[1].html_line_left assert_equal 'Praesent et sagittis dui. Vivamus ac diam diam', diff[1].html_line_right - + assert_equal [0, -14], diff[2].offsets assert_equal 'Ut sed auctor justo', diff[2].html_line_left assert_equal 'xxx auctor justo', diff[2].html_line_right @@ -88,9 +88,9 @@ class Redmine::UnifiedDiffTest < ActiveSupport::TestCase assert_equal [24, -8], diff[6].offsets assert_equal [37, -1], diff[8].offsets assert_equal [0, -38], diff[10].offsets - + end - + def test_line_starting_with_dashes diff = Redmine::UnifiedDiff.new(<<-DIFF --- old.txt Wed Nov 11 14:24:58 2009