tests: use subtests for weekarg cal(1) tests

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/tests/expected/cal/weekarg b/tests/expected/cal/weekarg
deleted file mode 100644 (file)
index 37fc53c..0000000
--- a/tests/expected/cal/weekarg
+++ /dev/null
@@ -1,147 +0,0 @@
-
-Gregorian - Monday-based, week 40, 3 month 
-     September 2013            October 2013            November 2013     
-   Mo Tu We Th Fr Sa Su     Mo Tu We Th Fr Sa Su     Mo Tu We Th Fr Sa Su
-35                    1  40     1  2  3  4  5  6  44              1  2  3 
-36  2  3  4  5  6  7  8  41  7  8  9 10 11 12 13  45  4  5  6  7  8  9 10 
-37  9 10 11 12 13 14 15  42 14 15 16 17 18 19 20  46 11 12 13 14 15 16 17 
-38 16 17 18 19 20 21 22  43 21 22 23 24 25 26 27  47 18 19 20 21 22 23 24 
-39 23 24 25 26 27 28 29  44 28 29 30 31           48 25 26 27 28 29 30    
-40 30                                                                     
-Gregorian - Sunday-based, week 40, 3 month 
-     September 2013            October 2013            November 2013     
-   Su Mo Tu We Th Fr Sa     Su Mo Tu We Th Fr Sa     Su Mo Tu We Th Fr Sa
-36  1  2  3  4  5  6  7  40        1  2  3  4  5  44                 1  2 
-37  8  9 10 11 12 13 14  41  6  7  8  9 10 11 12  45  3  4  5  6  7  8  9 
-38 15 16 17 18 19 20 21  42 13 14 15 16 17 18 19  46 10 11 12 13 14 15 16 
-39 22 23 24 25 26 27 28  43 20 21 22 23 24 25 26  47 17 18 19 20 21 22 23 
-40 29 30                 44 27 28 29 30 31        48 24 25 26 27 28 29 30 
-                                                                          
-Julian - Monday-based, week 40, 3 month 
-        September 2013                   October 2013                    November 2013        
-   Mon Tue Wed Thu Fri Sat Sun     Mon Tue Wed Thu Fri Sat Sun     Mon Tue Wed Thu Fri Sat Sun
-35                         244  40     274 275 276 277 278 279  44                 305 306 307 
-36 245 246 247 248 249 250 251  41 280 281 282 283 284 285 286  45 308 309 310 311 312 313 314 
-37 252 253 254 255 256 257 258  42 287 288 289 290 291 292 293  46 315 316 317 318 319 320 321 
-38 259 260 261 262 263 264 265  43 294 295 296 297 298 299 300  47 322 323 324 325 326 327 328 
-39 266 267 268 269 270 271 272  44 301 302 303 304              48 329 330 331 332 333 334     
-40 273                                                                                         
-Julian - Sunday-based, week 40, 3 month 
-        September 2013                   October 2013                    November 2013        
-   Sun Mon Tue Wed Thu Fri Sat     Sun Mon Tue Wed Thu Fri Sat     Sun Mon Tue Wed Thu Fri Sat
-36 244 245 246 247 248 249 250  40         274 275 276 277 278  44                     305 306 
-37 251 252 253 254 255 256 257  41 279 280 281 282 283 284 285  45 307 308 309 310 311 312 313 
-38 258 259 260 261 262 263 264  42 286 287 288 289 290 291 292  46 314 315 316 317 318 319 320 
-39 265 266 267 268 269 270 271  43 293 294 295 296 297 298 299  47 321 322 323 324 325 326 327 
-40 272 273                      44 300 301 302 303 304          48 328 329 330 331 332 333 334 
-                                                                                               
-Gregorian - Monday-based, week 40, 1 month 
-      October 2013     
-   Mo Tu We Th Fr Sa Su
-40     1  2  3  4  5  6 
-41  7  8  9 10 11 12 13 
-42 14 15 16 17 18 19 20 
-43 21 22 23 24 25 26 27 
-44 28 29 30 31          
-                        
-Gregorian - Sunday-based, week 40, 1 month 
-      October 2013     
-   Su Mo Tu We Th Fr Sa
-40        1  2  3  4  5 
-41  6  7  8  9 10 11 12 
-42 13 14 15 16 17 18 19 
-43 20 21 22 23 24 25 26 
-44 27 28 29 30 31       
-                        
-Julian - Monday-based, week 40, 1 month 
-         October 2013         
-   Mon Tue Wed Thu Fri Sat Sun
-40     274 275 276 277 278 279 
-41 280 281 282 283 284 285 286 
-42 287 288 289 290 291 292 293 
-43 294 295 296 297 298 299 300 
-44 301 302 303 304             
-                               
-Julian - Sunday-based, week 40, 1 month 
-         October 2013         
-   Sun Mon Tue Wed Thu Fri Sat
-40         274 275 276 277 278 
-41 279 280 281 282 283 284 285 
-42 286 287 288 289 290 291 292 
-43 293 294 295 296 297 298 299 
-44 300 301 302 303 304         
-                               
-Gregorian - Monday-based, week 53, 1 month 
-      January 2010     
-   Mo Tu We Th Fr Sa Su
-53              1  2  3 
- 1  4  5  6  7  8  9 10 
- 2 11 12 13 14 15 16 17 
- 3 18 19 20 21 22 23 24 
- 4 25 26 27 28 29 30 31 
-                        
-Julian - Monday-based, week 53, 1 month 
-         January 2010         
-   Mon Tue Wed Thu Fri Sat Sun
-53                   1   2   3 
- 1   4   5   6   7   8   9  10 
- 2  11  12  13  14  15  16  17 
- 3  18  19  20  21  22  23  24 
- 4  25  26  27  28  29  30  31 
-                               
-Gregorian - Monday-based, week 53 with colors, 1 month 
-      January 2010     
-   Mo Tu We Th Fr Sa Su
-\e[7m53\e[27m              1  2  3 
- 1  4  5  6  7  8  9 10 
- 2 11 12 13 14 15 16 17 
- 3 18 19 20 21 22 23 24 
- 4 25 26 27 28 29 30 31 
-                        
-Julian - Monday-based, week 53 with colors, 1 month 
-         January 2010         
-   Mon Tue Wed Thu Fri Sat Sun
-\e[7m53\e[27m                   1   2   3 
- 1   4   5   6   7   8   9  10 
- 2  11  12  13  14  15  16  17 
- 3  18  19  20  21  22  23  24 
- 4  25  26  27  28  29  30  31 
-                               
-Gregorian - Monday-based, week 40 with colors, 3 month 
-     September 2013            October 2013            November 2013     
-   Mo Tu We Th Fr Sa Su     Mo Tu We Th Fr Sa Su     Mo Tu We Th Fr Sa Su
-35                    1  \e[7m40\e[27m     1  2  3  4  5  6  44              1  2  3 
-36  2  3  4  5  6  7  8  41 \e[7m 7\e[27m  8  9 10 11 12 13  45  4  5  6  7  8  9 10 
-37  9 10 11 12 13 14 15  42 14 15 16 17 18 19 20  46 11 12 13 14 15 16 17 
-38 16 17 18 19 20 21 22  43 21 22 23 24 25 26 27  47 18 19 20 21 22 23 24 
-39 23 24 25 26 27 28 29  44 28 29 30 31           48 25 26 27 28 29 30    
-\e[7m40\e[27m 30                                                                     
-Julian - Monday-based, week 40 with colors, 3 month 
-        September 2013                   October 2013                    November 2013        
-   Mon Tue Wed Thu Fri Sat Sun     Mon Tue Wed Thu Fri Sat Sun     Mon Tue Wed Thu Fri Sat Sun
-35                         244  \e[7m40\e[27m     274 275 276 277 278 279  44                 305 306 307 
-36 245 246 247 248 249 250 251  41 \e[7m280\e[27m 281 282 283 284 285 286  45 308 309 310 311 312 313 314 
-37 252 253 254 255 256 257 258  42 287 288 289 290 291 292 293  46 315 316 317 318 319 320 321 
-38 259 260 261 262 263 264 265  43 294 295 296 297 298 299 300  47 322 323 324 325 326 327 328 
-39 266 267 268 269 270 271 272  44 301 302 303 304              48 329 330 331 332 333 334     
-\e[7m40\e[27m 273                                                                                         
-Gregorian - Sunday-based, week 54 with colors, 3 month 
-     November 2000            December 2000             January 2001     
-   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  49                 1  2   1     1  2  3  4  5  6 
-46  5  6  7  8  9 10 11  50  3  4  5  6  7  8  9   2  7  8  9 10 11 12 13 
-47 12 13 14 15 16 17 18  51 10 11 12 13 14 15 16   3 14 15 16 17 18 19 20 
-48 19 20 21 22 23 24 25  52 17 18 19 20 21 22 23   4 21 22 23 24 25 26 27 
-49 26 27 28 29 30        53 24 25 26 27 28 29 30   5 28 29 30 31          
-                         \e[7m54\e[27m \e[7m31\e[27m                                            
-Gregorian - Monday-based, week 53 with colors, 3 month 
-cal: illegal week value: year 2000 doesn't have week 53
-Gregorian - Monday-based, week 52 with colors, 3 month 
-     November 2000            December 2000             January 2001     
-   Mo Tu We Th Fr Sa Su     Mo Tu We Th Fr Sa Su     Mo Tu We Th Fr Sa Su
-44        1  2  3  4  5  48              1  2  3   1  1  2  3  4  5  6  7 
-45  6  7  8  9 10 11 12  49  4  5  6  7  8  9 10   2  8  9 10 11 12 13 14 
-46 13 14 15 16 17 18 19  50 11 12 13 14 15 16 17   3 15 16 17 18 19 20 21 
-47 20 21 22 23 24 25 26  51 18 19 20 21 22 23 24   4 22 23 24 25 26 27 28 
-48 27 28 29 30           \e[7m52\e[27m 25 26 27 28 29 30 \e[7m31\e[27m   5 29 30 31             
-                                                                          

diff --git a/tests/expected/cal/weekarg-1m-week53 b/tests/expected/cal/weekarg-1m-week53
new file mode 100644 (file)
index 0000000..f9f7cf7
--- /dev/null
+++ b/tests/expected/cal/weekarg-1m-week53
@@ -0,0 +1,9 @@
+Gregorian - Monday-based, week 53, 1 month
+      January 2010     
+   Mo Tu We Th Fr Sa Su
+53              1  2  3 
+ 1  4  5  6  7  8  9 10 
+ 2 11 12 13 14 15 16 17 
+ 3 18 19 20 21 22 23 24 
+ 4 25 26 27 28 29 30 31 
+                        

diff --git a/tests/expected/cal/weekarg-1m-week53-color b/tests/expected/cal/weekarg-1m-week53-color
new file mode 100644 (file)
index 0000000..8aff0b3
--- /dev/null
+++ b/tests/expected/cal/weekarg-1m-week53-color
@@ -0,0 +1,9 @@
+Gregorian - Monday-based, week 53, 1 month
+      January 2010     
+   Mo Tu We Th Fr Sa Su
+\e[7m53\e[27m              1  2  3 
+ 1  4  5  6  7  8  9 10 
+ 2 11 12 13 14 15 16 17 
+ 3 18 19 20 21 22 23 24 
+ 4 25 26 27 28 29 30 31 
+                        

diff --git a/tests/expected/cal/weekarg-1mj-week53 b/tests/expected/cal/weekarg-1mj-week53
new file mode 100644 (file)
index 0000000..f00e95e
--- /dev/null
+++ b/tests/expected/cal/weekarg-1mj-week53
@@ -0,0 +1,9 @@
+Julian    - Monday-based, week 53, 1 month
+         January 2010         
+   Mon Tue Wed Thu Fri Sat Sun
+53                   1   2   3 
+ 1   4   5   6   7   8   9  10 
+ 2  11  12  13  14  15  16  17 
+ 3  18  19  20  21  22  23  24 
+ 4  25  26  27  28  29  30  31 
+                               

diff --git a/tests/expected/cal/weekarg-1mj-week53-color b/tests/expected/cal/weekarg-1mj-week53-color
new file mode 100644 (file)
index 0000000..55c98e9
--- /dev/null
+++ b/tests/expected/cal/weekarg-1mj-week53-color
@@ -0,0 +1,9 @@
+Julian    - Monday-based, week 53, 1 month
+         January 2010         
+   Mon Tue Wed Thu Fri Sat Sun
+\e[7m53\e[27m                   1   2   3 
+ 1   4   5   6   7   8   9  10 
+ 2  11  12  13  14  15  16  17 
+ 3  18  19  20  21  22  23  24 
+ 4  25  26  27  28  29  30  31 
+                               

diff --git a/tests/expected/cal/weekarg-3m-week40 b/tests/expected/cal/weekarg-3m-week40
new file mode 100644 (file)
index 0000000..afc243d
--- /dev/null
+++ b/tests/expected/cal/weekarg-3m-week40
@@ -0,0 +1,9 @@
+Gregorian - Monday-based, week 40, 3 month
+     September 2013            October 2013            November 2013     
+   Mo Tu We Th Fr Sa Su     Mo Tu We Th Fr Sa Su     Mo Tu We Th Fr Sa Su
+35                    1  40     1  2  3  4  5  6  44              1  2  3 
+36  2  3  4  5  6  7  8  41  7  8  9 10 11 12 13  45  4  5  6  7  8  9 10 
+37  9 10 11 12 13 14 15  42 14 15 16 17 18 19 20  46 11 12 13 14 15 16 17 
+38 16 17 18 19 20 21 22  43 21 22 23 24 25 26 27  47 18 19 20 21 22 23 24 
+39 23 24 25 26 27 28 29  44 28 29 30 31           48 25 26 27 28 29 30    
+40 30                                                                     

diff --git a/tests/expected/cal/weekarg-3m-week40-color b/tests/expected/cal/weekarg-3m-week40-color
new file mode 100644 (file)
index 0000000..be10602
--- /dev/null
+++ b/tests/expected/cal/weekarg-3m-week40-color
@@ -0,0 +1,9 @@
+Gregorian - Monday-based, week 40, 3 month
+     September 2013            October 2013            November 2013     
+   Mo Tu We Th Fr Sa Su     Mo Tu We Th Fr Sa Su     Mo Tu We Th Fr Sa Su
+35                    1  \e[7m40\e[27m     1  2  3  4  5  6  44              1  2  3 
+36  2  3  4  5  6  7  8  41 \e[7m 7\e[27m  8  9 10 11 12 13  45  4  5  6  7  8  9 10 
+37  9 10 11 12 13 14 15  42 14 15 16 17 18 19 20  46 11 12 13 14 15 16 17 
+38 16 17 18 19 20 21 22  43 21 22 23 24 25 26 27  47 18 19 20 21 22 23 24 
+39 23 24 25 26 27 28 29  44 28 29 30 31           48 25 26 27 28 29 30    
+\e[7m40\e[27m 30                                                                     

diff --git a/tests/expected/cal/weekarg-3m-week52-color b/tests/expected/cal/weekarg-3m-week52-color
new file mode 100644 (file)
index 0000000..d51b95f
--- /dev/null
+++ b/tests/expected/cal/weekarg-3m-week52-color
@@ -0,0 +1,9 @@
+Gregorian - Monday-based, week 52, 3 month
+     November 2000            December 2000             January 2001     
+   Mo Tu We Th Fr Sa Su     Mo Tu We Th Fr Sa Su     Mo Tu We Th Fr Sa Su
+44        1  2  3  4  5  48              1  2  3   1  1  2  3  4  5  6  7 
+45  6  7  8  9 10 11 12  49  4  5  6  7  8  9 10   2  8  9 10 11 12 13 14 
+46 13 14 15 16 17 18 19  50 11 12 13 14 15 16 17   3 15 16 17 18 19 20 21 
+47 20 21 22 23 24 25 26  51 18 19 20 21 22 23 24   4 22 23 24 25 26 27 28 
+48 27 28 29 30           \e[7m52\e[27m 25 26 27 28 29 30 \e[7m31\e[27m   5 29 30 31             
+                                                                          

diff --git a/tests/expected/cal/weekarg-3m-week53-color b/tests/expected/cal/weekarg-3m-week53-color
new file mode 100644 (file)
index 0000000..86b97c2
--- /dev/null
+++ b/tests/expected/cal/weekarg-3m-week53-color
@@ -0,0 +1,9 @@
+Gregorian - Monday-based, week 53, 3 month
+     December 2009             January 2010            February 2010     
+   Mo Tu We Th Fr Sa Su     Mo Tu We Th Fr Sa Su     Mo Tu We Th Fr Sa Su
+49     1  2  3  4  5  6  \e[7m53\e[27m              1  2  3   5  1  2  3  4  5  6  7 
+50  7  8  9 10 11 12 13   1  4  5  6  7  8  9 10   6  8  9 10 11 12 13 14 
+51 14 15 16 17 18 19 20   2 11 12 13 14 15 16 17   7 15 16 17 18 19 20 21 
+52 21 22 23 24 25 26 27   3 18 19 20 21 22 23 24   8 22 23 24 25 26 27 28 
+\e[7m53\e[27m 28 29 30 31            4 25 26 27 28 29 30 31                          
+                                                                          

diff --git a/tests/expected/cal/weekarg-3mj-week40 b/tests/expected/cal/weekarg-3mj-week40
new file mode 100644 (file)
index 0000000..e9c2272
--- /dev/null
+++ b/tests/expected/cal/weekarg-3mj-week40
@@ -0,0 +1,9 @@
+Julian    - Monday-based, week 40, 3 month
+        September 2013                   October 2013                    November 2013        
+   Mon Tue Wed Thu Fri Sat Sun     Mon Tue Wed Thu Fri Sat Sun     Mon Tue Wed Thu Fri Sat Sun
+35                         244  40     274 275 276 277 278 279  44                 305 306 307 
+36 245 246 247 248 249 250 251  41 280 281 282 283 284 285 286  45 308 309 310 311 312 313 314 
+37 252 253 254 255 256 257 258  42 287 288 289 290 291 292 293  46 315 316 317 318 319 320 321 
+38 259 260 261 262 263 264 265  43 294 295 296 297 298 299 300  47 322 323 324 325 326 327 328 
+39 266 267 268 269 270 271 272  44 301 302 303 304              48 329 330 331 332 333 334     
+40 273                                                                                         

diff --git a/tests/expected/cal/weekarg-3mj-week40-color b/tests/expected/cal/weekarg-3mj-week40-color
new file mode 100644 (file)
index 0000000..80e095d
--- /dev/null
+++ b/tests/expected/cal/weekarg-3mj-week40-color
@@ -0,0 +1,9 @@
+Julian    - Monday-based, week 40, 3 month
+        September 2013                   October 2013                    November 2013        
+   Mon Tue Wed Thu Fri Sat Sun     Mon Tue Wed Thu Fri Sat Sun     Mon Tue Wed Thu Fri Sat Sun
+35                         244  \e[7m40\e[27m     274 275 276 277 278 279  44                 305 306 307 
+36 245 246 247 248 249 250 251  41 \e[7m280\e[27m 281 282 283 284 285 286  45 308 309 310 311 312 313 314 
+37 252 253 254 255 256 257 258  42 287 288 289 290 291 292 293  46 315 316 317 318 319 320 321 
+38 259 260 261 262 263 264 265  43 294 295 296 297 298 299 300  47 322 323 324 325 326 327 328 
+39 266 267 268 269 270 271 272  44 301 302 303 304              48 329 330 331 332 333 334     
+\e[7m40\e[27m 273                                                                                         

diff --git a/tests/expected/cal/weekarg-3s-week40 b/tests/expected/cal/weekarg-3s-week40
new file mode 100644 (file)
index 0000000..a9dcfd8
--- /dev/null
+++ b/tests/expected/cal/weekarg-3s-week40
@@ -0,0 +1,9 @@
+Gregorian - Sunday-based, week 40, 3 month
+     September 2013            October 2013            November 2013     
+   Su Mo Tu We Th Fr Sa     Su Mo Tu We Th Fr Sa     Su Mo Tu We Th Fr Sa
+36  1  2  3  4  5  6  7  40        1  2  3  4  5  44                 1  2 
+37  8  9 10 11 12 13 14  41  6  7  8  9 10 11 12  45  3  4  5  6  7  8  9 
+38 15 16 17 18 19 20 21  42 13 14 15 16 17 18 19  46 10 11 12 13 14 15 16 
+39 22 23 24 25 26 27 28  43 20 21 22 23 24 25 26  47 17 18 19 20 21 22 23 
+40 29 30                 44 27 28 29 30 31        48 24 25 26 27 28 29 30 
+                                                                          

diff --git a/tests/expected/cal/weekarg-3s-week54-color b/tests/expected/cal/weekarg-3s-week54-color
new file mode 100644 (file)
index 0000000..d5af5f0
--- /dev/null
+++ b/tests/expected/cal/weekarg-3s-week54-color
@@ -0,0 +1,9 @@
+Gregorian - Sunday-based, week 54, 3 month
+     November 2000            December 2000             January 2001     
+   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  49                 1  2   1     1  2  3  4  5  6 
+46  5  6  7  8  9 10 11  50  3  4  5  6  7  8  9   2  7  8  9 10 11 12 13 
+47 12 13 14 15 16 17 18  51 10 11 12 13 14 15 16   3 14 15 16 17 18 19 20 
+48 19 20 21 22 23 24 25  52 17 18 19 20 21 22 23   4 21 22 23 24 25 26 27 
+49 26 27 28 29 30        53 24 25 26 27 28 29 30   5 28 29 30 31          
+                         \e[7m54\e[27m \e[7m31\e[27m                                            

diff --git a/tests/expected/cal/weekarg-3sj-week40 b/tests/expected/cal/weekarg-3sj-week40
new file mode 100644 (file)
index 0000000..e0866b7
--- /dev/null
+++ b/tests/expected/cal/weekarg-3sj-week40
@@ -0,0 +1,9 @@
+Julian    - Sunday-based, week 40, 3 month
+        September 2013                   October 2013                    November 2013        
+   Sun Mon Tue Wed Thu Fri Sat     Sun Mon Tue Wed Thu Fri Sat     Sun Mon Tue Wed Thu Fri Sat
+36 244 245 246 247 248 249 250  40         274 275 276 277 278  44                     305 306 
+37 251 252 253 254 255 256 257  41 279 280 281 282 283 284 285  45 307 308 309 310 311 312 313 
+38 258 259 260 261 262 263 264  42 286 287 288 289 290 291 292  46 314 315 316 317 318 319 320 
+39 265 266 267 268 269 270 271  43 293 294 295 296 297 298 299  47 321 322 323 324 325 326 327 
+40 272 273                      44 300 301 302 303 304          48 328 329 330 331 332 333 334 
+                                                                                               

diff --git a/tests/expected/cal/weekarg-m-week40 b/tests/expected/cal/weekarg-m-week40
new file mode 100644 (file)
index 0000000..a3129ac
--- /dev/null
+++ b/tests/expected/cal/weekarg-m-week40
@@ -0,0 +1,9 @@
+Gregorian - Monday-based, week 40, 1 month
+      October 2013     
+   Mo Tu We Th Fr Sa Su
+40     1  2  3  4  5  6 
+41  7  8  9 10 11 12 13 
+42 14 15 16 17 18 19 20 
+43 21 22 23 24 25 26 27 
+44 28 29 30 31          
+                        

diff --git a/tests/expected/cal/weekarg-mj-week40 b/tests/expected/cal/weekarg-mj-week40
new file mode 100644 (file)
index 0000000..cd3d8b5
--- /dev/null
+++ b/tests/expected/cal/weekarg-mj-week40
@@ -0,0 +1,9 @@
+Julian    - Monday-based, week 40, 1 month
+         October 2013         
+   Mon Tue Wed Thu Fri Sat Sun
+40     274 275 276 277 278 279 
+41 280 281 282 283 284 285 286 
+42 287 288 289 290 291 292 293 
+43 294 295 296 297 298 299 300 
+44 301 302 303 304             
+                               

diff --git a/tests/expected/cal/weekarg-s-week40 b/tests/expected/cal/weekarg-s-week40
new file mode 100644 (file)
index 0000000..6158f42
--- /dev/null
+++ b/tests/expected/cal/weekarg-s-week40
@@ -0,0 +1,9 @@
+Gregorian - Sunday-based, week 40, 1 month
+      October 2013     
+   Su Mo Tu We Th Fr Sa
+40        1  2  3  4  5 
+41  6  7  8  9 10 11 12 
+42 13 14 15 16 17 18 19 
+43 20 21 22 23 24 25 26 
+44 27 28 29 30 31       
+                        

diff --git a/tests/expected/cal/weekarg-sj-week40 b/tests/expected/cal/weekarg-sj-week40
new file mode 100644 (file)
index 0000000..481a8a2
--- /dev/null
+++ b/tests/expected/cal/weekarg-sj-week40
@@ -0,0 +1,9 @@
+Julian    - Sunday-based, week 40, 1 month
+         October 2013         
+   Sun Mon Tue Wed Thu Fri Sat
+40         274 275 276 277 278 
+41 279 280 281 282 283 284 285 
+42 286 287 288 289 290 291 292 
+43 293 294 295 296 297 298 299 
+44 300 301 302 303 304         
+                               

diff --git a/tests/ts/cal/weekarg b/tests/ts/cal/weekarg
index 236baedd52b33c9188eb682809c278903afe5fbe..d26906ee15a025a55957a4b3b3fe6b6fa8f3ec24 100755 (executable)
--- a/tests/ts/cal/weekarg
+++ b/tests/ts/cal/weekarg
@@ -32,133 +32,67 @@ export TERM=linux
 
 USETERM=$( ts_has_option "useterm" "$*" )
 
-[ "$USETERM" == "yes" ] && TS_VERBOSE="yes"
-ts_log ""
+function call_cal_simple {
+       ts_log "$1"
+       shift
+       if [ "$USETERM" == "yes" ]; then
+               $TS_CMD_CAL "$@"
+       fi
+       $TS_CMD_CAL "$@" >> $TS_OUTPUT
+}
+
+function call_cal {
+       local testname=$(echo "${2}" | sed 's/-//g')
+       testname="${testname}-$(echo "${3}" | sed 's/=//g;s/-//g')"
+
+       ts_init_subtest "$testname"
+       call_cal_simple "$@"
+       ts_finalize_subtest
+}
+
+function call_cal_color {
+       local testname=$(echo "${2}" | sed 's/-//g')
+       testname="${testname}-$(echo "${3}" | sed 's/=//g;s/-//g')-color"
+
+       ts_init_subtest "$testname"
+       call_cal_simple "$@" --color=always
+       ts_finalize_subtest
+}
 
 MYTIME="7 10 2013"
 PWEEK="week 40"
 WEEK="--week=40"
-ts_log "Gregorian - Monday-based, $PWEEK, 3 month $x"
-if [ "$USETERM" == "yes" ]; then
-       $TS_CMD_CAL -3m $WEEK $MYTIME
-fi
-$TS_CMD_CAL -3m $WEEK $MYTIME >> $TS_OUTPUT
-
-ts_log "Gregorian - Sunday-based, $PWEEK, 3 month $x"
-if [ "$USETERM" == "yes" ]; then
-       $TS_CMD_CAL -3s $WEEK $MYTIME
-fi
-$TS_CMD_CAL -3s $WEEK $MYTIME >> $TS_OUTPUT
-
-
-ts_log "Julian - Monday-based, $PWEEK, 3 month $x"
-if [ "$USETERM" == "yes" ]; then
-       $TS_CMD_CAL -3mj $WEEK $MYTIME
-fi
-$TS_CMD_CAL -3mj $WEEK $MYTIME >> $TS_OUTPUT
-
-ts_log "Julian - Sunday-based, $PWEEK, 3 month $x"
-if [ "$USETERM" == "yes" ]; then
-       $TS_CMD_CAL -3sj $WEEK $MYTIME
-fi
-$TS_CMD_CAL -3sj $WEEK $MYTIME >> $TS_OUTPUT
-
-ts_log "Gregorian - Monday-based, $PWEEK, 1 month $x"
-if [ "$USETERM" == "yes" ]; then
-       $TS_CMD_CAL -m $WEEK $MYTIME
-fi
-$TS_CMD_CAL -m $WEEK $MYTIME >> $TS_OUTPUT
-
-ts_log "Gregorian - Sunday-based, $PWEEK, 1 month $x"
-if [ "$USETERM" == "yes" ]; then
-       $TS_CMD_CAL -s $WEEK $MYTIME
-fi
-$TS_CMD_CAL -s $WEEK $MYTIME >> $TS_OUTPUT
-
-
-ts_log "Julian - Monday-based, $PWEEK, 1 month $x"
-if [ "$USETERM" == "yes" ]; then
-       $TS_CMD_CAL -mj $WEEK $MYTIME
-fi
-$TS_CMD_CAL -mj $WEEK $MYTIME >> $TS_OUTPUT
-
-ts_log "Julian - Sunday-based, $PWEEK, 1 month $x"
-if [ "$USETERM" == "yes" ]; then
-       $TS_CMD_CAL -sj $WEEK $MYTIME
-fi
-$TS_CMD_CAL -sj $WEEK $MYTIME >> $TS_OUTPUT
+call_cal "Gregorian - Monday-based, $PWEEK, 3 month" -3m $WEEK $MYTIME
+call_cal "Gregorian - Sunday-based, $PWEEK, 3 month" -3s $WEEK $MYTIME
+call_cal "Julian    - Monday-based, $PWEEK, 3 month" -3mj $WEEK $MYTIME
+call_cal "Julian    - Sunday-based, $PWEEK, 3 month" -3sj $WEEK $MYTIME
+call_cal "Gregorian - Monday-based, $PWEEK, 1 month" -m $WEEK $MYTIME
+call_cal "Gregorian - Sunday-based, $PWEEK, 1 month" -s $WEEK $MYTIME
+call_cal "Julian    - Monday-based, $PWEEK, 1 month" -mj $WEEK $MYTIME
+call_cal "Julian    - Sunday-based, $PWEEK, 1 month" -sj $WEEK $MYTIME
+
+call_cal_color "Gregorian - Monday-based, $PWEEK, 3 month" -3m $WEEK $MYTIME 
+call_cal_color "Julian    - Monday-based, $PWEEK, 3 month" -3mj $WEEK $MYTIME
 
 # tricky year, starts with a bit of 53 yet ends during 52
 MYTIME="2010"
 PWEEK="week 53"
 WEEK="--week=53"
-ts_log "Gregorian - Monday-based, $PWEEK, 1 month $x"
-if [ "$USETERM" == "yes" ]; then
-       $TS_CMD_CAL -1m $WEEK $MYTIME
-fi
-$TS_CMD_CAL -1m $WEEK $MYTIME >> $TS_OUTPUT
-
-ts_log "Julian - Monday-based, $PWEEK, 1 month $x"
-if [ "$USETERM" == "yes" ]; then
-       $TS_CMD_CAL -1mj $WEEK $MYTIME
-fi
-$TS_CMD_CAL -1mj $WEEK $MYTIME >> $TS_OUTPUT
-
-MYTIME="2010"
-PWEEK="week 53 with colors"
-WEEK="--week=53 --color=always"
-ts_log "Gregorian - Monday-based, $PWEEK, 1 month $x"
-if [ "$USETERM" == "yes" ]; then
-       $TS_CMD_CAL -1m $WEEK $MYTIME
-fi
-$TS_CMD_CAL -1m $WEEK $MYTIME >> $TS_OUTPUT
-
-ts_log "Julian - Monday-based, $PWEEK, 1 month $x"
-if [ "$USETERM" == "yes" ]; then
-       $TS_CMD_CAL -1mj $WEEK $MYTIME
-fi
-$TS_CMD_CAL -1mj $WEEK $MYTIME >> $TS_OUTPUT
-
-MYTIME="7 10 2013"
-PWEEK="week 40 with colors"
-WEEK="--week=40 --color=always"
-ts_log "Gregorian - Monday-based, $PWEEK, 3 month $x"
-if [ "$USETERM" == "yes" ]; then
-       $TS_CMD_CAL -3m $WEEK $MYTIME
-fi
-$TS_CMD_CAL -3m $WEEK $MYTIME >> $TS_OUTPUT
-
-ts_log "Julian - Monday-based, $PWEEK, 3 month $x"
-if [ "$USETERM" == "yes" ]; then
-       $TS_CMD_CAL -3mj $WEEK $MYTIME
-fi
-$TS_CMD_CAL -3mj $WEEK $MYTIME >> $TS_OUTPUT
+call_cal "Gregorian - Monday-based, $PWEEK, 1 month" -1m $WEEK $MYTIME
+call_cal "Julian    - Monday-based, $PWEEK, 1 month" -1mj $WEEK $MYTIME
+call_cal_color "Gregorian - Monday-based, $PWEEK, 3 month" -3m $WEEK $MYTIME
+call_cal_color "Gregorian - Monday-based, $PWEEK, 1 month" -1m $WEEK $MYTIME
+call_cal_color "Julian    - Monday-based, $PWEEK, 1 month" -1mj $WEEK $MYTIME
 
 MYTIME="31 12 2000"
-PWEEK="week 54 with colors"
-WEEK="--week=54 --color=always"
-ts_log "Gregorian - Sunday-based, $PWEEK, 3 month $x"
-if [ "$USETERM" == "yes" ]; then
-       $TS_CMD_CAL --three --sunday $WEEK $MYTIME
-fi
-$TS_CMD_CAL --three --sunday $WEEK $MYTIME >> $TS_OUTPUT
-
-PWEEK="week 53 with colors"
-WEEK="--week=53 --color=always"
-ts_log "Gregorian - Monday-based, $PWEEK, 3 month $x"
-if [ "$USETERM" == "yes" ]; then
-       $TS_CMD_CAL --three --monday $WEEK $MYTIME
-fi
-$TS_CMD_CAL --three --monday $WEEK $MYTIME >> $TS_OUTPUT 2>&1
-
-PWEEK="week 52 with colors"
-WEEK="--week=52 --color=always"
-ts_log "Gregorian - Monday-based, $PWEEK, 3 month $x"
-if [ "$USETERM" == "yes" ]; then
-       $TS_CMD_CAL --three --monday $WEEK $MYTIME
-fi
-$TS_CMD_CAL --three --monday $WEEK $MYTIME >> $TS_OUTPUT 2>&1
+PWEEK="week 54"
+WEEK="--week=54"
+call_cal_color "Gregorian - Sunday-based, $PWEEK, 3 month" -3s $WEEK $MYTIME
 
+MYTIME="31 12 2000"
+PWEEK="week 52"
+WEEK="--week=52"
+call_cal_color "Gregorian - Monday-based, $PWEEK, 3 month" -3m $WEEK $MYTIME
 
 ts_finalize