Tests: extract builder with default test model creator.

Author: greenrobot-team

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

@@ -236,6 +236,13 @@ byte[] createTestModelWithTwoEntities(boolean withIndex) {
         return modelBuilder.build();
     }
 
+    /**
+     * When not using the {@link #store} of this to create a builder with the default test model.
+     */
+    protected BoxStoreBuilder createBuilderWithTestModel() {
+        return new BoxStoreBuilder(createTestModel(null));
+    }
+
     private void addTestEntity(ModelBuilder modelBuilder, @Nullable IndexType simpleStringIndexType) {
         lastEntityUid = ++lastUid;
         EntityBuilder entityBuilder = modelBuilder.entity("TestEntity").id(++lastEntityId, lastEntityUid);

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

@@ -55,7 +55,7 @@ protected BoxStore createBoxStore() {
     @Before
     public void setUpBuilder() {
         BoxStore.clearDefaultStore();
-        builder = new BoxStoreBuilder(createTestModel(null)).directory(boxStoreDir);
+        builder = createBuilderWithTestModel().directory(boxStoreDir);
     }
 
     @Test

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

@@ -176,7 +176,7 @@ public void openSamePath_afterClose_works() {
     @Test
     public void testOpenTwoBoxStoreTwoFiles() {
         File boxStoreDir2 = new File(boxStoreDir.getAbsolutePath() + "-2");
-        BoxStoreBuilder builder = new BoxStoreBuilder(createTestModel(null)).directory(boxStoreDir2);
+        BoxStoreBuilder builder = createBuilderWithTestModel().directory(boxStoreDir2);
         builder.entity(new TestEntity_());
     }
 
@@ -192,7 +192,7 @@ public void testDeleteAllFiles_staticDir() {
         closeStoreForTest();
 
         File boxStoreDir2 = new File(boxStoreDir.getAbsolutePath() + "-2");
-        BoxStoreBuilder builder = new BoxStoreBuilder(createTestModel(null)).directory(boxStoreDir2);
+        BoxStoreBuilder builder = createBuilderWithTestModel().directory(boxStoreDir2);
         BoxStore store2 = builder.build();
         store2.close();
 
@@ -217,7 +217,7 @@ public void testDeleteAllFiles_baseDirName() {
         File dbDir = new File(basedir, name);
         assertFalse(dbDir.exists());
 
-        BoxStoreBuilder builder = new BoxStoreBuilder(createTestModel(null)).baseDirectory(basedir).name(name);
+        BoxStoreBuilder builder = createBuilderWithTestModel().baseDirectory(basedir).name(name);
         BoxStore store2 = builder.build();
         store2.close();
 
@@ -285,7 +285,7 @@ public void testCallInReadTxWithRetry_callback() {
         final int[] countHolder = {0};
         final int[] countHolderCallback = {0};
 
-        BoxStoreBuilder builder = new BoxStoreBuilder(createTestModel(null)).directory(boxStoreDir)
+        BoxStoreBuilder builder = createBuilderWithTestModel().directory(boxStoreDir)
                 .failedReadTxAttemptCallback((result, error) -> {
                     assertNotNull(error);
                     countHolderCallback[0]++;

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

@@ -53,7 +53,7 @@ protected BoxStore createBoxStore() {
     @Before
     public void setUpBuilder() {
         BoxStore.clearDefaultStore();
-        builder = new BoxStoreBuilder(createTestModel(null)).directory(boxStoreDir);
+        builder = createBuilderWithTestModel().directory(boxStoreDir);
     }
 
     @Test

tests/objectbox-java-test/src/test/java/io/objectbox/query/QueryTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2023 ObjectBox Ltd. All rights reserved.
+ * Copyright 2017-2024 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,6 +16,9 @@
 
 package io.objectbox.query;
 
+import org.junit.Test;
+import org.junit.function.ThrowingRunnable;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
@@ -34,8 +37,7 @@
 import io.objectbox.relation.MyObjectBox;
 import io.objectbox.relation.Order;
 import io.objectbox.relation.Order_;
-import org.junit.Test;
-import org.junit.function.ThrowingRunnable;
+
 
 import static io.objectbox.TestEntity_.simpleBoolean;
 import static io.objectbox.TestEntity_.simpleByteArray;
@@ -1234,7 +1236,7 @@ public void testForEachBreak() {
     // TODO can we improve? More than just "still works"?
     public void testQueryAttempts() {
         store.close();
-        BoxStoreBuilder builder = new BoxStoreBuilder(createTestModel(null)).directory(boxStoreDir)
+        BoxStoreBuilder builder = createBuilderWithTestModel().directory(boxStoreDir)
                 .queryAttempts(5)
                 .failedReadTxAttemptCallback((result, error) -> {
                     if (error != null) {