From 935d528e855190776c96cb0209681a59359dcbe3 Mon Sep 17 00:00:00 2001 From: Charles Date: Sun, 21 Nov 2021 19:17:46 -0600 Subject: [PATCH] fix flaky test --- .../jdbc/repository/query/PartTreeJdbcQueryUnitTests.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/query/PartTreeJdbcQueryUnitTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/query/PartTreeJdbcQueryUnitTests.java index 8bff44d21e..c336e8d1dc 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/query/PartTreeJdbcQueryUnitTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/query/PartTreeJdbcQueryUnitTests.java @@ -589,10 +589,12 @@ public void createsQueryByEmbeddedObject() throws Exception { new Object[] { new Address("Hello", "World") }); ParametrizedQuery query = jdbcQuery.createQuery(accessor, returnedType); - String expectedSql = BASE_SELECT + " WHERE (" + TABLE + ".\"USER_STREET\" = :user_street AND " + TABLE + String expectedSql1 = BASE_SELECT + " WHERE (" + TABLE + ".\"USER_STREET\" = :user_street AND " + TABLE + ".\"USER_CITY\" = :user_city)"; + String expectedSql2 = BASE_SELECT + " WHERE (" + TABLE + ".\"USER_CITY\" = :user_city AND " + TABLE + + ".\"USER_STREET\" = :user_street)"; - assertThat(query.getQuery()).isEqualTo(expectedSql); + assertThat(query.getQuery().equals(expectedSql1) || query.getQuery().equals(expectedSql2)).isTrue(); assertThat(query.getParameterSource().getValue("user_street")).isEqualTo("Hello"); assertThat(query.getParameterSource().getValue("user_city")).isEqualTo("World"); }