test fixes for transaction not cleaned up

Author: greenrobot

tests/objectbox-java-test/src/main/java/io/objectbox/CursorBytesTest.java

@@ -21,10 +21,7 @@
 import java.util.Arrays;
 import java.util.Random;
 
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 // NOTE: Sizes must be multiple of 4 (currently not enforced)
 public class CursorBytesTest extends AbstractObjectBoxTest {
@@ -55,8 +52,8 @@ public void testFirstLastNextPrev() {
         assertTrue(Arrays.equals(new byte[]{4, 5, 6, 7}, cursor.getNext()));
         assertTrue(Arrays.equals(new byte[]{2, 3, 4, 5}, cursor.getPrev()));
         // getLast is currently unsupported
-//        assertTrue(Arrays.equals(new byte[]{8, 9, 10, 11, 12, 13}, cursor.getLast()));
-//        assertTrue(Arrays.equals(new byte[]{4, 5, 6, 7, 8}, cursor.getPrev()));
+        //        assertTrue(Arrays.equals(new byte[]{8, 9, 10, 11, 12, 13}, cursor.getLast()));
+        //        assertTrue(Arrays.equals(new byte[]{4, 5, 6, 7, 8}, cursor.getPrev()));
 
         cursor.close();
         transaction.abort();
@@ -65,19 +62,23 @@ public void testFirstLastNextPrev() {
     @Test
     public void testRemove() {
         Transaction transaction = store.beginTx();
-        KeyValueCursor cursor = transaction.createKeyValueCursor();
-
-        cursor.put(1, new byte[]{1, 1, 0, 0});
-        cursor.put(2, new byte[]{2, 1, 0, 0});
-        cursor.put(4, new byte[]{4, 1, 0, 0});
-
-        assertTrue(cursor.removeAt(2));
-
-        // now 4 should be next to 1
-        assertTrue(cursor.seek(1));
-        byte[] next = cursor.getNext();
-        assertNotNull(next);
-        assertTrue(Arrays.equals(new byte[]{4, 1, 0, 0}, next));
+        try {
+            KeyValueCursor cursor = transaction.createKeyValueCursor();
+
+            cursor.put(1, new byte[]{1, 1, 0, 0});
+            cursor.put(2, new byte[]{2, 1, 0, 0});
+            cursor.put(4, new byte[]{4, 1, 0, 0});
+
+            assertTrue(cursor.removeAt(2));
+
+            // now 4 should be next to 1
+            assertTrue(cursor.seek(1));
+            byte[] next = cursor.getNext();
+            assertNotNull(next);
+            assertTrue(Arrays.equals(new byte[]{4, 1, 0, 0}, next));
+        } finally {
+            transaction.close();
+        }
     }
 
     @Test

tests/objectbox-java-test/src/main/java/io/objectbox/CursorTest.java

@@ -23,13 +23,7 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 public class CursorTest extends AbstractObjectBoxTest {
 
@@ -64,7 +58,7 @@ public void testPutEntityWithInvalidId() {
             cursor.put(entity);
         } finally {
             cursor.close();
-            transaction.abort();
+            transaction.close();
         }
     }
 
@@ -149,15 +143,19 @@ public void testPutSameIndexValue() {
         String value = "lulu321";
         entity.setSimpleString(value);
         Transaction transaction = store.beginTx();
-
-        Cursor<TestEntity> cursor = transaction.createCursor(TestEntity.class);
-        long key = cursor.put(entity);
-        // And again
-        entity.setSimpleInt(1977);
-        cursor.put(entity);
-        assertEquals(key, cursor.lookupKeyUsingIndex(9, value));
-        TestEntity read = cursor.get(key);
-        cursor.close();
+        TestEntity read;
+        try {
+            Cursor<TestEntity> cursor = transaction.createCursor(TestEntity.class);
+            long key = cursor.put(entity);
+            // And again
+            entity.setSimpleInt(1977);
+            cursor.put(entity);
+            assertEquals(key, cursor.lookupKeyUsingIndex(9, value));
+            read = cursor.get(key);
+            cursor.close();
+        } finally {
+            transaction.close();
+        }
         assertEquals(1977, read.getSimpleInt());
         assertEquals(value, read.getSimpleString());
     }
@@ -264,13 +262,17 @@ public void testLookupKeyUsingIndex_samePrefix() {
     @Test
     public void testClose() {
         Transaction tx = store.beginReadTx();
-        Cursor<TestEntity> cursor = tx.createCursor(TestEntity.class);
-        assertFalse(cursor.isClosed());
-        cursor.close();
-        assertTrue(cursor.isClosed());
+        try {
+            Cursor<TestEntity> cursor = tx.createCursor(TestEntity.class);
+            assertFalse(cursor.isClosed());
+            cursor.close();
+            assertTrue(cursor.isClosed());
 
-        // Double close should be fine
-        cursor.close();
+            // Double close should be fine
+            cursor.close();
+        } finally {
+            tx.close();
+        }
     }
 
     @Test