From 5c8324fb88080238786c8ae31bc5640d9b7e9bd6 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Mon, 22 Jan 2018 15:01:05 +0100 Subject: [PATCH] tests: use subtests for sep1752w test Signed-off-by: Karel Zak --- tests/expected/cal/sep1752w | 258 ------------------------- tests/expected/cal/sep1752w-1mjw-month | 9 + tests/expected/cal/sep1752w-1mjw-year | 52 +++++ tests/expected/cal/sep1752w-1mw-month | 9 + tests/expected/cal/sep1752w-1mw-year | 36 ++++ tests/expected/cal/sep1752w-1sjw-month | 9 + tests/expected/cal/sep1752w-1sjw-year | 52 +++++ tests/expected/cal/sep1752w-1sw-month | 9 + tests/expected/cal/sep1752w-1sw-year | 36 ++++ tests/expected/cal/sep1752w-3mjw-month | 9 + tests/expected/cal/sep1752w-3mw-month | 9 + tests/expected/cal/sep1752w-3sjw-month | 9 + tests/expected/cal/sep1752w-3sw-month | 9 + tests/expected/cal/sep1752w-week-iso | 9 + tests/ts/cal/sep1752w | 24 ++- 15 files changed, 275 insertions(+), 264 deletions(-) delete mode 100644 tests/expected/cal/sep1752w create mode 100644 tests/expected/cal/sep1752w-1mjw-month create mode 100644 tests/expected/cal/sep1752w-1mjw-year create mode 100644 tests/expected/cal/sep1752w-1mw-month create mode 100644 tests/expected/cal/sep1752w-1mw-year create mode 100644 tests/expected/cal/sep1752w-1sjw-month create mode 100644 tests/expected/cal/sep1752w-1sjw-year create mode 100644 tests/expected/cal/sep1752w-1sw-month create mode 100644 tests/expected/cal/sep1752w-1sw-year create mode 100644 tests/expected/cal/sep1752w-3mjw-month create mode 100644 tests/expected/cal/sep1752w-3mw-month create mode 100644 tests/expected/cal/sep1752w-3sjw-month create mode 100644 tests/expected/cal/sep1752w-3sw-month create mode 100644 tests/expected/cal/sep1752w-week-iso diff --git a/tests/expected/cal/sep1752w b/tests/expected/cal/sep1752w deleted file mode 100644 index a71c230f2..000000000 --- a/tests/expected/cal/sep1752w +++ /dev/null @@ -1,258 +0,0 @@ - -Gregorian - Monday-based month with week numbers - September 1752 - Mo Tu We Th Fr Sa Su -36 1 2 14 15 16 17 -37 18 19 20 21 22 23 24 -38 25 26 27 28 29 30 - - - -Gregorian - Sunday-based month 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 - - - -Julian - Monday-based month with week numbers - September 1752 - Mon Tue Wed Thu Fri Sat Sun -36 245 246 258 259 260 261 -37 262 263 264 265 266 267 268 -38 269 270 271 272 273 274 - - - -Julian - Sunday-based month with week numbers - September 1752 - Sun Mon Tue Wed Thu Fri Sat -36 245 246 258 259 260 -37 261 262 263 264 265 266 267 -38 268 269 270 271 272 273 274 - - - -Gregorian - Monday-based three months with week numbers - August 1752 September 1752 October 1752 - Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su -31 1 2 36 1 2 14 15 16 17 38 1 -32 3 4 5 6 7 8 9 37 18 19 20 21 22 23 24 39 2 3 4 5 6 7 8 -33 10 11 12 13 14 15 16 38 25 26 27 28 29 30 40 9 10 11 12 13 14 15 -34 17 18 19 20 21 22 23 41 16 17 18 19 20 21 22 -35 24 25 26 27 28 29 30 42 23 24 25 26 27 28 29 -36 31 43 30 31 -Gregorian - Sunday-based three months with week numbers - August 1752 September 1752 October 1752 - Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa -31 1 36 1 2 14 15 16 39 1 2 3 4 5 6 7 -32 2 3 4 5 6 7 8 37 17 18 19 20 21 22 23 40 8 9 10 11 12 13 14 -33 9 10 11 12 13 14 15 38 24 25 26 27 28 29 30 41 15 16 17 18 19 20 21 -34 16 17 18 19 20 21 22 42 22 23 24 25 26 27 28 -35 23 24 25 26 27 28 29 43 29 30 31 -36 30 31 -Julian - Monday-based three months with week numbers - August 1752 September 1752 October 1752 - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -31 214 215 36 245 246 258 259 260 261 38 275 -32 216 217 218 219 220 221 222 37 262 263 264 265 266 267 268 39 276 277 278 279 280 281 282 -33 223 224 225 226 227 228 229 38 269 270 271 272 273 274 40 283 284 285 286 287 288 289 -34 230 231 232 233 234 235 236 41 290 291 292 293 294 295 296 -35 237 238 239 240 241 242 243 42 297 298 299 300 301 302 303 -36 244 43 304 305 -Julian - Sunday-based three months with week numbers - August 1752 September 1752 October 1752 - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat -31 214 36 245 246 258 259 260 39 275 276 277 278 279 280 281 -32 215 216 217 218 219 220 221 37 261 262 263 264 265 266 267 40 282 283 284 285 286 287 288 -33 222 223 224 225 226 227 228 38 268 269 270 271 272 273 274 41 289 290 291 292 293 294 295 -34 229 230 231 232 233 234 235 42 296 297 298 299 300 301 302 -35 236 237 238 239 240 241 242 43 303 304 305 -36 243 244 -Gregorian - Monday-based year with week numbers - 1752 - - January February March - Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su - 1 1 2 3 4 5 5 1 2 9 1 - 2 6 7 8 9 10 11 12 6 3 4 5 6 7 8 9 10 2 3 4 5 6 7 8 - 3 13 14 15 16 17 18 19 7 10 11 12 13 14 15 16 11 9 10 11 12 13 14 15 - 4 20 21 22 23 24 25 26 8 17 18 19 20 21 22 23 12 16 17 18 19 20 21 22 - 5 27 28 29 30 31 9 24 25 26 27 28 29 13 23 24 25 26 27 28 29 - 14 30 31 - April May June - Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su -14 1 2 3 4 5 18 1 2 3 23 1 2 3 4 5 6 7 -15 6 7 8 9 10 11 12 19 4 5 6 7 8 9 10 24 8 9 10 11 12 13 14 -16 13 14 15 16 17 18 19 20 11 12 13 14 15 16 17 25 15 16 17 18 19 20 21 -17 20 21 22 23 24 25 26 21 18 19 20 21 22 23 24 26 22 23 24 25 26 27 28 -18 27 28 29 30 22 25 26 27 28 29 30 31 27 29 30 - - July August September - Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su -27 1 2 3 4 5 31 1 2 36 1 2 14 15 16 17 -28 6 7 8 9 10 11 12 32 3 4 5 6 7 8 9 37 18 19 20 21 22 23 24 -29 13 14 15 16 17 18 19 33 10 11 12 13 14 15 16 38 25 26 27 28 29 30 -30 20 21 22 23 24 25 26 34 17 18 19 20 21 22 23 -31 27 28 29 30 31 35 24 25 26 27 28 29 30 - 36 31 - October November December - Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su -38 1 43 1 2 3 4 5 47 1 2 3 -39 2 3 4 5 6 7 8 44 6 7 8 9 10 11 12 48 4 5 6 7 8 9 10 -40 9 10 11 12 13 14 15 45 13 14 15 16 17 18 19 49 11 12 13 14 15 16 17 -41 16 17 18 19 20 21 22 46 20 21 22 23 24 25 26 50 18 19 20 21 22 23 24 -42 23 24 25 26 27 28 29 47 27 28 29 30 51 25 26 27 28 29 30 31 -43 30 31 - -Gregorian - Sunday-based year with week numbers - 1752 - - January February March - Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa - 1 1 2 3 4 5 1 10 1 2 3 4 5 6 7 - 2 5 6 7 8 9 10 11 6 2 3 4 5 6 7 8 11 8 9 10 11 12 13 14 - 3 12 13 14 15 16 17 18 7 9 10 11 12 13 14 15 12 15 16 17 18 19 20 21 - 4 19 20 21 22 23 24 25 8 16 17 18 19 20 21 22 13 22 23 24 25 26 27 28 - 5 26 27 28 29 30 31 9 23 24 25 26 27 28 29 14 29 30 31 - - April May June - Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa -14 1 2 3 4 18 1 2 23 1 2 3 4 5 6 -15 5 6 7 8 9 10 11 19 3 4 5 6 7 8 9 24 7 8 9 10 11 12 13 -16 12 13 14 15 16 17 18 20 10 11 12 13 14 15 16 25 14 15 16 17 18 19 20 -17 19 20 21 22 23 24 25 21 17 18 19 20 21 22 23 26 21 22 23 24 25 26 27 -18 26 27 28 29 30 22 24 25 26 27 28 29 30 27 28 29 30 - 23 31 - July August September - Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa -27 1 2 3 4 31 1 36 1 2 14 15 16 -28 5 6 7 8 9 10 11 32 2 3 4 5 6 7 8 37 17 18 19 20 21 22 23 -29 12 13 14 15 16 17 18 33 9 10 11 12 13 14 15 38 24 25 26 27 28 29 30 -30 19 20 21 22 23 24 25 34 16 17 18 19 20 21 22 -31 26 27 28 29 30 31 35 23 24 25 26 27 28 29 - 36 30 31 - October November December - Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa -39 1 2 3 4 5 6 7 43 1 2 3 4 47 1 2 -40 8 9 10 11 12 13 14 44 5 6 7 8 9 10 11 48 3 4 5 6 7 8 9 -41 15 16 17 18 19 20 21 45 12 13 14 15 16 17 18 49 10 11 12 13 14 15 16 -42 22 23 24 25 26 27 28 46 19 20 21 22 23 24 25 50 17 18 19 20 21 22 23 -43 29 30 31 47 26 27 28 29 30 51 24 25 26 27 28 29 30 - 52 31 - -Julian - Monday-based year with week numbers - 1752 - - January February - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun - 1 1 2 3 4 5 5 32 33 - 2 6 7 8 9 10 11 12 6 34 35 36 37 38 39 40 - 3 13 14 15 16 17 18 19 7 41 42 43 44 45 46 47 - 4 20 21 22 23 24 25 26 8 48 49 50 51 52 53 54 - 5 27 28 29 30 31 9 55 56 57 58 59 60 - - March April - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun - 9 61 14 92 93 94 95 96 -10 62 63 64 65 66 67 68 15 97 98 99 100 101 102 103 -11 69 70 71 72 73 74 75 16 104 105 106 107 108 109 110 -12 76 77 78 79 80 81 82 17 111 112 113 114 115 116 117 -13 83 84 85 86 87 88 89 18 118 119 120 121 -14 90 91 - May June - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -18 122 123 124 23 153 154 155 156 157 158 159 -19 125 126 127 128 129 130 131 24 160 161 162 163 164 165 166 -20 132 133 134 135 136 137 138 25 167 168 169 170 171 172 173 -21 139 140 141 142 143 144 145 26 174 175 176 177 178 179 180 -22 146 147 148 149 150 151 152 27 181 182 - - July August - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -27 183 184 185 186 187 31 214 215 -28 188 189 190 191 192 193 194 32 216 217 218 219 220 221 222 -29 195 196 197 198 199 200 201 33 223 224 225 226 227 228 229 -30 202 203 204 205 206 207 208 34 230 231 232 233 234 235 236 -31 209 210 211 212 213 35 237 238 239 240 241 242 243 - 36 244 - September October - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -36 245 246 258 259 260 261 38 275 -37 262 263 264 265 266 267 268 39 276 277 278 279 280 281 282 -38 269 270 271 272 273 274 40 283 284 285 286 287 288 289 - 41 290 291 292 293 294 295 296 - 42 297 298 299 300 301 302 303 - 43 304 305 - November December - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -43 306 307 308 309 310 47 336 337 338 -44 311 312 313 314 315 316 317 48 339 340 341 342 343 344 345 -45 318 319 320 321 322 323 324 49 346 347 348 349 350 351 352 -46 325 326 327 328 329 330 331 50 353 354 355 356 357 358 359 -47 332 333 334 335 51 360 361 362 363 364 365 366 - - -Julian - Sunday-based year with week numbers - 1752 - - January February - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat - 1 1 2 3 4 5 32 - 2 5 6 7 8 9 10 11 6 33 34 35 36 37 38 39 - 3 12 13 14 15 16 17 18 7 40 41 42 43 44 45 46 - 4 19 20 21 22 23 24 25 8 47 48 49 50 51 52 53 - 5 26 27 28 29 30 31 9 54 55 56 57 58 59 60 - - March April - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat -10 61 62 63 64 65 66 67 14 92 93 94 95 -11 68 69 70 71 72 73 74 15 96 97 98 99 100 101 102 -12 75 76 77 78 79 80 81 16 103 104 105 106 107 108 109 -13 82 83 84 85 86 87 88 17 110 111 112 113 114 115 116 -14 89 90 91 18 117 118 119 120 121 - - May June - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat -18 122 123 23 153 154 155 156 157 158 -19 124 125 126 127 128 129 130 24 159 160 161 162 163 164 165 -20 131 132 133 134 135 136 137 25 166 167 168 169 170 171 172 -21 138 139 140 141 142 143 144 26 173 174 175 176 177 178 179 -22 145 146 147 148 149 150 151 27 180 181 182 -23 152 - July August - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat -27 183 184 185 186 31 214 -28 187 188 189 190 191 192 193 32 215 216 217 218 219 220 221 -29 194 195 196 197 198 199 200 33 222 223 224 225 226 227 228 -30 201 202 203 204 205 206 207 34 229 230 231 232 233 234 235 -31 208 209 210 211 212 213 35 236 237 238 239 240 241 242 - 36 243 244 - September October - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat -36 245 246 258 259 260 39 275 276 277 278 279 280 281 -37 261 262 263 264 265 266 267 40 282 283 284 285 286 287 288 -38 268 269 270 271 272 273 274 41 289 290 291 292 293 294 295 - 42 296 297 298 299 300 301 302 - 43 303 304 305 - - November December - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat -43 306 307 308 309 47 336 337 -44 310 311 312 313 314 315 316 48 338 339 340 341 342 343 344 -45 317 318 319 320 321 322 323 49 345 346 347 348 349 350 351 -46 324 325 326 327 328 329 330 50 352 353 354 355 356 357 358 -47 331 332 333 334 335 51 359 360 361 362 363 364 365 - 52 366 - -Gregorian - address by week number - September 1752 - Su Mo Tu We Th Fr Sa -36 1 2 -37 3 4 5 6 7 8 9 -38 10 11 12 13 14 15 16 -39 17 18 19 20 21 22 23 -40 24 25 26 27 28 29 30 - diff --git a/tests/expected/cal/sep1752w-1mjw-month b/tests/expected/cal/sep1752w-1mjw-month new file mode 100644 index 000000000..3624288a2 --- /dev/null +++ b/tests/expected/cal/sep1752w-1mjw-month @@ -0,0 +1,9 @@ +Julian - Monday-based month with week numbers + September 1752 + Mon Tue Wed Thu Fri Sat Sun +36 245 246 258 259 260 261 +37 262 263 264 265 266 267 268 +38 269 270 271 272 273 274 + + + diff --git a/tests/expected/cal/sep1752w-1mjw-year b/tests/expected/cal/sep1752w-1mjw-year new file mode 100644 index 000000000..a168451f7 --- /dev/null +++ b/tests/expected/cal/sep1752w-1mjw-year @@ -0,0 +1,52 @@ +Julian - Monday-based year with week numbers + 1752 + + January February + Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun + 1 1 2 3 4 5 5 32 33 + 2 6 7 8 9 10 11 12 6 34 35 36 37 38 39 40 + 3 13 14 15 16 17 18 19 7 41 42 43 44 45 46 47 + 4 20 21 22 23 24 25 26 8 48 49 50 51 52 53 54 + 5 27 28 29 30 31 9 55 56 57 58 59 60 + + March April + Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun + 9 61 14 92 93 94 95 96 +10 62 63 64 65 66 67 68 15 97 98 99 100 101 102 103 +11 69 70 71 72 73 74 75 16 104 105 106 107 108 109 110 +12 76 77 78 79 80 81 82 17 111 112 113 114 115 116 117 +13 83 84 85 86 87 88 89 18 118 119 120 121 +14 90 91 + May June + Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun +18 122 123 124 23 153 154 155 156 157 158 159 +19 125 126 127 128 129 130 131 24 160 161 162 163 164 165 166 +20 132 133 134 135 136 137 138 25 167 168 169 170 171 172 173 +21 139 140 141 142 143 144 145 26 174 175 176 177 178 179 180 +22 146 147 148 149 150 151 152 27 181 182 + + July August + Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun +27 183 184 185 186 187 31 214 215 +28 188 189 190 191 192 193 194 32 216 217 218 219 220 221 222 +29 195 196 197 198 199 200 201 33 223 224 225 226 227 228 229 +30 202 203 204 205 206 207 208 34 230 231 232 233 234 235 236 +31 209 210 211 212 213 35 237 238 239 240 241 242 243 + 36 244 + September October + Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun +36 245 246 258 259 260 261 38 275 +37 262 263 264 265 266 267 268 39 276 277 278 279 280 281 282 +38 269 270 271 272 273 274 40 283 284 285 286 287 288 289 + 41 290 291 292 293 294 295 296 + 42 297 298 299 300 301 302 303 + 43 304 305 + November December + Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun +43 306 307 308 309 310 47 336 337 338 +44 311 312 313 314 315 316 317 48 339 340 341 342 343 344 345 +45 318 319 320 321 322 323 324 49 346 347 348 349 350 351 352 +46 325 326 327 328 329 330 331 50 353 354 355 356 357 358 359 +47 332 333 334 335 51 360 361 362 363 364 365 366 + + diff --git a/tests/expected/cal/sep1752w-1mw-month b/tests/expected/cal/sep1752w-1mw-month new file mode 100644 index 000000000..cef2eb17a --- /dev/null +++ b/tests/expected/cal/sep1752w-1mw-month @@ -0,0 +1,9 @@ +Gregorian - Monday-based month with week numbers + September 1752 + Mo Tu We Th Fr Sa Su +36 1 2 14 15 16 17 +37 18 19 20 21 22 23 24 +38 25 26 27 28 29 30 + + + diff --git a/tests/expected/cal/sep1752w-1mw-year b/tests/expected/cal/sep1752w-1mw-year new file mode 100644 index 000000000..3f5cd7fb3 --- /dev/null +++ b/tests/expected/cal/sep1752w-1mw-year @@ -0,0 +1,36 @@ +Gregorian - Monday-based year with week numbers + 1752 + + January February March + Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su + 1 1 2 3 4 5 5 1 2 9 1 + 2 6 7 8 9 10 11 12 6 3 4 5 6 7 8 9 10 2 3 4 5 6 7 8 + 3 13 14 15 16 17 18 19 7 10 11 12 13 14 15 16 11 9 10 11 12 13 14 15 + 4 20 21 22 23 24 25 26 8 17 18 19 20 21 22 23 12 16 17 18 19 20 21 22 + 5 27 28 29 30 31 9 24 25 26 27 28 29 13 23 24 25 26 27 28 29 + 14 30 31 + April May June + Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su +14 1 2 3 4 5 18 1 2 3 23 1 2 3 4 5 6 7 +15 6 7 8 9 10 11 12 19 4 5 6 7 8 9 10 24 8 9 10 11 12 13 14 +16 13 14 15 16 17 18 19 20 11 12 13 14 15 16 17 25 15 16 17 18 19 20 21 +17 20 21 22 23 24 25 26 21 18 19 20 21 22 23 24 26 22 23 24 25 26 27 28 +18 27 28 29 30 22 25 26 27 28 29 30 31 27 29 30 + + July August September + Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su +27 1 2 3 4 5 31 1 2 36 1 2 14 15 16 17 +28 6 7 8 9 10 11 12 32 3 4 5 6 7 8 9 37 18 19 20 21 22 23 24 +29 13 14 15 16 17 18 19 33 10 11 12 13 14 15 16 38 25 26 27 28 29 30 +30 20 21 22 23 24 25 26 34 17 18 19 20 21 22 23 +31 27 28 29 30 31 35 24 25 26 27 28 29 30 + 36 31 + October November December + Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su +38 1 43 1 2 3 4 5 47 1 2 3 +39 2 3 4 5 6 7 8 44 6 7 8 9 10 11 12 48 4 5 6 7 8 9 10 +40 9 10 11 12 13 14 15 45 13 14 15 16 17 18 19 49 11 12 13 14 15 16 17 +41 16 17 18 19 20 21 22 46 20 21 22 23 24 25 26 50 18 19 20 21 22 23 24 +42 23 24 25 26 27 28 29 47 27 28 29 30 51 25 26 27 28 29 30 31 +43 30 31 + diff --git a/tests/expected/cal/sep1752w-1sjw-month b/tests/expected/cal/sep1752w-1sjw-month new file mode 100644 index 000000000..0d3b2421c --- /dev/null +++ b/tests/expected/cal/sep1752w-1sjw-month @@ -0,0 +1,9 @@ +Julian - Sunday-based month with week numbers + September 1752 + Sun Mon Tue Wed Thu Fri Sat +36 245 246 258 259 260 +37 261 262 263 264 265 266 267 +38 268 269 270 271 272 273 274 + + + diff --git a/tests/expected/cal/sep1752w-1sjw-year b/tests/expected/cal/sep1752w-1sjw-year new file mode 100644 index 000000000..579ed69f4 --- /dev/null +++ b/tests/expected/cal/sep1752w-1sjw-year @@ -0,0 +1,52 @@ +Julian - Sunday-based year with week numbers + 1752 + + January February + Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat + 1 1 2 3 4 5 32 + 2 5 6 7 8 9 10 11 6 33 34 35 36 37 38 39 + 3 12 13 14 15 16 17 18 7 40 41 42 43 44 45 46 + 4 19 20 21 22 23 24 25 8 47 48 49 50 51 52 53 + 5 26 27 28 29 30 31 9 54 55 56 57 58 59 60 + + March April + Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat +10 61 62 63 64 65 66 67 14 92 93 94 95 +11 68 69 70 71 72 73 74 15 96 97 98 99 100 101 102 +12 75 76 77 78 79 80 81 16 103 104 105 106 107 108 109 +13 82 83 84 85 86 87 88 17 110 111 112 113 114 115 116 +14 89 90 91 18 117 118 119 120 121 + + May June + Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat +18 122 123 23 153 154 155 156 157 158 +19 124 125 126 127 128 129 130 24 159 160 161 162 163 164 165 +20 131 132 133 134 135 136 137 25 166 167 168 169 170 171 172 +21 138 139 140 141 142 143 144 26 173 174 175 176 177 178 179 +22 145 146 147 148 149 150 151 27 180 181 182 +23 152 + July August + Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat +27 183 184 185 186 31 214 +28 187 188 189 190 191 192 193 32 215 216 217 218 219 220 221 +29 194 195 196 197 198 199 200 33 222 223 224 225 226 227 228 +30 201 202 203 204 205 206 207 34 229 230 231 232 233 234 235 +31 208 209 210 211 212 213 35 236 237 238 239 240 241 242 + 36 243 244 + September October + Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat +36 245 246 258 259 260 39 275 276 277 278 279 280 281 +37 261 262 263 264 265 266 267 40 282 283 284 285 286 287 288 +38 268 269 270 271 272 273 274 41 289 290 291 292 293 294 295 + 42 296 297 298 299 300 301 302 + 43 303 304 305 + + November December + Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat +43 306 307 308 309 47 336 337 +44 310 311 312 313 314 315 316 48 338 339 340 341 342 343 344 +45 317 318 319 320 321 322 323 49 345 346 347 348 349 350 351 +46 324 325 326 327 328 329 330 50 352 353 354 355 356 357 358 +47 331 332 333 334 335 51 359 360 361 362 363 364 365 + 52 366 + diff --git a/tests/expected/cal/sep1752w-1sw-month b/tests/expected/cal/sep1752w-1sw-month new file mode 100644 index 000000000..c6aabead7 --- /dev/null +++ b/tests/expected/cal/sep1752w-1sw-month @@ -0,0 +1,9 @@ +Gregorian - Sunday-based month 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 + + + diff --git a/tests/expected/cal/sep1752w-1sw-year b/tests/expected/cal/sep1752w-1sw-year new file mode 100644 index 000000000..3acd068a1 --- /dev/null +++ b/tests/expected/cal/sep1752w-1sw-year @@ -0,0 +1,36 @@ +Gregorian - Sunday-based year with week numbers + 1752 + + January February March + Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 1 2 3 4 5 1 10 1 2 3 4 5 6 7 + 2 5 6 7 8 9 10 11 6 2 3 4 5 6 7 8 11 8 9 10 11 12 13 14 + 3 12 13 14 15 16 17 18 7 9 10 11 12 13 14 15 12 15 16 17 18 19 20 21 + 4 19 20 21 22 23 24 25 8 16 17 18 19 20 21 22 13 22 23 24 25 26 27 28 + 5 26 27 28 29 30 31 9 23 24 25 26 27 28 29 14 29 30 31 + + April May June + Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa +14 1 2 3 4 18 1 2 23 1 2 3 4 5 6 +15 5 6 7 8 9 10 11 19 3 4 5 6 7 8 9 24 7 8 9 10 11 12 13 +16 12 13 14 15 16 17 18 20 10 11 12 13 14 15 16 25 14 15 16 17 18 19 20 +17 19 20 21 22 23 24 25 21 17 18 19 20 21 22 23 26 21 22 23 24 25 26 27 +18 26 27 28 29 30 22 24 25 26 27 28 29 30 27 28 29 30 + 23 31 + July August September + Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa +27 1 2 3 4 31 1 36 1 2 14 15 16 +28 5 6 7 8 9 10 11 32 2 3 4 5 6 7 8 37 17 18 19 20 21 22 23 +29 12 13 14 15 16 17 18 33 9 10 11 12 13 14 15 38 24 25 26 27 28 29 30 +30 19 20 21 22 23 24 25 34 16 17 18 19 20 21 22 +31 26 27 28 29 30 31 35 23 24 25 26 27 28 29 + 36 30 31 + October November December + Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa +39 1 2 3 4 5 6 7 43 1 2 3 4 47 1 2 +40 8 9 10 11 12 13 14 44 5 6 7 8 9 10 11 48 3 4 5 6 7 8 9 +41 15 16 17 18 19 20 21 45 12 13 14 15 16 17 18 49 10 11 12 13 14 15 16 +42 22 23 24 25 26 27 28 46 19 20 21 22 23 24 25 50 17 18 19 20 21 22 23 +43 29 30 31 47 26 27 28 29 30 51 24 25 26 27 28 29 30 + 52 31 + diff --git a/tests/expected/cal/sep1752w-3mjw-month b/tests/expected/cal/sep1752w-3mjw-month new file mode 100644 index 000000000..e3c54ac30 --- /dev/null +++ b/tests/expected/cal/sep1752w-3mjw-month @@ -0,0 +1,9 @@ +Julian - Monday-based three months with week numbers + August 1752 September 1752 October 1752 + Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun +31 214 215 36 245 246 258 259 260 261 38 275 +32 216 217 218 219 220 221 222 37 262 263 264 265 266 267 268 39 276 277 278 279 280 281 282 +33 223 224 225 226 227 228 229 38 269 270 271 272 273 274 40 283 284 285 286 287 288 289 +34 230 231 232 233 234 235 236 41 290 291 292 293 294 295 296 +35 237 238 239 240 241 242 243 42 297 298 299 300 301 302 303 +36 244 43 304 305 diff --git a/tests/expected/cal/sep1752w-3mw-month b/tests/expected/cal/sep1752w-3mw-month new file mode 100644 index 000000000..88efe106f --- /dev/null +++ b/tests/expected/cal/sep1752w-3mw-month @@ -0,0 +1,9 @@ +Gregorian - Monday-based three months with week numbers + August 1752 September 1752 October 1752 + Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su +31 1 2 36 1 2 14 15 16 17 38 1 +32 3 4 5 6 7 8 9 37 18 19 20 21 22 23 24 39 2 3 4 5 6 7 8 +33 10 11 12 13 14 15 16 38 25 26 27 28 29 30 40 9 10 11 12 13 14 15 +34 17 18 19 20 21 22 23 41 16 17 18 19 20 21 22 +35 24 25 26 27 28 29 30 42 23 24 25 26 27 28 29 +36 31 43 30 31 diff --git a/tests/expected/cal/sep1752w-3sjw-month b/tests/expected/cal/sep1752w-3sjw-month new file mode 100644 index 000000000..32a321f0d --- /dev/null +++ b/tests/expected/cal/sep1752w-3sjw-month @@ -0,0 +1,9 @@ +Julian - Sunday-based three months with week numbers + August 1752 September 1752 October 1752 + Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat +31 214 36 245 246 258 259 260 39 275 276 277 278 279 280 281 +32 215 216 217 218 219 220 221 37 261 262 263 264 265 266 267 40 282 283 284 285 286 287 288 +33 222 223 224 225 226 227 228 38 268 269 270 271 272 273 274 41 289 290 291 292 293 294 295 +34 229 230 231 232 233 234 235 42 296 297 298 299 300 301 302 +35 236 237 238 239 240 241 242 43 303 304 305 +36 243 244 diff --git a/tests/expected/cal/sep1752w-3sw-month b/tests/expected/cal/sep1752w-3sw-month new file mode 100644 index 000000000..60d6a16b6 --- /dev/null +++ b/tests/expected/cal/sep1752w-3sw-month @@ -0,0 +1,9 @@ +Gregorian - Sunday-based three months with week numbers + August 1752 September 1752 October 1752 + Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa +31 1 36 1 2 14 15 16 39 1 2 3 4 5 6 7 +32 2 3 4 5 6 7 8 37 17 18 19 20 21 22 23 40 8 9 10 11 12 13 14 +33 9 10 11 12 13 14 15 38 24 25 26 27 28 29 30 41 15 16 17 18 19 20 21 +34 16 17 18 19 20 21 22 42 22 23 24 25 26 27 28 +35 23 24 25 26 27 28 29 43 29 30 31 +36 30 31 diff --git a/tests/expected/cal/sep1752w-week-iso b/tests/expected/cal/sep1752w-week-iso new file mode 100644 index 000000000..7a686911e --- /dev/null +++ b/tests/expected/cal/sep1752w-week-iso @@ -0,0 +1,9 @@ +Gregorian - address by week number + September 1752 + Su Mo Tu We Th Fr Sa +36 1 2 +37 3 4 5 6 7 8 9 +38 10 11 12 13 14 15 16 +39 17 18 19 20 21 22 23 +40 24 25 26 27 28 29 30 + diff --git a/tests/ts/cal/sep1752w b/tests/ts/cal/sep1752w index 494a90c7f..a3e15550d 100755 --- a/tests/ts/cal/sep1752w +++ b/tests/ts/cal/sep1752w @@ -26,11 +26,7 @@ USETERM=$( ts_has_option "useterm" "$*" ) MYMONTH="09 1752" MYYEAR="1752" -[ "$USETERM" == "yes" ] && TS_VERBOSE="yes" -ts_log "" - - -function call_cal { +function call_cal_simple { ts_log "$1" shift if [ "$USETERM" == "yes" ]; then @@ -39,6 +35,20 @@ function call_cal { $TS_CMD_CAL "$@" >> $TS_OUTPUT } +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" + call_cal_simple "$@" + ts_finalize_subtest +} + call_cal "Gregorian - Monday-based month with week numbers" -1mw $MYMONTH @@ -64,6 +74,8 @@ call_cal "Julian - Monday-based year with week numbers" -1mjw $MYYEAR call_cal "Julian - Sunday-based year with week numbers" -1sjw $MYYEAR -call_cal "Gregorian - address by week number" --week=40 --iso $MYYEAR +ts_init_subtest "week-iso" +call_cal_simple "Gregorian - address by week number" --week=40 --iso $MYYEAR +ts_finalize_subtest ts_finalize