tests: add color schema to cal(1) tests

Signed-off-by: Karel Zak <kzak@redhat.com>
karelzak · May 23, 2024 · 10ce2af · 10ce2af
1 parent 9abbe9e
commit 10ce2af
Show file tree

Hide file tree

Showing 17 changed files with 123 additions and 145 deletions.
diff --git a/tests/expected/cal/color-first-day b/tests/expected/cal/color-first-day
@@ -1,8 +1,8 @@
-    January 0001    
-Su Mo Tu We Th Fr Sa
-                  [7m 1[0m
- 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               
+[35m    January 0001    
+Su Mo Tu We Th Fr Sa[0m
+                 [31m [[48;5;160m[38;5;221m 1[0m[0m
+[31m 2[0m[1;33m  3[0m[1;33m  4[0m[1;33m  5[0m[1;33m  6[0m[1;33m  7[0m[31m  8[0m
+[31m 9[0m[1;33m 10[0m[1;33m 11[0m[1;33m 12[0m[1;33m 13[0m[1;33m 14[0m[31m 15[0m
+[31m16[0m[1;33m 17[0m[1;33m 18[0m[1;33m 19[0m[1;33m 20[0m[1;33m 21[0m[31m 22[0m
+[31m23[0m[1;33m 24[0m[1;33m 25[0m[1;33m 26[0m[1;33m 27[0m[1;33m 28[0m[31m 29[0m
+[31m30[0m[1;33m 31[0m               
diff --git a/tests/expected/cal/color-last-day b/tests/expected/cal/color-last-day
@@ -1,8 +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 [7m31[0m     23 24 25 26 27 28 29
-                                            30 31               
+[35m    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[0m
+  [1;33m  1[0m[1;33m  2[0m[1;33m  3[0m[1;33m  4[0m[1;33m  5[0m[31m  6[0m          [1;33m  1[0m[1;33m  2[0m[1;33m  3[0m[31m  4[0m                   [31m  1[0m
+[31m 7[0m[1;33m  8[0m[1;33m  9[0m[1;33m 10[0m[1;33m 11[0m[1;33m 12[0m[31m 13[0m  [31m 5[0m[1;33m  6[0m[1;33m  7[0m[1;33m  8[0m[1;33m  9[0m[1;33m 10[0m[31m 11[0m  [31m 2[0m[1;33m  3[0m[1;33m  4[0m[1;33m  5[0m[1;33m  6[0m[1;33m  7[0m[31m  8[0m
+[31m14[0m[1;33m 15[0m[1;33m 16[0m[1;33m 17[0m[1;33m 18[0m[1;33m 19[0m[31m 20[0m  [31m12[0m[1;33m 13[0m[1;33m 14[0m[1;33m 15[0m[1;33m 16[0m[1;33m 17[0m[31m 18[0m  [31m 9[0m[1;33m 10[0m[1;33m 11[0m[1;33m 12[0m[1;33m 13[0m[1;33m 14[0m[31m 15[0m
+[31m21[0m[1;33m 22[0m[1;33m 23[0m[1;33m 24[0m[1;33m 25[0m[1;33m 26[0m[31m 27[0m  [31m19[0m[1;33m 20[0m[1;33m 21[0m[1;33m 22[0m[1;33m 23[0m[1;33m 24[0m[31m 25[0m  [31m16[0m[1;33m 17[0m[1;33m 18[0m[1;33m 19[0m[1;33m 20[0m[1;33m 21[0m[31m 22[0m
+[31m28[0m[1;33m 29[0m[1;33m 30[0m              [31m26[0m[1;33m 27[0m[1;33m 28[0m[1;33m 29[0m[1;33m 30[0m[1;33m [[48;5;160m[38;5;221m31[0m[0m     [31m23[0m[1;33m 24[0m[1;33m 25[0m[1;33m 26[0m[1;33m 27[0m[1;33m 28[0m[31m 29[0m
+                                            [31m30[0m[1;33m 31[0m               
diff --git a/tests/expected/cal/color-reformation-corner-cases-1 b/tests/expected/cal/color-reformation-corner-cases-1
@@ -1,8 +1,8 @@
-   September 1752   
-Su Mo Tu We Th Fr Sa
-       1 [7m 2[0m 14 15 16
-17 18 19 20 21 22 23
-24 25 26 27 28 29 30
+[35m   September 1752   
+Su Mo Tu We Th Fr Sa[0m
+     [1;33m  1[0m[1;33m [[48;5;160m[38;5;221m 2[0m[0m[1;33m 14[0m[1;33m 15[0m[31m 16[0m
+[31m17[0m[1;33m 18[0m[1;33m 19[0m[1;33m 20[0m[1;33m 21[0m[1;33m 22[0m[31m 23[0m
+[31m24[0m[1;33m 25[0m[1;33m 26[0m[1;33m 27[0m[1;33m 28[0m[1;33m 29[0m[31m 30[0m
 
 
 
diff --git a/tests/expected/cal/color-reformation-corner-cases-2 b/tests/expected/cal/color-reformation-corner-cases-2
@@ -1,8 +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
+[35m   September 1752   
+Su Mo Tu We Th Fr Sa[0m
+     [1;33m  1[0m[1;33m  2[0m[1;33m 14[0m[1;33m 15[0m[31m 16[0m
+[31m17[0m[1;33m 18[0m[1;33m 19[0m[1;33m 20[0m[1;33m 21[0m[1;33m 22[0m[31m 23[0m
+[31m24[0m[1;33m 25[0m[1;33m 26[0m[1;33m 27[0m[1;33m 28[0m[1;33m 29[0m[31m 30[0m
 
 
 
diff --git a/tests/expected/cal/color-reformation-corner-cases-3 b/tests/expected/cal/color-reformation-corner-cases-3
@@ -1,8 +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
+[35m   September 1752   
+Su Mo Tu We Th Fr Sa[0m
+     [1;33m  1[0m[1;33m  2[0m[1;33m 14[0m[1;33m 15[0m[31m 16[0m
+[31m17[0m[1;33m 18[0m[1;33m 19[0m[1;33m 20[0m[1;33m 21[0m[1;33m 22[0m[31m 23[0m
+[31m24[0m[1;33m 25[0m[1;33m 26[0m[1;33m 27[0m[1;33m 28[0m[1;33m 29[0m[31m 30[0m
 
 
 
diff --git a/tests/expected/cal/color-reformation-corner-cases-4 b/tests/expected/cal/color-reformation-corner-cases-4
@@ -1,8 +1,8 @@
-   September 1752   
-Su Mo Tu We Th Fr Sa
-       1  2 [7m14[0m 15 16
-17 18 19 20 21 22 23
-24 25 26 27 28 29 30
+[35m   September 1752   
+Su Mo Tu We Th Fr Sa[0m
+     [1;33m  1[0m[1;33m  2[0m[1;33m [[48;5;160m[38;5;221m14[0m[0m[1;33m 15[0m[31m 16[0m
+[31m17[0m[1;33m 18[0m[1;33m 19[0m[1;33m 20[0m[1;33m 21[0m[1;33m 22[0m[31m 23[0m
+[31m24[0m[1;33m 25[0m[1;33m 26[0m[1;33m 27[0m[1;33m 28[0m[1;33m 29[0m[31m 30[0m
 
 
 
diff --git a/tests/expected/cal/color-vertical b/tests/expected/cal/color-vertical
@@ -1,8 +1,8 @@
-    February 2023      
-Su     5 12 19 26   
-Mo     6 13 20 27   
-Tu     7 14 21 28   
-We  1  8 [7m15[0m 22      
-Th  2  9 16 23      
-Fr  3 10 17 24      
-Sa  4 11 18 25      
+[35m    February 2023      [0m
+[35mSu[0m   [31m  5[0m[31m 12[0m[31m 19[0m[31m 26[0m   
+[35mMo[0m   [1;33m  6[0m[1;33m 13[0m[1;33m 20[0m[1;33m 27[0m   
+[35mTu[0m   [1;33m  7[0m[1;33m 14[0m[1;33m 21[0m[1;33m 28[0m   
+[35mWe[0m[1;33m  1[0m[1;33m  8[0m[1;33m [[48;5;160m[38;5;221m15[0m[0m[1;33m 22[0m      
+[35mTh[0m[1;33m  2[0m[1;33m  9[0m[1;33m 16[0m[1;33m 23[0m      
+[35mFr[0m[1;33m  3[0m[1;33m 10[0m[1;33m 17[0m[1;33m 24[0m      
+[35mSa[0m[31m  4[0m[31m 11[0m[31m 18[0m[31m 25[0m      
diff --git a/tests/expected/cal/color-vertical-week b/tests/expected/cal/color-vertical-week
@@ -1,9 +1,9 @@
-    February 2023      
-Su     5 12 19 26   
-Mo     6 13 20 27   
-Tu     7 14 21 28   
-We  1  8 [7m15[0m 22      
-Th  2  9 16 23      
-Fr  3 10 17 24      
-Sa  4 11 18 25      
-    5  6  7  8  9   
+[35m    February 2023      [0m
+[35mSu[0m   [31m  5[0m[31m 12[0m[31m 19[0m[31m 26[0m   
+[35mMo[0m   [1;33m  6[0m[1;33m 13[0m[1;33m 20[0m[1;33m 27[0m   
+[35mTu[0m   [1;33m  7[0m[1;33m 14[0m[1;33m 21[0m[1;33m 28[0m   
+[35mWe[0m[1;33m  1[0m[1;33m  8[0m[1;33m [[48;5;160m[38;5;221m15[0m[0m[1;33m 22[0m      
+[35mTh[0m[1;33m  2[0m[1;33m  9[0m[1;33m 16[0m[1;33m 23[0m      
+[35mFr[0m[1;33m  3[0m[1;33m 10[0m[1;33m 17[0m[1;33m 24[0m      
+[35mSa[0m[31m  4[0m[31m 11[0m[31m 18[0m[31m 25[0m      
+   [32m 5[0m [32m 6[0m [32m 7[0m [32m 8[0m [32m 9[0m   
diff --git a/tests/expected/cal/colorw-first-day-week-numbers b/tests/expected/cal/colorw-first-day-week-numbers
@@ -1,8 +1,8 @@
-      January 0001     
-   Su Mo Tu We Th Fr Sa
- 1                   [7m 1[0m
- 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               
+[35m      January 0001     
+   Su Mo Tu We Th Fr Sa[0m
+[32m 1[0m                  [31m [[48;5;160m[38;5;221m 1[0m[0m
+[32m 2[0m[31m  2[0m[1;33m  3[0m[1;33m  4[0m[1;33m  5[0m[1;33m  6[0m[1;33m  7[0m[31m  8[0m
+[32m 3[0m[31m  9[0m[1;33m 10[0m[1;33m 11[0m[1;33m 12[0m[1;33m 13[0m[1;33m 14[0m[31m 15[0m
+[32m 4[0m[31m 16[0m[1;33m 17[0m[1;33m 18[0m[1;33m 19[0m[1;33m 20[0m[1;33m 21[0m[31m 22[0m
+[32m 5[0m[31m 23[0m[1;33m 24[0m[1;33m 25[0m[1;33m 26[0m[1;33m 27[0m[1;33m 28[0m[31m 29[0m
+[32m 6[0m[31m 30[0m[1;33m 31[0m               
diff --git a/tests/expected/cal/colorw-last-day-week-numbers b/tests/expected/cal/colorw-last-day-week-numbers
@@ -1,8 +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 [7m31[0m      5 23 24 25 26 27 28 29
-                                                   6 30 31               
+[35m     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[0m
+[32m45[0m   [1;33m  1[0m[1;33m  2[0m[1;33m  3[0m[1;33m  4[0m[1;33m  5[0m[31m  6[0m  [32m49[0m         [1;33m  1[0m[1;33m  2[0m[1;33m  3[0m[31m  4[0m  [32m 1[0m                  [31m  1[0m
+[32m46[0m[31m  7[0m[1;33m  8[0m[1;33m  9[0m[1;33m 10[0m[1;33m 11[0m[1;33m 12[0m[31m 13[0m  [32m50[0m[31m  5[0m[1;33m  6[0m[1;33m  7[0m[1;33m  8[0m[1;33m  9[0m[1;33m 10[0m[31m 11[0m  [32m 2[0m[31m  2[0m[1;33m  3[0m[1;33m  4[0m[1;33m  5[0m[1;33m  6[0m[1;33m  7[0m[31m  8[0m
+[32m47[0m[31m 14[0m[1;33m 15[0m[1;33m 16[0m[1;33m 17[0m[1;33m 18[0m[1;33m 19[0m[31m 20[0m  [32m51[0m[31m 12[0m[1;33m 13[0m[1;33m 14[0m[1;33m 15[0m[1;33m 16[0m[1;33m 17[0m[31m 18[0m  [32m 3[0m[31m  9[0m[1;33m 10[0m[1;33m 11[0m[1;33m 12[0m[1;33m 13[0m[1;33m 14[0m[31m 15[0m
+[32m48[0m[31m 21[0m[1;33m 22[0m[1;33m 23[0m[1;33m 24[0m[1;33m 25[0m[1;33m 26[0m[31m 27[0m  [32m52[0m[31m 19[0m[1;33m 20[0m[1;33m 21[0m[1;33m 22[0m[1;33m 23[0m[1;33m 24[0m[31m 25[0m  [32m 4[0m[31m 16[0m[1;33m 17[0m[1;33m 18[0m[1;33m 19[0m[1;33m 20[0m[1;33m 21[0m[31m 22[0m
+[32m49[0m[31m 28[0m[1;33m 29[0m[1;33m 30[0m              [32m53[0m[31m 26[0m[1;33m 27[0m[1;33m 28[0m[1;33m 29[0m[1;33m 30[0m[1;33m [[48;5;160m[38;5;221m31[0m[0m     [32m 5[0m[31m 23[0m[1;33m 24[0m[1;33m 25[0m[1;33m 26[0m[1;33m 27[0m[1;33m 28[0m[31m 29[0m
+                                                  [32m 6[0m[31m 30[0m[1;33m 31[0m               
diff --git a/tests/expected/cal/colorw-reformation-corner-cases-1-week-numbers b/tests/expected/cal/colorw-reformation-corner-cases-1-week-numbers
@@ -1,8 +1,8 @@
-     September 1752    
-   Su Mo Tu We Th Fr Sa
-36        1 [7m 2[0m 14 15 16
-37 17 18 19 20 21 22 23
-38 24 25 26 27 28 29 30
+[35m     September 1752    
+   Su Mo Tu We Th Fr Sa[0m
+[32m36[0m      [1;33m  1[0m[1;33m [[48;5;160m[38;5;221m 2[0m[0m[1;33m 14[0m[1;33m 15[0m[31m 16[0m
+[32m37[0m[31m 17[0m[1;33m 18[0m[1;33m 19[0m[1;33m 20[0m[1;33m 21[0m[1;33m 22[0m[31m 23[0m
+[32m38[0m[31m 24[0m[1;33m 25[0m[1;33m 26[0m[1;33m 27[0m[1;33m 28[0m[1;33m 29[0m[31m 30[0m
 
 
 
diff --git a/tests/expected/cal/colorw-reformation-corner-cases-2-week-numbers b/tests/expected/cal/colorw-reformation-corner-cases-2-week-numbers
@@ -1,8 +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
+[35m     September 1752    
+   Su Mo Tu We Th Fr Sa[0m
+[32m36[0m      [1;33m  1[0m[1;33m  2[0m[1;33m 14[0m[1;33m 15[0m[31m 16[0m
+[32m37[0m[31m 17[0m[1;33m 18[0m[1;33m 19[0m[1;33m 20[0m[1;33m 21[0m[1;33m 22[0m[31m 23[0m
+[32m38[0m[31m 24[0m[1;33m 25[0m[1;33m 26[0m[1;33m 27[0m[1;33m 28[0m[1;33m 29[0m[31m 30[0m
 
 
 
diff --git a/tests/expected/cal/colorw-reformation-corner-cases-3-week-numbers b/tests/expected/cal/colorw-reformation-corner-cases-3-week-numbers
@@ -1,8 +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
+[35m     September 1752    
+   Su Mo Tu We Th Fr Sa[0m
+[32m36[0m      [1;33m  1[0m[1;33m  2[0m[1;33m 14[0m[1;33m 15[0m[31m 16[0m
+[32m37[0m[31m 17[0m[1;33m 18[0m[1;33m 19[0m[1;33m 20[0m[1;33m 21[0m[1;33m 22[0m[31m 23[0m
+[32m38[0m[31m 24[0m[1;33m 25[0m[1;33m 26[0m[1;33m 27[0m[1;33m 28[0m[1;33m 29[0m[31m 30[0m
 
 
 
diff --git a/tests/expected/cal/colorw-reformation-corner-cases-4-week-numbers b/tests/expected/cal/colorw-reformation-corner-cases-4-week-numbers
@@ -1,8 +1,8 @@
-     September 1752    
-   Su Mo Tu We Th Fr Sa
-36        1  2 [7m14[0m 15 16
-37 17 18 19 20 21 22 23
-38 24 25 26 27 28 29 30
+[35m     September 1752    
+   Su Mo Tu We Th Fr Sa[0m
+[32m36[0m      [1;33m  1[0m[1;33m  2[0m[1;33m [[48;5;160m[38;5;221m14[0m[0m[1;33m 15[0m[31m 16[0m
+[32m37[0m[31m 17[0m[1;33m 18[0m[1;33m 19[0m[1;33m 20[0m[1;33m 21[0m[1;33m 22[0m[31m 23[0m
+[32m38[0m[31m 24[0m[1;33m 25[0m[1;33m 26[0m[1;33m 27[0m[1;33m 28[0m[1;33m 29[0m[31m 30[0m
 
 
 
diff --git a/tests/ts/cal/color b/tests/ts/cal/color
@@ -31,64 +31,47 @@ fi
 # --color output depends on terminal type
 export TERM=linux
 
+function call_cal {
+	if [ "$USETERM" == "yes" ]; then
+		XDG_CONFIG_HOME="$TS_SELF" $TS_CMD_CAL --color=always "$@"
+	fi
+	XDG_CONFIG_HOME="$TS_SELF" $TS_CMD_CAL --color=always "$@" >> $TS_OUTPUT
+}
+
 USETERM=$( ts_has_option "useterm" "$*" )
 
 [ "$USETERM" == "yes" ] && TS_VERBOSE="yes"
 
 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
+call_cal --color=always 1 1 1
 ts_finalize_subtest
 
 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
+call_cal --color=always 2 9 1752
 ts_finalize_subtest
 
 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
+call_cal --color=always 3 9 1752
 ts_finalize_subtest
 
 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
+call_cal --color=always 13 9 1752
 ts_finalize_subtest
 
 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
+call_cal --color=always 14 9 1752
 ts_finalize_subtest
 
 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
+call_cal --color=always -3 31 12 9999
 ts_finalize_subtest
 
 ts_init_subtest "vertical"
-if [ "$USETERM" == "yes" ]; then
-	$TS_CMD_CAL --color=always 15 2 2023
-fi
-$TS_CMD_CAL --color=always --vertical 15 2 2023 >> $TS_OUTPUT
+call_cal --color=always --vertical 15 2 2023
 ts_finalize_subtest
 
 ts_init_subtest "vertical-week"
-if [ "$USETERM" == "yes" ]; then
-	$TS_CMD_CAL --color=always 15 2 2023
-fi
-$TS_CMD_CAL --color=always --vertical --week=15 15 2 2023 >> $TS_OUTPUT
+call_cal --color=always --vertical --week=15 15 2 2023
 ts_finalize_subtest
 
 

diff --git a/tests/ts/cal/colorw b/tests/ts/cal/colorw
@@ -35,46 +35,35 @@ USETERM=$( ts_has_option "useterm" "$*" )
 
 [ "$USETERM" == "yes" ] && TS_VERBOSE="yes"
 
+function call_cal {
+	if [ "$USETERM" == "yes" ]; then
+		 XDG_CONFIG_HOME="$TS_SELF" $TS_CMD_CAL --color=always "$@"
+	fi
+	XDG_CONFIG_HOME="$TS_SELF" $TS_CMD_CAL --color=always "$@" >> $TS_OUTPUT
+}
+
 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
+call_cal -w --color=always 1 1 1
 ts_finalize_subtest
 
 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
+call_cal -w --color=always 2 9 1752
 ts_finalize_subtest
 
 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
+call_cal -w --color=always 3 9 1752
 ts_finalize_subtest
 
 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
+call_cal -w --color=always 13 9 1752
 ts_finalize_subtest
 
 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
+call_cal -w --color=always 14 9 1752
 ts_finalize_subtest
 
 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
+call_cal -w --color=always -3 31 12 9999
 ts_finalize_subtest
 
 ts_finalize
diff --git a/tests/ts/cal/terminal-colors.d/cal.scheme b/tests/ts/cal/terminal-colors.d/cal.scheme
@@ -0,0 +1,6 @@
+workday yellow
+weekend red
+today \e[48;5;160m\e[38;5;221
+header magenta
+weeks green
+weeknumber blue