QueryBuilder: unify operator pending error, assert message in tests.

Author: greenrobot-team

objectbox-java/src/main/java/io/objectbox/query/QueryBuilder.java

@@ -25,7 +25,6 @@
 import io.objectbox.relation.RelationInfo;
 
 import javax.annotation.Nullable;
-import java.io.Closeable;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.Date;
@@ -355,10 +354,7 @@ public QueryBuilder<T> orderDesc(Property<T> property) {
     public QueryBuilder<T> order(Property<T> property, int flags) {
         verifyNotSubQuery();
         verifyHandle();
-        if (combineNextWith != Operator.NONE) {
-            throw new IllegalStateException(
-                    "An operator is pending. Use operators like and() and or() only between two conditions.");
-        }
+        checkNoOperatorPending();
         nativeOrder(handle, property.getId(), flags);
         return this;
     }
@@ -536,10 +532,15 @@ private void combineOperator(Operator operator) {
         if (lastCondition == 0) {
             throw new IllegalStateException("No previous condition. Use operators like and() and or() only between two conditions.");
         }
+        checkNoOperatorPending();
+        combineNextWith = operator;
+    }
+
+    private void checkNoOperatorPending() {
         if (combineNextWith != Operator.NONE) {
-            throw new IllegalStateException("Another operator is pending. Use operators like and() and or() only between two conditions.");
+            throw new IllegalStateException(
+                    "Another operator is pending. Use operators like and() and or() only between two conditions.");
         }
-        combineNextWith = operator;
     }
 
     private void checkCombineCondition(long currentCondition) {

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

@@ -867,14 +867,27 @@ public void testOr() {
         assertEquals(2007, entities.get(1).getSimpleInt());
     }
 
-    @Test(expected = IllegalStateException.class)
+    @Test
     public void testOr_bad1() {
-        box.query().or();
+        assertNoPreviousCondition(() -> box.query().or());
+    }
+
+    private void assertNoPreviousCondition(ThrowingRunnable runnable) {
+        IllegalStateException ex = assertThrows(IllegalStateException.class, runnable);
+        assertEquals("No previous condition. Use operators like and() and or() only between two conditions.",
+                ex.getMessage());
     }
 
-    @Test(expected = IllegalStateException.class)
+    @SuppressWarnings("resource") // Throws RuntimeException, so not closing Builder/Query is fine.
+    @Test
     public void testOr_bad2() {
-        box.query().equal(simpleInt, 1).or().build();
+        assertIncompleteLogicCondition(() -> box.query().equal(simpleInt, 1).or().build());
+    }
+
+    private void assertIncompleteLogicCondition(ThrowingRunnable runnable) {
+        IllegalStateException ex = assertThrows(IllegalStateException.class, runnable);
+        assertEquals("Incomplete logic condition. Use or()/and() between two conditions only.",
+                ex.getMessage());
     }
 
     @Test
@@ -887,24 +900,42 @@ public void testAnd() {
         assertEquals(2008, entities.get(0).getSimpleInt());
     }
 
-    @Test(expected = IllegalStateException.class)
+    @Test
     public void testAnd_bad1() {
-        box.query().and();
+        assertNoPreviousCondition(() -> box.query().and());
     }
 
-    @Test(expected = IllegalStateException.class)
+    @SuppressWarnings("resource") // Throws RuntimeException, so not closing Builder/Query is fine.
+    @Test
     public void testAnd_bad2() {
-        box.query().equal(simpleInt, 1).and().build();
+        assertIncompleteLogicCondition(() -> box.query().equal(simpleInt, 1).and().build());
     }
 
-    @Test(expected = IllegalStateException.class)
+    @SuppressWarnings("resource") // Throws RuntimeException, so not closing Builder/Query is fine.
+    @Test
     public void testOrAfterAnd() {
-        box.query().equal(simpleInt, 1).and().or().equal(simpleInt, 2).build();
+        assertOperatorIsPending(() -> box.query()
+                .equal(simpleInt, 1)
+                .and()
+                .or()
+                .equal(simpleInt, 2)
+                .build());
     }
 
-    @Test(expected = IllegalStateException.class)
+    @SuppressWarnings("resource") // Throws RuntimeException, so not closing Builder/Query is fine.
+    @Test
     public void testOrderAfterAnd() {
-        box.query().equal(simpleInt, 1).and().order(simpleInt).equal(simpleInt, 2).build();
+        assertOperatorIsPending(() -> box.query()
+                .equal(simpleInt, 1)
+                .and().order(simpleInt)
+                .equal(simpleInt, 2)
+                .build());
+    }
+
+    private void assertOperatorIsPending(ThrowingRunnable runnable) {
+        IllegalStateException ex = assertThrows(IllegalStateException.class, runnable);
+        assertEquals("Another operator is pending. Use operators like and() and or() only between two conditions.",
+                ex.getMessage());
     }
 
     @Test