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

10
spring-orm/src/test/java/org/springframework/orm/jpa/AbstractContainerEntityManagerFactoryIntegrationTests.java
View File

@@ -149,7 +149,7 @@ public abstract class AbstractContainerEntityManagerFactoryIntegrationTests
Query q = sharedEntityManager.createQuery("select p from Person as p");
List<Person> people = q.getResultList();
assertThat(people.size()).isEqualTo(1);
assertThat(people).hasSize(1);
assertThat(people.get(0).getFirstName()).isEqualTo(firstName);
}
@@ -186,7 +186,7 @@ public abstract class AbstractContainerEntityManagerFactoryIntegrationTests
EntityManager em = entityManagerFactory.createEntityManager();
Query q = em.createQuery("select p from Person as p");
List<Person> people = q.getResultList();
assertThat(people.size()).isEqualTo(0);
assertThat(people).hasSize(0);
assertThatExceptionOfType(NoResultException.class).isThrownBy(q::getSingleResult);
}
@@ -198,7 +198,7 @@ public abstract class AbstractContainerEntityManagerFactoryIntegrationTests
EntityManager em = entityManagerFactory.createEntityManager();
Query q = em.createQuery("select p from Person as p");
List<Person> people = q.getResultList();
assertThat(people.size()).isEqualTo(0);
assertThat(people).hasSize(0);
assertThatExceptionOfType(NoResultException.class).isThrownBy(q::getSingleResult);
}
@@ -208,7 +208,7 @@ public abstract class AbstractContainerEntityManagerFactoryIntegrationTests
Query q = this.sharedEntityManager.createQuery("select p from Person as p");
q.setFlushMode(FlushModeType.AUTO);
List<Person> people = q.getResultList();
assertThat(people.size()).isEqualTo(0);
assertThat(people).hasSize(0);
assertThatExceptionOfType(NoResultException.class).isThrownBy(q::getSingleResult);
}
@@ -221,7 +221,7 @@ public abstract class AbstractContainerEntityManagerFactoryIntegrationTests
Query q = em.createQuery("select p from Person as p");
q.setFlushMode(FlushModeType.AUTO);
List<Person> people = q.getResultList();
assertThat(people.size()).isEqualTo(0);
assertThat(people).hasSize(0);
assertThatException()
.isThrownBy(q::getSingleResult)
.withMessageContaining("closed");

4
spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateNativeEntityManagerFactoryIntegrationTests.java
View File

@@ -67,7 +67,7 @@ public class HibernateNativeEntityManagerFactoryIntegrationTests extends Abstrac
insertPerson(firstName);
List<Person> people = sharedEntityManager.createQuery("select p from Person as p").getResultList();
assertThat(people.size()).isEqualTo(1);
assertThat(people).hasSize(1);
assertThat(people.get(0).getFirstName()).isEqualTo(firstName);
assertThat(people.get(0).postLoaded).isSameAs(applicationContext);
}
@@ -80,7 +80,7 @@ public class HibernateNativeEntityManagerFactoryIntegrationTests extends Abstrac
Query q = sessionFactory.getCurrentSession().createQuery("select p from Person as p");
List<Person> people = q.getResultList();
assertThat(people.size()).isEqualTo(1);
assertThat(people).hasSize(1);
assertThat(people.get(0).getFirstName()).isEqualTo(firstName);
assertThat(people.get(0).postLoaded).isSameAs(applicationContext);
}

32
spring-orm/src/test/java/org/springframework/orm/jpa/persistenceunit/PersistenceXmlParsingTests.java
View File

@@ -60,7 +60,7 @@ public class PersistenceXmlParsingTests {
assertThat(info.length).isEqualTo(1);
assertThat(info[0].getPersistenceUnitName()).isEqualTo("OrderManagement");
assertThat(info[0].getJarFileUrls().size()).isEqualTo(2);
assertThat(info[0].getJarFileUrls()).hasSize(2);
assertThat(info[0].getJarFileUrls().get(0)).isEqualTo(new ClassPathResource("order.jar").getURL());
assertThat(info[0].getJarFileUrls().get(1)).isEqualTo(new ClassPathResource("order-supplemental.jar").getURL());
@@ -93,9 +93,9 @@ public class PersistenceXmlParsingTests {
assertThat(info[0].getPersistenceUnitName()).isEqualTo("OrderManagement2");
assertThat(info[0].getMappingFileNames().size()).isEqualTo(1);
assertThat(info[0].getMappingFileNames()).hasSize(1);
assertThat(info[0].getMappingFileNames().get(0)).isEqualTo("mappings.xml");
assertThat(info[0].getProperties().keySet().size()).isEqualTo(0);
assertThat(info[0].getProperties().keySet()).hasSize(0);
assertThat(info[0].excludeUnlistedClasses()).as("Exclude unlisted should default false in 1.0.").isFalse();
}
@@ -111,11 +111,11 @@ public class PersistenceXmlParsingTests {
assertThat(info.length).isEqualTo(1);
assertThat(info[0].getPersistenceUnitName()).isEqualTo("OrderManagement3");
assertThat(info[0].getJarFileUrls().size()).isEqualTo(2);
assertThat(info[0].getJarFileUrls()).hasSize(2);
assertThat(info[0].getJarFileUrls().get(0)).isEqualTo(new ClassPathResource("order.jar").getURL());
assertThat(info[0].getJarFileUrls().get(1)).isEqualTo(new ClassPathResource("order-supplemental.jar").getURL());
assertThat(info[0].getProperties().keySet().size()).isEqualTo(0);
assertThat(info[0].getProperties().keySet()).hasSize(0);
assertThat(info[0].getJtaDataSource()).isNull();
assertThat(info[0].getNonJtaDataSource()).isNull();
@@ -137,10 +137,10 @@ public class PersistenceXmlParsingTests {
assertThat(info.length).isEqualTo(1);
assertThat(info[0].getPersistenceUnitName()).isEqualTo("OrderManagement4");
assertThat(info[0].getMappingFileNames().size()).isEqualTo(1);
assertThat(info[0].getMappingFileNames()).hasSize(1);
assertThat(info[0].getMappingFileNames().get(0)).isEqualTo("order-mappings.xml");
assertThat(info[0].getManagedClassNames().size()).isEqualTo(3);
assertThat(info[0].getManagedClassNames()).hasSize(3);
assertThat(info[0].getManagedClassNames().get(0)).isEqualTo("com.acme.Order");
assertThat(info[0].getManagedClassNames().get(1)).isEqualTo("com.acme.Customer");
assertThat(info[0].getManagedClassNames().get(2)).isEqualTo("com.acme.Item");
@@ -148,7 +148,7 @@ public class PersistenceXmlParsingTests {
assertThat(info[0].excludeUnlistedClasses()).as("Exclude unlisted should be true when no value.").isTrue();
assertThat(info[0].getTransactionType()).isSameAs(PersistenceUnitTransactionType.RESOURCE_LOCAL);
assertThat(info[0].getProperties().keySet().size()).isEqualTo(0);
assertThat(info[0].getProperties().keySet()).hasSize(0);
builder.clear();
}
@@ -164,16 +164,16 @@ public class PersistenceXmlParsingTests {
assertThat(info.length).isEqualTo(1);
assertThat(info[0].getPersistenceUnitName()).isEqualTo("OrderManagement5");
assertThat(info[0].getMappingFileNames().size()).isEqualTo(2);
assertThat(info[0].getMappingFileNames()).hasSize(2);
assertThat(info[0].getMappingFileNames().get(0)).isEqualTo("order1.xml");
assertThat(info[0].getMappingFileNames().get(1)).isEqualTo("order2.xml");
assertThat(info[0].getJarFileUrls().size()).isEqualTo(2);
assertThat(info[0].getJarFileUrls()).hasSize(2);
assertThat(info[0].getJarFileUrls().get(0)).isEqualTo(new ClassPathResource("order.jar").getURL());
assertThat(info[0].getJarFileUrls().get(1)).isEqualTo(new ClassPathResource("order-supplemental.jar").getURL());
assertThat(info[0].getPersistenceProviderClassName()).isEqualTo("com.acme.AcmePersistence");
assertThat(info[0].getProperties().keySet().size()).isEqualTo(0);
assertThat(info[0].getProperties().keySet()).hasSize(0);
assertThat(info[0].excludeUnlistedClasses()).as("Exclude unlisted should default false in 1.0.").isFalse();
}
@@ -200,10 +200,10 @@ public class PersistenceXmlParsingTests {
assertThat(pu1.getPersistenceProviderClassName()).isEqualTo("com.acme.AcmePersistence");
assertThat(pu1.getMappingFileNames().size()).isEqualTo(1);
assertThat(pu1.getMappingFileNames()).hasSize(1);
assertThat(pu1.getMappingFileNames().get(0)).isEqualTo("ormap2.xml");
assertThat(pu1.getJarFileUrls().size()).isEqualTo(1);
assertThat(pu1.getJarFileUrls()).hasSize(1);
assertThat(pu1.getJarFileUrls().get(0)).isEqualTo(new ClassPathResource("order.jar").getURL());
assertThat(pu1.excludeUnlistedClasses()).isFalse();
@@ -211,7 +211,7 @@ public class PersistenceXmlParsingTests {
assertThat(pu1.getTransactionType()).isSameAs(PersistenceUnitTransactionType.RESOURCE_LOCAL);
Properties props = pu1.getProperties();
assertThat(props.keySet().size()).isEqualTo(2);
assertThat(props.keySet()).hasSize(2);
assertThat(props.getProperty("com.acme.persistence.sql-logging")).isEqualTo("on");
assertThat(props.getProperty("foo")).isEqualTo("bar");
@@ -226,7 +226,7 @@ public class PersistenceXmlParsingTests {
assertThat(pu2.getTransactionType()).isSameAs(PersistenceUnitTransactionType.JTA);
assertThat(pu2.getPersistenceProviderClassName()).isEqualTo("com.acme.AcmePersistence");
assertThat(pu2.getMappingFileNames().size()).isEqualTo(1);
assertThat(pu2.getMappingFileNames()).hasSize(1);
assertThat(pu2.getMappingFileNames().get(0)).isEqualTo("order2.xml");
// the following assertions fail only during coverage runs
@@ -249,7 +249,7 @@ public class PersistenceXmlParsingTests {
PersistenceUnitInfo[] info = reader.readPersistenceUnitInfos(resource);
assertThat(info.length).isEqualTo(1);
assertThat(info[0].getPersistenceUnitName()).isEqualTo("pu");
assertThat(info[0].getProperties().keySet().size()).isEqualTo(0);
assertThat(info[0].getProperties().keySet()).hasSize(0);
assertThat(info[0].excludeUnlistedClasses()).as("Exclude unlisted should default false in 1.0.").isFalse();
}