TestEntity: test null or default values, inline asserts.

Author: greenrobot-team

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

@@ -306,33 +306,6 @@ protected TestEntity createTestEntity(@Nullable String simpleString, int nr) {
         return entity;
     }
 
-    /**
-     * Asserts all properties, excluding id. Assumes entity was created with {@link #createTestEntity(String, int)}.
-     */
-    protected void assertTestEntity(TestEntity actual, @Nullable String simpleString, int nr) {
-        assertEquals(simpleString, actual.getSimpleString());
-        assertEquals(nr, actual.getSimpleInt());
-        assertEquals((byte) (10 + nr), actual.getSimpleByte());
-        assertEquals(nr % 2 == 0, actual.getSimpleBoolean());
-        assertEquals((short) (100 + nr), actual.getSimpleShort());
-        assertEquals(1000 + nr, actual.getSimpleLong());
-        assertEquals(200 + nr / 10f, actual.getSimpleFloat(), 0);
-        assertEquals(2000 + nr / 100f, actual.getSimpleDouble(), 0);
-        assertArrayEquals(new byte[]{1, 2, (byte) nr}, actual.getSimpleByteArray());
-        // null array items are ignored, so array/list will be empty
-        String[] expectedStringArray = simpleString == null ? new String[]{} : new String[]{simpleString};
-        assertArrayEquals(expectedStringArray, actual.getSimpleStringArray());
-        assertEquals(Arrays.asList(expectedStringArray), actual.getSimpleStringList());
-        assertEquals((short) (100 + nr), actual.getSimpleShortU());
-        assertEquals(nr, actual.getSimpleIntU());
-        assertEquals(1000 + nr, actual.getSimpleLongU());
-        if (simpleString != null) {
-            assertEquals(1, actual.getStringObjectMap().size());
-            assertEquals(simpleString, actual.getStringObjectMap().get(simpleString));
-        }
-        assertEquals(simpleString, actual.getFlexProperty());
-    }
-
     protected TestEntity putTestEntity(@Nullable String simpleString, int nr) {
         TestEntity entity = createTestEntity(simpleString, nr);
         long key = getTestEntityBox().put(entity);

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

@@ -25,7 +25,12 @@
 import java.util.List;
 import java.util.Map;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertArrayEquals;
+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.assertTrue;
 
 public class BoxTest extends AbstractObjectBoxTest {
 
@@ -42,14 +47,54 @@ public void testPutAndGet() {
         final int simpleInt = 1977;
 
         TestEntity entity = createTestEntity(simpleString, simpleInt);
-        long key = box.put(entity);
-        assertTrue(key != 0);
-        assertEquals(key, entity.getId());
+        long id = box.put(entity);
+        assertTrue(id != 0);
+        assertEquals(id, entity.getId());
 
-        TestEntity entityRead = box.get(key);
+        TestEntity entityRead = box.get(id);
         assertNotNull(entityRead);
-        assertEquals(key, entityRead.getId());
-        assertTestEntity(entityRead, simpleString, simpleInt);
+        assertEquals(id, entityRead.getId());
+        assertEquals(simpleString, entityRead.getSimpleString());
+        assertEquals(simpleInt, entityRead.getSimpleInt());
+        assertEquals((byte) (10 + simpleInt), entityRead.getSimpleByte());
+        assertFalse(entityRead.getSimpleBoolean());
+        assertEquals((short) (100 + simpleInt), entityRead.getSimpleShort());
+        assertEquals(1000 + simpleInt, entityRead.getSimpleLong());
+        assertEquals(200 + simpleInt / 10f, entityRead.getSimpleFloat(), 0);
+        assertEquals(2000 + simpleInt / 100f, entityRead.getSimpleDouble(), 0);
+        assertArrayEquals(new byte[]{1, 2, (byte) simpleInt}, entityRead.getSimpleByteArray());
+        String[] expectedStringArray = new String[]{simpleString};
+        assertArrayEquals(expectedStringArray, entityRead.getSimpleStringArray());
+        assertEquals(Arrays.asList(expectedStringArray), entityRead.getSimpleStringList());
+        assertEquals((short) (100 + simpleInt), entityRead.getSimpleShortU());
+        assertEquals(simpleInt, entityRead.getSimpleIntU());
+        assertEquals(1000 + simpleInt, entityRead.getSimpleLongU());
+        assertEquals(1, entityRead.getStringObjectMap().size());
+        assertEquals(simpleString, entityRead.getStringObjectMap().get(simpleString));
+        assertEquals(simpleString, entityRead.getFlexProperty());
+    }
+
+    @Test
+    public void testPutAndGet_defaultOrNullValues() {
+        long id = box.put(new TestEntity());
+
+        TestEntity defaultEntity = box.get(id);
+        assertNull(defaultEntity.getSimpleString());
+        assertEquals(0, defaultEntity.getSimpleInt());
+        assertEquals((byte) 0, defaultEntity.getSimpleByte());
+        assertFalse(defaultEntity.getSimpleBoolean());
+        assertEquals((short) 0, defaultEntity.getSimpleShort());
+        assertEquals(0, defaultEntity.getSimpleLong());
+        assertEquals(0, defaultEntity.getSimpleFloat(), 0);
+        assertEquals(0, defaultEntity.getSimpleDouble(), 0);
+        assertArrayEquals(null, defaultEntity.getSimpleByteArray());
+        assertNull(defaultEntity.getSimpleStringArray());
+        assertNull(defaultEntity.getSimpleStringList());
+        assertEquals(0, defaultEntity.getSimpleShortU());
+        assertEquals(0, defaultEntity.getSimpleIntU());
+        assertEquals(0, defaultEntity.getSimpleLongU());
+        assertNull(defaultEntity.getStringObjectMap());
+        assertNull(defaultEntity.getFlexProperty());
     }
 
     @Test
@@ -82,18 +127,6 @@ public void testPutStrings_onlyNull_isEmpty() {
         assertEquals(new ArrayList<>(), entityRead.getSimpleStringList());
     }
 
-    @Test
-    public void testPutStrings_null_isNull() {
-        // Null String array and list.
-        TestEntity entity = new TestEntity();
-        box.put(entity);
-
-        TestEntity entityRead = box.get(entity.getId());
-        assertNotNull(entityRead);
-        assertNull(entityRead.getSimpleStringArray());
-        assertNull(entityRead.getSimpleStringList());
-    }
-
     @Test
     public void testPutGetUpdateGetRemove() {
         // create an entity