tests: split cal/color test into subtests

diff --git a/tests/expected/cal/color b/tests/expected/cal/color
index 7147ccaef87dfd4935ef9ac855f0234dbee51ffc..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- 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
-                  \e[7m 1\e[27m
- 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 \e[7m 2\e[27m 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 \e[7m14\e[27m 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 \e[7m31\e[27m     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 (file)
index 0000000..ca3c63d
--- /dev/null
+++ b/tests/expected/cal/color-first-day
@@ -0,0 +1,8 @@
+    January 0001    
+Su Mo Tu We Th Fr Sa
+                  \e[7m 1\e[27m
+ 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 (file)
index 0000000..2f058da
--- /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 \e[7m31\e[27m     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 (file)
index 0000000..75bf906
--- /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 \e[7m 2\e[27m 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 (file)
index 0000000..db29a7f
--- /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 (file)
index 0000000..db29a7f
--- /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 (file)
index 0000000..5a7b85d
--- /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 \e[7m14\e[27m 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 8a6dfb69c375bba891cd22f098904ee251efc9f8..2e89412d9a32859cd28f4925bf7bec9ab2a3b476 100755 (executable)
--- 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
-