Call ob.close() at the end of every test #6

Author: loryruta

example/model.py

@@ -13,5 +13,5 @@ class Task:
 def get_objectbox_model():
     m = Model()
     m.entity(Task, last_property_id=IdUid(4, 1004))
-    m.last_entity_id = IdUid(1, 1)
+    m.last_entity_id = IdUid(2, 2)
     return m

objectbox/objectbox.py

@@ -21,11 +21,19 @@ class ObjectBox:
     def __init__(self, c_store: OBX_store_p):
         self._c_store = c_store
 
+        self._closed = False
+
     def __del__(self):
-        obx_store_close(self._c_store)
+        self.close()
 
     def read_tx(self):
         return objectbox.transaction.read(self)
 
     def write_tx(self):
         return objectbox.transaction.write(self)
+
+    def close(self):
+        if not self._closed:
+            obx_store_close(self._c_store)
+            self._closed = True
+

tests/common.py

@@ -36,7 +36,7 @@ def load_empty_test_datetime(name: str = "") -> objectbox.ObjectBox:
     model = objectbox.Model()
     from objectbox.model import IdUid
     model.entity(TestEntityDatetime, last_property_id=IdUid(3, 1003))
-    model.last_entity_id = IdUid(1, 1)
+    model.last_entity_id = IdUid(2, 2)
 
     db_name = test_dir if len(name) == 0 else test_dir + "/" + name
 

tests/model.py

@@ -30,7 +30,7 @@ class TestEntity:
     def __init__(self, string: str = ""):
         self.str = string
 
-@Entity(id=1, uid=1)
+@Entity(id=2, uid=2)
 class TestEntityDatetime:
     id = Id(id=1, uid=1001)
     date = Property(datetime, type=PropertyType.date, id=2, uid=1002)

tests/test_basics.py

@@ -1,5 +1,5 @@
 import objectbox
-from tests.common import autocleanup, load_empty_test_objectbox, assert_equal
+from tests.common import load_empty_test_objectbox
 
 
 def test_version():

tests/test_box.py

@@ -2,7 +2,6 @@
 import objectbox
 from tests.model import TestEntity, TestEntityDatetime
 from tests.common import (
-    autocleanup,
     load_empty_test_objectbox,
     load_empty_test_datetime,
     assert_equal,
@@ -84,6 +83,8 @@ def test_box_basics():
     with pytest.raises(objectbox.NotFoundException):
         box.get(1)
 
+    ob.close()
+
 
 def test_box_bulk():
     ob = load_empty_test_objectbox()
@@ -117,6 +118,8 @@ def test_box_bulk():
     assert removed == 4
     assert box.count() == 0
 
+    ob.close()
+
 
 def test_datetime():
     ob = load_empty_test_datetime()
@@ -170,6 +173,8 @@ def test_datetime():
     with pytest.raises(objectbox.NotFoundException):
         box.get(1)
 
+    ob.close()
+
 
 def test_box_bulk_datetime():
     ob = load_empty_test_datetime()
@@ -196,3 +201,5 @@ def test_box_bulk_datetime():
     removed = box.remove_all()
     assert removed == 4
     assert box.count() == 0
+
+    ob.close()

tests/test_transactions.py

@@ -1,7 +1,6 @@
-import pytest
 import objectbox
 from tests.model import TestEntity
-from tests.common import autocleanup, load_empty_test_objectbox, assert_equal
+from tests.common import load_empty_test_objectbox
 
 
 def test_transactions():
@@ -39,3 +38,5 @@ def test_transactions():
         assert 0
     except Exception as err:
         assert "Cannot start a write transaction inside a read only transaction" in str(err)
+    finally:
+        ob.close()