From b47dbe6156696ee6e6da10f48841a7d88c444e7f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Vojt=C4=9Bch=20Eichler?= Date: Fri, 1 Oct 2021 16:54:11 +0200 Subject: [PATCH] tests: split cal/colorw test into subtests --- tests/expected/cal/colorw | 55 ------------------- .../cal/colorw-first-day-week-numbers | 8 +++ .../expected/cal/colorw-last-day-week-numbers | 8 +++ ...rw-reformation-corner-cases-1-week-numbers | 8 +++ ...rw-reformation-corner-cases-2-week-numbers | 8 +++ ...rw-reformation-corner-cases-3-week-numbers | 8 +++ ...rw-reformation-corner-cases-4-week-numbers | 8 +++ tests/ts/cal/colorw | 21 ++++--- 8 files changed, 60 insertions(+), 64 deletions(-) create mode 100644 tests/expected/cal/colorw-first-day-week-numbers create mode 100644 tests/expected/cal/colorw-last-day-week-numbers create mode 100644 tests/expected/cal/colorw-reformation-corner-cases-1-week-numbers create mode 100644 tests/expected/cal/colorw-reformation-corner-cases-2-week-numbers create mode 100644 tests/expected/cal/colorw-reformation-corner-cases-3-week-numbers create mode 100644 tests/expected/cal/colorw-reformation-corner-cases-4-week-numbers diff --git a/tests/expected/cal/colorw b/tests/expected/cal/colorw index 5ecab6f820..e69de29bb2 100644 --- a/tests/expected/cal/colorw +++ b/tests/expected/cal/colorw @@ -1,55 +0,0 @@ - -First day with week numbers - January 0001 - Su Mo Tu We Th Fr Sa - 1  1 - 2 2 3 4 5 6 7 8 - 3 9 10 11 12 13 14 15 - 4 16 17 18 19 20 21 22 - 5 23 24 25 26 27 28 29 - 6 30 31 -Reformation corner cases 1 with week numbers - September 1752 - Su Mo Tu We Th Fr Sa -36 1  2 14 15 16 -37 17 18 19 20 21 22 23 -38 24 25 26 27 28 29 30 - - - -Reformation corner cases 2 with week numbers - September 1752 - Su Mo Tu We Th Fr Sa -36 1 2 14 15 16 -37 17 18 19 20 21 22 23 -38 24 25 26 27 28 29 30 - - - -Reformation corner cases 3 with week numbers - September 1752 - Su Mo Tu We Th Fr Sa -36 1 2 14 15 16 -37 17 18 19 20 21 22 23 -38 24 25 26 27 28 29 30 - - - -Reformation corner cases 4 with week numbers - September 1752 - Su Mo Tu We Th Fr Sa -36 1 2 14 15 16 -37 17 18 19 20 21 22 23 -38 24 25 26 27 28 29 30 - - - -Last day with week numbers - 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 -45 1 2 3 4 5 6 49 1 2 3 4 1 1 -46 7 8 9 10 11 12 13 50 5 6 7 8 9 10 11 2 2 3 4 5 6 7 8 -47 14 15 16 17 18 19 20 51 12 13 14 15 16 17 18 3 9 10 11 12 13 14 15 -48 21 22 23 24 25 26 27 52 19 20 21 22 23 24 25 4 16 17 18 19 20 21 22 -49 28 29 30 53 26 27 28 29 30 31 5 23 24 25 26 27 28 29 - 6 30 31 diff --git a/tests/expected/cal/colorw-first-day-week-numbers b/tests/expected/cal/colorw-first-day-week-numbers new file mode 100644 index 0000000000..78e1e81da6 --- /dev/null +++ b/tests/expected/cal/colorw-first-day-week-numbers @@ -0,0 +1,8 @@ + January 0001 + Su Mo Tu We Th Fr Sa + 1  1 + 2 2 3 4 5 6 7 8 + 3 9 10 11 12 13 14 15 + 4 16 17 18 19 20 21 22 + 5 23 24 25 26 27 28 29 + 6 30 31 diff --git a/tests/expected/cal/colorw-last-day-week-numbers b/tests/expected/cal/colorw-last-day-week-numbers new file mode 100644 index 0000000000..e1c1f04c73 --- /dev/null +++ b/tests/expected/cal/colorw-last-day-week-numbers @@ -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 +45 1 2 3 4 5 6 49 1 2 3 4 1 1 +46 7 8 9 10 11 12 13 50 5 6 7 8 9 10 11 2 2 3 4 5 6 7 8 +47 14 15 16 17 18 19 20 51 12 13 14 15 16 17 18 3 9 10 11 12 13 14 15 +48 21 22 23 24 25 26 27 52 19 20 21 22 23 24 25 4 16 17 18 19 20 21 22 +49 28 29 30 53 26 27 28 29 30 31 5 23 24 25 26 27 28 29 + 6 30 31 diff --git a/tests/expected/cal/colorw-reformation-corner-cases-1-week-numbers b/tests/expected/cal/colorw-reformation-corner-cases-1-week-numbers new file mode 100644 index 0000000000..5c7232eedc --- /dev/null +++ b/tests/expected/cal/colorw-reformation-corner-cases-1-week-numbers @@ -0,0 +1,8 @@ + September 1752 + Su Mo Tu We Th Fr Sa +36 1  2 14 15 16 +37 17 18 19 20 21 22 23 +38 24 25 26 27 28 29 30 + + + diff --git a/tests/expected/cal/colorw-reformation-corner-cases-2-week-numbers b/tests/expected/cal/colorw-reformation-corner-cases-2-week-numbers new file mode 100644 index 0000000000..fdbc199703 --- /dev/null +++ b/tests/expected/cal/colorw-reformation-corner-cases-2-week-numbers @@ -0,0 +1,8 @@ + September 1752 + Su Mo Tu We Th Fr Sa +36 1 2 14 15 16 +37 17 18 19 20 21 22 23 +38 24 25 26 27 28 29 30 + + + diff --git a/tests/expected/cal/colorw-reformation-corner-cases-3-week-numbers b/tests/expected/cal/colorw-reformation-corner-cases-3-week-numbers new file mode 100644 index 0000000000..fdbc199703 --- /dev/null +++ b/tests/expected/cal/colorw-reformation-corner-cases-3-week-numbers @@ -0,0 +1,8 @@ + September 1752 + Su Mo Tu We Th Fr Sa +36 1 2 14 15 16 +37 17 18 19 20 21 22 23 +38 24 25 26 27 28 29 30 + + + diff --git a/tests/expected/cal/colorw-reformation-corner-cases-4-week-numbers b/tests/expected/cal/colorw-reformation-corner-cases-4-week-numbers new file mode 100644 index 0000000000..dd081512b1 --- /dev/null +++ b/tests/expected/cal/colorw-reformation-corner-cases-4-week-numbers @@ -0,0 +1,8 @@ + September 1752 + Su Mo Tu We Th Fr Sa +36 1 2 14 15 16 +37 17 18 19 20 21 22 23 +38 24 25 26 27 28 29 30 + + + diff --git a/tests/ts/cal/colorw b/tests/ts/cal/colorw index 493dd2c518..9be3998c5d 100755 --- a/tests/ts/cal/colorw +++ b/tests/ts/cal/colorw @@ -33,44 +33,47 @@ export TERM=linux USETERM=$( ts_has_option "useterm" "$*" ) [ "$USETERM" == "yes" ] && TS_VERBOSE="yes" -ts_log "" -ts_log "First day with week numbers" +ts_init_subtest "first-day-week-numbers" if [ "$USETERM" == "yes" ]; then $TS_CMD_CAL -w --color=always 1 1 1 fi $TS_CMD_CAL -w --color=always 1 1 1 >> $TS_OUTPUT +ts_finalize_subtest -ts_log "Reformation corner cases 1 with week numbers" +ts_init_subtest "reformation-corner-cases-1-week-numbers" if [ "$USETERM" == "yes" ]; then $TS_CMD_CAL -w --color=always 2 9 1752 fi $TS_CMD_CAL -w --color=always 2 9 1752 >> $TS_OUTPUT +ts_finalize_subtest -ts_log "Reformation corner cases 2 with week numbers" +ts_init_subtest "reformation-corner-cases-2-week-numbers" if [ "$USETERM" == "yes" ]; then $TS_CMD_CAL -w --color=always 3 9 1752 fi $TS_CMD_CAL -w --color=always 3 9 1752 >> $TS_OUTPUT +ts_finalize_subtest -ts_log "Reformation corner cases 3 with week numbers" +ts_init_subtest "reformation-corner-cases-3-week-numbers" if [ "$USETERM" == "yes" ]; then $TS_CMD_CAL -w --color=always 13 9 1752 fi $TS_CMD_CAL -w --color=always 13 9 1752 >> $TS_OUTPUT +ts_finalize_subtest -ts_log "Reformation corner cases 4 with week numbers" +ts_init_subtest "reformation-corner-cases-4-week-numbers" if [ "$USETERM" == "yes" ]; then $TS_CMD_CAL -w --color=always 14 9 1752 fi $TS_CMD_CAL -w --color=always 14 9 1752 >> $TS_OUTPUT +ts_finalize_subtest -ts_log "Last day with week numbers" +ts_init_subtest "last-day-week-numbers" if [ "$USETERM" == "yes" ]; then $TS_CMD_CAL -w --color=always 31 12 9999 fi $TS_CMD_CAL -w --color=always -3 31 12 9999 >> $TS_OUTPUT - +ts_finalize_subtest ts_finalize - -- 2.47.2