t0030: Remove repeated instructions and add missing &&
Moved some tests to another test_expect_success block. Many tests now reuse the same "expect" file. Also replacing many printf "" >expect with one >expect instruction. Added missing && which concatenated tests in some test_expect_success blocks. Signed-off-by: Carlos Rica <jasampler@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Carlos Rica committed
Jul 10, 2007 at 23:53 UTC
defd53142e0c3326c3677cc3d623a6aeef899518
1 file changed
+13
-24
t/t0030-stripspace.sh
+13
-24
@@ -85,39 +85,36 @@ test_expect_success \
85
'
86
87
test_expect_success \
88
- 'consecutive blank lines at the beginning should be removed' '
89
- printf "" > expect &&
88
+ 'only consecutive blank lines should be completely removed' '
89
+ > expect &&
90
+
91
printf "\n" | git stripspace >actual &&
92
git diff expect actual &&
93
93
- printf "" > expect &&
94
printf "\n\n\n" | git stripspace >actual &&
95
git diff expect actual &&
96
97
- printf "" > expect &&
97
printf "$sss\n$sss\n$sss\n" | git stripspace >actual &&
98
git diff expect actual &&
99
101
- printf "" > expect &&
100
printf "$sss$sss\n$sss\n\n" | git stripspace >actual &&
101
git diff expect actual &&
102
105
- printf "" > expect &&
103
printf "\n$sss\n$sss$sss\n" | git stripspace >actual &&
104
git diff expect actual &&
105
109
- printf "" > expect &&
106
printf "$sss$sss$sss$sss\n\n\n" | git stripspace >actual &&
107
git diff expect actual &&
108
113
- printf "" > expect &&
109
printf "\n$sss$sss$sss$sss\n\n" | git stripspace >actual &&
110
git diff expect actual &&
111
117
- printf "" > expect &&
112
printf "\n\n$sss$sss$sss$sss\n" | git stripspace >actual &&
119
- git diff expect actual &&
113
+ git diff expect actual
114
+'
115
116
+test_expect_success \
117
+ 'consecutive blank lines at the beginning should be removed' '
118
printf "$ttt\n" > expect &&
119
printf "\n$ttt\n" | git stripspace >actual &&
120
git diff expect actual &&
@@ -139,26 +136,22 @@ test_expect_success \
136
git diff expect actual &&
137
138
printf "$ttt\n" > expect &&
139
+
140
printf "$sss\n$sss\n$sss\n$ttt\n" | git stripspace >actual &&
141
git diff expect actual &&
142
145
- printf "$ttt\n" > expect &&
143
printf "\n$sss\n$sss$sss\n$ttt\n" | git stripspace >actual &&
144
git diff expect actual &&
145
149
- printf "$ttt\n" > expect &&
146
printf "$sss$sss\n$sss\n\n$ttt\n" | git stripspace >actual &&
147
git diff expect actual &&
148
153
- printf "$ttt\n" > expect &&
149
printf "$sss$sss$sss\n\n\n$ttt\n" | git stripspace >actual &&
150
git diff expect actual &&
151
157
- printf "$ttt\n" > expect &&
152
printf "\n$sss$sss$sss\n\n$ttt\n" | git stripspace >actual &&
153
git diff expect actual &&
154
161
- printf "$ttt\n" > expect &&
155
printf "\n\n$sss$sss$sss\n$ttt\n" | git stripspace >actual &&
156
git diff expect actual
157
'
@@ -186,26 +179,22 @@ test_expect_success \
179
git diff expect actual &&
180
181
printf "$ttt\n" > expect &&
182
+
183
printf "$ttt\n$sss\n$sss\n$sss\n" | git stripspace >actual &&
184
git diff expect actual &&
185
192
- printf "$ttt\n" > expect &&
186
printf "$ttt\n\n$sss\n$sss$sss\n" | git stripspace >actual &&
187
git diff expect actual &&
188
196
- printf "$ttt\n" > expect &&
189
printf "$ttt\n$sss$sss\n$sss\n\n" | git stripspace >actual &&
190
git diff expect actual &&
191
200
- printf "$ttt\n" > expect &&
192
printf "$ttt\n$sss$sss$sss\n\n\n" | git stripspace >actual &&
193
git diff expect actual &&
194
204
- printf "$ttt\n" > expect &&
195
printf "$ttt\n\n$sss$sss$sss\n\n" | git stripspace >actual &&
196
git diff expect actual &&
197
208
- printf "$ttt\n" > expect &&
198
printf "$ttt\n\n\n$sss$sss$sss\n" | git stripspace >actual &&
199
git diff expect actual
200
'
@@ -224,7 +213,7 @@ test_expect_success \
213
'text plus spaces without newline at end should end with newline' '
214
test `printf "$ttt$sss" | git stripspace | wc -l` -gt 0 &&
215
test `printf "$ttt$ttt$sss" | git stripspace | wc -l` -gt 0 &&
227
- test `printf "$ttt$ttt$ttt$sss" | git stripspace | wc -l` -gt 0
216
+ test `printf "$ttt$ttt$ttt$sss" | git stripspace | wc -l` -gt 0 &&
217
test `printf "$ttt$sss$sss" | git stripspace | wc -l` -gt 0 &&
218
test `printf "$ttt$ttt$sss$sss" | git stripspace | wc -l` -gt 0 &&
219
test `printf "$ttt$sss$sss$sss" | git stripspace | wc -l` -gt 0
@@ -340,13 +329,13 @@ test_expect_success \
329
printf "" >expect &&
330
331
printf "" | git stripspace >actual &&
343
- git diff expect actual
332
+ git diff expect actual &&
333
334
printf "$sss$sss" | git stripspace >actual &&
346
- git diff expect actual
335
+ git diff expect actual &&
336
337
printf "$sss$sss$sss" | git stripspace >actual &&
349
- git diff expect actual
338
+ git diff expect actual &&
339
340
printf "$sss$sss$sss$sss" | git stripspace >actual &&
341
git diff expect actual