Spring/spring-data-relational
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATAJDBC-514 - Polishing.

Browse Source 
Use AssertJ version specified by Spring Data Build.

Original pull request: spring-projects/spring-data-r2dbc#295.
This commit is contained in:
Mark Paluch
2020-03-27 15:35:32 +01:00
parent 74540327f6
commit d61651ad1e
4 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pom.xml
View File

@@ -21,7 +21,6 @@
<properties>
<dist.id>spring-data-jdbc</dist.id>
<springdata.commons>2.3.0.BUILD-SNAPSHOT</springdata.commons>
<assertj>3.6.2</assertj>
<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
<degraph-check.version>0.1.4</degraph-check.version>

4
spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/DefaultDataAccessStrategyUnitTests.java
View File

@@ -106,8 +106,8 @@ public class DefaultDataAccessStrategyUnitTests {
verify(namedJdbcOperations).update(sqlCaptor.capture(), paramSourceCaptor.capture(), any(KeyHolder.class));
assertThat(sqlCaptor.getValue()) //
.containsSequence("INSERT INTO \"DUMMY_ENTITY\" (", "\"ID\"", ") VALUES (", ":id", ")") //
.containsSequence("INSERT INTO \"DUMMY_ENTITY\" (", "reference", ") VALUES (", ":reference", ")");
.containsSubsequence("INSERT INTO \"DUMMY_ENTITY\" (", "\"ID\"", ") VALUES (", ":id", ")") //
.containsSubsequence("INSERT INTO \"DUMMY_ENTITY\" (", "reference", ") VALUES (", ":reference", ")");
assertThat(paramSourceCaptor.getValue().getValue("id")).isEqualTo(ORIGINAL_ID);
}

2
spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/EntityRowMapperUnitTests.java
View File

@@ -277,7 +277,7 @@ public class EntityRowMapperUnitTests {
assertThat(extracted) //
.extracting(e -> e.one, e -> e.two, e -> e.three) //
.isEqualTo(new String[] { "111", "222", "333" });
.containsSequence("111", "222", "333");
}
@Test // DATAJDBC-273

6
spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/SqlGeneratorUnitTests.java
View File

@@ -351,7 +351,7 @@ public class SqlGeneratorUnitTests {
SqlGenerator sqlGenerator = createSqlGenerator(VersionedEntity.class, AnsiDialect.INSTANCE);
assertThat(sqlGenerator.getUpdateWithVersion()).containsSequence( //
assertThat(sqlGenerator.getUpdateWithVersion()).containsSubsequence( //
"UPDATE", //
"\"VERSIONED_ENTITY\"", //
"SET", //
@@ -389,7 +389,7 @@ public class SqlGeneratorUnitTests {
String findAll = sqlGenerator.getFindAll();
assertThat(findAll).containsSequence("SELECT",
assertThat(findAll).containsSubsequence("SELECT",
"\"child\".\"PARENT_OF_NO_ID_CHILD\" AS \"CHILD_PARENT_OF_NO_ID_CHILD\"", "FROM");
}
@@ -398,7 +398,7 @@ public class SqlGeneratorUnitTests {
SqlGenerator sqlGenerator = createSqlGenerator(DummyEntity.class, AnsiDialect.INSTANCE);
assertThat(sqlGenerator.getUpdate()).containsSequence( //
assertThat(sqlGenerator.getUpdate()).containsSubsequence( //
"UPDATE", //
"\"DUMMY_ENTITY\"", //
"SET", //