BoxTest: move put and get tests together for easier updating

Author: greenrobot-team

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

@@ -92,27 +92,6 @@ public void testPutAndGet() {
         assertArrayEquals(valByteArray, entity.getExternalId());
     }
 
-    // Note: There is a similar test using the Cursor API directly (which is deprecated) in CursorTest.
-    @Test
-    public void testPut_notAssignedId_fails() {
-        TestEntity entity = new TestEntity();
-        // Set ID that was not assigned
-        entity.setId(1);
-        IllegalArgumentException ex = assertThrows(IllegalArgumentException.class, () -> box.put(entity));
-        assertEquals("ID is higher or equal to internal ID sequence: 1 (vs. 1). Use ID 0 (zero) to insert new objects.", ex.getMessage());
-    }
-
-    @Test
-    public void testPut_assignedId_inserts() {
-        long id = box.put(new TestEntity());
-        box.remove(id);
-        // Put with previously assigned ID should insert
-        TestEntity entity = new TestEntity();
-        entity.setId(id);
-        box.put(entity);
-        assertEquals(1L, box.count());
-    }
-
     @Test
     public void testPutAndGet_defaultOrNullValues() {
         long id = box.put(new TestEntity());
@@ -145,6 +124,27 @@ public void testPutAndGet_defaultOrNullValues() {
         assertNull(defaultEntity.getExternalId());
     }
 
+    // Note: There is a similar test using the Cursor API directly (which is deprecated) in CursorTest.
+    @Test
+    public void testPut_notAssignedId_fails() {
+        TestEntity entity = new TestEntity();
+        // Set ID that was not assigned
+        entity.setId(1);
+        IllegalArgumentException ex = assertThrows(IllegalArgumentException.class, () -> box.put(entity));
+        assertEquals("ID is higher or equal to internal ID sequence: 1 (vs. 1). Use ID 0 (zero) to insert new objects.", ex.getMessage());
+    }
+
+    @Test
+    public void testPut_assignedId_inserts() {
+        long id = box.put(new TestEntity());
+        box.remove(id);
+        // Put with previously assigned ID should insert
+        TestEntity entity = new TestEntity();
+        entity.setId(id);
+        box.put(entity);
+        assertEquals(1L, box.count());
+    }
+
     @Test
     public void testPutStrings_withNull_ignoresNull() {
         final String[] stringArray = new String[]{"sunrise", null, "sunset"};