split tests and finish transactions

Author: Ivan Dlugos

README.md

@@ -69,7 +69,7 @@ For more information and code examples, see the tests folder. The docs for other
 * ObjectBox Java = https://docs.objectbox.io
 * ObjectBox Go - https://golang.objectbox.io
 * ObjectBox Swift - https://swift.objectbox.io
-* ObjectBox Dart/Flutter - https://github.com
+* ObjectBox Dart/Flutter - https://github.com/objectbox/objectbox-dart
 
 Some features
 -------------

objectbox/c.py

@@ -336,7 +336,7 @@ def c_voidp_as_bytes(voidp, size):
 # obx_err (OBX_box* box, uint64_t count, obx_id* out_first_id);
 obx_box_ids_for_put = fn('obx_box_ids_for_put', obx_err, [OBX_box_p, ctypes.c_uint64, ctypes.POINTER(obx_id)])
 
-# obx_err (OBX_box* box, obx_id id, const void* data, size_t size, OBXPutMode mode);
+# obx_err (OBX_box* box, obx_id id, const void* data, size_t size);
 obx_box_put = fn('obx_box_put', obx_err, [OBX_box_p, obx_id, ctypes.c_void_p, ctypes.c_size_t])
 
 # obx_err (OBX_box* box, const OBX_bytes_array* objects, const obx_id* ids, OBXPutMode mode);

objectbox/objectbox.py

@@ -26,4 +26,6 @@ def __del__(self):
     def read_tx(self):
         return objectbox.transaction.read(self)
 
+    def write_tx(self):
+        return objectbox.transaction.write(self)
 

objectbox/transaction.py

@@ -31,5 +31,7 @@ def write(ob: 'ObjectBox'):
     try:
         yield
         obx_txn_success(tx)
-    finally:
+    except:
+        obx_txn_abort(tx)
         obx_txn_close(tx)
+        raise

tests/test_basics.py

@@ -1,101 +1,11 @@
-import pytest
 import objectbox
-from tests.model import TestEntity
 from tests.common import autocleanup, load_empty_test_objectbox, assert_equal
 
+
 def test_version():
     info = objectbox.version_info()
     assert len(info) > 10
 
 
 def test_open():
     load_empty_test_objectbox()
-
-
-def test_box_basics():
-    ob = load_empty_test_objectbox()
-    box = objectbox.Box(ob, TestEntity)
-
-    assert box.is_empty()
-    assert box.count() == 0
-
-    # create
-    object = TestEntity()
-    id = box.put(object)
-    assert id == 1
-    assert id == object.id
-
-    # create with a given ID and some data
-    object = TestEntity()
-    object.id = 5
-    object.bool = True
-    object.int = 42
-    object.str = "foo"
-    object.float = 4.2
-    object.bytes = bytes([1, 1, 2, 3, 5])
-    object.transient = "abcd"
-
-    id = box.put(object)
-    assert id == 5
-    assert id == object.id
-
-    # check the count
-    assert not box.is_empty()
-    assert box.count() == 2
-
-    # read
-    read = box.get(object.id)
-    assert_equal(read, object)
-    assert read.transient != object.transient  # !=
-
-    # update
-    object.str = "bar"
-    id = box.put(object)
-    assert id == 5
-
-    # read again
-    read = box.get(object.id)
-    assert_equal(read, object)
-
-    # remove
-    box.remove(object)
-    box.remove(1)
-
-    # check they're gone
-    assert box.count() == 0
-    with pytest.raises(objectbox.NotFoundException):
-        box.get(object.id)
-    with pytest.raises(objectbox.NotFoundException):
-        box.get(1)
-
-
-def test_box_bulk():
-    ob = load_empty_test_objectbox()
-    box = objectbox.Box(ob, TestEntity)
-
-    box.put(TestEntity("first"))
-
-    objects = [TestEntity("second"), TestEntity("third"), TestEntity("fourth"), box.get(1)]
-    box.put(objects)
-    assert box.count() == 4
-    assert objects[0].id == 2
-    assert objects[1].id == 3
-    assert objects[2].id == 4
-    assert objects[3].id == 1
-
-    assert_equal(box.get(objects[0].id), objects[0])
-    assert_equal(box.get(objects[1].id), objects[1])
-    assert_equal(box.get(objects[2].id), objects[2])
-    assert_equal(box.get(objects[3].id), objects[3])
-
-    objects_read = box.get_all()
-    assert len(objects_read) == 4
-    assert_equal(objects_read[0], objects[3])
-    assert_equal(objects_read[1], objects[0])
-    assert_equal(objects_read[2], objects[1])
-    assert_equal(objects_read[3], objects[2])
-
-    # remove all
-    removed = box.remove_all()
-    assert removed == 4
-    assert box.count() == 0

tests/test_box.py

@@ -0,0 +1,93 @@
+import pytest
+import objectbox
+from tests.model import TestEntity
+from tests.common import autocleanup, load_empty_test_objectbox, assert_equal
+
+
+def test_box_basics():
+    ob = load_empty_test_objectbox()
+    box = objectbox.Box(ob, TestEntity)
+
+    assert box.is_empty()
+    assert box.count() == 0
+
+    # create
+    object = TestEntity()
+    id = box.put(object)
+    assert id == 1
+    assert id == object.id
+
+    # create with a given ID and some data
+    object = TestEntity()
+    object.id = 5
+    object.bool = True
+    object.int = 42
+    object.str = "foo"
+    object.float = 4.2
+    object.bytes = bytes([1, 1, 2, 3, 5])
+    object.transient = "abcd"
+
+    id = box.put(object)
+    assert id == 5
+    assert id == object.id
+
+    # check the count
+    assert not box.is_empty()
+    assert box.count() == 2
+
+    # read
+    read = box.get(object.id)
+    assert_equal(read, object)
+    assert read.transient != object.transient  # !=
+
+    # update
+    object.str = "bar"
+    id = box.put(object)
+    assert id == 5
+
+    # read again
+    read = box.get(object.id)
+    assert_equal(read, object)
+
+    # remove
+    box.remove(object)
+    box.remove(1)
+
+    # check they're gone
+    assert box.count() == 0
+    with pytest.raises(objectbox.NotFoundException):
+        box.get(object.id)
+    with pytest.raises(objectbox.NotFoundException):
+        box.get(1)
+
+
+def test_box_bulk():
+    ob = load_empty_test_objectbox()
+    box = objectbox.Box(ob, TestEntity)
+
+    box.put(TestEntity("first"))
+
+    objects = [TestEntity("second"), TestEntity("third"), TestEntity("fourth"), box.get(1)]
+    box.put(objects)
+    assert box.count() == 4
+    assert objects[0].id == 2
+    assert objects[1].id == 3
+    assert objects[2].id == 4
+    assert objects[3].id == 1
+
+    assert_equal(box.get(objects[0].id), objects[0])
+    assert_equal(box.get(objects[1].id), objects[1])
+    assert_equal(box.get(objects[2].id), objects[2])
+    assert_equal(box.get(objects[3].id), objects[3])
+
+    objects_read = box.get_all()
+    assert len(objects_read) == 4
+    assert_equal(objects_read[0], objects[3])
+    assert_equal(objects_read[1], objects[0])
+    assert_equal(objects_read[2], objects[1])
+    assert_equal(objects_read[3], objects[2])
+
+    # remove all
+    removed = box.remove_all()
+    assert removed == 4
+    assert box.count() == 0

tests/test_transactions.py

@@ -0,0 +1,41 @@
+import pytest
+import objectbox
+from tests.model import TestEntity
+from tests.common import autocleanup, load_empty_test_objectbox, assert_equal
+
+
+def test_transactions():
+    ob = load_empty_test_objectbox()
+    box = objectbox.Box(ob, TestEntity)
+
+    assert box.is_empty()
+
+    with ob.write_tx():
+        box.put(TestEntity("first"))
+        box.put(TestEntity("second"))
+
+    assert box.count() == 2
+
+    try:
+        with ob.write_tx():
+            box.put(TestEntity("third"))
+            box.put(TestEntity("fourth"))
+            raise Exception("mission abort!")
+
+        # exception must be propagated so this line must not execute
+        assert 0
+    except Exception as err:
+        assert str(err) == "mission abort!"
+
+    # changes have been rolled back
+    assert box.count() == 2
+
+    # can't write in a read TX
+    try:
+        with ob.read_tx():
+            box.put(TestEntity("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)