aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichaƂ Kiedrowicz <michal.kiedrowicz@gmail.com>2009-04-18 23:03:57 +0200
committerJunio C Hamano <gitster@pobox.com>2009-04-20 13:47:02 -0700
commitf0583867e746985e9d62f57d5ba6ce27b2603447 (patch)
treeb0a67fc24414be10381468d0bfb67e123b370d68
parente8141fcf54b4e8c2c12300da1ad1bc3573a4e204 (diff)
downloadgit-f0583867e746985e9d62f57d5ba6ce27b2603447.tar.gz
git-f0583867e746985e9d62f57d5ba6ce27b2603447.tar.xz
tests: make test-apply-criss-cross-rename more robust
I realized that this test does check if git-apply succeeds, but doesn't tell if it applies patches correctly. So I added test_cmp to check it. I also added a test which checks swapping three files. Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t4130-apply-criss-cross-rename.sh34
1 files changed, 31 insertions, 3 deletions
diff --git a/t/t4130-apply-criss-cross-rename.sh b/t/t4130-apply-criss-cross-rename.sh
index 8623dbeba..7cfa2d628 100755
--- a/t/t4130-apply-criss-cross-rename.sh
+++ b/t/t4130-apply-criss-cross-rename.sh
@@ -15,14 +15,17 @@ create_file() {
test_expect_success 'setup' '
create_file file1 "File1 contents" &&
create_file file2 "File2 contents" &&
- git add file1 file2 &&
+ create_file file3 "File3 contents" &&
+ git add file1 file2 file3 &&
git commit -m 1
'
test_expect_success 'criss-cross rename' '
mv file1 tmp &&
mv file2 file1 &&
- mv tmp file2
+ mv tmp file2 &&
+ cp file1 file1-swapped &&
+ cp file2 file2-swapped
'
test_expect_success 'diff -M -B' '
@@ -32,7 +35,32 @@ test_expect_success 'diff -M -B' '
'
test_expect_success 'apply' '
- git apply diff
+ git apply diff &&
+ test_cmp file1 file1-swapped &&
+ test_cmp file2 file2-swapped
+'
+
+test_expect_success 'criss-cross rename' '
+ git reset --hard &&
+ mv file1 tmp &&
+ mv file2 file1 &&
+ mv file3 file2
+ mv tmp file3 &&
+ cp file1 file1-swapped &&
+ cp file2 file2-swapped &&
+ cp file3 file3-swapped
+'
+
+test_expect_success 'diff -M -B' '
+ git diff -M -B > diff &&
+ git reset --hard
+'
+
+test_expect_success 'apply' '
+ git apply diff &&
+ test_cmp file1 file1-swapped &&
+ test_cmp file2 file2-swapped &&
+ test_cmp file3 file3-swapped
'
test_done