entrouvert/wcs
entrouvert
/
wcs
14
1
Fork 0
Code Issues Pull Requests 35 Releases Activity

tests: expand ranges for comparisons (#36515)

This commit is contained in:
Frédéric Péters 2019-11-13 09:32:18 +01:00
parent 22ba97571f
commit 7bd1967fc4
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tests/test_sql.py
View File

@ -764,11 +764,11 @@ def test_select_limit_offset():
assert len(data_class.select()) == 50
for iterator in (False, True):
for func_clause in (lambda x: True, None):
assert [x.id for x in data_class.select(func_clause, order_by='id', iterator=iterator)] == range(1, 51)
assert [x.id for x in data_class.select(func_clause, order_by='id', limit=10, iterator=iterator)] == range(1, 11)
assert [x.id for x in data_class.select(func_clause, order_by='id', limit=10, offset=10, iterator=iterator)] == range(11, 21)
assert [x.id for x in data_class.select(func_clause, order_by='id', limit=20, offset=20, iterator=iterator)] == range(21, 41)
assert [x.id for x in data_class.select(func_clause, order_by='id', offset=10, iterator=iterator)] == range(11, 51)
assert [x.id for x in data_class.select(func_clause, order_by='id', iterator=iterator)] == list(range(1, 51))
assert [x.id for x in data_class.select(func_clause, order_by='id', limit=10, iterator=iterator)] == list(range(1, 11))
assert [x.id for x in data_class.select(func_clause, order_by='id', limit=10, offset=10, iterator=iterator)] == list(range(11, 21))
assert [x.id for x in data_class.select(func_clause, order_by='id', limit=20, offset=20, iterator=iterator)] == list(range(21, 41))
assert [x.id for x in data_class.select(func_clause, order_by='id', offset=10, iterator=iterator)] == list(range(11, 51))
assert len([x.id for x in data_class.select(lambda x: x.id > 10, limit=10, iterator=iterator)]) == 10
@postgresql
@ -828,11 +828,11 @@ def test_select_criteria_or_and():
t = data_class()
t.store()
assert [x.id for x in data_class.select([st.Or([st.Less('id', 10)])], order_by='id')] == range(1, 10)
assert [x.id for x in data_class.select([st.Or([st.Less('id', 10)])], order_by='id')] == list(range(1, 10))
assert [x.id for x in data_class.select([st.Or([
st.Less('id', 10), st.Equal('id', 15)])], order_by='id')] == range(1, 10) + [15]
st.Less('id', 10), st.Equal('id', 15)])], order_by='id')] == list(range(1, 10)) + [15]
assert [x.id for x in data_class.select([st.And([
st.Less('id', 10), st.Greater('id', 5)])], order_by='id')] == range(6, 10)
st.Less('id', 10), st.Greater('id', 5)])], order_by='id')] == list(range(6, 10))
@postgresql
def test_select_criteria_null():
@ -897,8 +897,8 @@ def test_sql_criteria_ilike():
assert data_class.count() == 50
assert len(data_class.select()) == 50
assert [x.id for x in data_class.select([st.ILike('f3', 'bar')], order_by='id')] == range(21, 51)
assert [x.id for x in data_class.select([st.ILike('f3', 'BAR')], order_by='id')] == range(21, 51)
assert [x.id for x in data_class.select([st.ILike('f3', 'bar')], order_by='id')] == list(range(21, 51))
assert [x.id for x in data_class.select([st.ILike('f3', 'BAR')], order_by='id')] == list(range(21, 51))
@postgresql
def test_sql_criteria_fts():
@ -921,7 +921,7 @@ def test_sql_criteria_fts():
assert data_class.count() == 50
assert len(data_class.select()) == 50
assert [x.id for x in data_class.select([st.FtsMatch('BAR')], order_by='id')] == range(21, 51)
assert [x.id for x in data_class.select([st.FtsMatch('BAR')], order_by='id')] == list(range(21, 51))
# check fts against data in history
assert len(data_class.select([st.FtsMatch('XXX')])) == 0

30
tests/test_storage.py
View File

@ -217,10 +217,10 @@ def test_select_order_by():
test.unique_value = 51-x
test.store()
assert [int(x.id) for x in Foobar.select(order_by='id')] == range(1, 51)
assert [int(x.id) for x in Foobar.select(order_by='-id')] == range(50, 0, -1)
assert [int(x.id) for x in Foobar.select(order_by='unique_value')] == range(50, 0, -1)
assert [int(x.id) for x in Foobar.select(order_by='-unique_value')] == range(1, 51)
assert [int(x.id) for x in Foobar.select(order_by='id')] == list(range(1, 51))
assert [int(x.id) for x in Foobar.select(order_by='-id')] == list(range(50, 0, -1))
assert [int(x.id) for x in Foobar.select(order_by='unique_value')] == list(range(50, 0, -1))
assert [int(x.id) for x in Foobar.select(order_by='-unique_value')] == list(range(1, 51))
def test_select_datetime():
Foobar.wipe()
@ -249,10 +249,10 @@ def test_select_limit_offset():
test.store()
assert len(Foobar.select()) == 50
assert [int(x.id) for x in Foobar.select(order_by='id', limit=10)] == range(1, 11)
assert [int(x.id) for x in Foobar.select(order_by='id', limit=10, offset=10)] == range(11, 21)
assert [int(x.id) for x in Foobar.select(order_by='id', limit=20, offset=20)] == range(21, 41)
assert [int(x.id) for x in Foobar.select(order_by='id', offset=10)] == range(11, 51)
assert [int(x.id) for x in Foobar.select(order_by='id', limit=10)] == list(range(1, 11))
assert [int(x.id) for x in Foobar.select(order_by='id', limit=10, offset=10)] == list(range(11, 21))
assert [int(x.id) for x in Foobar.select(order_by='id', limit=20, offset=20)] == list(range(21, 41))
assert [int(x.id) for x in Foobar.select(order_by='id', offset=10)] == list(range(11, 51))
def test_select_criteria_overlaps():
@ -298,11 +298,11 @@ def test_select_criteria_or_and():
assert len(Foobar.select()) == 50
assert [int(x.id) for x in Foobar.select([st.Or([st.Less('value', 10)])], order_by='id')] == range(1, 10)
assert [int(x.id) for x in Foobar.select([st.Or([st.Less('value', 10)])], order_by='id')] == list(range(1, 10))
assert [int(x.id) for x in Foobar.select([st.Or([
st.Less('value', 10), st.Equal('value', 15)])], order_by='value')] == range(1, 10) + [15]
st.Less('value', 10), st.Equal('value', 15)])], order_by='value')] == list(range(1, 10)) + [15]
assert [int(x.id) for x in Foobar.select([st.And([st.Less('value', 10),
st.Greater('value', 5)])], order_by='id')] == range(6, 10)
st.Greater('value', 5)])], order_by='id')] == list(range(6, 10))
def test_select_criteria_null():
Foobar.wipe()
@ -336,8 +336,8 @@ def test_select_criteria_ilike():
assert len(Foobar.select()) == 50
assert [int(x.id) for x in Foobar.select([st.ILike('foo', 'bar')], order_by='id')] == range(21, 50)
assert [int(x.id) for x in Foobar.select([st.ILike('foo', 'BAR')], order_by='id')] == range(21, 50)
assert [int(x.id) for x in Foobar.select([st.ILike('foo', 'bar')], order_by='id')] == list(range(21, 50))
assert [int(x.id) for x in Foobar.select([st.ILike('foo', 'BAR')], order_by='id')] == list(range(21, 50))
def test_store_async():
Foobar.wipe()
@ -366,7 +366,7 @@ def test_items():
test = Foobar()
test.store()
assert sorted([(int(x), int(y.id)) for (x, y) in Foobar.items()]) == zip(range(1,51), range(1, 51))
assert sorted([(int(x), int(y.id)) for (x, y) in Foobar.items()]) == list(zip(range(1,51), range(1, 51)))
def test_reversed_order():
Foobar.wipe()
@ -376,7 +376,7 @@ def test_reversed_order():
test.store()
assert len(Foobar.select()) == 50
assert [int(x.id) for x in Foobar.select(order_by='-id', limit=10)] == range(50, 40, -1)
assert [int(x.id) for x in Foobar.select(order_by='-id', limit=10)] == list(range(50, 40, -1))
def test_destroy_rebuild_index():
test_get_with_indexed_value()