blob: 8b9cf2f94969a240af01c7d874e7943035373605 (
plain) (
blame)
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
|
scriptDir="$(cd "$(dirname "$0")"; pwd)"
source "$scriptDir/git-base.sh"
test_basic_unstaged_options() {
status="""
M modified-and-unstaged
D deleted-and-unstaged
A impossible-added-and-unstaged-(as-added-and-unstaged-is-untracked)
C impossible-copied-and-unstaged-(as-copied-and-unstaged-is-untracked)
R impossible-renamed-and-unstaged-(as-renamed-and-unstaged-is-untracked)
U impossible-updated-but-unmerged
! impossible-ignored-without-!-in-position-1
? impossible-untracked-without-?-in-position-1
empty-spaces-mean-nothing
"""
assertEquals "line:${LINENO} staged status failed match" "" "$(staged_status "$status")"
assertEquals "line:${LINENO} untracked status failed match" "" "$(untracked_status "$status")"
assertEquals "line:${LINENO} unstaged status failed match"\
"1D1M" "$(unstaged_status "$status")"
assertEquals "line:${LINENO} conflicted status failed match" "" "$(conflicted_status "$status")"
}
test_basic_staged_options() {
status="""
A added-and-staged
"""
assertEquals "line:${LINENO} staged status failed match"\
"1A" "$(staged_status "$status")"
assertEquals "line:${LINENO} untracked status failed match" "" "$(untracked_status "$status")"
assertEquals "line:${LINENO} unstaged status failed match" "" "$(unstaged_status "$status")"
assertEquals "line:${LINENO} conflicted status failed match" "" "$(conflicted_status "$status")"
status="""
M modified-and-staged
"""
assertEquals "line:${LINENO} staged status failed match"\
"1M" "$(staged_status "$status")"
assertEquals "line:${LINENO} untracked status failed match" "" "$(untracked_status "$status")"
assertEquals "line:${LINENO} unstaged status failed match" "" "$(unstaged_status "$status")"
assertEquals "line:${LINENO} conflicted status failed match" "" "$(conflicted_status "$status")"
status="""
D deleted-and-staged
"""
assertEquals "line:${LINENO} staged status failed match"\
"1D" "$(staged_status "$status")"
assertEquals "line:${LINENO} untracked status failed match" "" "$(untracked_status "$status")"
assertEquals "line:${LINENO} unstaged status failed match" "" "$(unstaged_status "$status")"
assertEquals "line:${LINENO} conflicted status failed match" "" "$(conflicted_status "$status")"
status="""
C copied-and-staged
"""
assertEquals "line:${LINENO} staged status failed match"\
"1C" "$(staged_status "$status")"
assertEquals "line:${LINENO} untracked status failed match" "" "$(untracked_status "$status")"
assertEquals "line:${LINENO} unstaged status failed match" "" "$(unstaged_status "$status")"
assertEquals "line:${LINENO} conflicted status failed match" "" "$(conflicted_status "$status")"
status="""
R renamed-and-staged
"""
assertEquals "line:${LINENO} staged status failed match"\
"1R" "$(staged_status "$status")"
assertEquals "line:${LINENO} untracked status failed match" "" "$(untracked_status "$status")"
assertEquals "line:${LINENO} unstaged status failed match" "" "$(unstaged_status "$status")"
assertEquals "line:${LINENO} conflicted status failed match" "" "$(conflicted_status "$status")"
status="""
U impossible-unmerged-without-a-character-in-position-2
? impossible-untracked-without-?-in-position-2
! impossible-ignored-without-!-in-position-2
empty-spaces-do-nothing
"""
assertEquals "line:${LINENO} staged status failed match" "" "$(staged_status "$status")"
assertEquals "line:${LINENO} untracked status failed match" "" "$(untracked_status "$status")"
assertEquals "line:${LINENO} unstaged status failed match" "" "$(unstaged_status "$status")"
assertEquals "line:${LINENO} conflicted status failed match" "" "$(conflicted_status "$status")"
}
test_conflicts() {
status="""
UD unmerged-deleted-by-them
UA unmerged-added-by-them
"""
assertEquals "line:${LINENO}" "" "$(staged_status "$status")"
assertEquals "line:${LINENO}" "" "$(untracked_status "$status")"
assertEquals "line:${LINENO}" "" "$(unstaged_status "$status")"
assertEquals "line:${LINENO}" "2T" "$(conflicted_status "$status")"
status="""
AU unmerged-added-by-us
DU unmerged-deleted-by-us
"""
assertEquals "line:${LINENO}" "" "$(staged_status "$status")"
assertEquals "line:${LINENO}" "" "$(untracked_status "$status")"
assertEquals "line:${LINENO}" "" "$(unstaged_status "$status")"
assertEquals "line:${LINENO}" "2U" "$(conflicted_status "$status")"
status="""
AA unmerged-both-added
DD unmerged-both-deleted
UU unmerged-both-modified
"""
assertEquals "line:${LINENO}" "" "$(staged_status "$status")"
assertEquals "line:${LINENO}" "" "$(untracked_status "$status")"
assertEquals "line:${LINENO}" "" "$(unstaged_status "$status")"
assertEquals "line:${LINENO}" "3B" "$(conflicted_status "$status")"
}
. ./shunit/shunit2
|
