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
|
#!/usr/bin/perl -w
#
# Copyright (C) 2010 Chris Jerdonek (chris.jerdonek@gmail.com)
#
# 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 parseDiff().
use strict;
use warnings;
use Test::More;
use VCSUtils;
my @diffHashRefKeys = ( # The $diffHashRef keys to check.
"copiedFromPath",
"indexPath",
"sourceRevision",
"svnConvertedText",
);
# The array of test cases.
my @testCaseHashRefs = (
{
# New test
diffName => "SVN: simple",
inputText => <<'END',
Index: Makefile
===================================================================
--- Makefile (revision 53052)
+++ Makefile (working copy)
@@ -1,3 +1,4 @@
+
MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKitTools
all:
END
# Header keys to check
svnConvertedText => <<'END', # Same as input text
Index: Makefile
===================================================================
--- Makefile (revision 53052)
+++ Makefile (working copy)
@@ -1,3 +1,4 @@
+
MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKitTools
all:
END
copiedFromPath => undef,
indexPath => "Makefile",
sourceRevision => "53052",
# Other values to check
lastReadLine => undef,
nextLine => undef,
},
{
# New test
diffName => "SVN: leading junk",
inputText => <<'END',
LEADING JUNK
Index: Makefile
===================================================================
--- Makefile (revision 53052)
+++ Makefile (working copy)
@@ -1,3 +1,4 @@
+
MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKitTools
all:
END
# Header keys to check
svnConvertedText => <<'END', # Same as input text
LEADING JUNK
Index: Makefile
===================================================================
--- Makefile (revision 53052)
+++ Makefile (working copy)
@@ -1,3 +1,4 @@
+
MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKitTools
all:
END
copiedFromPath => undef,
indexPath => "Makefile",
sourceRevision => "53052",
# Other values to check
lastReadLine => undef,
nextLine => undef,
},
{
# New test
diffName => "SVN: copied file",
inputText => <<'END',
Index: Makefile_new
===================================================================
--- Makefile_new (revision 53131) (from Makefile:53131)
+++ Makefile_new (working copy)
@@ -0,0 +1,1 @@
+MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKitTools
END
# Header keys to check
svnConvertedText => <<'END', # Same as input text
Index: Makefile_new
===================================================================
--- Makefile_new (revision 53131) (from Makefile:53131)
+++ Makefile_new (working copy)
@@ -0,0 +1,1 @@
+MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKitTools
END
copiedFromPath => "Makefile",
indexPath => "Makefile_new",
sourceRevision => "53131",
# Other values to check
lastReadLine => undef,
nextLine => undef,
},
{
# New test
diffName => "SVN: two diffs",
inputText => <<'END',
Index: Makefile
===================================================================
--- Makefile (revision 53131)
+++ Makefile (working copy)
@@ -1,1 +0,0 @@
-MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKitTools
Index: Makefile_new
===================================================================
--- Makefile_new (revision 53131) (from Makefile:53131)
END
# Header keys to check
svnConvertedText => <<'END',
Index: Makefile
===================================================================
--- Makefile (revision 53131)
+++ Makefile (working copy)
@@ -1,1 +0,0 @@
-MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKitTools
END
copiedFromPath => undef,
indexPath => "Makefile",
sourceRevision => "53131",
# Other values to check
lastReadLine => "Index: Makefile_new\n",
nextLine => "===================================================================\n",
},
{
# New test
diffName => "SVN: SVN diff followed by Git diff", # Should not recognize Git start
inputText => <<'END',
Index: Makefile
===================================================================
--- Makefile (revision 53131)
+++ Makefile (working copy)
@@ -1,1 +0,0 @@
-MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKitTools
diff --git a/Makefile b/Makefile
index f5d5e74..3b6aa92 100644
--- a/Makefile
+++ b/Makefile
@@ -1,1 1,1 @@ public:
END
# Header keys to check
svnConvertedText => <<'END', # Same as input text
Index: Makefile
===================================================================
--- Makefile (revision 53131)
+++ Makefile (working copy)
@@ -1,1 +0,0 @@
-MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKitTools
diff --git a/Makefile b/Makefile
index f5d5e74..3b6aa92 100644
--- a/Makefile
+++ b/Makefile
@@ -1,1 1,1 @@ public:
END
copiedFromPath => undef,
indexPath => "Makefile",
sourceRevision => "53131",
# Other values to check
lastReadLine => undef,
nextLine => undef,
},
{
# New test
diffName => "Git: simple",
inputText => <<'END',
diff --git a/Makefile b/Makefile
index f5d5e74..3b6aa92 100644
--- a/Makefile
+++ b/Makefile
@@ -1,1 1,1 @@ public:
END
# Header keys to check
svnConvertedText => <<'END',
Index: Makefile
===================================================================
--- Makefile
+++ Makefile
@@ -1,1 1,1 @@ public:
END
copiedFromPath => undef,
indexPath => "Makefile",
sourceRevision => undef,
# Other values to check
lastReadLine => undef,
nextLine => undef,
},
{
# New test
diffName => "Git: Git diff followed by SVN diff", # Should not recognize SVN start
inputText => <<'END',
diff --git a/Makefile b/Makefile
index f5d5e74..3b6aa92 100644
--- a/Makefile
+++ b/Makefile
@@ -1,1 1,1 @@ public:
Index: Makefile_new
===================================================================
--- Makefile_new (revision 53131) (from Makefile:53131)
END
# Header keys to check
svnConvertedText => <<'END',
Index: Makefile
===================================================================
--- Makefile
+++ Makefile
@@ -1,1 1,1 @@ public:
Index: Makefile_new
===================================================================
--- Makefile_new (revision 53131) (from Makefile:53131)
END
copiedFromPath => undef,
indexPath => "Makefile",
sourceRevision => undef,
# Other values to check
lastReadLine => undef,
nextLine => undef,
},
);
# Return the arguments for each assertion per test case.
#
# In particular, the number of assertions per test case is the length
# of the return value of this subroutine on a sample input.
#
# Returns @assertionArgsArrayRefs:
# $assertionArgsArrayRef: A reference to an array of parameters to pass
# to each call to is(). The parameters are--
# $got: The value obtained
# $expected: The expected value
# $testName: The name of the test
sub testParseDiffAssertionArgs($)
{
my ($testCaseHashRef) = @_;
my $fileHandle;
open($fileHandle, "<", \$testCaseHashRef->{inputText});
my $line = <$fileHandle>;
my ($diffHashRef, $lastReadLine) = VCSUtils::parseDiff($fileHandle, $line);
my $testNameStart = "parseDiff(): [$testCaseHashRef->{diffName}] ";
my @assertionArgsArrayRefs; # Return value
my @assertionArgs;
foreach my $diffHashRefKey (@diffHashRefKeys) {
my $testName = "${testNameStart}key=\"$diffHashRefKey\"";
@assertionArgs = ($diffHashRef->{$diffHashRefKey}, $testCaseHashRef->{$diffHashRefKey}, $testName);
push(@assertionArgsArrayRefs, \@assertionArgs);
}
@assertionArgs = ($lastReadLine, $testCaseHashRef->{lastReadLine}, "${testNameStart}lastReadLine");
push(@assertionArgsArrayRefs, \@assertionArgs);
my $nextLine = <$fileHandle>;
@assertionArgs = ($nextLine, $testCaseHashRef->{nextLine}, "${testNameStart}nextLine");
push(@assertionArgsArrayRefs, \@assertionArgs);
return @assertionArgsArrayRefs;
}
# Test parseDiff() for the given test case.
sub testParseDiff($)
{
my ($testCaseHashRef) = @_;
my @assertionArgsArrayRefs = testParseDiffAssertionArgs($testCaseHashRef);
foreach my $arrayRef (@assertionArgsArrayRefs) {
# The parameters are -- is($got, $expected, $testName).
is($arrayRef->[0], $arrayRef->[1], $arrayRef->[2]);
}
}
# Count the number of assertions per test case, using a sample test case.
my $assertionCount = testParseDiffAssertionArgs($testCaseHashRefs[0]);
plan(tests => @testCaseHashRefs * $assertionCount); # Total number of tests
foreach my $testCaseHashRef (@testCaseHashRefs) {
testParseDiff($testCaseHashRef);
}
|
