X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_common%2Ftests%2Ftest_dbmemory.py;h=b3b20ffc40c34349a32b5d968124de97543e6b84;hb=13a71fb5070a5d14134d517023377fb4687afeab;hp=e89560b4f23db3834bfa8e7267995c32d66f8eae;hpb=6472e2b6e90c263b59c1195a952fbf4b7d35eba0;p=osm%2Fcommon.git

diff --git a/osm_common/tests/test_dbmemory.py b/osm_common/tests/test_dbmemory.py
index e89560b..b3b20ff 100644
--- a/osm_common/tests/test_dbmemory.py
+++ b/osm_common/tests/test_dbmemory.py
@@ -53,7 +53,7 @@ def db_memory_with_many_data(request):
 
     db.create_list("test", [
         {"_id": 1, "data": {"data2": {"data3": 1}}, "list": [{"a": 1}], "text": "sometext"},
-        {"_id": 2, "data": {"data2": {"data3": 2}}, "list": [{"a": 2}]},
+        {"_id": 2, "data": {"data2": {"data3": 2}}, "list": [{"a": 2}], "list2": [1, 2, 3]},
         {"_id": 3, "data": {"data2": {"data3": 3}}, "list": [{"a": 3}]},
         {"_id": 4, "data": {"data2": {"data3": 4}}, "list": [{"a": 4}, {"a": 0}]},
         {"_id": 5, "data": {"data2": {"data3": 5}}, "list": [{"a": 5}]},
@@ -176,7 +176,11 @@ def test_get_one(db_memory_with_data, table, db_filter, expected_data):
     ({"_id": 1}, [1]),
     ({"data.data2.data3": 2}, [2]),
     ({"data.data2.data3.eq": 2}, [2]),
+    ({"data.data2.data3": [2]}, [2]),
+    ({"data.data2.data3.cont": [2]}, [2]),
     ({"data.data2.data3.neq": 2}, [1, 3, 4, 5, 6, 7, 8]),
+    ({"data.data2.data3.neq": [2]}, [1, 3, 4, 5, 6, 7, 8]),
+    ({"data.data2.data3.ncont": [2]}, [1, 3, 4, 5, 6, 7, 8]),
     ({"data.data2.data3": [2, 3]}, [2, 3]),
     ({"data.data2.data3.gt": 4}, [5, 6, 7]),
     ({"data.data2.data3.gte": 4}, [4, 5, 6, 7]),
@@ -184,6 +188,10 @@ def test_get_one(db_memory_with_data, table, db_filter, expected_data):
     ({"data.data2.data3.lte": 4}, [1, 2, 3, 4]),
     ({"data.data2.data3.lte": 4.5}, [1, 2, 3, 4]),
     ({"data.data2.data3.gt": "text"}, []),
+    ({"nonexist.nonexist": "4"}, []),
+    ({"nonexist.nonexist": None}, [1, 2, 3, 4, 5, 6, 7, 8]),
+    ({"nonexist.nonexist.neq": "4"}, [1, 2, 3, 4, 5, 6, 7, 8]),
+    ({"nonexist.nonexist.neq": None}, []),
     ({"text.eq": "sometext"}, [1]),
     ({"text.neq": "sometext"}, [2, 3, 4, 5, 6, 7, 8]),
     ({"text.eq": "somet"}, []),
@@ -198,6 +206,10 @@ def test_get_one(db_memory_with_data, table, db_filter, expected_data):
     ({"data.data2.data3": None}, [8]),
     ({"data.data2": "4"}, []),
     ({"list.0.a": 1}, [1, 6]),
+    ({"list2": 1}, [2]),
+    ({"list2": [1, 5]}, [2]),
+    ({"list2": [1, 2]}, [2]),
+    ({"list2": [5, 7]}, []),
     ({"list.ANYINDEX.a": 1}, [1]),
     ({"list.a": 3, "list.b": 1}, [8]),
     ({"list.ANYINDEX.a": 3, "list.ANYINDEX.b": 1}, []),
@@ -223,6 +235,8 @@ def test_get_list(db_memory_with_many_data, db_filter, expected_ids):
     assert len(db_memory_with_many_data.db) == 1
     assert "test" in db_memory_with_many_data.db
     assert len(db_memory_with_many_data.db["test"]) == 8
+    result = db_memory_with_many_data.count("test", db_filter)
+    assert result == len(expected_ids)
 
 
 @pytest.mark.parametrize("table, db_filter, expected_data", [