1.1 --- a/tests/internal/qualifiers.py Sun Oct 22 17:02:40 2017 +0200
1.2 +++ b/tests/internal/qualifiers.py Mon Oct 23 23:05:57 2017 +0200
1.3 @@ -69,7 +69,8 @@
1.4 print
1.5
1.6 qualifiers = [
1.7 - ("DAILY", {"interval" : 1})
1.8 + ("DAILY", {"interval" : 1}),
1.9 + ("COUNT", {"values" : [10]})
1.10 ]
1.11
1.12 l = order_qualifiers(qualifiers)
1.13 @@ -81,7 +82,7 @@
1.14 show(l)
1.15
1.16 s = get_selector(dt, qualifiers)
1.17 -l = s.materialise(dt, (1997, 12, 24), 10)
1.18 +l = s.materialise(dt, (1997, 12, 24))
1.19 print len(l) == 10, 10, len(l)
1.20 print l[0] == (1997, 9, 2, 9, 0, 0), (1997, 9, 2, 9, 0, 0), l[0]
1.21 print l[-1] == (1997, 9, 11, 9, 0, 0), (1997, 9, 11, 9, 0, 0), l[-1]
1.22 @@ -145,7 +146,8 @@
1.23 print
1.24
1.25 qualifiers = [
1.26 - ("DAILY", {"interval" : 10})
1.27 + ("DAILY", {"interval" : 10}),
1.28 + ("COUNT", {"values" : [5]})
1.29 ]
1.30
1.31 l = order_qualifiers(qualifiers)
1.32 @@ -157,7 +159,7 @@
1.33 show(l)
1.34
1.35 s = get_selector(dt, qualifiers)
1.36 -l = s.materialise(dt, (1997, 12, 24, 0, 0, 0), 5)
1.37 +l = s.materialise(dt, (1997, 12, 24, 0, 0, 0))
1.38 print len(l) == 5, 5, len(l)
1.39 print l[0] == (1997, 9, 2, 9, 0, 0), (1997, 9, 2, 9, 0, 0), l[0]
1.40 print l[-1] == (1997, 10, 12, 9, 0, 0), (1997, 10, 12, 9, 0, 0), l[-1]
1.41 @@ -205,7 +207,8 @@
1.42 print
1.43
1.44 qualifiers = [
1.45 - ("WEEKLY", {"interval" : 1})
1.46 + ("WEEKLY", {"interval" : 1}),
1.47 + ("COUNT", {"values" : [10]})
1.48 ]
1.49
1.50 l = order_qualifiers(qualifiers)
1.51 @@ -217,7 +220,7 @@
1.52 show(l)
1.53
1.54 s = get_selector(dt, qualifiers)
1.55 -l = s.materialise(dt, (1997, 12, 24, 0, 0, 0), 10)
1.56 +l = s.materialise(dt, (1997, 12, 24, 0, 0, 0))
1.57 print len(l) == 10, 10, len(l)
1.58 print l[0] == (1997, 9, 2, 9, 0, 0), (1997, 9, 2, 9, 0, 0), l[0]
1.59 print l[-1] == (1997, 11, 4, 9, 0, 0), (1997, 11, 4, 9, 0, 0), l[-1]
1.60 @@ -243,6 +246,25 @@
1.61 print
1.62
1.63 qualifiers = [
1.64 + ("WEEKLY", {"interval" : 1})
1.65 + ]
1.66 +
1.67 +l = order_qualifiers(qualifiers)
1.68 +show(l)
1.69 +dt = (1997, 9, 2)
1.70 +l = get_datetime_structure(dt)
1.71 +show(l)
1.72 +l = combine_datetime_with_qualifiers(dt, qualifiers)
1.73 +show(l)
1.74 +
1.75 +s = get_selector(dt, qualifiers)
1.76 +l = s.materialise(dt, (1997, 12, 24, 0, 0, 0))
1.77 +print len(l) == 17, 17, len(l)
1.78 +print l[0] == (1997, 9, 2), (1997, 9, 2), l[0]
1.79 +print l[-1] == (1997, 12, 23), (1997, 12, 23), l[-1]
1.80 +print
1.81 +
1.82 +qualifiers = [
1.83 ("WEEKLY", {"interval" : 2})
1.84 ]
1.85
1.86 @@ -283,7 +305,8 @@
1.87
1.88 qualifiers = [
1.89 ("WEEKLY", {"interval" : 1}),
1.90 - ("BYDAY", {"values" : [(2, None), (4, None)]})
1.91 + ("BYDAY", {"values" : [(2, None), (4, None)]}),
1.92 + ("COUNT", {"values" : [10]})
1.93 ]
1.94
1.95 l = order_qualifiers(qualifiers)
1.96 @@ -295,7 +318,7 @@
1.97 show(l)
1.98
1.99 s = get_selector(dt, qualifiers)
1.100 -l = s.materialise(dt, (1997, 12, 24, 0, 0, 0), 10)
1.101 +l = s.materialise(dt, (1997, 12, 24, 0, 0, 0))
1.102 print len(l) == 10, 10, len(l)
1.103 print l[0] == (1997, 9, 2, 9, 0, 0), (1997, 9, 2, 9, 0, 0), l[0]
1.104 print l[-1] == (1997, 10, 2, 9, 0, 0), (1997, 10, 2, 9, 0, 0), l[-1]
1.105 @@ -323,7 +346,8 @@
1.106
1.107 qualifiers = [
1.108 ("WEEKLY", {"interval" : 2}),
1.109 - ("BYDAY", {"values" : [(2, None), (4, None)]})
1.110 + ("BYDAY", {"values" : [(2, None), (4, None)]}),
1.111 + ("COUNT", {"values" : [8]})
1.112 ]
1.113
1.114 l = order_qualifiers(qualifiers)
1.115 @@ -335,7 +359,7 @@
1.116 show(l)
1.117
1.118 s = get_selector(dt, qualifiers)
1.119 -l = s.materialise(dt, (1997, 12, 24, 0, 0, 0), 8)
1.120 +l = s.materialise(dt, (1997, 12, 24, 0, 0, 0))
1.121 print len(l) == 8, 8, len(l)
1.122 print l[0] == (1997, 9, 2, 9, 0, 0), (1997, 9, 2, 9, 0, 0), l[0]
1.123 print l[-1] == (1997, 10, 16, 9, 0, 0), (1997, 10, 16, 9, 0, 0), l[-1]
1.124 @@ -343,7 +367,8 @@
1.125
1.126 qualifiers = [
1.127 ("MONTHLY", {"interval" : 1}),
1.128 - ("BYDAY", {"values" : [(5, 1)]})
1.129 + ("BYDAY", {"values" : [(5, 1)]}),
1.130 + ("COUNT", {"values" : [10]})
1.131 ]
1.132
1.133 l = order_qualifiers(qualifiers)
1.134 @@ -355,7 +380,7 @@
1.135 show(l)
1.136
1.137 s = get_selector(dt, qualifiers)
1.138 -l = s.materialise(dt, (1998, 12, 24, 0, 0, 0), 10)
1.139 +l = s.materialise(dt, (1998, 12, 24, 0, 0, 0))
1.140 print len(l) == 10, 10, len(l)
1.141 print l[0] == (1997, 9, 5, 9, 0, 0), (1997, 9, 5, 9, 0, 0), l[0]
1.142 print l[-1] == (1998, 6, 5, 9, 0, 0), (1998, 6, 5, 9, 0, 0), l[-1]
1.143 @@ -383,7 +408,8 @@
1.144
1.145 qualifiers = [
1.146 ("MONTHLY", {"interval" : 2}),
1.147 - ("BYDAY", {"values" : [(7, 1), (7, -1)]})
1.148 + ("BYDAY", {"values" : [(7, 1), (7, -1)]}),
1.149 + ("COUNT", {"values" : [10]})
1.150 ]
1.151
1.152 l = order_qualifiers(qualifiers)
1.153 @@ -395,7 +421,7 @@
1.154 show(l)
1.155
1.156 s = get_selector(dt, qualifiers)
1.157 -l = s.materialise(dt, (1998, 12, 24, 0, 0, 0), 10)
1.158 +l = s.materialise(dt, (1998, 12, 24, 0, 0, 0))
1.159 print len(l) == 10, 10, len(l)
1.160 print l[0] == (1997, 9, 7, 9, 0, 0), (1997, 9, 7, 9, 0, 0), l[0]
1.161 print l[-1] == (1998, 5, 31, 9, 0, 0), (1998, 5, 31, 9, 0, 0), l[-1]
1.162 @@ -403,7 +429,8 @@
1.163
1.164 qualifiers = [
1.165 ("MONTHLY", {"interval" : 1}),
1.166 - ("BYDAY", {"values" : [(1, -2)]})
1.167 + ("BYDAY", {"values" : [(1, -2)]}),
1.168 + ("COUNT", {"values" : [6]})
1.169 ]
1.170
1.171 l = order_qualifiers(qualifiers)
1.172 @@ -415,7 +442,7 @@
1.173 show(l)
1.174
1.175 s = get_selector(dt, qualifiers)
1.176 -l = s.materialise(dt, (1998, 12, 24, 0, 0, 0), 6)
1.177 +l = s.materialise(dt, (1998, 12, 24, 0, 0, 0))
1.178 print len(l) == 6, 6, len(l)
1.179 print l[0] == (1997, 9, 22, 9, 0, 0), (1997, 9, 22, 9, 0, 0), l[0]
1.180 print l[-1] == (1998, 2, 16, 9, 0, 0), (1998, 2, 16, 9, 0, 0), l[-1]
1.181 @@ -423,7 +450,8 @@
1.182
1.183 qualifiers = [
1.184 ("MONTHLY", {"interval" : 1}),
1.185 - ("BYMONTHDAY", {"values" : [-3]})
1.186 + ("BYMONTHDAY", {"values" : [-3]}),
1.187 + ("COUNT", {"values" : [6]})
1.188 ]
1.189
1.190 l = order_qualifiers(qualifiers)
1.191 @@ -435,7 +463,7 @@
1.192 show(l)
1.193
1.194 s = get_selector(dt, qualifiers)
1.195 -l = s.materialise(dt, (1998, 12, 24, 0, 0, 0), 6)
1.196 +l = s.materialise(dt, (1998, 12, 24, 0, 0, 0))
1.197 print len(l) == 6, 6, len(l)
1.198 print l[0] == (1997, 9, 28, 9, 0, 0), (1997, 9, 28, 9, 0, 0), l[0]
1.199 print l[-1] == (1998, 2, 26, 9, 0, 0), (1998, 2, 26, 9, 0, 0), l[-1]
1.200 @@ -443,7 +471,8 @@
1.201
1.202 qualifiers = [
1.203 ("MONTHLY", {"interval" : 1}),
1.204 - ("BYMONTHDAY", {"values" : [15, 2]}) # test ordering
1.205 + ("BYMONTHDAY", {"values" : [15, 2]}), # test ordering
1.206 + ("COUNT", {"values" : [10]})
1.207 ]
1.208
1.209 l = order_qualifiers(qualifiers)
1.210 @@ -455,7 +484,7 @@
1.211 show(l)
1.212
1.213 s = get_selector(dt, qualifiers)
1.214 -l = s.materialise(dt, (1998, 12, 24, 0, 0, 0), 10)
1.215 +l = s.materialise(dt, (1998, 12, 24, 0, 0, 0))
1.216 print len(l) == 10, 10, len(l)
1.217 print l[0] == (1997, 9, 2, 9, 0, 0), (1997, 9, 2, 9, 0, 0), l[0]
1.218 print l[-1] == (1998, 1, 15, 9, 0, 0), (1998, 1, 15, 9, 0, 0), l[-1]
1.219 @@ -463,7 +492,8 @@
1.220
1.221 qualifiers = [
1.222 ("MONTHLY", {"interval" : 1}),
1.223 - ("BYMONTHDAY", {"values" : [1, -1]})
1.224 + ("BYMONTHDAY", {"values" : [1, -1]}),
1.225 + ("COUNT", {"values" : [10]})
1.226 ]
1.227
1.228 l = order_qualifiers(qualifiers)
1.229 @@ -475,7 +505,7 @@
1.230 show(l)
1.231
1.232 s = get_selector(dt, qualifiers)
1.233 -l = s.materialise(dt, (1998, 12, 24, 0, 0, 0), 10)
1.234 +l = s.materialise(dt, (1998, 12, 24, 0, 0, 0))
1.235 print len(l) == 10, 10, len(l)
1.236 print l[0] == (1997, 9, 30, 9, 0, 0), (1997, 9, 30, 9, 0, 0), l[0]
1.237 print l[-1] == (1998, 2, 1, 9, 0, 0), (1998, 2, 1, 9, 0, 0), l[-1]
1.238 @@ -483,7 +513,8 @@
1.239
1.240 qualifiers = [
1.241 ("MONTHLY", {"interval" : 18}),
1.242 - ("BYMONTHDAY", {"values" : [10, 11, 12, 13, 14, 15]})
1.243 + ("BYMONTHDAY", {"values" : [10, 11, 12, 13, 14, 15]}),
1.244 + ("COUNT", {"values" : [10]})
1.245 ]
1.246
1.247 l = order_qualifiers(qualifiers)
1.248 @@ -495,7 +526,7 @@
1.249 show(l)
1.250
1.251 s = get_selector(dt, qualifiers)
1.252 -l = s.materialise(dt, (1999, 12, 24, 0, 0, 0), 10)
1.253 +l = s.materialise(dt, (1999, 12, 24, 0, 0, 0))
1.254 print len(l) == 10, 10, len(l)
1.255 print l[0] == (1997, 9, 10, 9, 0, 0), (1997, 9, 10, 9, 0, 0), l[0]
1.256 print l[-1] == (1999, 3, 13, 9, 0, 0), (1999, 3, 13, 9, 0, 0), l[-1]
1.257 @@ -523,7 +554,8 @@
1.258
1.259 qualifiers = [
1.260 ("YEARLY", {"interval" : 1}),
1.261 - ("BYMONTH", {"values" : [6, 7]})
1.262 + ("BYMONTH", {"values" : [6, 7]}),
1.263 + ("COUNT", {"values" : [10]})
1.264 ]
1.265
1.266 l = order_qualifiers(qualifiers)
1.267 @@ -535,7 +567,7 @@
1.268 show(l)
1.269
1.270 s = get_selector(dt, qualifiers)
1.271 -l = s.materialise(dt, (2001, 12, 24, 0, 0, 0), 10)
1.272 +l = s.materialise(dt, (2001, 12, 24, 0, 0, 0))
1.273 print len(l) == 10, 10, len(l)
1.274 print l[0] == (1997, 6, 10, 9, 0, 0), (1997, 6, 10, 9, 0, 0), l[0]
1.275 print l[-1] == (2001, 7, 10, 9, 0, 0), (2001, 7, 10, 9, 0, 0), l[-1]
1.276 @@ -543,7 +575,8 @@
1.277
1.278 qualifiers = [
1.279 ("YEARLY", {"interval" : 2}),
1.280 - ("BYMONTH", {"values" : [1, 2, 3]})
1.281 + ("BYMONTH", {"values" : [1, 2, 3]}),
1.282 + ("COUNT", {"values" : [10]})
1.283 ]
1.284
1.285 l = order_qualifiers(qualifiers)
1.286 @@ -555,7 +588,7 @@
1.287 show(l)
1.288
1.289 s = get_selector(dt, qualifiers)
1.290 -l = s.materialise(dt, (2003, 12, 24, 0, 0, 0), 10)
1.291 +l = s.materialise(dt, (2003, 12, 24, 0, 0, 0))
1.292 print len(l) == 10, 10, len(l)
1.293 print l[0] == (1997, 3, 10, 9, 0, 0), (1997, 3, 10, 9, 0, 0), l[0]
1.294 print l[-1] == (2003, 3, 10, 9, 0, 0), (2003, 3, 10, 9, 0, 0), l[-1]
1.295 @@ -563,7 +596,8 @@
1.296
1.297 qualifiers = [
1.298 ("YEARLY", {"interval" : 3}),
1.299 - ("BYYEARDAY", {"values" : [1, 100, 200]})
1.300 + ("BYYEARDAY", {"values" : [1, 100, 200]}),
1.301 + ("COUNT", {"values" : [10]})
1.302 ]
1.303
1.304 l = order_qualifiers(qualifiers)
1.305 @@ -575,7 +609,7 @@
1.306 show(l)
1.307
1.308 s = get_selector(dt, qualifiers)
1.309 -l = s.materialise(dt, (2006, 2, 1, 0, 0, 0), 10)
1.310 +l = s.materialise(dt, (2006, 2, 1, 0, 0, 0))
1.311 print len(l) == 10, 10, len(l)
1.312 print l[0] == (1997, 1, 1, 9, 0, 0), (1997, 1, 1, 9, 0, 0), l[0]
1.313 print l[-1] == (2006, 1, 1, 9, 0, 0), (2006, 1, 1, 9, 0, 0), l[-1]
1.314 @@ -732,7 +766,9 @@
1.315
1.316 qualifiers = [
1.317 ("MONTHLY", {"interval" : 1}),
1.318 - ("BYDAY", {"values" : [(2, None), (3, None), (4, None)]})
1.319 + ("BYDAY", {"values" : [(2, None), (3, None), (4, None)]}),
1.320 + ("BYSETPOS", {"values" : [3]}),
1.321 + ("COUNT", {"values" : [3]})
1.322 ]
1.323
1.324 l = order_qualifiers(qualifiers)
1.325 @@ -744,7 +780,7 @@
1.326 show(l)
1.327
1.328 s = get_selector(dt, qualifiers)
1.329 -l = s.materialise(dt, (1997, 12, 24, 0, 0, 0), 3, [3])
1.330 +l = s.materialise(dt, (1997, 12, 24, 0, 0, 0))
1.331 print len(l) == 3, 3, len(l)
1.332 print l[0] == (1997, 9, 4, 9, 0, 0), (1997, 9, 4, 9, 0, 0), l[0]
1.333 print l[-1] == (1997, 11, 6, 9, 0, 0), (1997, 11, 6, 9, 0, 0), l[-1]
1.334 @@ -754,7 +790,8 @@
1.335
1.336 qualifiers = [
1.337 ("MONTHLY", {"interval" : 1}),
1.338 - ("BYDAY", {"values" : [(1, None), (2, None), (3, None), (4, None), (5, None)]})
1.339 + ("BYDAY", {"values" : [(1, None), (2, None), (3, None), (4, None), (5, None)]}),
1.340 + ("BYSETPOS", {"values" : [-2]})
1.341 ]
1.342
1.343 l = order_qualifiers(qualifiers)
1.344 @@ -766,7 +803,7 @@
1.345 show(l)
1.346
1.347 s = get_selector(dt, qualifiers)
1.348 -l = s.materialise(dt, (1998, 4, 1, 0, 0, 0), None, [-2])
1.349 +l = s.materialise(dt, (1998, 4, 1, 0, 0, 0))
1.350 print len(l) == 7, 7, len(l)
1.351 print l[0] == (1997, 9, 29, 9, 0, 0), (1997, 9, 29, 9, 0, 0), l[0]
1.352 print l[-1] == (1998, 3, 30, 9, 0, 0), (1998, 3, 30, 9, 0, 0), l[-1]