1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
|
#!/usr/bin/perl -w
#
# Copyright (C) 2010 Chris Jerdonek (cjerdonek@webkit.org)
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
#
# THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
# DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR
# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# Unit tests of parseGitDiffHeader().
use strict;
use warnings;
use Test::More;
use VCSUtils;
# The array of test cases.
my @testCaseHashRefs = (
{ # New test
diffName => "Modified file",
inputText => <<'END',
diff --git a/foo.h b/foo.h
index f5d5e74..3b6aa92 100644
--- a/foo.h
+++ b/foo.h
@@ -1 +1 @@
-file contents
+new file contents
END
expectedReturn => [
{
svnConvertedText => <<'END',
Index: foo.h
index f5d5e74..3b6aa92 100644
--- foo.h
+++ foo.h
END
indexPath => "foo.h",
},
"@@ -1 +1 @@\n"],
expectedNextLine => "-file contents\n",
},
{ # New test
diffName => "new file",
inputText => <<'END',
diff --git a/foo.h b/foo.h
new file mode 100644
index 0000000..3c9f114
--- /dev/null
+++ b/foo.h
@@ -0,0 +1,34 @@
+<html>
END
expectedReturn => [
{
svnConvertedText => <<'END',
Index: foo.h
new file mode 100644
index 0000000..3c9f114
--- foo.h
+++ foo.h
END
indexPath => "foo.h",
isNew => 1,
},
"@@ -0,0 +1,34 @@\n"],
expectedNextLine => "+<html>\n",
},
{ # New test
diffName => "file deletion",
inputText => <<'END',
diff --git a/foo b/foo
deleted file mode 100644
index 1e50d1d..0000000
--- a/foo
+++ /dev/null
@@ -1,1 +0,0 @@
-line1
diff --git a/configure.ac b/configure.ac
index d45dd40..3494526 100644
END
expectedReturn => [
{
svnConvertedText => <<'END',
Index: foo
deleted file mode 100644
index 1e50d1d..0000000
--- foo
+++ foo
END
indexPath => "foo",
isDeletion => 1,
},
"@@ -1,1 +0,0 @@\n"],
expectedNextLine => "-line1\n",
},
{ # New test
diffName => "using --no-prefix",
inputText => <<'END',
diff --git foo.h foo.h
index c925780..9e65c43 100644
--- foo.h
+++ foo.h
@@ -1,3 +1,17 @@
+contents
END
expectedReturn => [
{
svnConvertedText => <<'END',
Index: foo.h
index c925780..9e65c43 100644
--- foo.h
+++ foo.h
END
indexPath => "foo.h",
},
"@@ -1,3 +1,17 @@\n"],
expectedNextLine => "+contents\n",
},
####
# Copy operations
##
{ # New test
diffName => "copy (with similarity index 100%)",
inputText => <<'END',
diff --git a/foo b/foo_new
similarity index 100%
copy from foo
copy to foo_new
diff --git a/bar b/bar
index d45dd40..3494526 100644
END
expectedReturn => [
{
svnConvertedText => <<'END',
Index: foo_new
similarity index 100%
copy from foo
copy to foo_new
END
copiedFromPath => "foo",
indexPath => "foo_new",
},
"diff --git a/bar b/bar\n"],
expectedNextLine => "index d45dd40..3494526 100644\n",
},
{ # New test
diffName => "copy (with similarity index < 100%)",
inputText => <<'END',
diff --git a/foo b/foo_new
similarity index 99%
copy from foo
copy to foo_new
diff --git a/bar b/bar
index d45dd40..3494526 100644
END
expectedReturn => [
{
svnConvertedText => <<'END',
Index: foo_new
similarity index 99%
copy from foo
copy to foo_new
END
copiedFromPath => "foo",
indexPath => "foo_new",
isCopyWithChanges => 1,
},
"diff --git a/bar b/bar\n"],
expectedNextLine => "index d45dd40..3494526 100644\n",
},
{ # New test
diffName => "rename (with similarity index 100%)",
inputText => <<'END',
diff --git a/foo b/foo_new
similarity index 100%
rename from foo
rename to foo_new
diff --git a/bar b/bar
index d45dd40..3494526 100644
END
expectedReturn => [
{
svnConvertedText => <<'END',
Index: foo_new
similarity index 100%
rename from foo
rename to foo_new
END
copiedFromPath => "foo",
indexPath => "foo_new",
shouldDeleteSource => 1,
},
"diff --git a/bar b/bar\n"],
expectedNextLine => "index d45dd40..3494526 100644\n",
},
{ # New test
diffName => "rename (with similarity index < 100%)",
inputText => <<'END',
diff --git a/foo b/foo_new
similarity index 99%
rename from foo
rename to foo_new
index 1e50d1d..1459d21 100644
--- a/foo
+++ b/foo_new
@@ -15,3 +15,4 @@ release r deployment dep deploy:
line1
line2
line3
+line4
diff --git a/bar b/bar
index d45dd40..3494526 100644
END
expectedReturn => [
{
svnConvertedText => <<'END',
Index: foo_new
similarity index 99%
rename from foo
rename to foo_new
index 1e50d1d..1459d21 100644
--- foo_new
+++ foo_new
END
copiedFromPath => "foo",
indexPath => "foo_new",
isCopyWithChanges => 1,
shouldDeleteSource => 1,
},
"@@ -15,3 +15,4 @@ release r deployment dep deploy:\n"],
expectedNextLine => " line1\n",
},
{ # New test
diffName => "rename (with executable bit change)",
inputText => <<'END',
diff --git a/foo b/foo_new
old mode 100644
new mode 100755
similarity index 100%
rename from foo
rename to foo_new
diff --git a/bar b/bar
index d45dd40..3494526 100644
END
expectedReturn => [
{
svnConvertedText => <<'END',
Index: foo_new
old mode 100644
new mode 100755
similarity index 100%
rename from foo
rename to foo_new
END
copiedFromPath => "foo",
executableBitDelta => 1,
indexPath => "foo_new",
isCopyWithChanges => 1,
shouldDeleteSource => 1,
},
"diff --git a/bar b/bar\n"],
expectedNextLine => "index d45dd40..3494526 100644\n",
},
####
# Binary file test cases
##
{
# New test case
diffName => "New binary file",
inputText => <<'END',
diff --git a/foo.gif b/foo.gif
new file mode 100644
index 0000000000000000000000000000000000000000..64a9532e7794fcd791f6f12157406d9060151690
GIT binary patch
literal 7
OcmYex&reDa;sO8*F9L)B
literal 0
HcmV?d00001
END
expectedReturn => [
{
svnConvertedText => <<'END',
Index: foo.gif
new file mode 100644
index 0000000000000000000000000000000000000000..64a9532e7794fcd791f6f12157406d9060151690
GIT binary patch
END
indexPath => "foo.gif",
isBinary => 1,
isNew => 1,
},
"literal 7\n"],
expectedNextLine => "OcmYex&reDa;sO8*F9L)B\n",
},
{
# New test case
diffName => "Deleted binary file",
inputText => <<'END',
diff --git a/foo.gif b/foo.gif
deleted file mode 100644
index 323fae0..0000000
GIT binary patch
literal 0
HcmV?d00001
literal 7
OcmYex&reDa;sO8*F9L)B
END
expectedReturn => [
{
svnConvertedText => <<'END',
Index: foo.gif
deleted file mode 100644
index 323fae0..0000000
GIT binary patch
END
indexPath => "foo.gif",
isBinary => 1,
isDeletion => 1,
},
"literal 0\n"],
expectedNextLine => "HcmV?d00001\n",
},
####
# Executable bit test cases
##
{
# New test case
diffName => "Modified executable file",
inputText => <<'END',
diff --git a/foo b/foo
index d03e242..435ad3a 100755
--- a/foo
+++ b/foo
@@ -1 +1 @@
-file contents
+new file contents
END
expectedReturn => [
{
svnConvertedText => <<'END',
Index: foo
index d03e242..435ad3a 100755
--- foo
+++ foo
END
indexPath => "foo",
},
"@@ -1 +1 @@\n"],
expectedNextLine => "-file contents\n",
},
{
# New test case
diffName => "Making file executable (last diff)",
inputText => <<'END',
diff --git a/foo.exe b/foo.exe
old mode 100644
new mode 100755
END
expectedReturn => [
{
svnConvertedText => <<'END',
Index: foo.exe
old mode 100644
new mode 100755
END
executableBitDelta => 1,
indexPath => "foo.exe",
},
undef],
expectedNextLine => undef,
},
{
# New test case
diffName => "Making file executable (not last diff)",
inputText => <<'END',
diff --git a/foo.exe b/foo.exe
old mode 100644
new mode 100755
diff --git a/another_file.txt b/another_file.txt
index d03e242..435ad3a 100755
END
expectedReturn => [
{
svnConvertedText => <<'END',
Index: foo.exe
old mode 100644
new mode 100755
END
executableBitDelta => 1,
indexPath => "foo.exe",
},
"diff --git a/another_file.txt b/another_file.txt\n"],
expectedNextLine => "index d03e242..435ad3a 100755\n",
},
{
# New test case
diffName => "New executable file",
inputText => <<'END',
diff --git a/foo b/foo
new file mode 100755
index 0000000..d03e242
--- /dev/null
+++ b/foo
@@ -0,0 +1 @@
+file contents
END
expectedReturn => [
{
svnConvertedText => <<'END',
Index: foo
new file mode 100755
index 0000000..d03e242
--- foo
+++ foo
END
executableBitDelta => 1,
indexPath => "foo",
isNew => 1,
},
"@@ -0,0 +1 @@\n"],
expectedNextLine => "+file contents\n",
},
{
# New test case
diffName => "Deleted executable file",
inputText => <<'END',
diff --git a/foo b/foo
deleted file mode 100755
index d03e242..0000000
--- a/foo
+++ /dev/null
@@ -1 +0,0 @@
-file contents
END
expectedReturn => [
{
svnConvertedText => <<'END',
Index: foo
deleted file mode 100755
index d03e242..0000000
--- foo
+++ foo
END
executableBitDelta => -1,
indexPath => "foo",
isDeletion => 1,
},
"@@ -1 +0,0 @@\n"],
expectedNextLine => "-file contents\n",
},
);
my $testCasesCount = @testCaseHashRefs;
plan(tests => 2 * $testCasesCount); # Total number of assertions.
foreach my $testCase (@testCaseHashRefs) {
my $testNameStart = "parseGitDiffHeader(): $testCase->{diffName}: comparing";
my $fileHandle;
open($fileHandle, "<", \$testCase->{inputText});
my $line = <$fileHandle>;
my @got = VCSUtils::parseGitDiffHeader($fileHandle, $line);
my $expectedReturn = $testCase->{expectedReturn};
is_deeply(\@got, $expectedReturn, "$testNameStart return value.");
my $gotNextLine = <$fileHandle>;
is($gotNextLine, $testCase->{expectedNextLine}, "$testNameStart next read line.");
}
|
