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
|
#!/usr/bin/perl -w
#
# Copyright (C) 2011 Research In Motion Limited. All rights reserved.
# Copyright (C) 2013 Apple Inc. All rights reserved.
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either
# version 2.1 of the License, or (at your option) any later version.
#
# This library 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
# Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
# Unit tests of parseDiff() with mock files; test override of patch EOL with EOL of target file.
use strict;
use warnings;
use File::Temp;
use POSIX qw/getcwd/;
use Test::More;
use VCSUtils;
# We should consider moving escapeNewLineCharacters() and toMacLineEndings()
# to VCSUtils.pm if they're useful in other places.
sub escapeNewLineCharacters($)
{
my ($text) = @_;
my @characters = split(//, $text);
my $result = "";
foreach (@characters) {
if (/^\r$/) {
$result .= '\r';
next;
}
if (/^\n$/) {
$result .= '\n';
}
$result .= $_;
}
return $result;
}
sub toMacLineEndings($)
{
my ($text) = @_;
$text =~ s/\n/\r/g;
return $text;
}
my $gitDiffHeaderForNewFile = <<EOF;
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..756e864
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,17 @@
EOF
my $gitDiffHeader = <<EOF;
diff --git a/Makefile b/Makefile
index 756e864..04d2ae1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,4 @@
EOF
my $svnConvertedGitDiffHeader = <<"EOF";
Index: Makefile
index 756e864..04d2ae1 100644
--- Makefile\t(revision 0)
+++ Makefile\t(working copy)
@@ -1,3 +1,4 @@
EOF
my $svnConvertedGitDiffHeaderForNewFile = <<"EOF";
Index: Makefile
new file mode 100644
index 0000000..756e864
--- Makefile\t(revision 0)
+++ Makefile\t(working copy)
@@ -0,0 +1,17 @@
EOF
my $svnDiffHeaderForNewFile = <<EOF;
Index: Makefile
===================================================================
--- Makefile (revision 0)
+++ Makefile (revision 0)
@@ -0,0 +1,17 @@
EOF
my $svnDiffHeader = <<EOF;
Index: Makefile
===================================================================
--- Makefile (revision 53052)
+++ Makefile (working copy)
@@ -1,3 +1,4 @@
EOF
my $diffBody = <<EOF;
+
MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKitTools
all:
EOF
my $MakefileContents = <<EOF;
MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKitTools
all:
EOF
my $mockDir = File::Temp->tempdir("parseDiffXXXX", CLEANUP => 1);
writeToFile(File::Spec->catfile($mockDir, "MakefileWithUnixEOL"), $MakefileContents);
writeToFile(File::Spec->catfile($mockDir, "MakefileWithWindowsEOL"), toWindowsLineEndings($MakefileContents));
writeToFile(File::Spec->catfile($mockDir, "MakefileWithMacEOL"), toMacLineEndings($MakefileContents));
# The array of test cases.
my @testCaseHashRefs = (
###
# SVN test cases
##
{
# New test
diffName => "SVN: Patch with Unix line endings and IndexPath has Unix line endings",
inputText => substituteString($svnDiffHeader, "Makefile", "MakefileWithUnixEOL") . $diffBody,
expectedReturn => [
[{
svnConvertedText => substituteString($svnDiffHeader, "Makefile", "MakefileWithUnixEOL") . $diffBody, # Same as input text
indexPath => "MakefileWithUnixEOL",
isSvn => 1,
numTextChunks => 1,
sourceRevision => "53052",
}],
undef],
expectedNextLine => undef,
},
{
# New test
diffName => "SVN: Patch with Windows line endings and IndexPath has Unix line endings",
inputText => substituteString($svnDiffHeader, "Makefile", "MakefileWithUnixEOL") . toWindowsLineEndings($diffBody),
expectedReturn => [
[{
svnConvertedText => substituteString($svnDiffHeader, "Makefile", "MakefileWithUnixEOL") . $diffBody,
indexPath => "MakefileWithUnixEOL",
isSvn => 1,
numTextChunks => 1,
sourceRevision => "53052",
}],
undef],
expectedNextLine => undef,
},
{
# New test
diffName => "SVN: Patch with Windows line endings and IndexPath has Windows line endings",
inputText => substituteString($svnDiffHeader, "Makefile", "MakefileWithWindowsEOL") . toWindowsLineEndings($diffBody),
expectedReturn => [
[{
svnConvertedText => substituteString($svnDiffHeader, "Makefile", "MakefileWithWindowsEOL") . toWindowsLineEndings($diffBody), # Same as input text
indexPath => "MakefileWithWindowsEOL",
isSvn => 1,
numTextChunks => 1,
sourceRevision => "53052",
}],
undef],
expectedNextLine => undef,
},
{
# New test
diffName => "SVN: Patch adds Windows newline to EOF and IndexPath has Windows line endings",
inputText => <<"EOF",
Index: MakefileWithWindowsEOL
===================================================================
--- MakefileWithWindowsEOL (revision 53052)
+++ MakefileWithWindowsEOL (working copy)
@@ -1,3 +1,4 @@\r
MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKitTools\r
\r
-all:
\\ No newline at end of file
+all:\r
+\r
EOF
expectedReturn => [
[{
# Same as input text
svnConvertedText => <<"EOF",
Index: MakefileWithWindowsEOL
===================================================================
--- MakefileWithWindowsEOL (revision 53052)
+++ MakefileWithWindowsEOL (working copy)
@@ -1,3 +1,4 @@\r
MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKitTools\r
\r
-all:
\\ No newline at end of file
+all:\r
+\r
EOF
indexPath => "MakefileWithWindowsEOL",
isSvn => 1,
numTextChunks => 1,
sourceRevision => 53052
}],
undef],
expectedNextLine => undef,
},
{
# New test
diffName => "SVN: Patch adds Mac newline to EOF and IndexPath has Mac line endings",
inputText => <<"EOF",
Index: MakefileWithMacEOL
===================================================================
--- MakefileWithMacEOL (revision 53052)
+++ MakefileWithMacEOL (working copy)
@@ -1,3 +1,4 @@\r MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKitTools\r \r-all:
\\ No newline at end of file
+all:\r+\r
EOF
expectedReturn => [
[{
# Same as input text
svnConvertedText => q(Index: MakefileWithMacEOL
===================================================================
--- MakefileWithMacEOL (revision 53052)
+++ MakefileWithMacEOL (working copy)
@@ -1,3 +1,4 @@\r MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKitTools\r \r-all:
\\ No newline at end of file
+all:\r+\r),
indexPath => "MakefileWithMacEOL",
isSvn => 1,
numTextChunks => 1,
sourceRevision => 53052
}],
undef],
expectedNextLine => undef,
},
{
# New test
diffName => "SVN: Patch with Unix line endings and IndexPath has Windows line endings",
inputText => substituteString($svnDiffHeader, "Makefile", "MakefileWithWindowsEOL") . $diffBody,
expectedReturn => [
[{
svnConvertedText => substituteString($svnDiffHeader, "Makefile", "MakefileWithWindowsEOL") . toWindowsLineEndings($diffBody),
indexPath => "MakefileWithWindowsEOL",
isSvn => 1,
numTextChunks => 1,
sourceRevision => "53052",
}],
undef],
expectedNextLine => undef,
},
{
# New test
diffName => "SVN: Patch with Unix line endings and nonexistent IndexPath",
inputText => substituteString($svnDiffHeaderForNewFile, "Makefile", "NonexistentFile") . $diffBody,
expectedReturn => [
[{
svnConvertedText => substituteString($svnDiffHeaderForNewFile, "Makefile", "NonexistentFile") . $diffBody, # Same as input text
indexPath => "NonexistentFile",
isSvn => 1,
isNew => 1,
numTextChunks => 1,
}],
undef],
expectedNextLine => undef,
},
{
# New test
diffName => "SVN: Patch with Windows line endings and nonexistent IndexPath",
inputText => substituteString($svnDiffHeaderForNewFile, "Makefile", "NonexistentFile") . toWindowsLineEndings($diffBody),
expectedReturn => [
[{
svnConvertedText => substituteString($svnDiffHeaderForNewFile, "Makefile", "NonexistentFile") . toWindowsLineEndings($diffBody), # Same as input text
indexPath => "NonexistentFile",
isSvn => 1,
isNew => 1,
numTextChunks => 1,
}],
undef],
expectedNextLine => undef,
},
###
# Git test cases
##
{
# New test
diffName => "Git: Patch with Unix line endings and IndexPath has Unix line endings",
inputText => substituteString($gitDiffHeader, "Makefile", "MakefileWithUnixEOL") . $diffBody,
expectedReturn => [
[{
svnConvertedText => substituteString($svnConvertedGitDiffHeader, "Makefile", "MakefileWithUnixEOL") . $diffBody, # Same as input text
indexPath => "MakefileWithUnixEOL",
isGit => 1,
numTextChunks => 1,
}],
undef],
expectedNextLine => undef,
},
{
# New test
diffName => "Git: Patch with Windows line endings and IndexPath has Unix line endings",
inputText => substituteString($gitDiffHeader, "Makefile", "MakefileWithUnixEOL") . toWindowsLineEndings($diffBody),
expectedReturn => [
[{
svnConvertedText => substituteString($svnConvertedGitDiffHeader, "Makefile", "MakefileWithUnixEOL") . $diffBody,
indexPath => "MakefileWithUnixEOL",
isGit => 1,
numTextChunks => 1,
}],
undef],
expectedNextLine => undef,
},
{
# New test
diffName => "Git: Patch with Windows line endings and IndexPath has Windows line endings",
inputText => substituteString($gitDiffHeader, "Makefile", "MakefileWithWindowsEOL") . toWindowsLineEndings($diffBody),
expectedReturn => [
[{
svnConvertedText => substituteString($svnConvertedGitDiffHeader, "Makefile", "MakefileWithWindowsEOL") . toWindowsLineEndings($diffBody), # Same as input text
indexPath => "MakefileWithWindowsEOL",
isGit => 1,
numTextChunks => 1,
}],
undef],
expectedNextLine => undef,
},
{
# New test
diffName => "Git: Patch adds newline to EOF with Windows line endings and IndexPath has Windows line endings",
inputText => <<"EOF",
diff --git a/MakefileWithWindowsEOL b/MakefileWithWindowsEOL
index e7e8475..ae16fc3 100644
--- a/MakefileWithWindowsEOL
+++ b/MakefileWithWindowsEOL
@@ -1,3 +1,4 @@\r
MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKitTools\r
\r
-all:
\\ No newline at end of file
+all:\r
+\r
EOF
expectedReturn => [
[{
# Same as input text
svnConvertedText => <<"EOF",
Index: MakefileWithWindowsEOL
index e7e8475..ae16fc3 100644
--- MakefileWithWindowsEOL\t(revision 0)
+++ MakefileWithWindowsEOL\t(working copy)
@@ -1,3 +1,4 @@\r
MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKitTools\r
\r
-all:
\\ No newline at end of file
+all:\r
+\r
EOF
indexPath => "MakefileWithWindowsEOL",
isGit => 1,
numTextChunks => 1
}],
undef],
expectedNextLine => undef,
},
{
# New test
diffName => "Git: Patch adds Mac newline to EOF and IndexPath has Mac line endings",
inputText => <<"EOF",
diff --git a/MakefileWithMacEOL b/MakefileWithMacEOL
index e7e8475..ae16fc3 100644
--- a/MakefileWithMacEOL
+++ b/MakefileWithMacEOL
@@ -1,3 +1,4 @@\r MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKitTools\r \r-all:
\\ No newline at end of file
+all:\r+\r
EOF
expectedReturn => [
[{
# Same as input text
svnConvertedText => qq(Index: MakefileWithMacEOL
index e7e8475..ae16fc3 100644
--- MakefileWithMacEOL\t(revision 0)
+++ MakefileWithMacEOL\t(working copy)
@@ -1,3 +1,4 @@\r MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKitTools\r \r-all:
\\ No newline at end of file
+all:\r+\r),
indexPath => "MakefileWithMacEOL",
isGit => 1,
numTextChunks => 1
}],
undef],
expectedNextLine => undef,
},
{
# New test
diffName => "Git: Patch with Unix line endings and IndexPath has Windows line endings",
inputText => substituteString($gitDiffHeader, "Makefile", "MakefileWithWindowsEOL") . $diffBody,
expectedReturn => [
[{
svnConvertedText => substituteString($svnConvertedGitDiffHeader, "Makefile", "MakefileWithWindowsEOL") . toWindowsLineEndings($diffBody),
indexPath => "MakefileWithWindowsEOL",
isGit => 1,
numTextChunks => 1,
}],
undef],
expectedNextLine => undef,
},
{
# New test
diffName => "Git: Patch with Unix line endings and nonexistent IndexPath",
inputText => substituteString($gitDiffHeaderForNewFile, "Makefile", "NonexistentFile") . $diffBody,
expectedReturn => [
[{
svnConvertedText => substituteString($svnConvertedGitDiffHeaderForNewFile, "Makefile", "NonexistentFile") . $diffBody, # Same as input text
indexPath => "NonexistentFile",
isGit => 1,
isNew => 1,
numTextChunks => 1,
}],
undef],
expectedNextLine => undef,
},
{
# New test
diffName => "Git: Patch with Windows line endings and nonexistent IndexPath",
inputText => substituteString($gitDiffHeaderForNewFile, "Makefile", "NonexistentFile") . toWindowsLineEndings($diffBody),
expectedReturn => [
[{
svnConvertedText => substituteString($svnConvertedGitDiffHeaderForNewFile, "Makefile", "NonexistentFile") . toWindowsLineEndings($diffBody), # Same as input text
indexPath => "NonexistentFile",
isGit => 1,
isNew => 1,
numTextChunks => 1,
}],
undef],
expectedNextLine => undef,
},
);
my $testCasesCount = @testCaseHashRefs;
plan(tests => 2 * $testCasesCount); # Total number of assertions.
my $savedCWD = getcwd();
chdir($mockDir) or die;
foreach my $testCase (@testCaseHashRefs) {
my $testNameStart = "parseDiff(): $testCase->{diffName}: comparing";
my $fileHandle;
open($fileHandle, "<", \$testCase->{inputText});
my $line = <$fileHandle>;
my @got = VCSUtils::parseDiff($fileHandle, $line);
my $expectedReturn = $testCase->{expectedReturn};
$got[0][0]->{svnConvertedText} = escapeNewLineCharacters($got[0][0]->{svnConvertedText});
$expectedReturn->[0][0]->{svnConvertedText} = escapeNewLineCharacters($expectedReturn->[0][0]->{svnConvertedText});
is_deeply(\@got, $expectedReturn, "$testNameStart return value.");
my $gotNextLine = <$fileHandle>;
is($gotNextLine, $testCase->{expectedNextLine}, "$testNameStart next read line.");
}
chdir($savedCWD);
sub substituteString
{
my ($string, $searchString, $replacementString) = @_;
$string =~ s/$searchString/$replacementString/g;
return $string;
}
sub writeToFile
{
my ($file, $text) = @_;
open(FILE, ">$file") or die;
print FILE $text;
close(FILE);
}
|