tests/examples use store.box, added Box example to test_deprecated #44

Author: dan-obx

benchmark.py

@@ -10,8 +10,8 @@ class ObjectBoxPerf:
     """
 
     def __init__(self):
-        self.ob = load_empty_test_default_store()
-        self.box = objectbox.Box(self.ob, TestEntity)
+        self.store = load_empty_test_default_store()
+        self.box = store.box(TestEntity)
 
     def remove_all(self):
         self.box.remove_all()

example/tasks/__main__.py

@@ -16,7 +16,7 @@ def format_date(timestamp_ms: int) -> str:
 class TasklistCmd(Cmd):
     prompt = "> "
     _store = objectbox.Store(model=get_objectbox_model(), directory="tasklist-db")
-    _box = objectbox.Box(_store, Task)
+    _box = _store.box(Task)
 
     def do_ls(self, _):
         """list tasks"""

example/vectorsearch-cities/__main__.py

@@ -24,7 +24,7 @@ def __init__(self, *args):
         dbdir = "cities-db"
         new_db = not os.path.exists(dbdir)
         self._store = objectbox.Store(model=get_objectbox_model(),directory=dbdir)
-        self._box = objectbox.Box(self._store, City)
+        self._box = _store.box(City)
         self._name_prop: Property = City.get_property("name")
         self._location_prop: Property = City.get_property("location")
         if new_db: 

tests/test_box.py

@@ -9,8 +9,8 @@
 
 
 def test_box_basics():
-    ob = load_empty_test_default_store()
-    box = objectbox.Box(ob, TestEntity)
+    store = load_empty_test_default_store()
+    box = store.box(TestEntity)
 
     assert box.is_empty()
     assert box.count() == 0
@@ -89,12 +89,12 @@ def test_box_basics():
     assert box.get(object.id) == None
     assert box.get(1) == None
 
-    ob.close()
+    store.close()
 
 
 def test_box_bulk():
-    ob = load_empty_test_default_store()
-    box = objectbox.Box(ob, TestEntity)
+    store = load_empty_test_default_store()
+    box = store.box(TestEntity)
 
     box.put(TestEntity(str="first"))
 
@@ -124,12 +124,12 @@ def test_box_bulk():
     assert removed == 4
     assert box.count() == 0
 
-    ob.close()
+    store.close()
 
 
 def test_datetime():
-    ob = load_empty_test_datetime_store()
-    box = objectbox.Box(ob, TestEntityDatetime)
+    store = load_empty_test_datetime_store()
+    box = store.box(TestEntityDatetime)
 
     assert box.is_empty()
     assert box.count() == 0
@@ -177,7 +177,7 @@ def test_datetime():
     assert box.get(object.id) == None
     assert box.get(1) == None
 
-    ob.close()
+    store.close()
 
 
 def test_flex():
@@ -188,8 +188,8 @@ def test_put_get(object: TestEntity, box: objectbox.Box, property):
         read = box.get(object.id)
         assert read.flex == object.flex
 
-    ob = load_empty_test_default_store()
-    box = objectbox.Box(ob, TestEntity)
+    store = load_empty_test_default_store()
+    box = store.box(TestEntity)
     object = TestEntity()
 
     # Put an empty object
@@ -226,13 +226,13 @@ def test_put_get(object: TestEntity, box: objectbox.Box, property):
     # Update to list inside dict
     test_put_get(object, box, {"a": 1, "b": [1, 2, 3]})
 
-    ob.close()
+    store.close()
 
 
 def test_flex_values():
-    ob = create_test_store()
+    store = create_test_store()
 
-    box = objectbox.Box(ob, TestEntityFlex)
+    box = store.box(TestEntityFlex)
 
     # Test empty object
     obj_id = box.put(TestEntityFlex())

tests/test_deprecated.py

@@ -11,6 +11,8 @@ def test_deprecated_ObjectBox():
     c_store = objectbox.c.obx_store_open(options._c_handle)
     with pytest.deprecated_call():
         ob = objectbox.objectbox.ObjectBox(c_store) 
+    box = objectbox.Box(ob, tests.model.TestEntity)
+    assert box.count() == 0
 
 def test_deprecated_Builder():
     model = tests.common.create_default_model()

tests/test_hnsw.py

@@ -34,10 +34,10 @@ def _test_random_points(
 
     points = np.random.rand(num_points, 2).astype(np.float32)
 
-    db = create_test_store()
+    store = create_test_store()
 
     # Init and seed DB
-    box = objectbox.Box(db, VectorEntity)
+    box = store.box(VectorEntity)
 
     print(f"Seeding DB with {num_points} points...")
     objects = []
@@ -94,9 +94,9 @@ def test_random_points():
 
 def _test_combined_nn_search(distance_type: VectorDistanceType = VectorDistanceType.EUCLIDEAN):
 
-    db = create_test_store()
+    store = create_test_store()
 
-    box = objectbox.Box(db, VectorEntity)
+    box = store.box(VectorEntity)
 
     vector_field_name = "vector_"+distance_type.name.lower()
 

tests/test_index.py

@@ -11,8 +11,8 @@
 
 @pytest.mark.skip(reason="Test indices implementation")
 def test_index_basics():
-    ob = load_empty_test_default_store()
-    box = objectbox.Box(ob, TestEntity)
+    store = load_empty_test_default_store()
+    box = store.box(TestEntity)
 
     # create
     object = TestEntity()

tests/test_inmemory.py

@@ -8,21 +8,21 @@
 def test_inmemory():
     # Use default path for persistent store
     db_name = "testdata"
-    ob = load_empty_test_default_store()
-    box = objectbox.Box(ob, TestEntity)
+    store = load_empty_test_default_store()
+    box = store.box(TestEntity)
     object = TestEntity()
     id = box.put(object)
     assert id == 1
     assert id == object.id
     assert os.path.exists(db_name)
     del box
-    ob.close()
+    store.close()
     shutil.rmtree(db_name)
 
     # Expect no path for in-memory store
     db_name = "memory:testdata"
-    ob = load_empty_test_default_store(db_name)
-    box = objectbox.Box(ob, TestEntity)
+    store = load_empty_test_default_store(db_name)
+    box = store.box(TestEntity)
     object = TestEntity()
     id = box.put(object)
     assert id == 1

tests/test_query.py

@@ -9,13 +9,13 @@
 
 
 def test_basics():
-    ob = create_test_store()
+    store = create_test_store()
 
-    box_test_entity = objectbox.Box(ob, TestEntity)
+    box_test_entity = store.box(TestEntity)
     box_test_entity.put(TestEntity(str="foo", int64=123))
     box_test_entity.put(TestEntity(str="bar", int64=456))
 
-    box_vector_entity = objectbox.Box(ob, VectorEntity)
+    box_vector_entity = store.box(VectorEntity)
     box_vector_entity.put(VectorEntity(name="Object 1", vector_euclidean=[1, 1]))
     box_vector_entity.put(VectorEntity(name="Object 2", vector_euclidean=[2, 2]))
     box_vector_entity.put(VectorEntity(name="Object 3", vector_euclidean=[3, 3]))
@@ -104,13 +104,13 @@ def test_basics():
     assert query.count() == 2
     assert query.find_ids() == [2, 3]
 
-    ob.close()
+    store.close()
 
 
 def test_flex_contains_key_value():
-    ob = create_test_store()
+    store = create_test_store()
 
-    box = objectbox.Box(ob, TestEntityFlex)
+    box = store.box(TestEntityFlex)
     box.put(TestEntityFlex(flex={"k1": "String", "k2": 2, "k3": "string"}))
     box.put(TestEntityFlex(flex={"k1": "strinG", "k2": 3, "k3": 10, "k4": [1, "foo", 3]}))
     box.put(TestEntityFlex(flex={"k1": "buzz", "k2": 3, "k3": [2, 3], "k4": {"k1": "a", "k2": "inner text"}}))
@@ -156,9 +156,9 @@ def test_flex_contains_key_value():
 
 
 def test_offset_limit():
-    ob = load_empty_test_default_store()
+    store = load_empty_test_default_store()
 
-    box = objectbox.Box(ob, TestEntity)
+    box = store.box(TestEntity)
     box.put(TestEntity())
     box.put(TestEntity(str="a"))
     box.put(TestEntity(str="b"))
@@ -185,9 +185,9 @@ def test_offset_limit():
 
 
 def test_any_all():
-    db = create_test_store()
+    store = create_test_store()
 
-    box = objectbox.Box(db, TestEntity)
+    box = store.box(TestEntity)
 
     box.put(TestEntity(str="Foo", int32=10, int8=2, float32=3.14, bool=True))
     box.put(TestEntity(str="FooBar", int32=100, int8=50, float32=2.0, bool=True))
@@ -247,17 +247,17 @@ def test_any_all():
 
 
 def test_set_parameter():
-    db = create_test_store()
+    store = create_test_store()
 
-    box_test_entity = objectbox.Box(db, TestEntity)
+    box_test_entity = store.box(TestEntity)
     box_test_entity.put(TestEntity(str="Foo", int64=2, int32=703, int8=101))
     box_test_entity.put(TestEntity(str="FooBar", int64=10, int32=49, int8=45))
     box_test_entity.put(TestEntity(str="Bar", int64=10, int32=226, int8=126))
     box_test_entity.put(TestEntity(str="Foster", int64=2, int32=301, int8=42))
     box_test_entity.put(TestEntity(str="Fox", int64=10, int32=157, int8=11))
     box_test_entity.put(TestEntity(str="Barrakuda", int64=4, int32=386, int8=60))
 
-    box_vector_entity = objectbox.Box(db, VectorEntity)
+    box_vector_entity = store.box(VectorEntity)
     box_vector_entity.put(VectorEntity(name="Object 1", vector_euclidean=[1, 1]))
     box_vector_entity.put(VectorEntity(name="Object 2", vector_euclidean=[2, 2]))
     box_vector_entity.put(VectorEntity(name="Object 3", vector_euclidean=[3, 3]))
@@ -300,13 +300,13 @@ def test_set_parameter():
 
 
 def test_set_parameter_alias():
-    db = create_test_store()
-    box = objectbox.Box(db, TestEntity)
+    store = create_test_store()
+    box = store.box(TestEntity)
 
     box.put(TestEntity(str="Foo", int64=2, int32=703, int8=101))
     box.put(TestEntity(str="FooBar", int64=10, int32=49, int8=45))
 
-    box_vector = objectbox.Box(db, VectorEntity)
+    box_vector = store.box(VectorEntity)
     box_vector.put(VectorEntity(name="Object 1", vector_euclidean=[1, 1]))
     box_vector.put(VectorEntity(name="Object 2", vector_euclidean=[2, 2]))
     box_vector.put(VectorEntity(name="Object 3", vector_euclidean=[3, 3]))
@@ -375,10 +375,10 @@ def test_set_parameter_alias():
 
 def test_set_parameter_alias_advanced():
     """ Tests set_parameter_alias in a complex scenario (i.e. multiple query conditions/logical aggregations). """
-    db = create_test_store()
+    store = create_test_store()
 
     # Setup 1
-    box = objectbox.Box(db, TestEntity)
+    box = store.box(TestEntity)
     box.put(TestEntity(str="Apple", bool=False, int64=47, int32=70))
     box.put(TestEntity(str="applE", bool=True, int64=253, int32=798))
     box.put(TestEntity(str="APPLE", bool=False, int64=3456, int32=123))

tests/test_transactions.py

@@ -4,19 +4,19 @@
 
 
 def test_transactions():
-    ob = load_empty_test_default_store()
-    box = objectbox.Box(ob, TestEntity)
+    store = load_empty_test_default_store()
+    box = store.box(TestEntity)
 
     assert box.is_empty()
 
-    with ob.write_tx():
+    with store.write_tx():
         box.put(TestEntity(str="first"))
         box.put(TestEntity(str="second"))
 
     assert box.count() == 2
 
     try:
-        with ob.write_tx():
+        with store.write_tx():
             box.put(TestEntity(str="third"))
             box.put(TestEntity(str="fourth"))
             raise Exception("mission abort!")
@@ -31,12 +31,12 @@ def test_transactions():
 
     # can't write in a read TX
     try:
-        with ob.read_tx():
+        with store.read_tx():
             box.put(TestEntity(str="third"))
 
         # exception must be propagated so this line must not execute
         assert 0
     except Exception as err:
         assert "Cannot start a write transaction inside a read only transaction" in str(err)
     finally:
-        ob.close()
+        store.close()