QueryTest: resolve all warnings.

Author: greenrobot-team

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

@@ -97,8 +97,8 @@ public void testScalarEqual() {
 
  Query<TestEntity> query = box.query().equal(simpleInt, 2007).build();
  assertEquals(1, query.count());
- assertEquals(8, query.findFirst().getId());
- assertEquals(8, query.findUnique().getId());
+ assertEquals(8, getFirstNotNull(query).getId());
+ assertEquals(8, getUniqueNotNull(query).getId());
  List<TestEntity> all = query.find();
  assertEquals(1, all.size());
  assertEquals(8, all.get(0).getId());
@@ -270,9 +270,9 @@ public void testOffsetLimit() {
  public void testString() {
  List<TestEntity> entities = putTestEntitiesStrings();
  int count = entities.size();
- assertEquals(1, box.query().equal(simpleString, "banana").build().findUnique().getId());
+ assertEquals(1, getUniqueNotNull(box.query().equal(simpleString, "banana").build()).getId());
  assertEquals(count - 1, box.query().notEqual(simpleString, "banana").build().count());
- assertEquals(4, box.query().startsWith(simpleString, "ba").endsWith(simpleString, "shake").build().findUnique()
+ assertEquals(4, getUniqueNotNull(box.query().startsWith(simpleString, "ba").endsWith(simpleString, "shake").build())
  .getId());
  assertEquals(2, box.query().contains(simpleString, "nana").build().count());
  }
@@ -425,23 +425,23 @@ public void testByteArrayEqualsAndSetParameter() {
  assertEquals(1, query.count());
  TestEntity first = query.findFirst();
  assertNotNull(first);
- assertTrue(Arrays.equals(value, first.getSimpleByteArray()));
+ assertArrayEquals(value, first.getSimpleByteArray());
 
  byte[] value2 = {1, 2, (byte) 2001};
  query.setParameter(simpleByteArray, value2);
 
  assertEquals(1, query.count());
  TestEntity first2 = query.findFirst();
  assertNotNull(first2);
- assertTrue(Arrays.equals(value2, first2.getSimpleByteArray()));
+ assertArrayEquals(value2, first2.getSimpleByteArray());
 
  byte[] value3 = {1, 2, (byte) 2002};
  query.setParameter("bytes", value3);
 
  assertEquals(1, query.count());
  TestEntity first3 = query.findFirst();
  assertNotNull(first3);
- assertTrue(Arrays.equals(value3, first3.getSimpleByteArray()));
+ assertArrayEquals(value3, first3.getSimpleByteArray());
  }
 
  @Test
@@ -729,12 +729,12 @@ public void testSetParameterInt() {
 
  putTestEntitiesScalars();
  Query<TestEntity> query = box.query().equal(simpleInt, 2007).parameterAlias("foo").build();
- assertEquals(8, query.findUnique().getId());
+ assertEquals(8, getUniqueNotNull(query).getId());
  query.setParameter(simpleInt, 2004);
- assertEquals(5, query.findUnique().getId());
+ assertEquals(5, getUniqueNotNull(query).getId());
 
  query.setParameter("foo", 2002);
- assertEquals(3, query.findUnique().getId());
+ assertEquals(3, getUniqueNotNull(query).getId());
  }
 
  @Test
@@ -749,7 +749,7 @@ public void testSetParameter2Ints() {
  assertEquals(4, entities.get(1).getId());
 
  query.setParameters("foo", 2007, 2007);
- assertEquals(8, query.findUnique().getId());
+ assertEquals(8, getUniqueNotNull(query).getId());
  }
 
  @Test
@@ -776,21 +776,21 @@ public void testSetParameter2Floats() {
  assertEquals(9, entities.get(1).getId());
 
  query.setParameters("foo", 400.45, 400.55);
- assertEquals(6, query.findUnique().getId());
+ assertEquals(6, getUniqueNotNull(query).getId());
  }
 
  @Test
  public void testSetParameterString() {
  putTestEntitiesStrings();
  Query<TestEntity> query = box.query().equal(simpleString, "banana").parameterAlias("foo").build();
- assertEquals(1, query.findUnique().getId());
+ assertEquals(1, getUniqueNotNull(query).getId());
  query.setParameter(simpleString, "bar");
- assertEquals(3, query.findUnique().getId());
+ assertEquals(3, getUniqueNotNull(query).getId());
 
  assertNull(query.setParameter(simpleString, "not here!").findUnique());
 
  query.setParameter("foo", "apple");
- assertEquals(2, query.findUnique().getId());
+ assertEquals(2, getUniqueNotNull(query).getId());
  }
 
  /**
@@ -845,14 +845,18 @@ public void testQueryAttempts() {
  store.close();
  BoxStoreBuilder builder = new BoxStoreBuilder(createTestModel(false)).directory(boxStoreDir)
  .queryAttempts(5)
- .failedReadTxAttemptCallback((result, error) -> error.printStackTrace());
+ .failedReadTxAttemptCallback((result, error) -> {
+ if (error != null) {
+ error.printStackTrace();
+ }
+ });
  builder.entity(new TestEntity_());
 
  store = builder.build();
  putTestEntitiesScalars();
 
  Query<TestEntity> query = store.boxFor(TestEntity.class).query().equal(simpleInt, 2007).build();
- assertEquals(2007, query.findFirst().getSimpleInt());
+ assertEquals(2007, getFirstNotNull(query).getSimpleInt());
  }
 
  @Test
@@ -953,4 +957,10 @@ private <T> T getFirstNotNull(Query<T> query) {
  assertNotNull(first);
  return first;
  }
+
+ private <T> T getUniqueNotNull(Query<T> query) {
+ T first = query.findUnique();
+ assertNotNull(first);
+ return first;
+ }
 }