tests: rewrite cal(1) bigyear test

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

diff --git a/tests/expected/cal/bigyear b/tests/expected/cal/bigyear
deleted file mode 100644 (file)
index 75bee2a..0000000
--- a/tests/expected/cal/bigyear
+++ /dev/null
@@ -1,109 +0,0 @@
-
-Gregorian - Monday-based month
- December 2147483646
-Mo Tu We Th Fr Sa Su
-                1  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                  
-Gregorian - Sunday-based month
- December 2147483646
-Su Mo Tu We Th Fr Sa
-                   1
- 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               
-Julian - Monday-based month
-    December 2147483646    
-Mon Tue Wed Thu Fri Sat Sun
-                    335 336
-337 338 339 340 341 342 343
-344 345 346 347 348 349 350
-351 352 353 354 355 356 357
-358 359 360 361 362 363 364
-365                        
-Julian - Sunday-based month
-    December 2147483646    
-Sun Mon Tue Wed Thu Fri Sat
-                        335
-336 337 338 339 340 341 342
-343 344 345 346 347 348 349
-350 351 352 353 354 355 356
-357 358 359 360 361 362 363
-364 365                    
-Gregorian - Monday-based three months
- November 2147483646   December 2147483646   January 2147483647 
-Mo Tu We Th Fr Sa Su  Mo Tu We Th Fr Sa Su  Mo Tu We Th Fr Sa Su
-          1  2  3  4                  1  2      1  2  3  4  5  6
- 5  6  7  8  9 10 11   3  4  5  6  7  8  9   7  8  9 10 11 12 13
-12 13 14 15 16 17 18  10 11 12 13 14 15 16  14 15 16 17 18 19 20
-19 20 21 22 23 24 25  17 18 19 20 21 22 23  21 22 23 24 25 26 27
-26 27 28 29 30        24 25 26 27 28 29 30  28 29 30 31         
-                      31                                        
-Gregorian - Sunday-based three months
- November 2147483646   December 2147483646   January 2147483647 
-Su Mo Tu We Th Fr Sa  Su Mo Tu We Th Fr Sa  Su Mo Tu We Th Fr Sa
-             1  2  3                     1         1  2  3  4  5
- 4  5  6  7  8  9 10   2  3  4  5  6  7  8   6  7  8  9 10 11 12
-11 12 13 14 15 16 17   9 10 11 12 13 14 15  13 14 15 16 17 18 19
-18 19 20 21 22 23 24  16 17 18 19 20 21 22  20 21 22 23 24 25 26
-25 26 27 28 29 30     23 24 25 26 27 28 29  27 28 29 30 31      
-                      30 31                                     
-Julian - Monday-based three months
-    November 2147483646          December 2147483646           January 2147483647    
-Mon Tue Wed Thu Fri Sat Sun  Mon Tue Wed Thu Fri Sat Sun  Mon Tue Wed Thu Fri Sat Sun
-            305 306 307 308                      335 336        1   2   3   4   5   6
-309 310 311 312 313 314 315  337 338 339 340 341 342 343    7   8   9  10  11  12  13
-316 317 318 319 320 321 322  344 345 346 347 348 349 350   14  15  16  17  18  19  20
-323 324 325 326 327 328 329  351 352 353 354 355 356 357   21  22  23  24  25  26  27
-330 331 332 333 334          358 359 360 361 362 363 364   28  29  30  31            
-                             365                                                     
-Julian - Sunday-based three months
-    November 2147483646          December 2147483646           January 2147483647    
-Sun Mon Tue Wed Thu Fri Sat  Sun Mon Tue Wed Thu Fri Sat  Sun Mon Tue Wed Thu Fri Sat
-                305 306 307                          335            1   2   3   4   5
-308 309 310 311 312 313 314  336 337 338 339 340 341 342    6   7   8   9  10  11  12
-315 316 317 318 319 320 321  343 344 345 346 347 348 349   13  14  15  16  17  18  19
-322 323 324 325 326 327 328  350 351 352 353 354 355 356   20  21  22  23  24  25  26
-329 330 331 332 333 334      357 358 359 360 361 362 363   27  28  29  30  31        
-                             364 365                                                 
-Gregorian - Monday-based year
- January 2147483646 
-Mo Tu We Th Fr Sa Su
- 1  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            
-                    
-Gregorian - Sunday-based year
- January 2147483646 
-Su Mo Tu We Th Fr Sa
-    1  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         
-                    
-Julian - Monday-based year
-     January 2147483646    
-Mon Tue Wed Thu Fri Sat Sun
-  1   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                
-                           
-Julian - Sunday-based year
-     January 2147483646    
-Sun Mon Tue Wed Thu Fri Sat
-      1   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/bigyear-1m-month b/tests/expected/cal/bigyear-1m-month
new file mode 100644 (file)
index 0000000..6a0f2ad
--- /dev/null
+++ b/tests/expected/cal/bigyear-1m-month
@@ -0,0 +1,9 @@
+Gregorian - Monday-based month
+ December 2147483646
+Mo Tu We Th Fr Sa Su
+                1  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/bigyear-1m-year b/tests/expected/cal/bigyear-1m-year
new file mode 100644 (file)
index 0000000..00c0a12
--- /dev/null
+++ b/tests/expected/cal/bigyear-1m-year
@@ -0,0 +1,9 @@
+Gregorian - Monday-based year
+ January 2147483646 
+Mo Tu We Th Fr Sa Su
+ 1  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/bigyear-1mj-month b/tests/expected/cal/bigyear-1mj-month
new file mode 100644 (file)
index 0000000..f29e05d
--- /dev/null
+++ b/tests/expected/cal/bigyear-1mj-month
@@ -0,0 +1,9 @@
+Julian    - Monday-based month
+    December 2147483646    
+Mon Tue Wed Thu Fri Sat Sun
+                    335 336
+337 338 339 340 341 342 343
+344 345 346 347 348 349 350
+351 352 353 354 355 356 357
+358 359 360 361 362 363 364
+365                        

diff --git a/tests/expected/cal/bigyear-1mj-year b/tests/expected/cal/bigyear-1mj-year
new file mode 100644 (file)
index 0000000..56c3f8a
--- /dev/null
+++ b/tests/expected/cal/bigyear-1mj-year
@@ -0,0 +1,9 @@
+Julian    - Monday-based year
+     January 2147483646    
+Mon Tue Wed Thu Fri Sat Sun
+  1   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/bigyear-1mjw-month b/tests/expected/cal/bigyear-1mjw-month
new file mode 100644 (file)
index 0000000..35f8269
--- /dev/null
+++ b/tests/expected/cal/bigyear-1mjw-month
@@ -0,0 +1,9 @@
+Julian    - Monday-based month with weeks
+      December 2147483646     
+   Mon Tue Wed Thu Fri Sat Sun
+48                     335 336
+49 337 338 339 340 341 342 343
+50 344 345 346 347 348 349 350
+51 351 352 353 354 355 356 357
+52 358 359 360 361 362 363 364
+ 1 365                        

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

diff --git a/tests/expected/cal/bigyear-1mw-month b/tests/expected/cal/bigyear-1mw-month
new file mode 100644 (file)
index 0000000..a7dd7c6
--- /dev/null
+++ b/tests/expected/cal/bigyear-1mw-month
@@ -0,0 +1,9 @@
+Gregorian - Monday-based month with weeks
+  December 2147483646  
+   Mo Tu We Th Fr Sa Su
+48                 1  2
+49  3  4  5  6  7  8  9
+50 10 11 12 13 14 15 16
+51 17 18 19 20 21 22 23
+52 24 25 26 27 28 29 30
+ 1 31                  

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

diff --git a/tests/expected/cal/bigyear-1s-month b/tests/expected/cal/bigyear-1s-month
new file mode 100644 (file)
index 0000000..fcf5c0f
--- /dev/null
+++ b/tests/expected/cal/bigyear-1s-month
@@ -0,0 +1,9 @@
+Gregorian - Sunday-based month
+ December 2147483646
+Su Mo Tu We Th Fr Sa
+                   1
+ 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/bigyear-1s-year b/tests/expected/cal/bigyear-1s-year
new file mode 100644 (file)
index 0000000..8442aea
--- /dev/null
+++ b/tests/expected/cal/bigyear-1s-year
@@ -0,0 +1,9 @@
+Gregorian - Sunday-based year
+ January 2147483646 
+Su Mo Tu We Th Fr Sa
+    1  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/bigyear-1sj-month b/tests/expected/cal/bigyear-1sj-month
new file mode 100644 (file)
index 0000000..d159352
--- /dev/null
+++ b/tests/expected/cal/bigyear-1sj-month
@@ -0,0 +1,9 @@
+Julian    - Sunday-based month
+    December 2147483646    
+Sun Mon Tue Wed Thu Fri Sat
+                        335
+336 337 338 339 340 341 342
+343 344 345 346 347 348 349
+350 351 352 353 354 355 356
+357 358 359 360 361 362 363
+364 365                    

diff --git a/tests/expected/cal/bigyear-1sj-year b/tests/expected/cal/bigyear-1sj-year
new file mode 100644 (file)
index 0000000..980e4b2
--- /dev/null
+++ b/tests/expected/cal/bigyear-1sj-year
@@ -0,0 +1,9 @@
+Julian    - Sunday-based year
+     January 2147483646    
+Sun Mon Tue Wed Thu Fri Sat
+      1   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/bigyear-1sjw-month b/tests/expected/cal/bigyear-1sjw-month
new file mode 100644 (file)
index 0000000..139ba22
--- /dev/null
+++ b/tests/expected/cal/bigyear-1sjw-month
@@ -0,0 +1,9 @@
+Julian    - Sunday-based month with weeks
+      December 2147483646     
+   Sun Mon Tue Wed Thu Fri Sat
+48                         335
+49 336 337 338 339 340 341 342
+50 343 344 345 346 347 348 349
+51 350 351 352 353 354 355 356
+52 357 358 359 360 361 362 363
+53 364 365                    

diff --git a/tests/expected/cal/bigyear-1sjw-year b/tests/expected/cal/bigyear-1sjw-year
new file mode 100644 (file)
index 0000000..4d35dab
--- /dev/null
+++ b/tests/expected/cal/bigyear-1sjw-year
@@ -0,0 +1,9 @@
+Julian    - Sunday-based year with weeks
+      January 2147483646      
+   Sun Mon Tue Wed Thu Fri Sat
+ 1       1   2   3   4   5   6
+ 2   7   8   9  10  11  12  13
+ 3  14  15  16  17  18  19  20
+ 4  21  22  23  24  25  26  27
+ 5  28  29  30  31            
+                              

diff --git a/tests/expected/cal/bigyear-1sw-month b/tests/expected/cal/bigyear-1sw-month
new file mode 100644 (file)
index 0000000..ca3aaa7
--- /dev/null
+++ b/tests/expected/cal/bigyear-1sw-month
@@ -0,0 +1,9 @@
+Gregorian - Sunday-based month with weeks
+  December 2147483646  
+   Su Mo Tu We Th Fr Sa
+48                    1
+49  2  3  4  5  6  7  8
+50  9 10 11 12 13 14 15
+51 16 17 18 19 20 21 22
+52 23 24 25 26 27 28 29
+53 30 31               

diff --git a/tests/expected/cal/bigyear-1sw-year b/tests/expected/cal/bigyear-1sw-year
new file mode 100644 (file)
index 0000000..7fb287c
--- /dev/null
+++ b/tests/expected/cal/bigyear-1sw-year
@@ -0,0 +1,9 @@
+Gregorian - Sunday-based year with weeks
+   January 2147483646  
+   Su Mo Tu We Th Fr Sa
+ 1     1  2  3  4  5  6
+ 2  7  8  9 10 11 12 13
+ 3 14 15 16 17 18 19 20
+ 4 21 22 23 24 25 26 27
+ 5 28 29 30 31         
+                       

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

diff --git a/tests/expected/cal/bigyear-3mj-month b/tests/expected/cal/bigyear-3mj-month
new file mode 100644 (file)
index 0000000..297f6a8
--- /dev/null
+++ b/tests/expected/cal/bigyear-3mj-month
@@ -0,0 +1,9 @@
+Julian    - Monday-based 3 months
+    November 2147483646          December 2147483646           January 2147483647    
+Mon Tue Wed Thu Fri Sat Sun  Mon Tue Wed Thu Fri Sat Sun  Mon Tue Wed Thu Fri Sat Sun
+            305 306 307 308                      335 336        1   2   3   4   5   6
+309 310 311 312 313 314 315  337 338 339 340 341 342 343    7   8   9  10  11  12  13
+316 317 318 319 320 321 322  344 345 346 347 348 349 350   14  15  16  17  18  19  20
+323 324 325 326 327 328 329  351 352 353 354 355 356 357   21  22  23  24  25  26  27
+330 331 332 333 334          358 359 360 361 362 363 364   28  29  30  31            
+                             365                                                     

diff --git a/tests/expected/cal/bigyear-3mjw-month b/tests/expected/cal/bigyear-3mjw-month
new file mode 100644 (file)
index 0000000..2f6648f
--- /dev/null
+++ b/tests/expected/cal/bigyear-3mjw-month
@@ -0,0 +1,9 @@
+Julian    - Monday-based 3 months with weeks
+      November 2147483646             December 2147483646             January 2147483647      
+   Mon Tue Wed Thu Fri Sat Sun     Mon Tue Wed Thu Fri Sat Sun     Mon Tue Wed Thu Fri Sat Sun
+44             305 306 307 308  48                     335 336   1       1   2   3   4   5   6
+45 309 310 311 312 313 314 315  49 337 338 339 340 341 342 343   2   7   8   9  10  11  12  13
+46 316 317 318 319 320 321 322  50 344 345 346 347 348 349 350   3  14  15  16  17  18  19  20
+47 323 324 325 326 327 328 329  51 351 352 353 354 355 356 357   4  21  22  23  24  25  26  27
+48 330 331 332 333 334          52 358 359 360 361 362 363 364   5  28  29  30  31            
+                                 1 365                                                        

diff --git a/tests/expected/cal/bigyear-3mw-month b/tests/expected/cal/bigyear-3mw-month
new file mode 100644 (file)
index 0000000..ace1ff8
--- /dev/null
+++ b/tests/expected/cal/bigyear-3mw-month
@@ -0,0 +1,9 @@
+Gregorian - Monday-based 3 months with weeks
+  November 2147483646      December 2147483646       January 2147483647  
+   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  48                 1  2   1     1  2  3  4  5  6
+45  5  6  7  8  9 10 11  49  3  4  5  6  7  8  9   2  7  8  9 10 11 12 13
+46 12 13 14 15 16 17 18  50 10 11 12 13 14 15 16   3 14 15 16 17 18 19 20
+47 19 20 21 22 23 24 25  51 17 18 19 20 21 22 23   4 21 22 23 24 25 26 27
+48 26 27 28 29 30        52 24 25 26 27 28 29 30   5 28 29 30 31         
+                          1 31                                           

diff --git a/tests/expected/cal/bigyear-3s-month b/tests/expected/cal/bigyear-3s-month
new file mode 100644 (file)
index 0000000..e0bdb8d
--- /dev/null
+++ b/tests/expected/cal/bigyear-3s-month
@@ -0,0 +1,9 @@
+Gregorian - Sunday-based 3 months
+ November 2147483646   December 2147483646   January 2147483647 
+Su Mo Tu We Th Fr Sa  Su Mo Tu We Th Fr Sa  Su Mo Tu We Th Fr Sa
+             1  2  3                     1         1  2  3  4  5
+ 4  5  6  7  8  9 10   2  3  4  5  6  7  8   6  7  8  9 10 11 12
+11 12 13 14 15 16 17   9 10 11 12 13 14 15  13 14 15 16 17 18 19
+18 19 20 21 22 23 24  16 17 18 19 20 21 22  20 21 22 23 24 25 26
+25 26 27 28 29 30     23 24 25 26 27 28 29  27 28 29 30 31      
+                      30 31                                     

diff --git a/tests/expected/cal/bigyear-3sj-month b/tests/expected/cal/bigyear-3sj-month
new file mode 100644 (file)
index 0000000..1205d56
--- /dev/null
+++ b/tests/expected/cal/bigyear-3sj-month
@@ -0,0 +1,9 @@
+Julian    - Sunday-based 3 months
+    November 2147483646          December 2147483646           January 2147483647    
+Sun Mon Tue Wed Thu Fri Sat  Sun Mon Tue Wed Thu Fri Sat  Sun Mon Tue Wed Thu Fri Sat
+                305 306 307                          335            1   2   3   4   5
+308 309 310 311 312 313 314  336 337 338 339 340 341 342    6   7   8   9  10  11  12
+315 316 317 318 319 320 321  343 344 345 346 347 348 349   13  14  15  16  17  18  19
+322 323 324 325 326 327 328  350 351 352 353 354 355 356   20  21  22  23  24  25  26
+329 330 331 332 333 334      357 358 359 360 361 362 363   27  28  29  30  31        
+                             364 365                                                 

diff --git a/tests/expected/cal/bigyear-3sjw-month b/tests/expected/cal/bigyear-3sjw-month
new file mode 100644 (file)
index 0000000..541d3ae
--- /dev/null
+++ b/tests/expected/cal/bigyear-3sjw-month
@@ -0,0 +1,9 @@
+Julian    - Sunday-based 3 months with weeks
+      November 2147483646             December 2147483646             January 2147483647      
+   Sun Mon Tue Wed Thu Fri Sat     Sun Mon Tue Wed Thu Fri Sat     Sun Mon Tue Wed Thu Fri Sat
+44                 305 306 307  48                         335   1           1   2   3   4   5
+45 308 309 310 311 312 313 314  49 336 337 338 339 340 341 342   2   6   7   8   9  10  11  12
+46 315 316 317 318 319 320 321  50 343 344 345 346 347 348 349   3  13  14  15  16  17  18  19
+47 322 323 324 325 326 327 328  51 350 351 352 353 354 355 356   4  20  21  22  23  24  25  26
+48 329 330 331 332 333 334      52 357 358 359 360 361 362 363   5  27  28  29  30  31        
+                                53 364 365                                                    

diff --git a/tests/expected/cal/bigyear-3sw-month b/tests/expected/cal/bigyear-3sw-month
new file mode 100644 (file)
index 0000000..305e2c6
--- /dev/null
+++ b/tests/expected/cal/bigyear-3sw-month
@@ -0,0 +1,9 @@
+Gregorian - Sunday-based 3 months with weeks
+  November 2147483646      December 2147483646       January 2147483647  
+   Su Mo Tu We Th Fr Sa     Su Mo Tu We Th Fr Sa     Su Mo Tu We Th Fr Sa
+44              1  2  3  48                    1   1        1  2  3  4  5
+45  4  5  6  7  8  9 10  49  2  3  4  5  6  7  8   2  6  7  8  9 10 11 12
+46 11 12 13 14 15 16 17  50  9 10 11 12 13 14 15   3 13 14 15 16 17 18 19
+47 18 19 20 21 22 23 24  51 16 17 18 19 20 21 22   4 20 21 22 23 24 25 26
+48 25 26 27 28 29 30     52 23 24 25 26 27 28 29   5 27 28 29 30 31      
+                         53 30 31                                        

diff --git a/tests/expected/cal/bigyearw b/tests/expected/cal/bigyearw
deleted file mode 100644 (file)
index 9f0c066..0000000
--- a/tests/expected/cal/bigyearw
+++ /dev/null
@@ -1,109 +0,0 @@
-
-Gregorian - Monday-based month with week numbers
-  December 2147483646  
-   Mo Tu We Th Fr Sa Su
-48                 1  2
-49  3  4  5  6  7  8  9
-50 10 11 12 13 14 15 16
-51 17 18 19 20 21 22 23
-52 24 25 26 27 28 29 30
- 1 31                  
-Gregorian - Sunday-based month with week numbers
-  December 2147483646  
-   Su Mo Tu We Th Fr Sa
-48                    1
-49  2  3  4  5  6  7  8
-50  9 10 11 12 13 14 15
-51 16 17 18 19 20 21 22
-52 23 24 25 26 27 28 29
-53 30 31               
-Julian - Monday-based month with week numbers
-      December 2147483646     
-   Mon Tue Wed Thu Fri Sat Sun
-48                     335 336
-49 337 338 339 340 341 342 343
-50 344 345 346 347 348 349 350
-51 351 352 353 354 355 356 357
-52 358 359 360 361 362 363 364
- 1 365                        
-Julian - Sunday-based month with week numbers
-      December 2147483646     
-   Sun Mon Tue Wed Thu Fri Sat
-48                         335
-49 336 337 338 339 340 341 342
-50 343 344 345 346 347 348 349
-51 350 351 352 353 354 355 356
-52 357 358 359 360 361 362 363
-53 364 365                    
-Gregorian - Monday-based three months with week numbers
-  November 2147483646      December 2147483646       January 2147483647  
-   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  48                 1  2   1     1  2  3  4  5  6
-45  5  6  7  8  9 10 11  49  3  4  5  6  7  8  9   2  7  8  9 10 11 12 13
-46 12 13 14 15 16 17 18  50 10 11 12 13 14 15 16   3 14 15 16 17 18 19 20
-47 19 20 21 22 23 24 25  51 17 18 19 20 21 22 23   4 21 22 23 24 25 26 27
-48 26 27 28 29 30        52 24 25 26 27 28 29 30   5 28 29 30 31         
-                          1 31                                           
-Gregorian - Sunday-based three months with week numbers
-  November 2147483646      December 2147483646       January 2147483647  
-   Su Mo Tu We Th Fr Sa     Su Mo Tu We Th Fr Sa     Su Mo Tu We Th Fr Sa
-44              1  2  3  48                    1   1        1  2  3  4  5
-45  4  5  6  7  8  9 10  49  2  3  4  5  6  7  8   2  6  7  8  9 10 11 12
-46 11 12 13 14 15 16 17  50  9 10 11 12 13 14 15   3 13 14 15 16 17 18 19
-47 18 19 20 21 22 23 24  51 16 17 18 19 20 21 22   4 20 21 22 23 24 25 26
-48 25 26 27 28 29 30     52 23 24 25 26 27 28 29   5 27 28 29 30 31      
-                         53 30 31                                        
-Julian - Monday-based three months with week numbers
-      November 2147483646             December 2147483646             January 2147483647      
-   Mon Tue Wed Thu Fri Sat Sun     Mon Tue Wed Thu Fri Sat Sun     Mon Tue Wed Thu Fri Sat Sun
-44             305 306 307 308  48                     335 336   1       1   2   3   4   5   6
-45 309 310 311 312 313 314 315  49 337 338 339 340 341 342 343   2   7   8   9  10  11  12  13
-46 316 317 318 319 320 321 322  50 344 345 346 347 348 349 350   3  14  15  16  17  18  19  20
-47 323 324 325 326 327 328 329  51 351 352 353 354 355 356 357   4  21  22  23  24  25  26  27
-48 330 331 332 333 334          52 358 359 360 361 362 363 364   5  28  29  30  31            
-                                 1 365                                                        
-Julian - Sunday-based three months with week numbers
-      November 2147483646             December 2147483646             January 2147483647      
-   Sun Mon Tue Wed Thu Fri Sat     Sun Mon Tue Wed Thu Fri Sat     Sun Mon Tue Wed Thu Fri Sat
-44                 305 306 307  48                         335   1           1   2   3   4   5
-45 308 309 310 311 312 313 314  49 336 337 338 339 340 341 342   2   6   7   8   9  10  11  12
-46 315 316 317 318 319 320 321  50 343 344 345 346 347 348 349   3  13  14  15  16  17  18  19
-47 322 323 324 325 326 327 328  51 350 351 352 353 354 355 356   4  20  21  22  23  24  25  26
-48 329 330 331 332 333 334      52 357 358 359 360 361 362 363   5  27  28  29  30  31        
-                                53 364 365                                                    
-Gregorian - Monday-based year with week numbers
-   January 2147483646  
-   Mo Tu We Th Fr Sa Su
- 1  1  2  3  4  5  6  7
- 2  8  9 10 11 12 13 14
- 3 15 16 17 18 19 20 21
- 4 22 23 24 25 26 27 28
- 5 29 30 31            
-                       
-Gregorian - Sunday-based year with week numbers
-   January 2147483646  
-   Su Mo Tu We Th Fr Sa
- 1     1  2  3  4  5  6
- 2  7  8  9 10 11 12 13
- 3 14 15 16 17 18 19 20
- 4 21 22 23 24 25 26 27
- 5 28 29 30 31         
-                       
-Julian - Monday-based year with week numbers
-      January 2147483646      
-   Mon Tue Wed Thu Fri Sat Sun
- 1   1   2   3   4   5   6   7
- 2   8   9  10  11  12  13  14
- 3  15  16  17  18  19  20  21
- 4  22  23  24  25  26  27  28
- 5  29  30  31                
-                              
-Julian - Sunday-based year with week numbers
-      January 2147483646      
-   Sun Mon Tue Wed Thu Fri Sat
- 1       1   2   3   4   5   6
- 2   7   8   9  10  11  12  13
- 3  14  15  16  17  18  19  20
- 4  21  22  23  24  25  26  27
- 5  28  29  30  31            
-                              

diff --git a/tests/ts/cal/bigyear b/tests/ts/cal/bigyear
index 5dced2a0fbd412189be8571ca6ce0a6d130bf6c1..d205c3afd7a059b41e808da385174de084abbe26 100755 (executable)
--- a/tests/ts/cal/bigyear
+++ b/tests/ts/cal/bigyear
@@ -26,73 +26,58 @@ USETERM=$( ts_has_option "useterm" "$*" )
 MYMONTH="12 2147483646"
 MYYEAR="2147483646"
 
-[ "$USETERM" == "yes" ] && TS_VERBOSE="yes"
-ts_log ""
-
-
-ts_log "Gregorian - Monday-based month"
-if [ "$USETERM" == "yes" ]; then
-       $TS_CMD_CAL -1m
-fi
-$TS_CMD_CAL -1m $MYMONTH >> $TS_OUTPUT
-ts_log "Gregorian - Sunday-based month"
-if [ "$USETERM" == "yes" ]; then
-       $TS_CMD_CAL -1s $MYMONTH
-fi
-$TS_CMD_CAL -1s $MYMONTH >> $TS_OUTPUT
-ts_log "Julian - Monday-based month"
-if [ "$USETERM" == "yes" ]; then
-       $TS_CMD_CAL -1mj $MYMONTH
-fi
-$TS_CMD_CAL -1mj $MYMONTH >> $TS_OUTPUT
-ts_log "Julian - Sunday-based month"
-if [ "$USETERM" == "yes" ]; then
-       $TS_CMD_CAL -1sj $MYMONTH
-fi
-$TS_CMD_CAL -1sj $MYMONTH >> $TS_OUTPUT
-
-
-ts_log "Gregorian - Monday-based three months"
-if [ "$USETERM" == "yes" ]; then
-       $TS_CMD_CAL -3m
-fi
-$TS_CMD_CAL -3m $MYMONTH >> $TS_OUTPUT
-ts_log "Gregorian - Sunday-based three months"
-if [ "$USETERM" == "yes" ]; then
-       $TS_CMD_CAL -3s $MYMONTH
-fi
-$TS_CMD_CAL -3s $MYMONTH >> $TS_OUTPUT
-ts_log "Julian - Monday-based three months"
-if [ "$USETERM" == "yes" ]; then
-       $TS_CMD_CAL -3mj $MYMONTH
-fi
-$TS_CMD_CAL -3mj $MYMONTH >> $TS_OUTPUT
-ts_log "Julian - Sunday-based three months"
-if [ "$USETERM" == "yes" ]; then
-       $TS_CMD_CAL -3sj $MYMONTH
-fi
-$TS_CMD_CAL -3sj $MYMONTH >> $TS_OUTPUT
-
-
-ts_log "Gregorian - Monday-based year"
-if [ "$USETERM" == "yes" ]; then
-       $TS_CMD_CAL -1m $MYYEAR
-fi
-$TS_CMD_CAL -1m $MYYEAR >> $TS_OUTPUT
-ts_log "Gregorian - Sunday-based year"
-if [ "$USETERM" == "yes" ]; then
-       $TS_CMD_CAL -1s $MYYEAR
-fi
-$TS_CMD_CAL -1s $MYYEAR >> $TS_OUTPUT
-ts_log "Julian - Monday-based year"
-if [ "$USETERM" == "yes" ]; then
-       $TS_CMD_CAL -1mj $MYYEAR
-fi
-$TS_CMD_CAL -1mj $MYYEAR >> $TS_OUTPUT
-ts_log "Julian - Sunday-based year"
-if [ "$USETERM" == "yes" ]; then
-       $TS_CMD_CAL -1sj $MYYEAR
-fi
-$TS_CMD_CAL -1sj $MYYEAR >> $TS_OUTPUT
+
+CAL_TEST_TIME=1516562739  # 21st January 2018
+export CAL_TEST_TIME
+
+function call_cal {
+       local testname=$(echo "$2" | sed 's/-//g')
+
+       if [ "$3" == "$MYYEAR" ]; then
+               testname="${testname}-year"
+       else
+               testname="${testname}-month"
+       fi
+
+       ts_init_subtest "$testname"
+       ts_log "$1"
+       shift
+       if [ "$USETERM" == "yes" ]; then
+               $TS_HELPER_CAL "$@"
+       fi
+       $TS_HELPER_CAL "$@" >> $TS_OUTPUT
+       ts_finalize_subtest
+}
+
+call_cal "Gregorian - Monday-based month" -1m $MYMONTH
+call_cal "Gregorian - Sunday-based month" -1s $MYMONTH
+call_cal "Julian    - Monday-based month" -1mj $MYMONTH
+call_cal "Julian    - Sunday-based month" -1sj $MYMONTH
+
+call_cal "Gregorian - Monday-based 3 months" -3m $MYMONTH
+call_cal "Gregorian - Sunday-based 3 months" -3s $MYMONTH
+call_cal "Julian    - Monday-based 3 months" -3mj $MYMONTH
+call_cal "Julian    - Sunday-based 3 months" -3sj $MYMONTH
+
+call_cal "Gregorian - Monday-based year" -1m $MYYEAR
+call_cal "Gregorian - Sunday-based year" -1s $MYYEAR
+call_cal "Julian    - Monday-based year" -1mj $MYYEAR
+call_cal "Julian    - Sunday-based year" -1sj $MYYEAR
+
+
+call_cal "Gregorian - Monday-based month with weeks" -1mw $MYMONTH
+call_cal "Gregorian - Sunday-based month with weeks" -1sw $MYMONTH
+call_cal "Julian    - Monday-based month with weeks" -1mjw $MYMONTH
+call_cal "Julian    - Sunday-based month with weeks" -1sjw $MYMONTH
+
+call_cal "Gregorian - Monday-based 3 months with weeks" -3mw $MYMONTH
+call_cal "Gregorian - Sunday-based 3 months with weeks" -3sw $MYMONTH
+call_cal "Julian    - Monday-based 3 months with weeks" -3mjw $MYMONTH
+call_cal "Julian    - Sunday-based 3 months with weeks" -3sjw $MYMONTH
+
+call_cal "Gregorian - Monday-based year with weeks" -1mw $MYYEAR
+call_cal "Gregorian - Sunday-based year with weeks" -1sw $MYYEAR
+call_cal "Julian    - Monday-based year with weeks" -1mjw $MYYEAR
+call_cal "Julian    - Sunday-based year with weeks" -1sjw $MYYEAR
 
 ts_finalize

diff --git a/tests/ts/cal/bigyearw b/tests/ts/cal/bigyearw
deleted file mode 100755 (executable)
index 2ce9fc7..0000000
--- a/tests/ts/cal/bigyearw
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/bin/bash
-
-# This file is part of util-linux.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This file is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-TS_TOPDIR="${0%/*}/../.."
-TS_DESC="Year 2147483646 with week numbers"
-
-. $TS_TOPDIR/functions.sh
-ts_init "$*"
-
-ts_check_test_command "$TS_CMD_CAL"
-
-export TERM=linux
-
-USETERM=$( ts_has_option "useterm" "$*" )
-MYMONTH="12 2147483646"
-MYYEAR="2147483646"
-
-[ "$USETERM" == "yes" ] && TS_VERBOSE="yes"
-ts_log ""
-
-
-ts_log "Gregorian - Monday-based month with week numbers"
-if [ "$USETERM" == "yes" ]; then
-       $TS_CMD_CAL -1mw
-fi
-$TS_CMD_CAL -1mw $MYMONTH >> $TS_OUTPUT
-ts_log "Gregorian - Sunday-based month with week numbers"
-if [ "$USETERM" == "yes" ]; then
-       $TS_CMD_CAL -1sw $MYMONTH
-fi
-$TS_CMD_CAL -1sw $MYMONTH >> $TS_OUTPUT
-ts_log "Julian - Monday-based month with week numbers"
-if [ "$USETERM" == "yes" ]; then
-       $TS_CMD_CAL -1mjw $MYMONTH
-fi
-$TS_CMD_CAL -1mjw $MYMONTH >> $TS_OUTPUT
-ts_log "Julian - Sunday-based month with week numbers"
-if [ "$USETERM" == "yes" ]; then
-       $TS_CMD_CAL -1sjw $MYMONTH
-fi
-$TS_CMD_CAL -1sjw $MYMONTH >> $TS_OUTPUT
-
-
-ts_log "Gregorian - Monday-based three months with week numbers"
-if [ "$USETERM" == "yes" ]; then
-       $TS_CMD_CAL -3mw
-fi
-$TS_CMD_CAL -3mw $MYMONTH >> $TS_OUTPUT
-ts_log "Gregorian - Sunday-based three months with week numbers"
-if [ "$USETERM" == "yes" ]; then
-       $TS_CMD_CAL -3sw $MYMONTH
-fi
-$TS_CMD_CAL -3sw $MYMONTH >> $TS_OUTPUT
-ts_log "Julian - Monday-based three months with week numbers"
-if [ "$USETERM" == "yes" ]; then
-       $TS_CMD_CAL -3mjw $MYMONTH
-fi
-$TS_CMD_CAL -3mjw $MYMONTH >> $TS_OUTPUT
-ts_log "Julian - Sunday-based three months with week numbers"
-if [ "$USETERM" == "yes" ]; then
-       $TS_CMD_CAL -3sjw $MYMONTH
-fi
-$TS_CMD_CAL -3sjw $MYMONTH >> $TS_OUTPUT
-
-
-ts_log "Gregorian - Monday-based year with week numbers"
-if [ "$USETERM" == "yes" ]; then
-       $TS_CMD_CAL -1mw $MYYEAR
-fi
-$TS_CMD_CAL -1mw $MYYEAR >> $TS_OUTPUT
-ts_log "Gregorian - Sunday-based year with week numbers"
-if [ "$USETERM" == "yes" ]; then
-       $TS_CMD_CAL -1sw $MYYEAR
-fi
-$TS_CMD_CAL -1sw $MYYEAR >> $TS_OUTPUT
-ts_log "Julian - Monday-based year with week numbers"
-if [ "$USETERM" == "yes" ]; then
-       $TS_CMD_CAL -1mjw $MYYEAR
-fi
-$TS_CMD_CAL -1mjw $MYYEAR >> $TS_OUTPUT
-ts_log "Julian - Sunday-based year with week numbers"
-if [ "$USETERM" == "yes" ]; then
-       $TS_CMD_CAL -1sjw $MYYEAR
-fi
-$TS_CMD_CAL -1sjw $MYYEAR >> $TS_OUTPUT
-
-ts_finalize