Skip to content

Commit 75c5aa0

Browse files
Denton-Lgitster
Denton-L
authored and
gitster
committed
t3206: s/expected/expect/
For test cases, the usual convention is to name expected output files "expect", not "expected". Replace all instances of "expected" with "expect". Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 79f3950 commit 75c5aa0

File tree

1 file changed

+32
-32
lines changed

1 file changed

+32
-32
lines changed

‎t/t3206-range-diff.sh‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -121,88 +121,88 @@ test_expect_success 'setup' '
121121
test_expect_success 'simple A..B A..C (unmodified)' '
122122
git range-diff --no-color master..topic master..unmodified \
123123
>actual &&
124-
cat >expected <<-EOF &&
124+
cat >expect <<-EOF &&
125125
1: $(test_oid t1) = 1: $(test_oid u1) s/5/A/
126126
2: $(test_oid t2) = 2: $(test_oid u2) s/4/A/
127127
3: $(test_oid t3) = 3: $(test_oid u3) s/11/B/
128128
4: $(test_oid t4) = 4: $(test_oid u4) s/12/B/
129129
EOF
130-
test_cmp expected actual
130+
test_cmp expect actual
131131
'
132132

133133
test_expect_success 'simple B...C (unmodified)' '
134134
git range-diff --no-color topic...unmodified >actual &&
135-
# same "expected" as above
136-
test_cmp expected actual
135+
# same "expect" as above
136+
test_cmp expect actual
137137
'
138138

139139
test_expect_success 'simple A B C (unmodified)' '
140140
git range-diff --no-color master topic unmodified >actual &&
141-
# same "expected" as above
142-
test_cmp expected actual
141+
# same "expect" as above
142+
test_cmp expect actual
143143
'
144144

145145
test_expect_success 'trivial reordering' '
146146
git range-diff --no-color master topic reordered >actual &&
147-
cat >expected <<-EOF &&
147+
cat >expect <<-EOF &&
148148
1: $(test_oid t1) = 1: $(test_oid r1) s/5/A/
149149
3: $(test_oid t3) = 2: $(test_oid r2) s/11/B/
150150
4: $(test_oid t4) = 3: $(test_oid r3) s/12/B/
151151
2: $(test_oid t2) = 4: $(test_oid r4) s/4/A/
152152
EOF
153-
test_cmp expected actual
153+
test_cmp expect actual
154154
'
155155

156156
test_expect_success 'removed a commit' '
157157
git range-diff --no-color master topic removed >actual &&
158-
cat >expected <<-EOF &&
158+
cat >expect <<-EOF &&
159159
1: $(test_oid t1) = 1: $(test_oid d1) s/5/A/
160160
2: $(test_oid t2) < -: $(test_oid __) s/4/A/
161161
3: $(test_oid t3) = 2: $(test_oid d2) s/11/B/
162162
4: $(test_oid t4) = 3: $(test_oid d3) s/12/B/
163163
EOF
164-
test_cmp expected actual
164+
test_cmp expect actual
165165
'
166166

167167
test_expect_success 'added a commit' '
168168
git range-diff --no-color master topic added >actual &&
169-
cat >expected <<-EOF &&
169+
cat >expect <<-EOF &&
170170
1: $(test_oid t1) = 1: $(test_oid a1) s/5/A/
171171
2: $(test_oid t2) = 2: $(test_oid a2) s/4/A/
172172
-: $(test_oid __) > 3: $(test_oid a3) s/6/A/
173173
3: $(test_oid t3) = 4: $(test_oid a4) s/11/B/
174174
4: $(test_oid t4) = 5: $(test_oid a5) s/12/B/
175175
EOF
176-
test_cmp expected actual
176+
test_cmp expect actual
177177
'
178178

179179
test_expect_success 'new base, A B C' '
180180
git range-diff --no-color master topic rebased >actual &&
181-
cat >expected <<-EOF &&
181+
cat >expect <<-EOF &&
182182
1: $(test_oid t1) = 1: $(test_oid b1) s/5/A/
183183
2: $(test_oid t2) = 2: $(test_oid b2) s/4/A/
184184
3: $(test_oid t3) = 3: $(test_oid b3) s/11/B/
185185
4: $(test_oid t4) = 4: $(test_oid b4) s/12/B/
186186
EOF
187-
test_cmp expected actual
187+
test_cmp expect actual
188188
'
189189

190190
test_expect_success 'new base, B...C' '
191191
# this syntax includes the commits from master!
192192
git range-diff --no-color topic...rebased >actual &&
193-
cat >expected <<-EOF &&
193+
cat >expect <<-EOF &&
194194
-: $(test_oid __) > 1: $(test_oid b5) unrelated
195195
1: $(test_oid t1) = 2: $(test_oid b1) s/5/A/
196196
2: $(test_oid t2) = 3: $(test_oid b2) s/4/A/
197197
3: $(test_oid t3) = 4: $(test_oid b3) s/11/B/
198198
4: $(test_oid t4) = 5: $(test_oid b4) s/12/B/
199199
EOF
200-
test_cmp expected actual
200+
test_cmp expect actual
201201
'
202202

203203
test_expect_success 'changed commit' '
204204
git range-diff --no-color topic...changed >actual &&
205-
cat >expected <<-EOF &&
205+
cat >expect <<-EOF &&
206206
1: $(test_oid t1) = 1: $(test_oid c1) s/5/A/
207207
2: $(test_oid t2) = 2: $(test_oid c2) s/4/A/
208208
3: $(test_oid t3) ! 3: $(test_oid c3) s/11/B/
@@ -226,23 +226,23 @@ test_expect_success 'changed commit' '
226226
+B
227227
13
228228
EOF
229-
test_cmp expected actual
229+
test_cmp expect actual
230230
'
231231

232232
test_expect_success 'changed commit with --no-patch diff option' '
233233
git range-diff --no-color --no-patch topic...changed >actual &&
234-
cat >expected <<-EOF &&
234+
cat >expect <<-EOF &&
235235
1: $(test_oid t1) = 1: $(test_oid c1) s/5/A/
236236
2: $(test_oid t2) = 2: $(test_oid c2) s/4/A/
237237
3: $(test_oid t3) ! 3: $(test_oid c3) s/11/B/
238238
4: $(test_oid t4) ! 4: $(test_oid c4) s/12/B/
239239
EOF
240-
test_cmp expected actual
240+
test_cmp expect actual
241241
'
242242

243243
test_expect_success 'changed commit with --stat diff option' '
244244
git range-diff --no-color --stat topic...changed >actual &&
245-
cat >expected <<-EOF &&
245+
cat >expect <<-EOF &&
246246
1: $(test_oid t1) = 1: $(test_oid c1) s/5/A/
247247
a => b | 0
248248
1 file changed, 0 insertions(+), 0 deletions(-)
@@ -256,12 +256,12 @@ test_expect_success 'changed commit with --stat diff option' '
256256
a => b | 0
257257
1 file changed, 0 insertions(+), 0 deletions(-)
258258
EOF
259-
test_cmp expected actual
259+
test_cmp expect actual
260260
'
261261

262262
test_expect_success 'changed commit with sm config' '
263263
git range-diff --no-color --submodule=log topic...changed >actual &&
264-
cat >expected <<-EOF &&
264+
cat >expect <<-EOF &&
265265
1: $(test_oid t1) = 1: $(test_oid c1) s/5/A/
266266
2: $(test_oid t2) = 2: $(test_oid c2) s/4/A/
267267
3: $(test_oid t3) ! 3: $(test_oid c3) s/11/B/
@@ -285,12 +285,12 @@ test_expect_success 'changed commit with sm config' '
285285
+B
286286
13
287287
EOF
288-
test_cmp expected actual
288+
test_cmp expect actual
289289
'
290290

291291
test_expect_success 'renamed file' '
292292
git range-diff --no-color --submodule=log topic...renamed-file >actual &&
293-
sed s/Z/\ /g >expected <<-EOF &&
293+
sed s/Z/\ /g >expect <<-EOF &&
294294
1: $(test_oid t1) = 1: $(test_oid n1) s/5/A/
295295
2: $(test_oid t2) ! 2: $(test_oid n2) s/4/A/
296296
@@ Metadata
@@ -330,12 +330,12 @@ test_expect_success 'renamed file' '
330330
Z 10
331331
Z B
332332
EOF
333-
test_cmp expected actual
333+
test_cmp expect actual
334334
'
335335

336336
test_expect_success 'file with mode only change' '
337337
git range-diff --no-color --submodule=log topic...mode-only-change >actual &&
338-
sed s/Z/\ /g >expected <<-EOF &&
338+
sed s/Z/\ /g >expect <<-EOF &&
339339
1: fccce22 ! 1: 4d39cb3 s/4/A/
340340
@@ Metadata
341341
ZAuthor: Thomas Rast <trast@inf.ethz.ch>
@@ -370,12 +370,12 @@ test_expect_success 'file with mode only change' '
370370
+ ## other-file (mode change 100644 => 100755) ##
371371
3: a63e992 = 3: 4c1e0f5 s/12/B/
372372
EOF
373-
test_cmp expected actual
373+
test_cmp expect actual
374374
'
375375

376376
test_expect_success 'file added and later removed' '
377377
git range-diff --no-color --submodule=log topic...added-removed >actual &&
378-
sed s/Z/\ /g >expected <<-EOF &&
378+
sed s/Z/\ /g >expect <<-EOF &&
379379
1: $(test_oid t1) = 1: $(test_oid s1) s/5/A/
380380
2: $(test_oid t2) ! 2: $(test_oid s2) s/4/A/
381381
@@ Metadata
@@ -411,7 +411,7 @@ test_expect_success 'file added and later removed' '
411411
+ ## new-file (deleted) ##
412412
4: $(test_oid t4) = 4: $(test_oid s4) s/12/B/
413413
EOF
414-
test_cmp expected actual
414+
test_cmp expect actual
415415
'
416416

417417
test_expect_success 'no commits on one side' '
@@ -421,7 +421,7 @@ test_expect_success 'no commits on one side' '
421421

422422
test_expect_success 'changed message' '
423423
git range-diff --no-color topic...changed-message >actual &&
424-
sed s/Z/\ /g >expected <<-EOF &&
424+
sed s/Z/\ /g >expect <<-EOF &&
425425
1: $(test_oid t1) = 1: $(test_oid m1) s/5/A/
426426
2: $(test_oid t2) ! 2: $(test_oid m2) s/4/A/
427427
@@ Metadata
@@ -436,7 +436,7 @@ test_expect_success 'changed message' '
436436
3: $(test_oid t3) = 3: $(test_oid m3) s/11/B/
437437
4: $(test_oid t4) = 4: $(test_oid m4) s/12/B/
438438
EOF
439-
test_cmp expected actual
439+
test_cmp expect actual
440440
'
441441

442442
test_expect_success 'dual-coloring' '

0 commit comments

Comments
 (0)