--- a/web/test/unittest_facet.py Thu Jul 07 13:53:00 2011 +0200
+++ b/web/test/unittest_facet.py Thu Jul 07 16:22:08 2011 +0200
@@ -135,27 +135,27 @@
select=rqlst.children[0],
filtered_variable=filtered_variable)
f.rtype = 'creation_date'
- dates = self.execute('Any CD ORDERBY CD WHERE X is CWUser, X creation_date CD')
+ mind, maxd = self.execute('Any MIN(CD), MAX(CD) WHERE X is CWUser, X creation_date CD')[0]
self.assertEqual(f.vocabulary(),
- [(str(dates[0][0]), dates[0][0]),
- (str(dates[1][0]), dates[1][0])])
+ [(str(mind), mind),
+ (str(maxd), maxd)])
# ensure rqlst is left unmodified
self.assertEqual(rqlst.as_string(), 'DISTINCT Any WHERE X is CWUser')
#rqlst = rset.syntax_tree()
self.assertEqual(f.possible_values(),
- [str(dates[0][0]), str(dates[1][0])])
+ [str(mind), str(maxd)])
# ensure rqlst is left unmodified
self.assertEqual(rqlst.as_string(), 'DISTINCT Any WHERE X is CWUser')
- req.form['%s_inf' % f.__regid__] = str(datetime2ticks(dates[0][0]))
- req.form['%s_sup' % f.__regid__] = str(datetime2ticks(dates[0][0]))
+ req.form['%s_inf' % f.__regid__] = str(datetime2ticks(mind))
+ req.form['%s_sup' % f.__regid__] = str(datetime2ticks(mind))
f.add_rql_restrictions()
# selection is cluttered because rqlst has been prepared for facet (it
# is not in real life)
self.assertEqual(f.select.as_string(),
'DISTINCT Any WHERE X is CWUser, X creation_date >= "%s", '
'X creation_date <= "%s"'
- % (dates[0][0].strftime('%Y/%m/%d'),
- dates[0][0].strftime('%Y/%m/%d')))
+ % (mind.strftime('%Y/%m/%d'),
+ mind.strftime('%Y/%m/%d')))
def test_attribute(self):
req, rset, rqlst, filtered_variable = self.prepare_rqlst()