From: Vojtěch Eichler Date: Fri, 1 Oct 2021 13:56:35 +0000 (+0200) Subject: tests: split cal/color test into subtests X-Git-Tag: v2.38-rc1~199^2~4 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1f2a2925be220d1ab090a82f3fe5e9c227418a5f;p=thirdparty%2Futil-linux.git tests: split cal/color test into subtests --- diff --git a/tests/expected/cal/color b/tests/expected/cal/color index 7147ccaef8..e69de29bb2 100644 --- a/tests/expected/cal/color +++ b/tests/expected/cal/color @@ -1,55 +0,0 @@ - -First day - January 0001 -Su Mo Tu We Th Fr Sa -  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 -Reformation corner cases 1 - September 1752 -Su Mo Tu We Th Fr Sa - 1  2 14 15 16 -17 18 19 20 21 22 23 -24 25 26 27 28 29 30 - - - -Reformation corner cases 2 - September 1752 -Su Mo Tu We Th Fr Sa - 1 2 14 15 16 -17 18 19 20 21 22 23 -24 25 26 27 28 29 30 - - - -Reformation corner cases 3 - September 1752 -Su Mo Tu We Th Fr Sa - 1 2 14 15 16 -17 18 19 20 21 22 23 -24 25 26 27 28 29 30 - - - -Reformation corner cases 4 - September 1752 -Su Mo Tu We Th Fr Sa - 1 2 14 15 16 -17 18 19 20 21 22 23 -24 25 26 27 28 29 30 - - - -Last day - November 9999 December 9999 January 10000 -Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa - 1 2 3 4 5 6 1 2 3 4 1 - 7 8 9 10 11 12 13 5 6 7 8 9 10 11 2 3 4 5 6 7 8 -14 15 16 17 18 19 20 12 13 14 15 16 17 18 9 10 11 12 13 14 15 -21 22 23 24 25 26 27 19 20 21 22 23 24 25 16 17 18 19 20 21 22 -28 29 30 26 27 28 29 30 31 23 24 25 26 27 28 29 - 30 31 diff --git a/tests/expected/cal/color-first-day b/tests/expected/cal/color-first-day new file mode 100644 index 0000000000..ca3c63d845 --- /dev/null +++ b/tests/expected/cal/color-first-day @@ -0,0 +1,8 @@ + January 0001 +Su Mo Tu We Th Fr Sa +  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 diff --git a/tests/expected/cal/color-last-day b/tests/expected/cal/color-last-day new file mode 100644 index 0000000000..2f058dabd0 --- /dev/null +++ b/tests/expected/cal/color-last-day @@ -0,0 +1,8 @@ + November 9999 December 9999 January 10000 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 4 5 6 1 2 3 4 1 + 7 8 9 10 11 12 13 5 6 7 8 9 10 11 2 3 4 5 6 7 8 +14 15 16 17 18 19 20 12 13 14 15 16 17 18 9 10 11 12 13 14 15 +21 22 23 24 25 26 27 19 20 21 22 23 24 25 16 17 18 19 20 21 22 +28 29 30 26 27 28 29 30 31 23 24 25 26 27 28 29 + 30 31 diff --git a/tests/expected/cal/color-reformation-corner-cases-1 b/tests/expected/cal/color-reformation-corner-cases-1 new file mode 100644 index 0000000000..75bf906b63 --- /dev/null +++ b/tests/expected/cal/color-reformation-corner-cases-1 @@ -0,0 +1,8 @@ + September 1752 +Su Mo Tu We Th Fr Sa + 1  2 14 15 16 +17 18 19 20 21 22 23 +24 25 26 27 28 29 30 + + + diff --git a/tests/expected/cal/color-reformation-corner-cases-2 b/tests/expected/cal/color-reformation-corner-cases-2 new file mode 100644 index 0000000000..db29a7f424 --- /dev/null +++ b/tests/expected/cal/color-reformation-corner-cases-2 @@ -0,0 +1,8 @@ + September 1752 +Su Mo Tu We Th Fr Sa + 1 2 14 15 16 +17 18 19 20 21 22 23 +24 25 26 27 28 29 30 + + + diff --git a/tests/expected/cal/color-reformation-corner-cases-3 b/tests/expected/cal/color-reformation-corner-cases-3 new file mode 100644 index 0000000000..db29a7f424 --- /dev/null +++ b/tests/expected/cal/color-reformation-corner-cases-3 @@ -0,0 +1,8 @@ + September 1752 +Su Mo Tu We Th Fr Sa + 1 2 14 15 16 +17 18 19 20 21 22 23 +24 25 26 27 28 29 30 + + + diff --git a/tests/expected/cal/color-reformation-corner-cases-4 b/tests/expected/cal/color-reformation-corner-cases-4 new file mode 100644 index 0000000000..5a7b85dab1 --- /dev/null +++ b/tests/expected/cal/color-reformation-corner-cases-4 @@ -0,0 +1,8 @@ + September 1752 +Su Mo Tu We Th Fr Sa + 1 2 14 15 16 +17 18 19 20 21 22 23 +24 25 26 27 28 29 30 + + + diff --git a/tests/ts/cal/color b/tests/ts/cal/color index 8a6dfb69c3..2e89412d9a 100755 --- a/tests/ts/cal/color +++ b/tests/ts/cal/color @@ -33,44 +33,48 @@ export TERM=linux USETERM=$( ts_has_option "useterm" "$*" ) [ "$USETERM" == "yes" ] && TS_VERBOSE="yes" -ts_log "" -ts_log "First day" +ts_init_subtest "first-day" if [ "$USETERM" == "yes" ]; then $TS_CMD_CAL --color=always 1 1 1 fi $TS_CMD_CAL --color=always 1 1 1 >> $TS_OUTPUT +ts_finalize_subtest -ts_log "Reformation corner cases 1" +ts_init_subtest "reformation-corner-cases-1" if [ "$USETERM" == "yes" ]; then $TS_CMD_CAL --color=always 2 9 1752 fi $TS_CMD_CAL --color=always 2 9 1752 >> $TS_OUTPUT +ts_finalize_subtest -ts_log "Reformation corner cases 2" +ts_init_subtest "reformation-corner-cases-2" if [ "$USETERM" == "yes" ]; then $TS_CMD_CAL --color=always 3 9 1752 fi $TS_CMD_CAL --color=always 3 9 1752 >> $TS_OUTPUT +ts_finalize_subtest -ts_log "Reformation corner cases 3" +ts_init_subtest "reformation-corner-cases-3" if [ "$USETERM" == "yes" ]; then $TS_CMD_CAL --color=always 13 9 1752 fi $TS_CMD_CAL --color=always 13 9 1752 >> $TS_OUTPUT +ts_finalize_subtest -ts_log "Reformation corner cases 4" +ts_init_subtest "reformation-corner-cases-4" if [ "$USETERM" == "yes" ]; then $TS_CMD_CAL --color=always 14 9 1752 fi $TS_CMD_CAL --color=always 14 9 1752 >> $TS_OUTPUT +ts_finalize_subtest -ts_log "Last day" +ts_init_subtest "last-day" if [ "$USETERM" == "yes" ]; then $TS_CMD_CAL --color=always 31 12 9999 fi $TS_CMD_CAL --color=always -3 31 12 9999 >> $TS_OUTPUT +ts_finalize_subtest ts_finalize -