154 lines
4.2 KiB
Ruby
154 lines
4.2 KiB
Ruby
#-- encoding: UTF-8
|
|
#-- copyright
|
|
# ChiliProject is a project management system.
|
|
#
|
|
# Copyright (C) 2010-2012 the ChiliProject Team
|
|
#
|
|
# This program is free software; you can redistribute it and/or
|
|
# 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.
|
|
#
|
|
# See doc/COPYRIGHT.rdoc for more details.
|
|
#++
|
|
|
|
require File.expand_path('../../../../test_helper', __FILE__)
|
|
|
|
class Redmine::UnifiedDiffTest < ActiveSupport::TestCase
|
|
|
|
def setup
|
|
end
|
|
|
|
def test_subversion_diff
|
|
diff = Redmine::UnifiedDiff.new(read_diff_fixture('subversion.diff'))
|
|
# number of files
|
|
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 <span>elit</span>', diff[0].html_line
|
|
assert_equal 'Lorem ipsum dolor sit amet, consectetur adipiscing <span>xx</span>', 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 '<span>Ut sed</span> auctor justo', diff[3].html_line
|
|
assert_equal '<span>xxx</span> 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 <span>elit</span>', diff[0].html_line_left
|
|
assert_equal 'Lorem ipsum dolor sit amet, consectetur adipiscing <span>xx</span>', 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 '<span>Ut sed</span> auctor justo', diff[2].html_line_left
|
|
assert_equal '<span>xxx</span> auctor justo', diff[2].html_line_right
|
|
|
|
assert_equal [13, -19], diff[4].offsets
|
|
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
|
|
+++ new.txt Wed Nov 11 14:25:02 2009
|
|
@@ -1,8 +1,4 @@
|
|
-Lines that starts with dashes:
|
|
-
|
|
-------------------------
|
|
--- file.c
|
|
-------------------------
|
|
+A line that starts with dashes:
|
|
|
|
and removed.
|
|
|
|
@@ -23,4 +19,4 @@
|
|
|
|
|
|
|
|
-Another chunk of change
|
|
+Another chunk of changes
|
|
|
|
DIFF
|
|
)
|
|
assert_equal 1, diff.size
|
|
end
|
|
|
|
def test_one_line_new_files
|
|
diff = Redmine::UnifiedDiff.new(<<-DIFF
|
|
diff -r 000000000000 -r ea98b14f75f0 README1
|
|
--- /dev/null
|
|
+++ b/README1
|
|
@@ -0,0 +1,1 @@
|
|
+test1
|
|
diff -r 000000000000 -r ea98b14f75f0 README2
|
|
--- /dev/null
|
|
+++ b/README2
|
|
@@ -0,0 +1,1 @@
|
|
+test2
|
|
diff -r 000000000000 -r ea98b14f75f0 README3
|
|
--- /dev/null
|
|
+++ b/README3
|
|
@@ -0,0 +1,3 @@
|
|
+test4
|
|
+test5
|
|
+test6
|
|
diff -r 000000000000 -r ea98b14f75f0 README4
|
|
--- /dev/null
|
|
+++ b/README4
|
|
@@ -0,0 +1,3 @@
|
|
+test4
|
|
+test5
|
|
+test6
|
|
DIFF
|
|
)
|
|
assert_equal 4, diff.size
|
|
end
|
|
|
|
private
|
|
|
|
def read_diff_fixture(filename)
|
|
File.new(File.join(File.dirname(__FILE__), '/../../../fixtures/diffs', filename)).read
|
|
end
|
|
end
|