tests: split cal/colorw test into subtests

diff --git a/tests/expected/cal/colorw b/tests/expected/cal/colorw
index 5ecab6f820d5c09da9eae4e5c833ab6e3de28ce9..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- 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                   \e[7m 1\e[27m
- 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 \e[7m 2\e[27m 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 \e[7m14\e[27m 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 \e[7m31\e[27m      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 (file)
index 0000000..78e1e81
--- /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                   \e[7m 1\e[27m
+ 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 (file)
index 0000000..e1c1f04
--- /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 \e[7m31\e[27m      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 (file)
index 0000000..5c7232e
--- /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 \e[7m 2\e[27m 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 (file)
index 0000000..fdbc199
--- /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 (file)
index 0000000..fdbc199
--- /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 (file)
index 0000000..dd08151
--- /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 \e[7m14\e[27m 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 493dd2c518647f0ad25b7ff02538f607054b43d0..9be3998c5d19159f5576d8b6f33d08e5aa15ca80 100755 (executable)
--- 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
-