up version to "2.7.0-2020-07-30", add validateOnOpen() test

Author: greenrobot

objectbox-java/src/main/java/io/objectbox/BoxStore.java

@@ -66,7 +66,7 @@ public class BoxStore implements Closeable {
     /** Change so ReLinker will update native library when using workaround loading. */
     public static final String JNI_VERSION = "2.6.0";
 
-    private static final String VERSION = "2.6.1-2020-06-09";
+    private static final String VERSION = "2.7.0-2020-07-30";
     private static BoxStore defaultStore;
 
     /** Currently used DB dirs with values from {@link #getCanonicalPath(File)}. */

objectbox-java/src/main/java/io/objectbox/BoxStoreBuilder.java

@@ -102,7 +102,7 @@ public class BoxStoreBuilder {
     boolean readOnly;
     boolean usePreviousCommit;
 
-    int validateOnOpenMode;
+    short validateOnOpenMode;
     long validateOnOpenPageLimit;
 
     TxCallback<?> failedReadTxAttemptCallback;
@@ -357,7 +357,7 @@ public BoxStoreBuilder usePreviousCommit() {
      *
      * @param validateOnOpenMode One of {@link ValidateOnOpenMode}.
      */
-    public BoxStoreBuilder validateOnOpen(int validateOnOpenMode) {
+    public BoxStoreBuilder validateOnOpen(short validateOnOpenMode) {
         if (validateOnOpenMode < ValidateOnOpenMode.None || validateOnOpenMode > ValidateOnOpenMode.Full) {
             throw new IllegalArgumentException("Must be one of ValidateOnOpenMode");
         }
@@ -366,7 +366,7 @@ public BoxStoreBuilder validateOnOpen(int validateOnOpenMode) {
     }
 
     /**
-     * To fine-tune {@link #validateOnOpen(int)}, you can specify a limit on how much data is looked at.
+     * To fine-tune {@link #validateOnOpen(short)}, you can specify a limit on how much data is looked at.
      * This is measured in "pages" with a page typically holding 4000.
      * Usually a low number (e.g. 1-20) is sufficient and does not impact startup performance significantly.
      * <p>

tests/objectbox-java-test/src/test/java/io/objectbox/AbstractObjectBoxTest.java

@@ -58,6 +58,7 @@ public void setUp() throws IOException {
 
         // This works with Android without needing any context
         File tempFile = File.createTempFile("object-store-test", "");
+        //noinspection ResultOfMethodCallIgnored
         tempFile.delete();
         boxStoreDir = tempFile;
 

tests/objectbox-java-test/src/test/java/io/objectbox/BoxStoreBuilderTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ObjectBox Ltd. All rights reserved.
+ * Copyright 2017-2020 ObjectBox Ltd. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,13 +16,15 @@
 
 package io.objectbox;
 
+import io.objectbox.model.ValidateOnOpenMode;
 import org.junit.Before;
 import org.junit.Test;
 
 
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
+import static org.junit.Assert.assertNotNull;
 
 public class BoxStoreBuilderTest extends AbstractObjectBoxTest {
 
@@ -35,7 +37,7 @@ protected BoxStore createBoxStore() {
     }
 
     @Before
-    public void setUpBox() {
+    public void setUpBuilder() {
         BoxStore.clearDefaultStore();
         builder = new BoxStoreBuilder(createTestModel(false)).directory(boxStoreDir);
     }
@@ -106,17 +108,39 @@ public void testMaxReaders() {
 
     @Test
     public void readOnly() {
-        // Create a database first.
+        // Create a database first; we must create the model only once (ID/UID sequences would be different 2nd time)
         byte[] model = createTestModel(false);
         builder = new BoxStoreBuilder(model).directory(boxStoreDir);
         store = builder.build();
         store.close();
 
-        // Then open database with same model as read-only.
+        // Then re-open database with same model as read-only.
         builder = new BoxStoreBuilder(model).directory(boxStoreDir);
         builder.readOnly();
         store = builder.build();
 
         assertTrue(store.isReadOnly());
     }
+
+    @Test
+    public void validateOnOpen() {
+        // Create a database first; we must create the model only once (ID/UID sequences would be different 2nd time)
+        byte[] model = createTestModel(false);
+        builder = new BoxStoreBuilder(model).directory(boxStoreDir);
+        builder.entity(new TestEntity_());
+        store = builder.build();
+
+        TestEntity object = new TestEntity(0);
+        object.setSimpleString("hello hello");
+        long id = getTestEntityBox().put(object);
+        store.close();
+
+        // Then re-open database with validation and ensure db is operational
+        builder = new BoxStoreBuilder(model).directory(boxStoreDir);
+        builder.entity(new TestEntity_());
+        builder.validateOnOpen(ValidateOnOpenMode.Full);
+        store = builder.build();
+        assertNotNull(getTestEntityBox().get(id));
+        getTestEntityBox().put(new TestEntity(0));
+    }
 }