spring-projects#282 - Add a few more tests for 'PartTreeR2dbcQuery'

Author: rchigvintsev

Diff for: src/main/java/org/springframework/data/r2dbc/repository/query/ConditionFactory.java

@@ -149,7 +149,7 @@ public Condition createCondition(Part part) {
                 return Conditions.isEqual(lhs, rhs).not();
             }
             default:
-                throw new UnsupportedOperationException("Creating conditions for type " + type + " is unsupported");
+                throw new IllegalArgumentException("Unsupported keyword " + type);
         }
 
     }

Diff for: src/test/java/org/springframework/data/r2dbc/repository/query/LikeEscaperTest.java

@@ -0,0 +1,15 @@
+package org.springframework.data.r2dbc.repository.query;
+
+import org.junit.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+/**
+ * @author Roman Chigvintsev
+ */
+public class LikeEscaperTest {
+    @Test
+    public void ignoresNulls() {
+        assertNull(LikeEscaper.DEFAULT.escape(null));
+    }
+}

Diff for: src/test/java/org/springframework/data/r2dbc/repository/query/PartTreeR2dbcQueryIntegrationTests.java

@@ -376,6 +376,19 @@ public void createsQueryToFindAllEntitiesByIntegerAttributeWithDescendingOrderin
         assertThat(bindableQuery.get()).isEqualTo(expectedSql);
     }
 
+    @Test
+    public void createsQueryToFindAllEntitiesByIntegerAttributeWithAscendingOrderingByStringAttribute()
+            throws Exception {
+        R2dbcQueryMethod queryMethod = getQueryMethod("findAllByAgeOrderByLastNameAsc", Integer.class);
+        PartTreeR2dbcQuery r2dbcQuery = new PartTreeR2dbcQuery(queryMethod, databaseClient, r2dbcConverter,
+                dataAccessStrategy);
+        RelationalParametersParameterAccessor accessor = getAccessor(queryMethod, new Object[]{"oh"});
+        BindableQuery bindableQuery = r2dbcQuery.createQuery(accessor);
+        String expectedSql = "SELECT " + ALL_FIELDS + " FROM " + TABLE
+                + " WHERE " + TABLE + ".age = ? ORDER BY last_name ASC";
+        assertThat(bindableQuery.get()).isEqualTo(expectedSql);
+    }
+
     @Test
     public void createsQueryToFindAllEntitiesByStringAttributeNot() throws Exception {
         R2dbcQueryMethod queryMethod = getQueryMethod("findAllByLastNameNot", String.class);
@@ -477,6 +490,26 @@ public void throwsExceptionWhenSimplePropertyPredicateHasIterableParameter() thr
         r2dbcQuery.createQuery(getAccessor(queryMethod, new Object[]{Collections.singleton(1L)}));
     }
 
+    @Test
+    public void throwsExceptionWhenConditionKeywordIsUnsupported() throws Exception {
+        thrown.expect(IllegalArgumentException.class);
+        thrown.expectMessage("Unsupported keyword IS_EMPTY");
+        R2dbcQueryMethod queryMethod = getQueryMethod("findAllByIdIsEmpty");
+        PartTreeR2dbcQuery r2dbcQuery = new PartTreeR2dbcQuery(queryMethod, databaseClient, r2dbcConverter,
+                dataAccessStrategy);
+        r2dbcQuery.createQuery(getAccessor(queryMethod, new Object[0]));
+    }
+
+    @Test
+    public void throwsExceptionWhenInvalidNumberOfParameterIsGiven() throws Exception {
+        thrown.expect(IllegalArgumentException.class);
+        thrown.expectMessage("Invalid number of parameters given!");
+        R2dbcQueryMethod queryMethod = getQueryMethod("findAllByFirstName", String.class);
+        PartTreeR2dbcQuery r2dbcQuery = new PartTreeR2dbcQuery(queryMethod, databaseClient, r2dbcConverter,
+                dataAccessStrategy);
+        r2dbcQuery.createQuery(getAccessor(queryMethod, new Object[0]));
+    }
+
     private R2dbcQueryMethod getQueryMethod(String methodName, Class<?>... parameterTypes) throws Exception {
         Method method = UserRepository.class.getMethod(methodName, parameterTypes);
         return new R2dbcQueryMethod(method, new DefaultRepositoryMetadata(UserRepository.class),
@@ -526,6 +559,8 @@ private interface UserRepository extends Repository<User, Long> {
 
         Flux<User> findAllByFirstNameNotContaining(String notContaining);
 
+        Flux<User> findAllByAgeOrderByLastNameAsc(Integer age);
+
         Flux<User> findAllByAgeOrderByLastNameDesc(Integer age);
 
         Flux<User> findAllByLastNameNot(String lastName);
@@ -545,6 +580,8 @@ private interface UserRepository extends Repository<User, Long> {
         Flux<User> findAllByIdIn(Long id);
 
         Flux<User> findAllById(Collection<Long> ids);
+
+        Flux<User> findAllByIdIsEmpty();
     }
 
     @Table("users")