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>
Michał Kiedrowicz committed
Apr 18, 2009 at 23:03 UTC
f0583867e746985e9d62f57d5ba6ce27b2603447
1 file changed
+31
-3
t/t4130-apply-criss-cross-rename.sh
+31
-3
@@ -15,14 +15,17 @@ create_file() {
15
test_expect_success 'setup' '
16
create_file file1 "File1 contents" &&
17
create_file file2 "File2 contents" &&
18
- git add file1 file2 &&
18
+ create_file file3 "File3 contents" &&
19
+ git add file1 file2 file3 &&
20
git commit -m 1
21
'
22
23
test_expect_success 'criss-cross rename' '
24
mv file1 tmp &&
25
mv file2 file1 &&
25
- mv tmp file2
26
+ mv tmp file2 &&
27
+ cp file1 file1-swapped &&
28
+ cp file2 file2-swapped
29
'
30
31
test_expect_success 'diff -M -B' '
@@ -32,7 +35,32 @@ test_expect_success 'diff -M -B' '
35
'
36
37
test_expect_success 'apply' '
35
- git apply diff
38
+ git apply diff &&
39
+ test_cmp file1 file1-swapped &&
40
+ test_cmp file2 file2-swapped
41
+'
42
+
43
+test_expect_success 'criss-cross rename' '
44
+ git reset --hard &&
45
+ mv file1 tmp &&
46
+ mv file2 file1 &&
47
+ mv file3 file2
48
+ mv tmp file3 &&
49
+ cp file1 file1-swapped &&
50
+ cp file2 file2-swapped &&
51
+ cp file3 file3-swapped
52
+'
53
+
54
+test_expect_success 'diff -M -B' '
55
+ git diff -M -B > diff &&
56
+ git reset --hard
57
+'
58
+
59
+test_expect_success 'apply' '
60
+ git apply diff &&
61
+ test_cmp file1 file1-swapped &&
62
+ test_cmp file2 file2-swapped &&
63
+ test_cmp file3 file3-swapped
64
'
65
66
test_done