From 5973a17253f09b03eaa8baa3e369dc0a9308aa45 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Thu, 5 Feb 2026 20:30:36 +0100 Subject: [PATCH] Polishing (cherry picked from commit 153c378bb2414f34e0ce068ee0d18f5de33829ef) --- ...ContainerEntityManagerFactoryIntegrationTests.java | 11 ++++------- .../orm/jpa/EntityManagerFactoryUtilsTests.java | 6 ++---- ...lipseLinkEntityManagerFactoryIntegrationTests.java | 3 +-- ...nateMultiEntityManagerFactoryIntegrationTests.java | 3 +-- .../jpa/support/SharedEntityManagerFactoryTests.java | 3 +-- 5 files changed, 9 insertions(+), 17 deletions(-) diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractContainerEntityManagerFactoryIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractContainerEntityManagerFactoryIntegrationTests.java index e0263fb33da..5ddd424e1bd 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractContainerEntityManagerFactoryIntegrationTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractContainerEntityManagerFactoryIntegrationTests.java @@ -49,8 +49,7 @@ public abstract class AbstractContainerEntityManagerFactoryIntegrationTests @Test protected void testEntityManagerFactoryImplementsEntityManagerFactoryInfo() { - boolean condition = entityManagerFactory instanceof EntityManagerFactoryInfo; - assertThat(condition).as("Must have introduced config interface").isTrue(); + assertThat(entityManagerFactory).isInstanceOf(EntityManagerFactoryInfo.class); EntityManagerFactoryInfo emfi = (EntityManagerFactoryInfo) entityManagerFactory; assertThat(emfi.getPersistenceUnitName()).isEqualTo("Person"); assertThat(emfi.getPersistenceUnitInfo()).as("PersistenceUnitInfo must be available").isNotNull(); @@ -172,8 +171,8 @@ public abstract class AbstractContainerEntityManagerFactoryIntegrationTests @Test void testEntityManagerProxyRejectsProgrammaticTxManagement() { - assertThatIllegalStateException().as("Should not be able to create transactions on container managed EntityManager").isThrownBy( - sharedEntityManager::getTransaction); + assertThatIllegalStateException().as("Should not be able to create transactions on container managed EntityManager") + .isThrownBy(sharedEntityManager::getTransaction); } @Test @@ -234,9 +233,7 @@ public abstract class AbstractContainerEntityManagerFactoryIntegrationTests q.setFlushMode(FlushModeType.AUTO); List people = q.getResultList(); assertThat(people).isEmpty(); - assertThatException() - .isThrownBy(q::getSingleResult) - .withMessageContaining("closed"); + assertThatException().isThrownBy(q::getSingleResult).withMessageContaining("closed"); // We would typically expect an IllegalStateException, but Hibernate throws a // PersistenceException. So we assert the contents of the exception message instead. diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/EntityManagerFactoryUtilsTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/EntityManagerFactoryUtilsTests.java index 78803e5c5c0..01849d7d1a0 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/EntityManagerFactoryUtilsTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/EntityManagerFactoryUtilsTests.java @@ -88,8 +88,7 @@ class EntityManagerFactoryUtilsTests { IllegalStateException ise = new IllegalStateException(); DataAccessException dex = EntityManagerFactoryUtils.convertJpaAccessExceptionIfPossible(ise); assertThat(dex.getCause()).isSameAs(ise); - boolean condition = dex instanceof InvalidDataAccessApiUsageException; - assertThat(condition).isTrue(); + assertThat(dex).isInstanceOf(InvalidDataAccessApiUsageException.class); } @Test @@ -97,8 +96,7 @@ class EntityManagerFactoryUtilsTests { IllegalArgumentException iae = new IllegalArgumentException(); DataAccessException dex = EntityManagerFactoryUtils.convertJpaAccessExceptionIfPossible(iae); assertThat(dex.getCause()).isSameAs(iae); - boolean condition = dex instanceof InvalidDataAccessApiUsageException; - assertThat(condition).isTrue(); + assertThat(dex).isInstanceOf(InvalidDataAccessApiUsageException.class); } /** diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/eclipselink/EclipseLinkEntityManagerFactoryIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/eclipselink/EclipseLinkEntityManagerFactoryIntegrationTests.java index 389192ee997..fa1d0aab34c 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/eclipselink/EclipseLinkEntityManagerFactoryIntegrationTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/eclipselink/EclipseLinkEntityManagerFactoryIntegrationTests.java @@ -39,8 +39,7 @@ class EclipseLinkEntityManagerFactoryIntegrationTests extends AbstractContainerE @Test void testCanCastSharedEntityManagerProxyToEclipseLinkEntityManager() { - boolean condition = sharedEntityManager instanceof JpaEntityManager; - assertThat(condition).isTrue(); + assertThat(sharedEntityManager).isInstanceOf(JpaEntityManager.class); JpaEntityManager eclipselinkEntityManager = (JpaEntityManager) sharedEntityManager; assertThat(eclipselinkEntityManager.getActiveSession()).isNotNull(); } diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateMultiEntityManagerFactoryIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateMultiEntityManagerFactoryIntegrationTests.java index dfe60863652..71e56f3da7c 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateMultiEntityManagerFactoryIntegrationTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateMultiEntityManagerFactoryIntegrationTests.java @@ -48,8 +48,7 @@ class HibernateMultiEntityManagerFactoryIntegrationTests extends AbstractContain @Override @Test protected void testEntityManagerFactoryImplementsEntityManagerFactoryInfo() { - boolean condition = this.entityManagerFactory instanceof EntityManagerFactoryInfo; - assertThat(condition).as("Must have introduced config interface").isTrue(); + assertThat(this.entityManagerFactory).isInstanceOf(EntityManagerFactoryInfo.class); EntityManagerFactoryInfo emfi = (EntityManagerFactoryInfo) this.entityManagerFactory; assertThat(emfi.getPersistenceUnitName()).isEqualTo("Drivers"); assertThat(emfi.getPersistenceUnitInfo()).as("PersistenceUnitInfo must be available").isNotNull(); diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/support/SharedEntityManagerFactoryTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/support/SharedEntityManagerFactoryTests.java index cc01c0d7998..5f9b7b153f1 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/support/SharedEntityManagerFactoryTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/support/SharedEntityManagerFactoryTests.java @@ -58,8 +58,7 @@ class SharedEntityManagerFactoryTests { assertThat(proxyFactoryBean.getObject()).isSameAs(proxy); assertThat(proxy.contains(o)).isFalse(); - boolean condition = proxy instanceof EntityManagerProxy; - assertThat(condition).isTrue(); + assertThat(proxy).isInstanceOf(EntityManagerProxy.class); EntityManagerProxy emProxy = (EntityManagerProxy) proxy; assertThatIllegalStateException().as("outside of transaction").isThrownBy( emProxy::getTargetEntityManager);