Merge branch 'test-cleanup' into dev

Author: greenrobot-team

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

@@ -23,7 +23,18 @@
 
 import javax.annotation.Nullable;
 
-/** In "real" entity would be annotated with @Entity. */
+import io.objectbox.annotation.Entity;
+import io.objectbox.annotation.Id;
+import io.objectbox.annotation.Unsigned;
+
+/**
+ * The annotations in this class have no effect as the Gradle plugin is not configured in this project. However, test
+ * code builds a model like if the annotations were processed.
+ * <p>
+ * There is a matching test in the internal integration test project where this is tested and model builder code can be
+ * "stolen" from.
+ */
+@Entity
 public class TestEntity {
 
     public static final String STRING_VALUE_THROW_IN_CONSTRUCTOR =
@@ -32,7 +43,7 @@ public class TestEntity {
     public static final String EXCEPTION_IN_CONSTRUCTOR_MESSAGE =
             "Hello, this is an exception from TestEntity constructor";
 
-    /** In "real" entity would be annotated with @Id. */
+    @Id
     private long id;
     private boolean simpleBoolean;
     private byte simpleByte;
@@ -47,11 +58,11 @@ public class TestEntity {
     /** Not-null value. */
     private String[] simpleStringArray;
     private List<String> simpleStringList;
-    /** In "real" entity would be annotated with @Unsigned. */
+    @Unsigned
     private short simpleShortU;
-    /** In "real" entity would be annotated with @Unsigned. */
+    @Unsigned
     private int simpleIntU;
-    /** In "real" entity would be annotated with @Unsigned. */
+    @Unsigned
     private long simpleLongU;
     private Map<String, Object> stringObjectMap;
     private Object flexProperty;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 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,14 +16,16 @@
 
 package io.objectbox;
 
+import java.util.Map;
+
 import io.objectbox.annotation.apihint.Internal;
 import io.objectbox.converter.FlexObjectConverter;
 import io.objectbox.converter.StringFlexMapConverter;
 import io.objectbox.internal.CursorFactory;
 
-import java.util.Map;
+// NOTE: Instead of updating this by hand, copy changes from the internal integration test project after updating its
+// TestEntity. But make sure to keep the INT_NULL_HACK to make it work with tests here.
 
-// NOTE: Copied from a plugin project (& removed some unused Properties).
 // THIS CODE IS GENERATED BY ObjectBox, DO NOT EDIT.
 
 /**
@@ -86,6 +88,7 @@ public long getId(TestEntity entity) {
      *
      * @return The ID of the object within its box.
      */
+    @SuppressWarnings({"rawtypes", "unchecked"})
     @Override
     public long put(TestEntity entity) {
         short[] shortArray = entity.getShortArray();

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

@@ -1,6 +1,5 @@
-
 /*
- * Copyright 2017 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.
@@ -17,16 +16,18 @@
 
 package io.objectbox;
 
+import java.util.Map;
+
 import io.objectbox.TestEntityCursor.Factory;
 import io.objectbox.annotation.apihint.Internal;
 import io.objectbox.converter.FlexObjectConverter;
 import io.objectbox.converter.StringFlexMapConverter;
 import io.objectbox.internal.CursorFactory;
 import io.objectbox.internal.IdGetter;
 
-import java.util.Map;
+// NOTE: Instead of updating this by hand, copy changes from the internal integration test project after updating its
+// TestEntity.
 
-// NOTE: Copied from a plugin project (& removed some unused Properties).
 // THIS CODE IS GENERATED BY ObjectBox, DO NOT EDIT.
 
 /**
@@ -82,7 +83,7 @@ public final class TestEntity_ implements EntityInfo<TestEntity> {
             new io.objectbox.Property<>(__INSTANCE, 9, 10, byte[].class, "simpleByteArray");
 
     public final static io.objectbox.Property<TestEntity> simpleStringArray =
-            new io.objectbox.Property<>(__INSTANCE, 10, 11, String[].class, "simpleStringArray", false, "simpleStringArray");
+            new io.objectbox.Property<>(__INSTANCE, 10, 11, String[].class, "simpleStringArray");
 
     public final static io.objectbox.Property<TestEntity> simpleStringList =
             new io.objectbox.Property<>(__INSTANCE, 11, 15, java.util.List.class, "simpleStringList");
@@ -103,19 +104,19 @@ public final class TestEntity_ implements EntityInfo<TestEntity> {
             new io.objectbox.Property<>(__INSTANCE, 16, 17, byte[].class, "flexProperty", false, "flexProperty", FlexObjectConverter.class, Object.class);
 
     public final static io.objectbox.Property<TestEntity> shortArray =
-            new io.objectbox.Property<>(__INSTANCE, 17, 19, short[].class, "shortArray");
+            new io.objectbox.Property<>(__INSTANCE, 17, 18, short[].class, "shortArray");
 
     public final static io.objectbox.Property<TestEntity> charArray =
-            new io.objectbox.Property<>(__INSTANCE, 18, 20, char[].class, "charArray");
+            new io.objectbox.Property<>(__INSTANCE, 18, 19, char[].class, "charArray");
 
     public final static io.objectbox.Property<TestEntity> intArray =
-            new io.objectbox.Property<>(__INSTANCE, 19, 21, int[].class, "intArray");
+            new io.objectbox.Property<>(__INSTANCE, 19, 20, int[].class, "intArray");
 
     public final static io.objectbox.Property<TestEntity> longArray =
-            new io.objectbox.Property<>(__INSTANCE, 20, 22, long[].class, "longArray");
+            new io.objectbox.Property<>(__INSTANCE, 20, 21, long[].class, "longArray");
 
     public final static io.objectbox.Property<TestEntity> floatArray =
-            new io.objectbox.Property<>(__INSTANCE, 21, 18, float[].class, "floatArray");
+            new io.objectbox.Property<>(__INSTANCE, 21, 22, float[].class, "floatArray");
 
     public final static io.objectbox.Property<TestEntity> doubleArray =
             new io.objectbox.Property<>(__INSTANCE, 22, 23, double[].class, "doubleArray");

tests/objectbox-java-test/src/main/resources/testentity-index.json

@@ -96,7 +96,7 @@ public void testPut_notAssignedId_fails() {
         // Set ID that was not assigned
         entity.setId(1);
         IllegalArgumentException ex = assertThrows(IllegalArgumentException.class, () -> box.put(entity));
-        assertEquals(ex.getMessage(), "ID is higher or equal to internal ID sequence: 1 (vs. 1). Use ID 0 (zero) to insert new objects.");
+        assertEquals("ID is higher or equal to internal ID sequence: 1 (vs. 1). Use ID 0 (zero) to insert new objects.", ex.getMessage());
     }
 
     @Test