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

Use AssertJ's hasSize() for collections and maps

Browse Source 
Achieved via a global search-and-replace.
This commit is contained in:
Sam Brannen
2022-11-22 16:50:10 +01:00
parent f9f8f2d89e
commit 36f7597f25
237 changed files with 1161 additions and 1172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-jdbc/src/test/java/org/springframework/jdbc/config/InitializeDatabaseIntegrationTests.java
View File

@@ -110,7 +110,7 @@ public class InitializeDatabaseIntegrationTests {
context = new ClassPathXmlApplicationContext("org/springframework/jdbc/config/jdbc-initialize-cache-config.xml");
assertCorrectSetup(context.getBean("dataSource", DataSource.class));
CacheData cache = context.getBean(CacheData.class);
assertThat(cache.getCachedData().size()).isEqualTo(1);
assertThat(cache.getCachedData()).hasSize(1);
}
private void assertCorrectSetup(DataSource dataSource) {

8
spring-jdbc/src/test/java/org/springframework/jdbc/core/DataClassRowMapperTests.java
View File

@@ -41,7 +41,7 @@ public class DataClassRowMapperTests extends AbstractRowMapperTests {
List<ConstructorPerson> result = mock.getJdbcTemplate().query(
"select name, age, birth_date, balance from people",
new DataClassRowMapper<>(ConstructorPerson.class));
assertThat(result.size()).isEqualTo(1);
assertThat(result).hasSize(1);
verifyPerson(result.get(0));
mock.verifyClosed();
@@ -53,7 +53,7 @@ public class DataClassRowMapperTests extends AbstractRowMapperTests {
List<ConstructorPersonWithGenerics> result = mock.getJdbcTemplate().query(
"select name, age, birth_date, balance from people",
new DataClassRowMapper<>(ConstructorPersonWithGenerics.class));
assertThat(result.size()).isEqualTo(1);
assertThat(result).hasSize(1);
ConstructorPersonWithGenerics person = result.get(0);
assertThat(person.name()).isEqualTo("Bubba");
assertThat(person.age()).isEqualTo(22L);
@@ -69,7 +69,7 @@ public class DataClassRowMapperTests extends AbstractRowMapperTests {
List<ConstructorPersonWithSetters> result = mock.getJdbcTemplate().query(
"select name, age, birthdate, balance from people",
new DataClassRowMapper<>(ConstructorPersonWithSetters.class));
assertThat(result.size()).isEqualTo(1);
assertThat(result).hasSize(1);
ConstructorPersonWithSetters person = result.get(0);
assertThat(person.name()).isEqualTo("BUBBA");
assertThat(person.age()).isEqualTo(22L);
@@ -85,7 +85,7 @@ public class DataClassRowMapperTests extends AbstractRowMapperTests {
List<RecordPerson> result = mock.getJdbcTemplate().query(
"select name, age, birth_date, balance from people",
new DataClassRowMapper<>(RecordPerson.class));
assertThat(result.size()).isEqualTo(1);
assertThat(result).hasSize(1);
verifyPerson(result.get(0));
mock.verifyClosed();

2
spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java
View File

@@ -1082,7 +1082,7 @@ public class JdbcTemplateTests {
given(this.resultSet.getObject(2)).willReturn("second value");
Map<String, Object> map = this.template.queryForMap("my query");
assertThat(map.size()).isEqualTo(1);
assertThat(map).hasSize(1);
assertThat(map.get("x")).isEqualTo("first value");
}

2
spring-jdbc/src/test/java/org/springframework/jdbc/core/RowMapperTests.java
View File

@@ -83,7 +83,7 @@ public class RowMapperTests {
@AfterEach
public void verifyResults() {
assertThat(result).isNotNull();
assertThat(result.size()).isEqualTo(2);
assertThat(result).hasSize(2);
TestBean testBean1 = result.get(0);
TestBean testBean2 = result.get(1);
assertThat(testBean1.getName()).isEqualTo("tb1");

8
spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplateTests.java
View File

@@ -283,7 +283,7 @@ public class NamedParameterJdbcTemplateTests {
customers.add(cust);
});
assertThat(customers.size()).isEqualTo(1);
assertThat(customers).hasSize(1);
assertThat(customers.get(0).getId() == 1).as("Customer id was assigned correctly").isTrue();
assertThat(customers.get(0).getForename().equals("rod")).as("Customer forename was assigned correctly").isTrue();
verify(connection).prepareStatement(SELECT_NAMED_PARAMETERS_PARSED);
@@ -308,7 +308,7 @@ public class NamedParameterJdbcTemplateTests {
customers.add(cust);
});
assertThat(customers.size()).isEqualTo(1);
assertThat(customers).hasSize(1);
assertThat(customers.get(0).getId() == 1).as("Customer id was assigned correctly").isTrue();
assertThat(customers.get(0).getForename().equals("rod")).as("Customer forename was assigned correctly").isTrue();
verify(connection).prepareStatement(SELECT_NO_PARAMETERS);
@@ -333,7 +333,7 @@ public class NamedParameterJdbcTemplateTests {
return cust;
});
assertThat(customers.size()).isEqualTo(1);
assertThat(customers).hasSize(1);
assertThat(customers.get(0).getId() == 1).as("Customer id was assigned correctly").isTrue();
assertThat(customers.get(0).getForename().equals("rod")).as("Customer forename was assigned correctly").isTrue();
verify(connection).prepareStatement(SELECT_NAMED_PARAMETERS_PARSED);
@@ -358,7 +358,7 @@ public class NamedParameterJdbcTemplateTests {
return cust;
});
assertThat(customers.size()).isEqualTo(1);
assertThat(customers).hasSize(1);
assertThat(customers.get(0).getId() == 1).as("Customer id was assigned correctly").isTrue();
assertThat(customers.get(0).getForename().equals("rod")).as("Customer forename was assigned correctly").isTrue();
verify(connection).prepareStatement(SELECT_NO_PARAMETERS);

10
spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterUtilsTests.java
View File

@@ -224,7 +224,7 @@ public class NamedParameterUtilsTests {
String sql = "select '0\\:0' as a, foo from bar where baz < DATE(:p1 23\\:59\\:59) and baz = :p2";
ParsedSql parsedSql = NamedParameterUtils.parseSqlStatement(sql);
assertThat(parsedSql.getParameterNames().size()).isEqualTo(2);
assertThat(parsedSql.getParameterNames()).hasSize(2);
assertThat(parsedSql.getParameterNames().get(0)).isEqualTo("p1");
assertThat(parsedSql.getParameterNames().get(1)).isEqualTo("p2");
String finalSql = NamedParameterUtils.substituteNamedParameters(parsedSql, null);
@@ -237,7 +237,7 @@ public class NamedParameterUtilsTests {
String sql = "select foo from bar where baz = b:{p1}:{p2}z";
ParsedSql parsedSql = NamedParameterUtils.parseSqlStatement(sql);
assertThat(parsedSql.getParameterNames().size()).isEqualTo(2);
assertThat(parsedSql.getParameterNames()).hasSize(2);
assertThat(parsedSql.getParameterNames().get(0)).isEqualTo("p1");
assertThat(parsedSql.getParameterNames().get(1)).isEqualTo("p2");
String finalSql = NamedParameterUtils.substituteNamedParameters(parsedSql, null);
@@ -249,7 +249,7 @@ public class NamedParameterUtilsTests {
String expectedSql = "select foo from bar where baz = b:{}z";
String sql = "select foo from bar where baz = b:{}z";
ParsedSql parsedSql = NamedParameterUtils.parseSqlStatement(sql);
assertThat(parsedSql.getParameterNames().size()).isEqualTo(0);
assertThat(parsedSql.getParameterNames()).hasSize(0);
String finalSql = NamedParameterUtils.substituteNamedParameters(parsedSql, null);
assertThat(finalSql).isEqualTo(expectedSql);
@@ -257,7 +257,7 @@ public class NamedParameterUtilsTests {
String sql2 = "select foo from bar where baz = 'b:{p1}z'";
ParsedSql parsedSql2 = NamedParameterUtils.parseSqlStatement(sql2);
assertThat(parsedSql2.getParameterNames().size()).isEqualTo(0);
assertThat(parsedSql2.getParameterNames()).hasSize(0);
String finalSql2 = NamedParameterUtils.substituteNamedParameters(parsedSql2, null);
assertThat(finalSql2).isEqualTo(expectedSql2);
}
@@ -268,7 +268,7 @@ public class NamedParameterUtilsTests {
String sql = "select foo from bar where baz = b:{p}z";
ParsedSql parsedSql = NamedParameterUtils.parseSqlStatement(sql);
assertThat(parsedSql.getParameterNames().size()).isEqualTo(1);
assertThat(parsedSql.getParameterNames()).hasSize(1);
assertThat(parsedSql.getParameterNames().get(0)).isEqualTo("p");
String finalSql = NamedParameterUtils.substituteNamedParameters(parsedSql, null);
assertThat(finalSql).isEqualTo(expectedSql);

2
spring-jdbc/src/test/java/org/springframework/jdbc/object/RdbmsOperationTests.java
View File

@@ -167,7 +167,7 @@ public class RdbmsOperationTests {
new SqlParameter("two", Types.NUMERIC)});
operation.afterPropertiesSet();
operation.validateParameters(new Object[] { 1, "2" });
assertThat(operation.getDeclaredParameters().size()).isEqualTo(2);
assertThat(operation.getDeclaredParameters()).hasSize(2);
}

2
spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlUpdateTests.java
View File

@@ -224,7 +224,7 @@ public class SqlUpdateTests {
int rowsAffected = pc.run("rod", generatedKeyHolder);
assertThat(rowsAffected).isEqualTo(1);
assertThat(generatedKeyHolder.getKeyList().size()).isEqualTo(1);
assertThat(generatedKeyHolder.getKeyList()).hasSize(1);
assertThat(generatedKeyHolder.getKey().intValue()).isEqualTo(11);
verify(preparedStatement).setString(1, "rod");
verify(resultSet).close();

4
spring-jdbc/src/test/java/org/springframework/jdbc/object/StoredProcedureTests.java
View File

@@ -317,7 +317,7 @@ public class StoredProcedureTests {
assertThat(rs1).containsExactly("Foo", "Bar");
List<Object> rs2 = (List<Object>) res.get("#result-set-2");
assertThat(rs2.size()).isEqualTo(1);
assertThat(rs2).hasSize(1);
Object o2 = rs2.get(0);
assertThat(o2).as("wron type returned for result set 2").isInstanceOf(Map.class);
Map<String, String> m2 = (Map<String, String>) o2;
@@ -362,7 +362,7 @@ public class StoredProcedureTests {
assertThat(res.size()).as("incorrect number of returns").isEqualTo(1);
List<String> rs1 = (List<String>) res.get("rs");
assertThat(rs1.size()).isEqualTo(2);
assertThat(rs1).hasSize(2);
assertThat(rs1.get(0)).isEqualTo("Foo");
assertThat(rs1.get(1)).isEqualTo("Bar");
verify(resultSet).close();