tests: use always create_test_store() (all entities) #25

loryruta · loryruta · commit 9553f81651cf · 2024-05-26T13:19:39.000+02:00
diff --git a/tests/common.py b/tests/common.py
@@ -1,68 +1,32 @@
-from datetime import timezone
-
-import objectbox
-import os
 from os import path
-import shutil
 import pytest
-import numpy as np
-from typing import *
+import objectbox
+from objectbox.logger import logger
+from objectbox.store import Store
+from objectbox.model.sync_model import sync_model
 from tests.model import *
+import numpy as np
+from datetime import timezone
 
-test_dir = 'testdata'
-
-
-def create_default_model() -> objectbox.Model:
+def create_default_model():
     model = objectbox.Model()
-    model.entity(TestEntity, last_property_id=IdUid(28, 1028))
-    model.last_entity_id = IdUid(2, 2)
-    model.last_index_id = IdUid(2, 10002)
+    model.entity(TestEntity)
+    model.entity(TestEntityDatetime)
+    model.entity(TestEntityFlex)
+    model.entity(VectorEntity)
+    sync_model(model)  # Assign IDs/UIDs
     return model
 
 
-def load_empty_test_default_store(db_name: str = test_dir) -> objectbox.Store:
-    model = create_default_model()
-    return objectbox.Store(model=model, directory=db_name)
-
-
-def load_empty_test_datetime_store(name: str = "") -> objectbox.Store:
-    model = objectbox.Model()
-    model.entity(TestEntityDatetime, last_property_id=IdUid(4, 2004))
-    model.last_entity_id = IdUid(2, 2)
-
-    db_name = test_dir if len(name) == 0 else test_dir + "/" + name
-
-    return objectbox.Store(model=model, directory=db_name)
-
-
-def load_empty_test_flex_store(name: str = "") -> objectbox.Store:
-    model = objectbox.Model()
-    model.entity(TestEntityFlex, last_property_id=IdUid(2, 3002))
-    model.last_entity_id = IdUid(3, 3)
-
-    db_name = test_dir if len(name) == 0 else test_dir + "/" + name
-
-    return objectbox.Store(model=model, directory=db_name)
-
-
-def create_test_store(db_name: Optional[str] = None, clear_db: bool = True) -> objectbox.Store:
+def create_test_store(db_path: str = "testdata", clear_db: bool = True) -> objectbox.Store:
     """ Creates a Store instance with all entities. """
 
-    db_path = test_dir if db_name is None else path.join(test_dir, db_name)
-    print(f"DB path: \"{db_path}\"")
-
-    if clear_db and path.exists(db_path):
-        shutil.rmtree(db_path)
-
-    model = objectbox.Model()
-    model.entity(TestEntity, last_property_id=IdUid(28, 1028))
-    model.entity(TestEntityDatetime, last_property_id=IdUid(4, 2004))
-    model.entity(TestEntityFlex, last_property_id=IdUid(2, 3002))
-    model.entity(VectorEntity, last_property_id=IdUid(5, 4005))
-    model.last_entity_id = IdUid(4, 4)
-    model.last_index_id = IdUid(5, 40003)
+    is_inmemory = db_path.startswith("memory:")
+    logger.info(f"DB path: {db_path} ({'in-memory' if is_inmemory else ''})")
 
-    return objectbox.Store(model=model, directory=db_path)
+    if clear_db:
+        Store.remove_db_files(db_path)
+    return objectbox.Store(model=create_default_model(), directory=db_path)
 
 
 def assert_equal_prop(actual, expected, default):
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -3,12 +3,13 @@
 from common import *
 from objectbox.store import Store
 
+
 # Fixtures in this file are used by all files in the same directory:
 # https://docs.pytest.org/en/7.1.x/reference/fixtures.html#conftest-py-sharing-fixtures-across-multiple-files
 
 
 def _clear_test_db():
-    Store.remove_db_files(test_dir)
+    Store.remove_db_files("testdata")
 
 
 @pytest.fixture(autouse=True)
diff --git a/tests/test_basics.py b/tests/test_basics.py
@@ -12,7 +12,7 @@
 # limitations under the License.
 
 import objectbox
-from tests.common import load_empty_test_default_store
+from tests.common import create_test_store
 
 
 def test_version():
@@ -30,4 +30,4 @@ def test_version():
 
 
 def test_open():
-    load_empty_test_default_store()
+    create_test_store()
diff --git a/tests/test_box.py b/tests/test_box.py
@@ -9,7 +9,7 @@
 
 
 def test_box_basics():
-    store = load_empty_test_default_store()
+    store = create_test_store()
     box = store.box(TestEntity)
 
     assert box.is_empty()
@@ -98,7 +98,7 @@ def test_box_basics():
 
 
 def test_box_bulk():
-    store = load_empty_test_default_store()
+    store = create_test_store()
     box = store.box(TestEntity)
 
     box.put(TestEntity(str="first"))
@@ -134,7 +134,7 @@ def test_box_bulk():
 
 
 def test_datetime():
-    store = load_empty_test_datetime_store()
+    store = create_test_store()
     box = store.box(TestEntityDatetime)
 
     assert box.is_empty()
@@ -189,7 +189,7 @@ def test_datetime():
 
 
 def test_datetime_special_values():
-    store = load_empty_test_datetime_store()
+    store = create_test_store()
     box = store.box(TestEntityDatetime)
     assert box.is_empty()
 
@@ -224,7 +224,7 @@ def test_put_get(object: TestEntity, box: objectbox.Box, property):
         read = box.get(object.id)
         assert read.flex == object.flex
 
-    store = load_empty_test_default_store()
+    store = create_test_store()
     box = store.box(TestEntity)
     object = TestEntity()
 
diff --git a/tests/test_deprecated.py b/tests/test_deprecated.py
@@ -1,20 +1,24 @@
 import pytest
 import tests.common
 import objectbox
-import objectbox.store_options 
+from objectbox import ObjectBox
+from objectbox.c import *
+from objectbox.store_options import StoreOptions
+from tests.common import *
+
 
 def test_deprecated_ObjectBox():
     model = tests.common.create_default_model()
-    model._finish()
-    options = objectbox.store_options.StoreOptions()
+    options = StoreOptions()
     options.model(model)
-    c_store = objectbox.c.obx_store_open(options._c_handle)
+    c_store = obx_store_open(options._c_handle)
     with pytest.deprecated_call():
-        ob = objectbox.objectbox.ObjectBox(c_store) 
-    box = objectbox.Box(ob, tests.model.TestEntity)
+        ob = ObjectBox(c_store)
+    box = objectbox.Box(ob, TestEntity)
     assert box.count() == 0
-    
+
+
 def test_deprecated_Builder():
     model = tests.common.create_default_model()
     with pytest.deprecated_call():
-        ob = objectbox.Builder().model(model).directory(tests.common.test_dir).build()
+        ob = objectbox.Builder().model(model).directory("testdata").build()
diff --git a/tests/test_hnsw.py b/tests/test_hnsw.py
@@ -3,7 +3,7 @@
 import random
 from common import *
 from objectbox.query_builder import QueryBuilder
-
+from typing import *
 
 def _find_expected_nn(points: np.ndarray, query: np.ndarray, n: int):
     """ Given a set of points of shape (N, P) and a query of shape (P), finds the n points nearest to query. """
diff --git a/tests/test_index.py b/tests/test_index.py
@@ -11,7 +11,7 @@
 
 @pytest.mark.skip(reason="Test indices implementation")
 def test_index_basics():
-    store = load_empty_test_default_store()
+    store = create_test_store()
     box = store.box(TestEntity)
 
     # create
@@ -36,13 +36,13 @@ def test_index_basics():
 
 @pytest.mark.skip(reason="Test indices implementation")
 def test_index_error():
-    @Entity(id=3, uid=3)
+    @Entity()
     class TestEntityInvalidIndex:
-        id = Id(id=1, uid=3001)
+        id = Id()
 
         # Cannot set index type when index is False
         try:
-            str = Property(str, id=2, uid=3002, index=False, index_type=IndexType.hash)
+            str = Property(str, index=False, index_type=IndexType.hash)
         except Exception:
             assert pytest.raises(Exception,
                                  match='trying to set index type on property of id 2 while index is set to False')
diff --git a/tests/test_inmemory.py b/tests/test_inmemory.py
@@ -1,5 +1,5 @@
 import objectbox
-from tests.common import load_empty_test_default_store
+from tests.common import create_test_store
 from tests.model import TestEntity
 import os.path
 import shutil
@@ -8,7 +8,7 @@
 def test_inmemory():
     # Use default path for persistent store
     db_name = "testdata"
-    store = load_empty_test_default_store()
+    store = create_test_store()
     box = store.box(TestEntity)
     object = TestEntity()
     id = box.put(object)
@@ -21,7 +21,7 @@ def test_inmemory():
 
     # Expect no path for in-memory store
     db_name = "memory:testdata"
-    store = load_empty_test_default_store(db_name)
+    store = create_test_store(db_name)
     box = store.box(TestEntity)
     object = TestEntity()
     id = box.put(object)
diff --git a/tests/test_query.py b/tests/test_query.py
@@ -316,7 +316,7 @@ def test_flex_contains_key_value():
 
 
 def test_offset_limit():
-    store = load_empty_test_default_store()
+    store = create_test_store()
 
     box = store.box(TestEntity)
     box.put(TestEntity())
diff --git a/tests/test_store_options.py b/tests/test_store_options.py
@@ -52,7 +52,7 @@ def test_set_options():
 def test_store_with_options():
     store = objectbox.Store(
         model=tests.common.create_default_model(),
-        directory=tests.common.test_dir,
+        directory="testdata",
         max_db_size_in_kb=1<<20,
         max_data_size_in_kb=(1<<20)-(1<<10),
         file_mode=int('664',8),
diff --git a/tests/test_transactions.py b/tests/test_transactions.py
@@ -4,7 +4,7 @@
 
 
 def test_transactions():
-    store = load_empty_test_default_store()
+    store = create_test_store()
     box = store.box(TestEntity)
 
     assert box.is_empty()
diff --git a/tests/test_userclass.py b/tests/test_userclass.py
@@ -1,13 +1,13 @@
 from objectbox import *
 from objectbox.model import *
-
+from objectbox.model.idsync import sync_model
 
 def test_userclass():
-    @Entity(id=1, uid=1)
+    @Entity()
     class Person:
-        id = Id(id=1, uid=1001)
-        firstName = Property(str, id=2, uid=1002)
-        lastName = Property(str, id=3, uid=1003)
+        id = Id()
+        firstName = String()
+        lastName = String()
 
         def __init__(self):
             self.counter = 0
@@ -19,8 +19,8 @@ def tick(self):
             self.counter += 1
 
     model = Model()
-    model.entity(Person, last_property_id=IdUid(3, 1003))
-    model.last_entity_id = IdUid(1, 1)
+    model.entity(Person)
+    sync_model(model)
     dbpath = "testdb"
     Store.remove_db_files(dbpath)
 
