From 26311d5fbad9c80e476df56d38b7c9b5f332d9b5 Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Tue, 7 Jan 2020 12:10:40 +0100 Subject: [PATCH] DATAJPA-1652 - Polishing. Streamlined assertion. Removed a superfluous `public`. Original pull request: #405. --- .../query/StringQueryUnitTests.java | 20 +++++++------------ 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/src/test/java/org/springframework/data/jpa/repository/query/StringQueryUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/query/StringQueryUnitTests.java index 38e23a0f0..1a785e512 100644 --- a/src/test/java/org/springframework/data/jpa/repository/query/StringQueryUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/query/StringQueryUnitTests.java @@ -547,12 +547,9 @@ public class StringQueryUnitTests { String queryString = "SELECT u FROM User u WHERE u.lastname LIKE '%'||:name||'%'"; StringQuery query = new StringQuery(queryString); - softly.assertThat(query.getQueryString()).isEqualTo(queryString); - softly.assertThat(query.hasParameterBindings()).isTrue(); - softly.assertThat(query.getParameterBindings()).hasSize(1); - softly.assertThat(query.getParameterBindings().get(0).getName()).isEqualTo("name"); - - softly.assertAll(); + assertThat(query.getParameterBindings()) // + .extracting(ParameterBinding::getName) // + .containsExactly("name"); } @Test // DATAJPA-1652 @@ -561,15 +558,12 @@ public class StringQueryUnitTests { String queryString = "SELECT u FROM User u WHERE :age>u.age"; StringQuery query = new StringQuery(queryString); - softly.assertThat(query.getQueryString()).isEqualTo(queryString); - softly.assertThat(query.hasParameterBindings()).isTrue(); - softly.assertThat(query.getParameterBindings()).hasSize(1); - softly.assertThat(query.getParameterBindings().get(0).getName()).isEqualTo("age"); - - softly.assertAll(); + assertThat(query.getParameterBindings()) // + .extracting(ParameterBinding::getName) // + .containsExactly("age"); } - public void checkNumberOfNamedParameters(String query, int expectedSize, String label) { + void checkNumberOfNamedParameters(String query, int expectedSize, String label) { DeclaredQuery declaredQuery = DeclaredQuery.of(query);