# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1512260208 -3600
# Node ID 11bf85dcefd0670904584522c0f62546f22667aa
# Parent  aa8c4539376aca2a4d1fa9f60bd38ed0e3449a50
Updated the recurrence rule tests for the revised API.

diff -r aa8c4539376a -r 11bf85dcefd0 tests/qualifiers.py
--- a/tests/qualifiers.py	Sun Dec 03 01:16:20 2017 +0100
+++ b/tests/qualifiers.py	Sun Dec 03 01:16:48 2017 +0100
@@ -30,15 +30,16 @@
     ("YEARLY", {"interval" : 1})
     ]
 
-l = order_qualifiers(qualifiers)
-show(l)
+sel = make_selectors(qualifiers)
+show(sel)
 dt = (1997, 11, 2)
 l = get_datetime_structure(dt)
 show(l)
-l = combine_datetime_with_qualifiers(dt, qualifiers)
-show(l)
+sel = combine_datetime_with_selectors(dt, sel)
 
-s = get_selector(dt, qualifiers)
+s = get_selector(dt, sel)
+show(sel)
+
 l = s.materialise(dt, (2003, 12, 24))
 print len(l) == 7, 7, len(l)
 print l[0] == (1997, 11, 2), (1997, 11, 2), l[0]
@@ -48,24 +49,25 @@
 qualifiers = [
     ("YEARLY", {"interval" : 2}),
     ("BYMONTH", {"values" : [1]}),
-    ("BYDAY", {"values" : [(6, None)]}),
+    ("BYDAY", {"values" : [(7, None)]}),
     ("BYHOUR", {"values" : [8, 9]}),
     ("BYMINUTE", {"values" : [30]})
     ]
 
-l = order_qualifiers(qualifiers)
-show(l)
+sel = make_selectors(qualifiers)
+show(sel)
 dt = (1997, 1, 5, 8, 30, 0)
 l = get_datetime_structure(dt)
 show(l)
-l = combine_datetime_with_qualifiers(dt, qualifiers)
-show(l)
+sel = combine_datetime_with_selectors(dt, sel)
+
+s = get_selector(dt, sel)
+show(sel)
 
-s = get_selector(dt, qualifiers)
 l = s.materialise(dt, (2003, 12, 24, 0, 0, 0))
-print len(l) == 32, 32, len(l)
-print l[0] == (1997, 1, 11, 8, 30, 0), (1997, 1, 11, 8, 30, 0), l[0]
-print l[-1] == (2003, 1, 25, 9, 30, 0), (2003, 1, 25, 9, 30, 0), l[-1]
+print len(l) == 34, 34, len(l)
+print l[0] == (1997, 1, 5, 8, 30, 0), (1997, 1, 5, 8, 30, 0), l[0]
+print l[-1] == (2003, 1, 26, 9, 30, 0), (2003, 1, 26, 9, 30, 0), l[-1]
 print
 
 qualifiers = [
@@ -73,15 +75,16 @@
     ("COUNT", {"values" : [10]})
     ]
 
-l = order_qualifiers(qualifiers)
-show(l)
+sel = make_selectors(qualifiers)
+show(sel)
 dt = (1997, 9, 2, 9, 0, 0)
 l = get_datetime_structure(dt)
 show(l)
-l = combine_datetime_with_qualifiers(dt, qualifiers)
-show(l)
+sel = combine_datetime_with_selectors(dt, sel)
 
-s = get_selector(dt, qualifiers)
+s = get_selector(dt, sel)
+show(sel)
+
 l = s.materialise(dt, (1997, 12, 24))
 print len(l) == 10, 10, len(l)
 print l[0] == (1997, 9, 2, 9, 0, 0), (1997, 9, 2, 9, 0, 0), l[0]
@@ -92,15 +95,16 @@
     ("DAILY", {"interval" : 1})
     ]
 
-l = order_qualifiers(qualifiers)
-show(l)
+sel = make_selectors(qualifiers)
+show(sel)
 dt = (1997, 9, 2, 9, 0, 0)
 l = get_datetime_structure(dt)
 show(l)
-l = combine_datetime_with_qualifiers(dt, qualifiers)
-show(l)
+sel = combine_datetime_with_selectors(dt, sel)
 
-s = get_selector(dt, qualifiers)
+s = get_selector(dt, sel)
+show(sel)
+
 l = s.materialise(dt, (1997, 12, 24, 0, 0, 0))
 print len(l) == 113, 113, len(l)
 print l[0] == (1997, 9, 2, 9, 0, 0), (1997, 9, 2, 9, 0, 0), l[0]
@@ -111,15 +115,16 @@
     ("DAILY", {"interval" : 2})
     ]
 
-l = order_qualifiers(qualifiers)
-show(l)
+sel = make_selectors(qualifiers)
+show(sel)
 dt = (1997, 9, 2, 9, 0, 0)
 l = get_datetime_structure(dt)
 show(l)
-l = combine_datetime_with_qualifiers(dt, qualifiers)
-show(l)
+sel = combine_datetime_with_selectors(dt, sel)
 
-s = get_selector(dt, qualifiers)
+s = get_selector(dt, sel)
+show(sel)
+
 l = s.materialise(dt, (1997, 12, 24, 0, 0, 0))
 print len(l) == 57, 57, len(l)
 print l[0] == (1997, 9, 2, 9, 0, 0), (1997, 9, 2, 9, 0, 0), l[0]
@@ -130,15 +135,16 @@
     ("WEEKLY", {"interval" : 1})
     ]
 
-l = order_qualifiers(qualifiers)
-show(l)
+sel = make_selectors(qualifiers)
+show(sel)
 dt = (1997, 9, 2, 9, 0, 0)
 l = get_datetime_structure(dt)
 show(l)
-l = combine_datetime_with_qualifiers(dt, qualifiers)
-show(l)
+sel = combine_datetime_with_selectors(dt, sel)
 
-s = get_selector(dt, qualifiers)
+s = get_selector(dt, sel)
+show(sel)
+
 l = s.materialise(dt, (1997, 12, 24, 0, 0, 0))
 print len(l) == 17, 17, len(l)
 print l[0] == (1997, 9, 2, 9, 0, 0), (1997, 9, 2, 9, 0, 0), l[0]
@@ -150,15 +156,16 @@
     ("COUNT", {"values" : [5]})
     ]
 
-l = order_qualifiers(qualifiers)
-show(l)
+sel = make_selectors(qualifiers)
+show(sel)
 dt = (1997, 9, 2, 9, 0, 0)
 l = get_datetime_structure(dt)
 show(l)
-l = combine_datetime_with_qualifiers(dt, qualifiers)
-show(l)
+sel = combine_datetime_with_selectors(dt, sel)
 
-s = get_selector(dt, qualifiers)
+s = get_selector(dt, sel)
+show(sel)
+
 l = s.materialise(dt, (1997, 12, 24, 0, 0, 0))
 print len(l) == 5, 5, len(l)
 print l[0] == (1997, 9, 2, 9, 0, 0), (1997, 9, 2, 9, 0, 0), l[0]
@@ -171,15 +178,16 @@
     ("BYDAY", {"values" : [(1, None), (2, None), (3, None), (4, None), (5, None), (6, None), (7, None)]})
     ]
 
-l = order_qualifiers(qualifiers)
-show(l)
+sel = make_selectors(qualifiers)
+show(sel)
 dt = (1998, 1, 1, 9, 0, 0)
 l = get_datetime_structure(dt)
 show(l)
-l = combine_datetime_with_qualifiers(dt, qualifiers)
-show(l)
+sel = combine_datetime_with_selectors(dt, sel)
 
-s = get_selector(dt, qualifiers)
+s = get_selector(dt, sel)
+show(sel)
+
 l = s.materialise(dt, (2000, 1, 31, 14, 0, 0))
 print len(l) == 93, 93, len(l)
 print l[0] == (1998, 1, 1, 9, 0, 0), (1998, 1, 1, 9, 0, 0), l[0]
@@ -191,15 +199,16 @@
     ("BYMONTH", {"values" : [1]})
     ]
 
-l = order_qualifiers(qualifiers)
-show(l)
+sel = make_selectors(qualifiers)
+show(sel)
 dt = (1998, 1, 1, 9, 0, 0)
 l = get_datetime_structure(dt)
 show(l)
-l = combine_datetime_with_qualifiers(dt, qualifiers)
-show(l)
+sel = combine_datetime_with_selectors(dt, sel)
 
-s = get_selector(dt, qualifiers)
+s = get_selector(dt, sel)
+show(sel)
+
 l = s.materialise(dt, (2000, 1, 31, 14, 0, 0))
 print len(l) == 93, 93, len(l)
 print l[0] == (1998, 1, 1, 9, 0, 0), (1998, 1, 1, 9, 0, 0), l[0]
@@ -211,15 +220,16 @@
     ("COUNT", {"values" : [10]})
     ]
 
-l = order_qualifiers(qualifiers)
-show(l)
+sel = make_selectors(qualifiers)
+show(sel)
 dt = (1997, 9, 2, 9, 0, 0)
 l = get_datetime_structure(dt)
 show(l)
-l = combine_datetime_with_qualifiers(dt, qualifiers)
-show(l)
+sel = combine_datetime_with_selectors(dt, sel)
 
-s = get_selector(dt, qualifiers)
+s = get_selector(dt, sel)
+show(sel)
+
 l = s.materialise(dt, (1997, 12, 24, 0, 0, 0))
 print len(l) == 10, 10, len(l)
 print l[0] == (1997, 9, 2, 9, 0, 0), (1997, 9, 2, 9, 0, 0), l[0]
@@ -230,15 +240,16 @@
     ("WEEKLY", {"interval" : 1})
     ]
 
-l = order_qualifiers(qualifiers)
-show(l)
+sel = make_selectors(qualifiers)
+show(sel)
 dt = (1997, 9, 2, 9, 0, 0)
 l = get_datetime_structure(dt)
 show(l)
-l = combine_datetime_with_qualifiers(dt, qualifiers)
-show(l)
+sel = combine_datetime_with_selectors(dt, sel)
 
-s = get_selector(dt, qualifiers)
+s = get_selector(dt, sel)
+show(sel)
+
 l = s.materialise(dt, (1997, 12, 24, 0, 0, 0))
 print len(l) == 17, 17, len(l)
 print l[0] == (1997, 9, 2, 9, 0, 0), (1997, 9, 2, 9, 0, 0), l[0]
@@ -249,15 +260,16 @@
     ("WEEKLY", {"interval" : 1})
     ]
 
-l = order_qualifiers(qualifiers)
-show(l)
+sel = make_selectors(qualifiers)
+show(sel)
 dt = (1997, 9, 2)
 l = get_datetime_structure(dt)
 show(l)
-l = combine_datetime_with_qualifiers(dt, qualifiers)
-show(l)
+sel = combine_datetime_with_selectors(dt, sel)
 
-s = get_selector(dt, qualifiers)
+s = get_selector(dt, sel)
+show(sel)
+
 l = s.materialise(dt, (1997, 12, 24, 0, 0, 0))
 print len(l) == 17, 17, len(l)
 print l[0] == (1997, 9, 2), (1997, 9, 2), l[0]
@@ -268,15 +280,16 @@
     ("WEEKLY", {"interval" : 2})
     ]
 
-l = order_qualifiers(qualifiers)
-show(l)
+sel = make_selectors(qualifiers)
+show(sel)
 dt = (1997, 9, 2, 9, 0, 0)
 l = get_datetime_structure(dt)
 show(l)
-l = combine_datetime_with_qualifiers(dt, qualifiers)
-show(l)
+sel = combine_datetime_with_selectors(dt, sel)
 
-s = get_selector(dt, qualifiers)
+s = get_selector(dt, sel)
+show(sel)
+
 l = s.materialise(dt, (1998, 2, 20, 0, 0, 0))
 print len(l) == 13, 13, len(l)
 print l[0] == (1997, 9, 2, 9, 0, 0), (1997, 9, 2, 9, 0, 0), l[0]
@@ -288,15 +301,16 @@
     ("BYDAY", {"values" : [(2, None), (4, None)]})
     ]
 
-l = order_qualifiers(qualifiers)
-show(l)
+sel = make_selectors(qualifiers)
+show(sel)
 dt = (1997, 9, 2, 9, 0, 0)
 l = get_datetime_structure(dt)
 show(l)
-l = combine_datetime_with_qualifiers(dt, qualifiers)
-show(l)
+sel = combine_datetime_with_selectors(dt, sel)
 
-s = get_selector(dt, qualifiers)
+s = get_selector(dt, sel)
+show(sel)
+
 l = s.materialise(dt, (1997, 10, 7, 9, 0, 0))
 print len(l) == 10, 10, len(l)
 print l[0] == (1997, 9, 2, 9, 0, 0), (1997, 9, 2, 9, 0, 0), l[0]
@@ -309,15 +323,16 @@
     ("COUNT", {"values" : [10]})
     ]
 
-l = order_qualifiers(qualifiers)
-show(l)
+sel = make_selectors(qualifiers)
+show(sel)
 dt = (1997, 9, 2, 9, 0, 0)
 l = get_datetime_structure(dt)
 show(l)
-l = combine_datetime_with_qualifiers(dt, qualifiers)
-show(l)
+sel = combine_datetime_with_selectors(dt, sel)
 
-s = get_selector(dt, qualifiers)
+s = get_selector(dt, sel)
+show(sel)
+
 l = s.materialise(dt, (1997, 12, 24, 0, 0, 0))
 print len(l) == 10, 10, len(l)
 print l[0] == (1997, 9, 2, 9, 0, 0), (1997, 9, 2, 9, 0, 0), l[0]
@@ -329,15 +344,16 @@
     ("BYDAY", {"values" : [(1, None), (3, None), (5, None)]})
     ]
 
-l = order_qualifiers(qualifiers)
-show(l)
+sel = make_selectors(qualifiers)
+show(sel)
 dt = (1997, 9, 1, 9, 0, 0)
 l = get_datetime_structure(dt)
 show(l)
-l = combine_datetime_with_qualifiers(dt, qualifiers)
-show(l)
+sel = combine_datetime_with_selectors(dt, sel)
 
-s = get_selector(dt, qualifiers)
+s = get_selector(dt, sel)
+show(sel)
+
 l = s.materialise(dt, (1997, 12, 24, 0, 0, 0))
 print len(l) == 25, 25, len(l)
 print l[0] == (1997, 9, 1, 9, 0, 0), (1997, 9, 1, 9, 0, 0), l[0]
@@ -350,15 +366,16 @@
     ("COUNT", {"values" : [8]})
     ]
 
-l = order_qualifiers(qualifiers)
-show(l)
+sel = make_selectors(qualifiers)
+show(sel)
 dt = (1997, 9, 2, 9, 0, 0)
 l = get_datetime_structure(dt)
 show(l)
-l = combine_datetime_with_qualifiers(dt, qualifiers)
-show(l)
+sel = combine_datetime_with_selectors(dt, sel)
 
-s = get_selector(dt, qualifiers)
+s = get_selector(dt, sel)
+show(sel)
+
 l = s.materialise(dt, (1997, 12, 24, 0, 0, 0))
 print len(l) == 8, 8, len(l)
 print l[0] == (1997, 9, 2, 9, 0, 0), (1997, 9, 2, 9, 0, 0), l[0]
@@ -371,15 +388,16 @@
     ("COUNT", {"values" : [10]})
     ]
 
-l = order_qualifiers(qualifiers)
-show(l)
+sel = make_selectors(qualifiers)
+show(sel)
 dt = (1997, 9, 5, 9, 0, 0)
 l = get_datetime_structure(dt)
 show(l)
-l = combine_datetime_with_qualifiers(dt, qualifiers)
-show(l)
+sel = combine_datetime_with_selectors(dt, sel)
 
-s = get_selector(dt, qualifiers)
+s = get_selector(dt, sel)
+show(sel)
+
 l = s.materialise(dt, (1998, 12, 24, 0, 0, 0))
 print len(l) == 10, 10, len(l)
 print l[0] == (1997, 9, 5, 9, 0, 0), (1997, 9, 5, 9, 0, 0), l[0]
@@ -391,15 +409,16 @@
     ("BYDAY", {"values" : [(5, 1)]})
     ]
 
-l = order_qualifiers(qualifiers)
-show(l)
+sel = make_selectors(qualifiers)
+show(sel)
 dt = (1997, 9, 5, 9, 0, 0)
 l = get_datetime_structure(dt)
 show(l)
-l = combine_datetime_with_qualifiers(dt, qualifiers)
-show(l)
+sel = combine_datetime_with_selectors(dt, sel)
 
-s = get_selector(dt, qualifiers)
+s = get_selector(dt, sel)
+show(sel)
+
 l = s.materialise(dt, (1997, 12, 24, 0, 0, 0))
 print len(l) == 4, 4, len(l)
 print l[0] == (1997, 9, 5, 9, 0, 0), (1997, 9, 5, 9, 0, 0), l[0]
@@ -412,15 +431,16 @@
     ("COUNT", {"values" : [10]})
     ]
 
-l = order_qualifiers(qualifiers)
-show(l)
+sel = make_selectors(qualifiers)
+show(sel)
 dt = (1997, 9, 7, 9, 0, 0)
 l = get_datetime_structure(dt)
 show(l)
-l = combine_datetime_with_qualifiers(dt, qualifiers)
-show(l)
+sel = combine_datetime_with_selectors(dt, sel)
 
-s = get_selector(dt, qualifiers)
+s = get_selector(dt, sel)
+show(sel)
+
 l = s.materialise(dt, (1998, 12, 24, 0, 0, 0))
 print len(l) == 10, 10, len(l)
 print l[0] == (1997, 9, 7, 9, 0, 0), (1997, 9, 7, 9, 0, 0), l[0]
@@ -433,15 +453,16 @@
     ("COUNT", {"values" : [6]})
     ]
 
-l = order_qualifiers(qualifiers)
-show(l)
+sel = make_selectors(qualifiers)
+show(sel)
 dt = (1997, 9, 22, 9, 0, 0)
 l = get_datetime_structure(dt)
 show(l)
-l = combine_datetime_with_qualifiers(dt, qualifiers)
-show(l)
+sel = combine_datetime_with_selectors(dt, sel)
 
-s = get_selector(dt, qualifiers)
+s = get_selector(dt, sel)
+show(sel)
+
 l = s.materialise(dt, (1998, 12, 24, 0, 0, 0))
 print len(l) == 6, 6, len(l)
 print l[0] == (1997, 9, 22, 9, 0, 0), (1997, 9, 22, 9, 0, 0), l[0]
@@ -454,15 +475,16 @@
     ("COUNT", {"values" : [6]})
     ]
 
-l = order_qualifiers(qualifiers)
-show(l)
+sel = make_selectors(qualifiers)
+show(sel)
 dt = (1997, 9, 28, 9, 0, 0)
 l = get_datetime_structure(dt)
 show(l)
-l = combine_datetime_with_qualifiers(dt, qualifiers)
-show(l)
+sel = combine_datetime_with_selectors(dt, sel)
 
-s = get_selector(dt, qualifiers)
+s = get_selector(dt, sel)
+show(sel)
+
 l = s.materialise(dt, (1998, 12, 24, 0, 0, 0))
 print len(l) == 6, 6, len(l)
 print l[0] == (1997, 9, 28, 9, 0, 0), (1997, 9, 28, 9, 0, 0), l[0]
@@ -475,15 +497,16 @@
     ("COUNT", {"values" : [10]})
     ]
 
-l = order_qualifiers(qualifiers)
-show(l)
+sel = make_selectors(qualifiers)
+show(sel)
 dt = (1997, 9, 2, 9, 0, 0)
 l = get_datetime_structure(dt)
 show(l)
-l = combine_datetime_with_qualifiers(dt, qualifiers)
-show(l)
+sel = combine_datetime_with_selectors(dt, sel)
 
-s = get_selector(dt, qualifiers)
+s = get_selector(dt, sel)
+show(sel)
+
 l = s.materialise(dt, (1998, 12, 24, 0, 0, 0))
 print len(l) == 10, 10, len(l)
 print l[0] == (1997, 9, 2, 9, 0, 0), (1997, 9, 2, 9, 0, 0), l[0]
@@ -496,15 +519,16 @@
     ("COUNT", {"values" : [10]})
     ]
 
-l = order_qualifiers(qualifiers)
-show(l)
+sel = make_selectors(qualifiers)
+show(sel)
 dt = (1997, 9, 30, 9, 0, 0)
 l = get_datetime_structure(dt)
 show(l)
-l = combine_datetime_with_qualifiers(dt, qualifiers)
-show(l)
+sel = combine_datetime_with_selectors(dt, sel)
 
-s = get_selector(dt, qualifiers)
+s = get_selector(dt, sel)
+show(sel)
+
 l = s.materialise(dt, (1998, 12, 24, 0, 0, 0))
 print len(l) == 10, 10, len(l)
 print l[0] == (1997, 9, 30, 9, 0, 0), (1997, 9, 30, 9, 0, 0), l[0]
@@ -517,15 +541,16 @@
     ("COUNT", {"values" : [10]})
     ]
 
-l = order_qualifiers(qualifiers)
-show(l)
+sel = make_selectors(qualifiers)
+show(sel)
 dt = (1997, 9, 10, 9, 0, 0)
 l = get_datetime_structure(dt)
 show(l)
-l = combine_datetime_with_qualifiers(dt, qualifiers)
-show(l)
+sel = combine_datetime_with_selectors(dt, sel)
 
-s = get_selector(dt, qualifiers)
+s = get_selector(dt, sel)
+show(sel)
+
 l = s.materialise(dt, (1999, 12, 24, 0, 0, 0))
 print len(l) == 10, 10, len(l)
 print l[0] == (1997, 9, 10, 9, 0, 0), (1997, 9, 10, 9, 0, 0), l[0]
@@ -537,15 +562,16 @@
     ("BYDAY", {"values" : [(2, None)]})
     ]
 
-l = order_qualifiers(qualifiers)
-show(l)
+sel = make_selectors(qualifiers)
+show(sel)
 dt = (1997, 9, 2, 9, 0, 0)
 l = get_datetime_structure(dt)
 show(l)
-l = combine_datetime_with_qualifiers(dt, qualifiers)
-show(l)
+sel = combine_datetime_with_selectors(dt, sel)
 
-s = get_selector(dt, qualifiers)
+s = get_selector(dt, sel)
+show(sel)
+
 l = s.materialise(dt, (1998, 4, 1, 0, 0, 0))
 print len(l) == 18, 18, len(l)
 print l[0] == (1997, 9, 2, 9, 0, 0), (1997, 9, 2, 9, 0, 0), l[0]
@@ -558,15 +584,16 @@
     ("COUNT", {"values" : [10]})
     ]
 
-l = order_qualifiers(qualifiers)
-show(l)
+sel = make_selectors(qualifiers)
+show(sel)
 dt = (1997, 6, 10, 9, 0, 0)
 l = get_datetime_structure(dt)
 show(l)
-l = combine_datetime_with_qualifiers(dt, qualifiers)
-show(l)
+sel = combine_datetime_with_selectors(dt, sel)
 
-s = get_selector(dt, qualifiers)
+s = get_selector(dt, sel)
+show(sel)
+
 l = s.materialise(dt, (2001, 12, 24, 0, 0, 0))
 print len(l) == 10, 10, len(l)
 print l[0] == (1997, 6, 10, 9, 0, 0), (1997, 6, 10, 9, 0, 0), l[0]
@@ -579,15 +606,16 @@
     ("COUNT", {"values" : [10]})
     ]
 
-l = order_qualifiers(qualifiers)
-show(l)
+sel = make_selectors(qualifiers)
+show(sel)
 dt = (1997, 3, 10, 9, 0, 0)
 l = get_datetime_structure(dt)
 show(l)
-l = combine_datetime_with_qualifiers(dt, qualifiers)
-show(l)
+sel = combine_datetime_with_selectors(dt, sel)
 
-s = get_selector(dt, qualifiers)
+s = get_selector(dt, sel)
+show(sel)
+
 l = s.materialise(dt, (2003, 12, 24, 0, 0, 0))
 print len(l) == 10, 10, len(l)
 print l[0] == (1997, 3, 10, 9, 0, 0), (1997, 3, 10, 9, 0, 0), l[0]
@@ -600,15 +628,16 @@
     ("COUNT", {"values" : [10]})
     ]
 
-l = order_qualifiers(qualifiers)
-show(l)
+sel = make_selectors(qualifiers)
+show(sel)
 dt = (1997, 1, 1, 9, 0, 0)
 l = get_datetime_structure(dt)
 show(l)
-l = combine_datetime_with_qualifiers(dt, qualifiers)
-show(l)
+sel = combine_datetime_with_selectors(dt, sel)
 
-s = get_selector(dt, qualifiers)
+s = get_selector(dt, sel)
+show(sel)
+
 l = s.materialise(dt, (2006, 2, 1, 0, 0, 0))
 print len(l) == 10, 10, len(l)
 print l[0] == (1997, 1, 1, 9, 0, 0), (1997, 1, 1, 9, 0, 0), l[0]
@@ -620,15 +649,16 @@
     ("BYDAY", {"values" : [(1, 20)]})
     ]
 
-l = order_qualifiers(qualifiers)
-show(l)
+sel = make_selectors(qualifiers)
+show(sel)
 dt = (1997, 5, 19, 9, 0, 0)
 l = get_datetime_structure(dt)
 show(l)
-l = combine_datetime_with_qualifiers(dt, qualifiers)
-show(l)
+sel = combine_datetime_with_selectors(dt, sel)
 
-s = get_selector(dt, qualifiers)
+s = get_selector(dt, sel)
+show(sel)
+
 l = s.materialise(dt, (1999, 12, 24, 0, 0, 0))
 print len(l) == 3, 3, len(l)
 print l[0] == (1997, 5, 19, 9, 0, 0), (1997, 5, 19, 9, 0, 0), l[0]
@@ -642,15 +672,16 @@
     ("BYDAY", {"values" : [(1, None)]})
     ]
 
-l = order_qualifiers(qualifiers)
-show(l)
+sel = make_selectors(qualifiers)
+show(sel)
 dt = (1997, 5, 12, 9, 0, 0)
 l = get_datetime_structure(dt)
 show(l)
-l = combine_datetime_with_qualifiers(dt, qualifiers)
-show(l)
+sel = combine_datetime_with_selectors(dt, sel)
 
-s = get_selector(dt, qualifiers)
+s = get_selector(dt, sel)
+show(sel)
+
 l = s.materialise(dt, (1999, 12, 24, 0, 0, 0))
 print len(l) == 3, 3, len(l)
 print l[0] == (1997, 5, 12, 9, 0, 0), (1997, 5, 12, 9, 0, 0), l[0]
@@ -664,15 +695,16 @@
     ("BYDAY", {"values" : [(4, None)]})
     ]
 
-l = order_qualifiers(qualifiers)
-show(l)
+sel = make_selectors(qualifiers)
+show(sel)
 dt = (1997, 3, 13, 9, 0, 0)
 l = get_datetime_structure(dt)
 show(l)
-l = combine_datetime_with_qualifiers(dt, qualifiers)
-show(l)
+sel = combine_datetime_with_selectors(dt, sel)
 
-s = get_selector(dt, qualifiers)
+s = get_selector(dt, sel)
+show(sel)
+
 l = s.materialise(dt, (1999, 12, 24, 0, 0, 0))
 print len(l) == 11, 11, len(l)
 print l[0] == (1997, 3, 13, 9, 0, 0), (1997, 3, 13, 9, 0, 0), l[0]
@@ -685,15 +717,16 @@
     ("BYDAY", {"values" : [(4, None)]})
     ]
 
-l = order_qualifiers(qualifiers)
-show(l)
+sel = make_selectors(qualifiers)
+show(sel)
 dt = (1997, 6, 5, 9, 0, 0)
 l = get_datetime_structure(dt)
 show(l)
-l = combine_datetime_with_qualifiers(dt, qualifiers)
-show(l)
+sel = combine_datetime_with_selectors(dt, sel)
 
-s = get_selector(dt, qualifiers)
+s = get_selector(dt, sel)
+show(sel)
+
 l = s.materialise(dt, (1999, 12, 24, 0, 0, 0))
 print len(l) == 39, 39, len(l)
 print l[0] == (1997, 6, 5, 9, 0, 0), (1997, 6, 5, 9, 0, 0), l[0]
@@ -706,18 +739,19 @@
     ("BYDAY", {"values" : [(5, None)]})
     ]
 
-l = order_qualifiers(qualifiers)
-show(l)
+sel = make_selectors(qualifiers)
+show(sel)
 dt = (1997, 9, 2, 9, 0, 0)
 l = get_datetime_structure(dt)
 show(l)
-l = combine_datetime_with_qualifiers(dt, qualifiers)
-show(l)
+sel = combine_datetime_with_selectors(dt, sel)
 
-s = get_selector(dt, qualifiers)
+s = get_selector(dt, sel)
+show(sel)
+
 l = s.materialise(dt, (2000, 12, 24, 0, 0, 0))
-print len(l) == 5, 5, len(l)
-print l[0] == (1998, 2, 13, 9, 0, 0), (1998, 2, 13, 9, 0, 0), l[0]
+print len(l) == 6, 6, len(l)
+print l[1] == (1998, 2, 13, 9, 0, 0), (1998, 2, 13, 9, 0, 0), l[1]
 print l[-1] == (2000, 10, 13, 9, 0, 0), (2000, 10, 13, 9, 0, 0), l[-1]
 print
 
@@ -727,15 +761,16 @@
     ("BYDAY", {"values" : [(6, None)]})
     ]
 
-l = order_qualifiers(qualifiers)
-show(l)
+sel = make_selectors(qualifiers)
+show(sel)
 dt = (1997, 9, 13, 9, 0, 0)
 l = get_datetime_structure(dt)
 show(l)
-l = combine_datetime_with_qualifiers(dt, qualifiers)
-show(l)
+sel = combine_datetime_with_selectors(dt, sel)
 
-s = get_selector(dt, qualifiers)
+s = get_selector(dt, sel)
+show(sel)
+
 l = s.materialise(dt, (1998, 6, 30, 0, 0, 0))
 print len(l) == 10, 10, len(l)
 print l[0] == (1997, 9, 13, 9, 0, 0), (1997, 9, 13, 9, 0, 0), l[0]
@@ -749,15 +784,16 @@
     ("BYDAY", {"values" : [(2, None)]})
     ]
 
-l = order_qualifiers(qualifiers)
-show(l)
+sel = make_selectors(qualifiers)
+show(sel)
 dt = (1996, 11, 5, 9, 0, 0)
 l = get_datetime_structure(dt)
 show(l)
-l = combine_datetime_with_qualifiers(dt, qualifiers)
-show(l)
+sel = combine_datetime_with_selectors(dt, sel)
 
-s = get_selector(dt, qualifiers)
+s = get_selector(dt, sel)
+show(sel)
+
 l = s.materialise(dt, (2004, 12, 24, 0, 0, 0))
 print len(l) == 3, 3, len(l)
 print l[0] == (1996, 11, 5, 9, 0, 0), (1996, 11, 5, 9, 0, 0), l[0]
@@ -771,15 +807,16 @@
     ("COUNT", {"values" : [3]})
     ]
 
-l = order_qualifiers(qualifiers)
-show(l)
+sel = make_selectors(qualifiers)
+show(sel)
 dt = (1997, 9, 4, 9, 0, 0)
 l = get_datetime_structure(dt)
 show(l)
-l = combine_datetime_with_qualifiers(dt, qualifiers)
-show(l)
+sel = combine_datetime_with_selectors(dt, sel)
 
-s = get_selector(dt, qualifiers)
+s = get_selector(dt, sel)
+show(sel)
+
 l = s.materialise(dt, (1997, 12, 24, 0, 0, 0))
 print len(l) == 3, 3, len(l)
 print l[0] == (1997, 9, 4, 9, 0, 0), (1997, 9, 4, 9, 0, 0), l[0]
@@ -794,67 +831,71 @@
     ("BYSETPOS", {"values" : [-2]})
     ]
 
-l = order_qualifiers(qualifiers)
-show(l)
+sel = make_selectors(qualifiers)
+show(sel)
 dt = (1997, 9, 29, 9, 0, 0)
 l = get_datetime_structure(dt)
 show(l)
-l = combine_datetime_with_qualifiers(dt, qualifiers)
-show(l)
+sel = combine_datetime_with_selectors(dt, sel)
 
-s = get_selector(dt, qualifiers)
+s = get_selector(dt, sel)
+show(sel)
+
 l = s.materialise(dt, (1998, 4, 1, 0, 0, 0))
 print len(l) == 7, 7, len(l)
 print l[0] == (1997, 9, 29, 9, 0, 0), (1997, 9, 29, 9, 0, 0), l[0]
 print l[-1] == (1998, 3, 30, 9, 0, 0), (1998, 3, 30, 9, 0, 0), l[-1]
 print
 
-qualifiers = get_qualifiers(["FREQ=MONTHLY", "BYMONTHDAY=5", "FREQ=HOURLY", "INTERVAL=12"])
+qualifiers = get_qualifiers(["BYMONTHDAY=5", "FREQ=HOURLY", "INTERVAL=12"])
 
-l = order_qualifiers(qualifiers)
-show(l)
+sel = make_selectors(qualifiers)
+show(sel)
 dt = (2017, 6, 13)
 l = get_datetime_structure(dt)
 show(l)
-l = combine_datetime_with_qualifiers(dt, qualifiers)
-show(l)
+sel = combine_datetime_with_selectors(dt, sel)
 
-s = get_selector(dt, qualifiers)
+s = get_selector(dt, sel)
+show(sel)
+
 l = s.materialise(dt, (2019, 1, 1))
-print len(l) == 36
-print l[0] == (2017, 7, 5, 0), (2017, 7, 5, 0), l[0]
+print len(l) == 37, 37, len(l)
+print l[1] == (2017, 7, 5, 0), (2017, 7, 5, 0), l[1]
 print l[-1] == (2018, 12, 5, 12), (2018, 12, 5, 12), l[-1]
 
 qualifiers = get_qualifiers(["FREQ=DAILY", "BYMONTH=1"])
 
-l = order_qualifiers(qualifiers)
-show(l)
+sel = make_selectors(qualifiers)
+show(sel)
 dt = (2017, 6, 13)
 l = get_datetime_structure(dt)
 show(l)
-l = combine_datetime_with_qualifiers(dt, qualifiers)
-show(l)
+sel = combine_datetime_with_selectors(dt, sel)
 
-s = get_selector(dt, qualifiers)
+s = get_selector(dt, sel)
+show(sel)
+
 l = s.materialise(dt, (2019, 1, 1))
-print len(l) == 31
-print l[0] == (2018, 1, 1), (2018, 1, 1), l[0]
+print len(l) == 32, 32, len(l)
+print l[1] == (2018, 1, 1), (2018, 1, 1), l[1]
 print l[-1] == (2018, 1, 31), (2018, 1, 31), l[-1]
 
 qualifiers = get_qualifiers(["FREQ=MONTHLY", "BYDAY=WE,1FR,2MO,2FR"])
 
-l = order_qualifiers(qualifiers)
-show(l)
+sel = make_selectors(qualifiers)
+show(sel)
 dt = (2017, 10, 15)
 l = get_datetime_structure(dt)
 show(l)
-l = combine_datetime_with_qualifiers(dt, qualifiers)
-show(l)
+sel = combine_datetime_with_selectors(dt, sel)
 
-s = get_selector(dt, qualifiers)
+s = get_selector(dt, sel)
+show(sel)
+
 l = s.materialise(dt, (2018, 1, 1))
-print len(l) == 17
-print l[0] == (2017, 10, 18), (2017, 10, 18), l[0]
+print len(l) == 18, 18, len(l)
+print l[1] == (2017, 10, 18), (2017, 10, 18), l[1]
 print l[-1] == (2017, 12, 27), (2017, 12, 27), l[-1]
 
 # vim: tabstop=4 expandtab shiftwidth=4