t0080: use here-doc test body
Improve the readability of the expected output by using a here-doc for the test body and replacing the unwieldy ${SQ} references with literal single quotes. Signed-off-by: René Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
d19b6cd2dd
commit
4575ba6a7c
@ -5,7 +5,7 @@ test_description='Test the output of the unit test framework'
|
|||||||
TEST_PASSES_SANITIZE_LEAK=true
|
TEST_PASSES_SANITIZE_LEAK=true
|
||||||
. ./test-lib.sh
|
. ./test-lib.sh
|
||||||
|
|
||||||
test_expect_success 'TAP output from unit tests' '
|
test_expect_success 'TAP output from unit tests' - <<\EOT
|
||||||
cat >expect <<-EOF &&
|
cat >expect <<-EOF &&
|
||||||
ok 1 - passing test
|
ok 1 - passing test
|
||||||
ok 2 - passing test and assertion return 1
|
ok 2 - passing test and assertion return 1
|
||||||
@ -16,12 +16,12 @@ test_expect_success 'TAP output from unit tests' '
|
|||||||
ok 4 - failing test and assertion return 0
|
ok 4 - failing test and assertion return 0
|
||||||
not ok 5 - passing TEST_TODO() # TODO
|
not ok 5 - passing TEST_TODO() # TODO
|
||||||
ok 6 - passing TEST_TODO() returns 1
|
ok 6 - passing TEST_TODO() returns 1
|
||||||
# todo check ${SQ}check(x)${SQ} succeeded at t/helper/test-example-tap.c:26
|
# todo check 'check(x)' succeeded at t/helper/test-example-tap.c:26
|
||||||
not ok 7 - failing TEST_TODO()
|
not ok 7 - failing TEST_TODO()
|
||||||
ok 8 - failing TEST_TODO() returns 0
|
ok 8 - failing TEST_TODO() returns 0
|
||||||
# check "0" failed at t/helper/test-example-tap.c:31
|
# check "0" failed at t/helper/test-example-tap.c:31
|
||||||
# skipping test - missing prerequisite
|
# skipping test - missing prerequisite
|
||||||
# skipping check ${SQ}1${SQ} at t/helper/test-example-tap.c:33
|
# skipping check '1' at t/helper/test-example-tap.c:33
|
||||||
ok 9 - test_skip() # SKIP
|
ok 9 - test_skip() # SKIP
|
||||||
ok 10 - skipped test returns 1
|
ok 10 - skipped test returns 1
|
||||||
# skipping test - missing prerequisite
|
# skipping test - missing prerequisite
|
||||||
@ -39,12 +39,12 @@ test_expect_success 'TAP output from unit tests' '
|
|||||||
# check "!strcmp("NULL", NULL)" failed at t/helper/test-example-tap.c:63
|
# check "!strcmp("NULL", NULL)" failed at t/helper/test-example-tap.c:63
|
||||||
# left: "NULL"
|
# left: "NULL"
|
||||||
# right: NULL
|
# right: NULL
|
||||||
# check "${SQ}a${SQ} == ${SQ}\n${SQ}" failed at t/helper/test-example-tap.c:64
|
# check "'a' == '\n'" failed at t/helper/test-example-tap.c:64
|
||||||
# left: ${SQ}a${SQ}
|
# left: 'a'
|
||||||
# right: ${SQ}\012${SQ}
|
# right: '\012'
|
||||||
# check "${SQ}\\\\${SQ} == ${SQ}\\${SQ}${SQ}" failed at t/helper/test-example-tap.c:65
|
# check "'\\\\' == '\\''" failed at t/helper/test-example-tap.c:65
|
||||||
# left: ${SQ}\\\\${SQ}
|
# left: '\\\\'
|
||||||
# right: ${SQ}\\${SQ}${SQ}
|
# right: '\\''
|
||||||
not ok 17 - messages from failing string and char comparison
|
not ok 17 - messages from failing string and char comparison
|
||||||
# BUG: test has no checks at t/helper/test-example-tap.c:92
|
# BUG: test has no checks at t/helper/test-example-tap.c:92
|
||||||
not ok 18 - test with no checks
|
not ok 18 - test with no checks
|
||||||
@ -54,6 +54,6 @@ test_expect_success 'TAP output from unit tests' '
|
|||||||
|
|
||||||
! test-tool example-tap >actual &&
|
! test-tool example-tap >actual &&
|
||||||
test_cmp expect actual
|
test_cmp expect actual
|
||||||
'
|
EOT
|
||||||
|
|
||||||
test_done
|
test_done
|
||||||
|
Reference in New Issue
Block a user