Mercurial > hg > soundsoftware-site
comparison test/unit/lib/redmine/.svn/text-base/unified_diff_test.rb.svn-base @ 246:eeebe205a056 cannam
* Merge from default branch, bringing us up to SVN trunk rev 4993
author | Chris Cannam |
---|---|
date | Thu, 03 Mar 2011 12:02:03 +0000 |
parents | 051f544170fe |
children | cbce1fd3b1b7 |
comparison
equal
deleted
inserted
replaced
138:fca2657f4aa5 | 246:eeebe205a056 |
---|---|
58 DIFF | 58 DIFF |
59 ) | 59 ) |
60 assert_equal 1, diff.size | 60 assert_equal 1, diff.size |
61 end | 61 end |
62 | 62 |
63 def test_one_line_new_files | |
64 diff = Redmine::UnifiedDiff.new(<<-DIFF | |
65 diff -r 000000000000 -r ea98b14f75f0 README1 | |
66 --- /dev/null | |
67 +++ b/README1 | |
68 @@ -0,0 +1,1 @@ | |
69 +test1 | |
70 diff -r 000000000000 -r ea98b14f75f0 README2 | |
71 --- /dev/null | |
72 +++ b/README2 | |
73 @@ -0,0 +1,1 @@ | |
74 +test2 | |
75 diff -r 000000000000 -r ea98b14f75f0 README3 | |
76 --- /dev/null | |
77 +++ b/README3 | |
78 @@ -0,0 +1,3 @@ | |
79 +test4 | |
80 +test5 | |
81 +test6 | |
82 diff -r 000000000000 -r ea98b14f75f0 README4 | |
83 --- /dev/null | |
84 +++ b/README4 | |
85 @@ -0,0 +1,3 @@ | |
86 +test4 | |
87 +test5 | |
88 +test6 | |
89 DIFF | |
90 ) | |
91 assert_equal 4, diff.size | |
92 end | |
93 | |
63 private | 94 private |
64 | 95 |
65 def read_diff_fixture(filename) | 96 def read_diff_fixture(filename) |
66 File.new(File.join(File.dirname(__FILE__), '/../../../fixtures/diffs', filename)).read | 97 File.new(File.join(File.dirname(__FILE__), '/../../../fixtures/diffs', filename)).read |
67 end | 98 end |
68 end | 99 end |