1.1 --- a/tests/internal/qualifiers.py Fri Jan 12 19:33:18 2018 +0100
1.2 +++ b/tests/internal/qualifiers.py Fri Jan 12 19:35:17 2018 +0100
1.3 @@ -40,6 +40,14 @@
1.4 show(csel)
1.5 return s
1.6
1.7 +def show_result(tests):
1.8 + result = True
1.9 + for test, expected, obtained in tests:
1.10 + result = result and test
1.11 + print test, expected, obtained
1.12 + print
1.13 + return result
1.14 +
1.15 def test1():
1.16 qualifiers = [
1.17 ("YEARLY", {"interval" : 1})
1.18 @@ -48,10 +56,9 @@
1.19 s = select(dt, qualifiers)
1.20
1.21 l = s.materialise(dt, (2003, 12, 24))
1.22 - print len(l) == 7, 7, len(l)
1.23 - print l[0] == (1997, 11, 2), (1997, 11, 2), l[0]
1.24 - print l[-1] == (2003, 11, 2), (2003, 11, 2), l[-1]
1.25 - print
1.26 + return show_result([(len(l) == 7, 7, len(l)),
1.27 + (l[0] == (1997, 11, 2), (1997, 11, 2), l[0]),
1.28 + (l[-1] == (2003, 11, 2), (2003, 11, 2), l[-1])])
1.29
1.30 def test2():
1.31 qualifiers = [
1.32 @@ -65,10 +72,9 @@
1.33 s = select(dt, qualifiers)
1.34
1.35 l = s.materialise(dt, (2003, 12, 24, 0, 0, 0))
1.36 - print len(l) == 34, 34, len(l)
1.37 - print l[0] == (1997, 1, 5, 8, 30, 0), (1997, 1, 5, 8, 30, 0), l[0]
1.38 - print l[-1] == (2003, 1, 26, 9, 30, 0), (2003, 1, 26, 9, 30, 0), l[-1]
1.39 - print
1.40 + return show_result([(len(l) == 34, 34, len(l)),
1.41 + (l[0] == (1997, 1, 5, 8, 30, 0), (1997, 1, 5, 8, 30, 0), l[0]),
1.42 + (l[-1] == (2003, 1, 26, 9, 30, 0), (2003, 1, 26, 9, 30, 0), l[-1])])
1.43
1.44 def test3():
1.45 qualifiers = [
1.46 @@ -79,10 +85,9 @@
1.47 s = select(dt, qualifiers)
1.48
1.49 l = s.materialise(dt, (1997, 12, 24))
1.50 - print len(l) == 10, 10, len(l)
1.51 - print l[0] == (1997, 9, 2, 9, 0, 0), (1997, 9, 2, 9, 0, 0), l[0]
1.52 - print l[-1] == (1997, 9, 11, 9, 0, 0), (1997, 9, 11, 9, 0, 0), l[-1]
1.53 - print
1.54 + return show_result([(len(l) == 10, 10, len(l)),
1.55 + (l[0] == (1997, 9, 2, 9, 0, 0), (1997, 9, 2, 9, 0, 0), l[0]),
1.56 + (l[-1] == (1997, 9, 11, 9, 0, 0), (1997, 9, 11, 9, 0, 0), l[-1])])
1.57
1.58 def test4():
1.59 qualifiers = [
1.60 @@ -92,10 +97,9 @@
1.61 s = select(dt, qualifiers)
1.62
1.63 l = s.materialise(dt, (1997, 12, 24, 0, 0, 0))
1.64 - print len(l) == 113, 113, len(l)
1.65 - print l[0] == (1997, 9, 2, 9, 0, 0), (1997, 9, 2, 9, 0, 0), l[0]
1.66 - print l[-1] == (1997, 12, 23, 9, 0, 0), (1997, 12, 23, 9, 0, 0), l[-1]
1.67 - print
1.68 + return show_result([(len(l) == 113, 113, len(l)),
1.69 + (l[0] == (1997, 9, 2, 9, 0, 0), (1997, 9, 2, 9, 0, 0), l[0]),
1.70 + (l[-1] == (1997, 12, 23, 9, 0, 0), (1997, 12, 23, 9, 0, 0), l[-1])])
1.71
1.72 def test5():
1.73 qualifiers = get_qualifiers(["FREQ=DAILY", "UNTIL=19971224T000000Z"])
1.74 @@ -103,10 +107,9 @@
1.75 s = select(dt, qualifiers)
1.76
1.77 l = s.materialise(dt, (1997, 12, 25, 0, 0, 0), True)
1.78 - print len(l) == 113, 113, len(l)
1.79 - print l[0] == (1997, 9, 2, 9, 0, 0), (1997, 9, 2, 9, 0, 0), l[0]
1.80 - print l[-1] == (1997, 12, 23, 9, 0, 0), (1997, 12, 23, 9, 0, 0), l[-1]
1.81 - print
1.82 + return show_result([(len(l) == 113, 113, len(l)),
1.83 + (l[0] == (1997, 9, 2, 9, 0, 0), (1997, 9, 2, 9, 0, 0), l[0]),
1.84 + (l[-1] == (1997, 12, 23, 9, 0, 0), (1997, 12, 23, 9, 0, 0), l[-1])])
1.85
1.86 # See also test43.
1.87
1.88 @@ -118,10 +121,9 @@
1.89 s = select(dt, qualifiers)
1.90
1.91 l = s.materialise(dt, (1997, 12, 24, 0, 0, 0))
1.92 - print len(l) == 57, 57, len(l)
1.93 - print l[0] == (1997, 9, 2, 9, 0, 0), (1997, 9, 2, 9, 0, 0), l[0]
1.94 - print l[-1] == (1997, 12, 23, 9, 0, 0), (1997, 12, 23, 9, 0, 0), l[-1]
1.95 - print
1.96 + return show_result([(len(l) == 57, 57, len(l)),
1.97 + (l[0] == (1997, 9, 2, 9, 0, 0), (1997, 9, 2, 9, 0, 0), l[0]),
1.98 + (l[-1] == (1997, 12, 23, 9, 0, 0), (1997, 12, 23, 9, 0, 0), l[-1])])
1.99
1.100 def test7():
1.101 qualifiers = [
1.102 @@ -131,10 +133,9 @@
1.103 s = select(dt, qualifiers)
1.104
1.105 l = s.materialise(dt, (1997, 12, 24, 0, 0, 0))
1.106 - print len(l) == 17, 17, len(l)
1.107 - print l[0] == (1997, 9, 2, 9, 0, 0), (1997, 9, 2, 9, 0, 0), l[0]
1.108 - print l[-1] == (1997, 12, 23, 9, 0, 0), (1997, 12, 23, 9, 0, 0), l[-1]
1.109 - print
1.110 + return show_result([(len(l) == 17, 17, len(l)),
1.111 + (l[0] == (1997, 9, 2, 9, 0, 0), (1997, 9, 2, 9, 0, 0), l[0]),
1.112 + (l[-1] == (1997, 12, 23, 9, 0, 0), (1997, 12, 23, 9, 0, 0), l[-1])])
1.113
1.114 def test8():
1.115 qualifiers = [
1.116 @@ -145,10 +146,9 @@
1.117 s = select(dt, qualifiers)
1.118
1.119 l = s.materialise(dt, (1997, 12, 24, 0, 0, 0))
1.120 - print len(l) == 5, 5, len(l)
1.121 - print l[0] == (1997, 9, 2, 9, 0, 0), (1997, 9, 2, 9, 0, 0), l[0]
1.122 - print l[-1] == (1997, 10, 12, 9, 0, 0), (1997, 10, 12, 9, 0, 0), l[-1]
1.123 - print
1.124 + return show_result([(len(l) == 5, 5, len(l)),
1.125 + (l[0] == (1997, 9, 2, 9, 0, 0), (1997, 9, 2, 9, 0, 0), l[0]),
1.126 + (l[-1] == (1997, 10, 12, 9, 0, 0), (1997, 10, 12, 9, 0, 0), l[-1])])
1.127
1.128 def test9():
1.129 qualifiers = [
1.130 @@ -160,10 +160,9 @@
1.131 s = select(dt, qualifiers)
1.132
1.133 l = s.materialise(dt, (2000, 1, 31, 14, 0, 0))
1.134 - print len(l) == 93, 93, len(l)
1.135 - print l[0] == (1998, 1, 1, 9, 0, 0), (1998, 1, 1, 9, 0, 0), l[0]
1.136 - print l[-1] == (2000, 1, 31, 9, 0, 0), (2000, 1, 31, 9, 0, 0), l[-1]
1.137 - print
1.138 + return show_result([(len(l) == 93, 93, len(l)),
1.139 + (l[0] == (1998, 1, 1, 9, 0, 0), (1998, 1, 1, 9, 0, 0), l[0]),
1.140 + (l[-1] == (2000, 1, 31, 9, 0, 0), (2000, 1, 31, 9, 0, 0), l[-1])])
1.141
1.142 def test10():
1.143 qualifiers = [
1.144 @@ -174,10 +173,9 @@
1.145 s = select(dt, qualifiers)
1.146
1.147 l = s.materialise(dt, (2000, 1, 31, 14, 0, 0))
1.148 - print len(l) == 93, 93, len(l)
1.149 - print l[0] == (1998, 1, 1, 9, 0, 0), (1998, 1, 1, 9, 0, 0), l[0]
1.150 - print l[-1] == (2000, 1, 31, 9, 0, 0), (2000, 1, 31, 9, 0, 0), l[-1]
1.151 - print
1.152 + return show_result([(len(l) == 93, 93, len(l)),
1.153 + (l[0] == (1998, 1, 1, 9, 0, 0), (1998, 1, 1, 9, 0, 0), l[0]),
1.154 + (l[-1] == (2000, 1, 31, 9, 0, 0), (2000, 1, 31, 9, 0, 0), l[-1])])
1.155
1.156 def test11():
1.157 qualifiers = [
1.158 @@ -188,10 +186,9 @@
1.159 s = select(dt, qualifiers)
1.160
1.161 l = s.materialise(dt, (1997, 12, 24, 0, 0, 0))
1.162 - print len(l) == 10, 10, len(l)
1.163 - print l[0] == (1997, 9, 2, 9, 0, 0), (1997, 9, 2, 9, 0, 0), l[0]
1.164 - print l[-1] == (1997, 11, 4, 9, 0, 0), (1997, 11, 4, 9, 0, 0), l[-1]
1.165 - print
1.166 + return show_result([(len(l) == 10, 10, len(l)),
1.167 + (l[0] == (1997, 9, 2, 9, 0, 0), (1997, 9, 2, 9, 0, 0), l[0]),
1.168 + (l[-1] == (1997, 11, 4, 9, 0, 0), (1997, 11, 4, 9, 0, 0), l[-1])])
1.169
1.170 def test12():
1.171 qualifiers = [
1.172 @@ -201,10 +198,9 @@
1.173 s = select(dt, qualifiers)
1.174
1.175 l = s.materialise(dt, (1997, 12, 24, 0, 0, 0))
1.176 - print len(l) == 17, 17, len(l)
1.177 - print l[0] == (1997, 9, 2, 9, 0, 0), (1997, 9, 2, 9, 0, 0), l[0]
1.178 - print l[-1] == (1997, 12, 23, 9, 0, 0), (1997, 12, 23, 9, 0, 0), l[-1]
1.179 - print
1.180 + return show_result([(len(l) == 17, 17, len(l)),
1.181 + (l[0] == (1997, 9, 2, 9, 0, 0), (1997, 9, 2, 9, 0, 0), l[0]),
1.182 + (l[-1] == (1997, 12, 23, 9, 0, 0), (1997, 12, 23, 9, 0, 0), l[-1])])
1.183
1.184 def test13():
1.185 qualifiers = [
1.186 @@ -214,10 +210,9 @@
1.187 s = select(dt, qualifiers)
1.188
1.189 l = s.materialise(dt, (1997, 12, 24, 0, 0, 0))
1.190 - print len(l) == 17, 17, len(l)
1.191 - print l[0] == (1997, 9, 2), (1997, 9, 2), l[0]
1.192 - print l[-1] == (1997, 12, 23), (1997, 12, 23), l[-1]
1.193 - print
1.194 + return show_result([(len(l) == 17, 17, len(l)),
1.195 + (l[0] == (1997, 9, 2), (1997, 9, 2), l[0]),
1.196 + (l[-1] == (1997, 12, 23), (1997, 12, 23), l[-1])])
1.197
1.198 def test14():
1.199 qualifiers = [
1.200 @@ -227,10 +222,9 @@
1.201 s = select(dt, qualifiers)
1.202
1.203 l = s.materialise(dt, (1998, 2, 20, 0, 0, 0))
1.204 - print len(l) == 13, 13, len(l)
1.205 - print l[0] == (1997, 9, 2, 9, 0, 0), (1997, 9, 2, 9, 0, 0), l[0]
1.206 - print l[-1] == (1998, 2, 17, 9, 0, 0), (1998, 2, 17, 9, 0, 0), l[-1]
1.207 - print
1.208 + return show_result([(len(l) == 13, 13, len(l)),
1.209 + (l[0] == (1997, 9, 2, 9, 0, 0), (1997, 9, 2, 9, 0, 0), l[0]),
1.210 + (l[-1] == (1998, 2, 17, 9, 0, 0), (1998, 2, 17, 9, 0, 0), l[-1])])
1.211
1.212 def test15():
1.213 qualifiers = [
1.214 @@ -241,10 +235,9 @@
1.215 s = select(dt, qualifiers)
1.216
1.217 l = s.materialise(dt, (1997, 10, 7, 9, 0, 0))
1.218 - print len(l) == 10, 10, len(l)
1.219 - print l[0] == (1997, 9, 2, 9, 0, 0), (1997, 9, 2, 9, 0, 0), l[0]
1.220 - print l[-1] == (1997, 10, 2, 9, 0, 0), (1997, 10, 2, 9, 0, 0), l[-1]
1.221 - print
1.222 + return show_result([(len(l) == 10, 10, len(l)),
1.223 + (l[0] == (1997, 9, 2, 9, 0, 0), (1997, 9, 2, 9, 0, 0), l[0]),
1.224 + (l[-1] == (1997, 10, 2, 9, 0, 0), (1997, 10, 2, 9, 0, 0), l[-1])])
1.225
1.226 def test16():
1.227 qualifiers = [
1.228 @@ -256,10 +249,9 @@
1.229 s = select(dt, qualifiers)
1.230
1.231 l = s.materialise(dt, (1997, 12, 24, 0, 0, 0))
1.232 - print len(l) == 10, 10, len(l)
1.233 - print l[0] == (1997, 9, 2, 9, 0, 0), (1997, 9, 2, 9, 0, 0), l[0]
1.234 - print l[-1] == (1997, 10, 2, 9, 0, 0), (1997, 10, 2, 9, 0, 0), l[-1]
1.235 - print
1.236 + return show_result([(len(l) == 10, 10, len(l)),
1.237 + (l[0] == (1997, 9, 2, 9, 0, 0), (1997, 9, 2, 9, 0, 0), l[0]),
1.238 + (l[-1] == (1997, 10, 2, 9, 0, 0), (1997, 10, 2, 9, 0, 0), l[-1])])
1.239
1.240 def test17():
1.241 qualifiers = [
1.242 @@ -270,10 +262,9 @@
1.243 s = select(dt, qualifiers)
1.244
1.245 l = s.materialise(dt, (1997, 12, 24, 0, 0, 0))
1.246 - print len(l) == 25, 25, len(l)
1.247 - print l[0] == (1997, 9, 1, 9, 0, 0), (1997, 9, 1, 9, 0, 0), l[0]
1.248 - print l[-1] == (1997, 12, 22, 9, 0, 0), (1997, 12, 22, 9, 0, 0), l[-1]
1.249 - print
1.250 + return show_result([(len(l) == 25, 25, len(l)),
1.251 + (l[0] == (1997, 9, 1, 9, 0, 0), (1997, 9, 1, 9, 0, 0), l[0]),
1.252 + (l[-1] == (1997, 12, 22, 9, 0, 0), (1997, 12, 22, 9, 0, 0), l[-1])])
1.253
1.254 def test18():
1.255 qualifiers = [
1.256 @@ -285,10 +276,9 @@
1.257 s = select(dt, qualifiers)
1.258
1.259 l = s.materialise(dt, (1997, 12, 24, 0, 0, 0))
1.260 - print len(l) == 8, 8, len(l)
1.261 - print l[0] == (1997, 9, 2, 9, 0, 0), (1997, 9, 2, 9, 0, 0), l[0]
1.262 - print l[-1] == (1997, 10, 16, 9, 0, 0), (1997, 10, 16, 9, 0, 0), l[-1]
1.263 - print
1.264 + return show_result([(len(l) == 8, 8, len(l)),
1.265 + (l[0] == (1997, 9, 2, 9, 0, 0), (1997, 9, 2, 9, 0, 0), l[0]),
1.266 + (l[-1] == (1997, 10, 16, 9, 0, 0), (1997, 10, 16, 9, 0, 0), l[-1])])
1.267
1.268 def test19():
1.269 qualifiers = [
1.270 @@ -300,10 +290,9 @@
1.271 s = select(dt, qualifiers)
1.272
1.273 l = s.materialise(dt, (1998, 12, 24, 0, 0, 0))
1.274 - print len(l) == 10, 10, len(l)
1.275 - print l[0] == (1997, 9, 5, 9, 0, 0), (1997, 9, 5, 9, 0, 0), l[0]
1.276 - print l[-1] == (1998, 6, 5, 9, 0, 0), (1998, 6, 5, 9, 0, 0), l[-1]
1.277 - print
1.278 + return show_result([(len(l) == 10, 10, len(l)),
1.279 + (l[0] == (1997, 9, 5, 9, 0, 0), (1997, 9, 5, 9, 0, 0), l[0]),
1.280 + (l[-1] == (1998, 6, 5, 9, 0, 0), (1998, 6, 5, 9, 0, 0), l[-1])])
1.281
1.282 def test20():
1.283 qualifiers = [
1.284 @@ -314,10 +303,9 @@
1.285 s = select(dt, qualifiers)
1.286
1.287 l = s.materialise(dt, (1997, 12, 24, 0, 0, 0))
1.288 - print len(l) == 4, 4, len(l)
1.289 - print l[0] == (1997, 9, 5, 9, 0, 0), (1997, 9, 5, 9, 0, 0), l[0]
1.290 - print l[-1] == (1997, 12, 5, 9, 0, 0), (1997, 12, 5, 9, 0, 0), l[-1]
1.291 - print
1.292 + return show_result([(len(l) == 4, 4, len(l)),
1.293 + (l[0] == (1997, 9, 5, 9, 0, 0), (1997, 9, 5, 9, 0, 0), l[0]),
1.294 + (l[-1] == (1997, 12, 5, 9, 0, 0), (1997, 12, 5, 9, 0, 0), l[-1])])
1.295
1.296 def test21():
1.297 qualifiers = [
1.298 @@ -329,10 +317,9 @@
1.299 s = select(dt, qualifiers)
1.300
1.301 l = s.materialise(dt, (1998, 12, 24, 0, 0, 0))
1.302 - print len(l) == 10, 10, len(l)
1.303 - print l[0] == (1997, 9, 7, 9, 0, 0), (1997, 9, 7, 9, 0, 0), l[0]
1.304 - print l[-1] == (1998, 5, 31, 9, 0, 0), (1998, 5, 31, 9, 0, 0), l[-1]
1.305 - print
1.306 + return show_result([(len(l) == 10, 10, len(l)),
1.307 + (l[0] == (1997, 9, 7, 9, 0, 0), (1997, 9, 7, 9, 0, 0), l[0]),
1.308 + (l[-1] == (1998, 5, 31, 9, 0, 0), (1998, 5, 31, 9, 0, 0), l[-1])])
1.309
1.310 def test22():
1.311 qualifiers = [
1.312 @@ -344,10 +331,9 @@
1.313 s = select(dt, qualifiers)
1.314
1.315 l = s.materialise(dt, (1998, 12, 24, 0, 0, 0))
1.316 - print len(l) == 6, 6, len(l)
1.317 - print l[0] == (1997, 9, 22, 9, 0, 0), (1997, 9, 22, 9, 0, 0), l[0]
1.318 - print l[-1] == (1998, 2, 16, 9, 0, 0), (1998, 2, 16, 9, 0, 0), l[-1]
1.319 - print
1.320 + return show_result([(len(l) == 6, 6, len(l)),
1.321 + (l[0] == (1997, 9, 22, 9, 0, 0), (1997, 9, 22, 9, 0, 0), l[0]),
1.322 + (l[-1] == (1998, 2, 16, 9, 0, 0), (1998, 2, 16, 9, 0, 0), l[-1])])
1.323
1.324 def test23():
1.325 qualifiers = [
1.326 @@ -359,10 +345,9 @@
1.327 s = select(dt, qualifiers)
1.328
1.329 l = s.materialise(dt, (1998, 12, 24, 0, 0, 0))
1.330 - print len(l) == 6, 6, len(l)
1.331 - print l[0] == (1997, 9, 28, 9, 0, 0), (1997, 9, 28, 9, 0, 0), l[0]
1.332 - print l[-1] == (1998, 2, 26, 9, 0, 0), (1998, 2, 26, 9, 0, 0), l[-1]
1.333 - print
1.334 + return show_result([(len(l) == 6, 6, len(l)),
1.335 + (l[0] == (1997, 9, 28, 9, 0, 0), (1997, 9, 28, 9, 0, 0), l[0]),
1.336 + (l[-1] == (1998, 2, 26, 9, 0, 0), (1998, 2, 26, 9, 0, 0), l[-1])])
1.337
1.338 def test24():
1.339 qualifiers = [
1.340 @@ -374,10 +359,9 @@
1.341 s = select(dt, qualifiers)
1.342
1.343 l = s.materialise(dt, (1998, 12, 24, 0, 0, 0))
1.344 - print len(l) == 10, 10, len(l)
1.345 - print l[0] == (1997, 9, 2, 9, 0, 0), (1997, 9, 2, 9, 0, 0), l[0]
1.346 - print l[-1] == (1998, 1, 15, 9, 0, 0), (1998, 1, 15, 9, 0, 0), l[-1]
1.347 - print
1.348 + return show_result([(len(l) == 10, 10, len(l)),
1.349 + (l[0] == (1997, 9, 2, 9, 0, 0), (1997, 9, 2, 9, 0, 0), l[0]),
1.350 + (l[-1] == (1998, 1, 15, 9, 0, 0), (1998, 1, 15, 9, 0, 0), l[-1])])
1.351
1.352 def test25():
1.353 qualifiers = [
1.354 @@ -389,10 +373,9 @@
1.355 s = select(dt, qualifiers)
1.356
1.357 l = s.materialise(dt, (1998, 12, 24, 0, 0, 0))
1.358 - print len(l) == 10, 10, len(l)
1.359 - print l[0] == (1997, 9, 30, 9, 0, 0), (1997, 9, 30, 9, 0, 0), l[0]
1.360 - print l[-1] == (1998, 2, 1, 9, 0, 0), (1998, 2, 1, 9, 0, 0), l[-1]
1.361 - print
1.362 + return show_result([(len(l) == 10, 10, len(l)),
1.363 + (l[0] == (1997, 9, 30, 9, 0, 0), (1997, 9, 30, 9, 0, 0), l[0]),
1.364 + (l[-1] == (1998, 2, 1, 9, 0, 0), (1998, 2, 1, 9, 0, 0), l[-1])])
1.365
1.366 def test26():
1.367 qualifiers = [
1.368 @@ -404,10 +387,9 @@
1.369 s = select(dt, qualifiers)
1.370
1.371 l = s.materialise(dt, (1999, 12, 24, 0, 0, 0))
1.372 - print len(l) == 10, 10, len(l)
1.373 - print l[0] == (1997, 9, 10, 9, 0, 0), (1997, 9, 10, 9, 0, 0), l[0]
1.374 - print l[-1] == (1999, 3, 13, 9, 0, 0), (1999, 3, 13, 9, 0, 0), l[-1]
1.375 - print
1.376 + return show_result([(len(l) == 10, 10, len(l)),
1.377 + (l[0] == (1997, 9, 10, 9, 0, 0), (1997, 9, 10, 9, 0, 0), l[0]),
1.378 + (l[-1] == (1999, 3, 13, 9, 0, 0), (1999, 3, 13, 9, 0, 0), l[-1])])
1.379
1.380 def test27():
1.381 qualifiers = [
1.382 @@ -418,10 +400,9 @@
1.383 s = select(dt, qualifiers)
1.384
1.385 l = s.materialise(dt, (1998, 4, 1, 0, 0, 0))
1.386 - print len(l) == 18, 18, len(l)
1.387 - print l[0] == (1997, 9, 2, 9, 0, 0), (1997, 9, 2, 9, 0, 0), l[0]
1.388 - print l[-1] == (1998, 3, 31, 9, 0, 0), (1998, 3, 31, 9, 0, 0), l[-1]
1.389 - print
1.390 + return show_result([(len(l) == 18, 18, len(l)),
1.391 + (l[0] == (1997, 9, 2, 9, 0, 0), (1997, 9, 2, 9, 0, 0), l[0]),
1.392 + (l[-1] == (1998, 3, 31, 9, 0, 0), (1998, 3, 31, 9, 0, 0), l[-1])])
1.393
1.394 def test28():
1.395 qualifiers = [
1.396 @@ -433,10 +414,9 @@
1.397 s = select(dt, qualifiers)
1.398
1.399 l = s.materialise(dt, (2001, 12, 24, 0, 0, 0))
1.400 - print len(l) == 10, 10, len(l)
1.401 - print l[0] == (1997, 6, 10, 9, 0, 0), (1997, 6, 10, 9, 0, 0), l[0]
1.402 - print l[-1] == (2001, 7, 10, 9, 0, 0), (2001, 7, 10, 9, 0, 0), l[-1]
1.403 - print
1.404 + return show_result([(len(l) == 10, 10, len(l)),
1.405 + (l[0] == (1997, 6, 10, 9, 0, 0), (1997, 6, 10, 9, 0, 0), l[0]),
1.406 + (l[-1] == (2001, 7, 10, 9, 0, 0), (2001, 7, 10, 9, 0, 0), l[-1])])
1.407
1.408 def test29():
1.409 qualifiers = [
1.410 @@ -448,10 +428,9 @@
1.411 s = select(dt, qualifiers)
1.412
1.413 l = s.materialise(dt, (2003, 12, 24, 0, 0, 0))
1.414 - print len(l) == 10, 10, len(l)
1.415 - print l[0] == (1997, 3, 10, 9, 0, 0), (1997, 3, 10, 9, 0, 0), l[0]
1.416 - print l[-1] == (2003, 3, 10, 9, 0, 0), (2003, 3, 10, 9, 0, 0), l[-1]
1.417 - print
1.418 + return show_result([(len(l) == 10, 10, len(l)),
1.419 + (l[0] == (1997, 3, 10, 9, 0, 0), (1997, 3, 10, 9, 0, 0), l[0]),
1.420 + (l[-1] == (2003, 3, 10, 9, 0, 0), (2003, 3, 10, 9, 0, 0), l[-1])])
1.421
1.422 def test30():
1.423 qualifiers = [
1.424 @@ -463,10 +442,9 @@
1.425 s = select(dt, qualifiers)
1.426
1.427 l = s.materialise(dt, (2006, 2, 1, 0, 0, 0))
1.428 - print len(l) == 10, 10, len(l)
1.429 - print l[0] == (1997, 1, 1, 9, 0, 0), (1997, 1, 1, 9, 0, 0), l[0]
1.430 - print l[-1] == (2006, 1, 1, 9, 0, 0), (2006, 1, 1, 9, 0, 0), l[-1]
1.431 - print
1.432 + return show_result([(len(l) == 10, 10, len(l)),
1.433 + (l[0] == (1997, 1, 1, 9, 0, 0), (1997, 1, 1, 9, 0, 0), l[0]),
1.434 + (l[-1] == (2006, 1, 1, 9, 0, 0), (2006, 1, 1, 9, 0, 0), l[-1])])
1.435
1.436 def test31():
1.437 qualifiers = [
1.438 @@ -477,10 +455,9 @@
1.439 s = select(dt, qualifiers)
1.440
1.441 l = s.materialise(dt, (1999, 12, 24, 0, 0, 0))
1.442 - print len(l) == 3, 3, len(l)
1.443 - print l[0] == (1997, 5, 19, 9, 0, 0), (1997, 5, 19, 9, 0, 0), l[0]
1.444 - print l[-1] == (1999, 5, 17, 9, 0, 0), (1999, 5, 17, 9, 0, 0), l[-1]
1.445 - print
1.446 + return show_result([(len(l) == 3, 3, len(l)),
1.447 + (l[0] == (1997, 5, 19, 9, 0, 0), (1997, 5, 19, 9, 0, 0), l[0]),
1.448 + (l[-1] == (1999, 5, 17, 9, 0, 0), (1999, 5, 17, 9, 0, 0), l[-1])])
1.449
1.450 def test32():
1.451 qualifiers = [
1.452 @@ -493,10 +470,9 @@
1.453
1.454 """
1.455 l = s.materialise(dt, (1999, 12, 24, 0, 0, 0))
1.456 - print len(l) == 3, 3, len(l)
1.457 - print l[0] == (1997, 5, 12, 9, 0, 0), (1997, 5, 12, 9, 0, 0), l[0]
1.458 - print l[-1] == (1999, 5, 17, 9, 0, 0), (1999, 5, 17, 9, 0, 0), l[-1]
1.459 - print
1.460 + return show_result([(len(l) == 3, 3, len(l)),
1.461 + (l[0] == (1997, 5, 12, 9, 0, 0), (1997, 5, 12, 9, 0, 0), l[0]),
1.462 + (l[-1] == (1999, 5, 17, 9, 0, 0), (1999, 5, 17, 9, 0, 0), l[-1])])
1.463 """
1.464
1.465 def test33():
1.466 @@ -509,10 +485,9 @@
1.467 s = select(dt, qualifiers)
1.468
1.469 l = s.materialise(dt, (1999, 12, 24, 0, 0, 0))
1.470 - print len(l) == 11, 11, len(l)
1.471 - print l[0] == (1997, 3, 13, 9, 0, 0), (1997, 3, 13, 9, 0, 0), l[0]
1.472 - print l[-1] == (1999, 3, 25, 9, 0, 0), (1999, 3, 25, 9, 0, 0), l[-1]
1.473 - print
1.474 + return show_result([(len(l) == 11, 11, len(l)),
1.475 + (l[0] == (1997, 3, 13, 9, 0, 0), (1997, 3, 13, 9, 0, 0), l[0]),
1.476 + (l[-1] == (1999, 3, 25, 9, 0, 0), (1999, 3, 25, 9, 0, 0), l[-1])])
1.477
1.478 def test34():
1.479 qualifiers = [
1.480 @@ -524,10 +499,9 @@
1.481 s = select(dt, qualifiers)
1.482
1.483 l = s.materialise(dt, (1999, 12, 24, 0, 0, 0))
1.484 - print len(l) == 39, 39, len(l)
1.485 - print l[0] == (1997, 6, 5, 9, 0, 0), (1997, 6, 5, 9, 0, 0), l[0]
1.486 - print l[-1] == (1999, 8, 26, 9, 0, 0), (1999, 8, 26, 9, 0, 0), l[-1]
1.487 - print
1.488 + return show_result([(len(l) == 39, 39, len(l)),
1.489 + (l[0] == (1997, 6, 5, 9, 0, 0), (1997, 6, 5, 9, 0, 0), l[0]),
1.490 + (l[-1] == (1999, 8, 26, 9, 0, 0), (1999, 8, 26, 9, 0, 0), l[-1])])
1.491
1.492 def test35():
1.493 qualifiers = [
1.494 @@ -539,10 +513,9 @@
1.495 s = select(dt, qualifiers)
1.496
1.497 l = s.materialise(dt, (2000, 12, 24, 0, 0, 0))
1.498 - print len(l) == 6, 6, len(l)
1.499 - print l[1] == (1998, 2, 13, 9, 0, 0), (1998, 2, 13, 9, 0, 0), l[1]
1.500 - print l[-1] == (2000, 10, 13, 9, 0, 0), (2000, 10, 13, 9, 0, 0), l[-1]
1.501 - print
1.502 + return show_result([(len(l) == 6, 6, len(l)),
1.503 + (l[1] == (1998, 2, 13, 9, 0, 0), (1998, 2, 13, 9, 0, 0), l[1]),
1.504 + (l[-1] == (2000, 10, 13, 9, 0, 0), (2000, 10, 13, 9, 0, 0), l[-1])])
1.505
1.506 def test36():
1.507 qualifiers = [
1.508 @@ -554,10 +527,9 @@
1.509 s = select(dt, qualifiers)
1.510
1.511 l = s.materialise(dt, (1998, 6, 30, 0, 0, 0))
1.512 - print len(l) == 10, 10, len(l)
1.513 - print l[0] == (1997, 9, 13, 9, 0, 0), (1997, 9, 13, 9, 0, 0), l[0]
1.514 - print l[-1] == (1998, 6, 13, 9, 0, 0), (1998, 6, 13, 9, 0, 0), l[-1]
1.515 - print
1.516 + return show_result([(len(l) == 10, 10, len(l)),
1.517 + (l[0] == (1997, 9, 13, 9, 0, 0), (1997, 9, 13, 9, 0, 0), l[0]),
1.518 + (l[-1] == (1998, 6, 13, 9, 0, 0), (1998, 6, 13, 9, 0, 0), l[-1])])
1.519
1.520 def test37():
1.521 qualifiers = [
1.522 @@ -570,10 +542,9 @@
1.523 s = select(dt, qualifiers)
1.524
1.525 l = s.materialise(dt, (2004, 12, 24, 0, 0, 0))
1.526 - print len(l) == 3, 3, len(l)
1.527 - print l[0] == (1996, 11, 5, 9, 0, 0), (1996, 11, 5, 9, 0, 0), l[0]
1.528 - print l[-1] == (2004, 11, 2, 9, 0, 0), (2004, 11, 2, 9, 0, 0), l[-1]
1.529 - print
1.530 + return show_result([(len(l) == 3, 3, len(l)),
1.531 + (l[0] == (1996, 11, 5, 9, 0, 0), (1996, 11, 5, 9, 0, 0), l[0]),
1.532 + (l[-1] == (2004, 11, 2, 9, 0, 0), (2004, 11, 2, 9, 0, 0), l[-1])])
1.533
1.534 def test38():
1.535 qualifiers = [
1.536 @@ -586,10 +557,9 @@
1.537 s = select(dt, qualifiers)
1.538
1.539 l = s.materialise(dt, (1997, 12, 24, 0, 0, 0))
1.540 - print len(l) == 3, 3, len(l)
1.541 - print l[0] == (1997, 9, 4, 9, 0, 0), (1997, 9, 4, 9, 0, 0), l[0]
1.542 - print l[-1] == (1997, 11, 6, 9, 0, 0), (1997, 11, 6, 9, 0, 0), l[-1]
1.543 - print
1.544 + return show_result([(len(l) == 3, 3, len(l)),
1.545 + (l[0] == (1997, 9, 4, 9, 0, 0), (1997, 9, 4, 9, 0, 0), l[0]),
1.546 + (l[-1] == (1997, 11, 6, 9, 0, 0), (1997, 11, 6, 9, 0, 0), l[-1])])
1.547
1.548 def test39():
1.549 qualifiers = [
1.550 @@ -601,10 +571,9 @@
1.551 s = select(dt, qualifiers)
1.552
1.553 l = s.materialise(dt, (1998, 4, 1, 0, 0, 0))
1.554 - print len(l) == 7, 7, len(l)
1.555 - print l[0] == (1997, 9, 29, 9, 0, 0), (1997, 9, 29, 9, 0, 0), l[0]
1.556 - print l[-1] == (1998, 3, 30, 9, 0, 0), (1998, 3, 30, 9, 0, 0), l[-1]
1.557 - print
1.558 + return show_result([(len(l) == 7, 7, len(l)),
1.559 + (l[0] == (1997, 9, 29, 9, 0, 0), (1997, 9, 29, 9, 0, 0), l[0]),
1.560 + (l[-1] == (1998, 3, 30, 9, 0, 0), (1998, 3, 30, 9, 0, 0), l[-1])])
1.561
1.562 def test40():
1.563 qualifiers = get_qualifiers(["BYMONTHDAY=5", "FREQ=HOURLY", "INTERVAL=12"])
1.564 @@ -612,10 +581,9 @@
1.565 s = select(dt, qualifiers)
1.566
1.567 l = s.materialise(dt, (2019, 1, 1))
1.568 - print len(l) == 37, 37, len(l)
1.569 - print l[1] == (2017, 7, 5, 0), (2017, 7, 5, 0), l[1]
1.570 - print l[-1] == (2018, 12, 5, 12), (2018, 12, 5, 12), l[-1]
1.571 - print
1.572 + return show_result([(len(l) == 37, 37, len(l)),
1.573 + (l[1] == (2017, 7, 5, 0), (2017, 7, 5, 0), l[1]),
1.574 + (l[-1] == (2018, 12, 5, 12), (2018, 12, 5, 12), l[-1])])
1.575
1.576 def test41():
1.577 qualifiers = get_qualifiers(["FREQ=DAILY", "BYMONTH=1"])
1.578 @@ -623,10 +591,9 @@
1.579 s = select(dt, qualifiers)
1.580
1.581 l = s.materialise(dt, (2019, 1, 1))
1.582 - print len(l) == 32, 32, len(l)
1.583 - print l[1] == (2018, 1, 1), (2018, 1, 1), l[1]
1.584 - print l[-1] == (2018, 1, 31), (2018, 1, 31), l[-1]
1.585 - print
1.586 + return show_result([(len(l) == 32, 32, len(l)),
1.587 + (l[1] == (2018, 1, 1), (2018, 1, 1), l[1]),
1.588 + (l[-1] == (2018, 1, 31), (2018, 1, 31), l[-1])])
1.589
1.590 def test42():
1.591 qualifiers = get_qualifiers(["FREQ=MONTHLY", "BYDAY=WE,1FR,2MO,2FR"])
1.592 @@ -634,10 +601,9 @@
1.593 s = select(dt, qualifiers)
1.594
1.595 l = s.materialise(dt, (2018, 1, 1))
1.596 - print len(l) == 18, 18, len(l)
1.597 - print l[1] == (2017, 10, 18), (2017, 10, 18), l[1]
1.598 - print l[-1] == (2017, 12, 27), (2017, 12, 27), l[-1]
1.599 - print
1.600 + return show_result([(len(l) == 18, 18, len(l)),
1.601 + (l[1] == (2017, 10, 18), (2017, 10, 18), l[1]),
1.602 + (l[-1] == (2017, 12, 27), (2017, 12, 27), l[-1])])
1.603
1.604 def test43():
1.605 qualifiers = get_qualifiers(["FREQ=DAILY", "UNTIL=19971224T090000Z"])
1.606 @@ -645,13 +611,36 @@
1.607 s = select(dt, qualifiers)
1.608
1.609 l = s.materialise(dt, (1997, 12, 25, 0, 0, 0), True)
1.610 - print len(l) == 114, 114, len(l)
1.611 - print l[0] == (1997, 9, 2, 9, 0, 0), (1997, 9, 2, 9, 0, 0), l[0]
1.612 - print l[-1] == (1997, 12, 24, 9, 0, 0), (1997, 12, 24, 9, 0, 0), l[-1]
1.613 - print
1.614 + return show_result([(len(l) == 114, 114, len(l)),
1.615 + (l[0] == (1997, 9, 2, 9, 0, 0), (1997, 9, 2, 9, 0, 0), l[0]),
1.616 + (l[-1] == (1997, 12, 24, 9, 0, 0), (1997, 12, 24, 9, 0, 0), l[-1])])
1.617
1.618 # See also test5.
1.619
1.620 +def test44():
1.621 + qualifiers = get_qualifiers(["FREQ=MONTHLY", "BYDAY=WE,1FR,2MO,2FR"])
1.622 + dt = (2017, 10, 15, 9, 30, 0)
1.623 + s = select(dt, qualifiers)
1.624 +
1.625 + l = s.materialise(dt, (2018, 1, 1))
1.626 + return show_result([(len(l) == 18, 18, len(l)),
1.627 + (l[1] == (2017, 10, 18, 9, 30, 0), (2017, 10, 18, 9, 30, 0), l[1]),
1.628 + (l[-1] == (2017, 12, 27, 9, 30, 0), (2017, 12, 27, 9, 30, 0), l[-1])])
1.629 +
1.630 + # See also test42.
1.631 +
1.632 +def test45():
1.633 + qualifiers = get_qualifiers(["BYYEARDAY=1,100,200", "COUNT=10"])
1.634 + dt = (1997, 1, 1, 9, 0, 0)
1.635 + s = select(dt, qualifiers)
1.636 +
1.637 + l = s.materialise(dt, (2006, 2, 1, 0, 0, 0))
1.638 + return show_result([(len(l) == 10, 10, len(l)),
1.639 + (l[0] == (1997, 1, 1, 9, 0, 0), (1997, 1, 1, 9, 0, 0), l[0]),
1.640 + (l[-1] == (2006, 1, 1, 9, 0, 0), (2006, 1, 1, 9, 0, 0), l[-1])])
1.641 +
1.642 + # See also test30.
1.643 +
1.644 test0 = lambda: 0 # started at 1 above
1.645
1.646 tests = [
1.647 @@ -659,7 +648,7 @@
1.648 test10, test11, test12, test13, test14, test15, test16, test17, test18, test19,
1.649 test20, test21, test22, test23, test24, test25, test26, test27, test28, test29,
1.650 test30, test31, test32, test33, test34, test35, test36, test37, test38, test39,
1.651 - test40, test41, test42, test43
1.652 + test40, test41, test42, test43, test44, test45
1.653 ]
1.654
1.655 if __name__ == "__main__":