Browse Source

Temporarily disable ORM tests on Java 18

This commit disables some ORM tests based on
`AbstractEntityManagerFactoryBeanTests` as those fail when the main
source set is built with Java 17 and tests are executed with Java 18.
pull/29136/head
Brian Clozel 2 years ago
parent
commit
82a4e374a1
  1. 2
      spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBeanTests.java
  2. 3
      spring-orm/src/test/java/org/springframework/orm/jpa/ApplicationManagedEntityManagerIntegrationTests.java
  3. 3
      spring-orm/src/test/java/org/springframework/orm/jpa/ContainerManagedEntityManagerIntegrationTests.java
  4. 3
      spring-orm/src/test/java/org/springframework/orm/jpa/eclipselink/EclipseLinkEntityManagerFactoryIntegrationTests.java

2
spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBeanTests.java

@ -68,7 +68,7 @@ public abstract class AbstractEntityManagerFactoryBeanTests { @@ -68,7 +68,7 @@ public abstract class AbstractEntityManagerFactoryBeanTests {
private static final long serialVersionUID = 1L;
private final EntityManagerFactory emf;
private transient final EntityManagerFactory emf;
public DummyEntityManagerFactoryBean(EntityManagerFactory emf) {
this.emf = emf;

3
spring-orm/src/test/java/org/springframework/orm/jpa/ApplicationManagedEntityManagerIntegrationTests.java

@ -23,6 +23,8 @@ import jakarta.persistence.EntityManager; @@ -23,6 +23,8 @@ import jakarta.persistence.EntityManager;
import jakarta.persistence.Query;
import jakarta.persistence.TransactionRequiredException;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledOnJre;
import org.junit.jupiter.api.condition.JRE;
import org.springframework.orm.jpa.domain.Person;
@ -37,6 +39,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; @@ -37,6 +39,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
* @author Juergen Hoeller
* @since 2.0
*/
@DisabledOnJre(value = JRE.JAVA_18)
public class ApplicationManagedEntityManagerIntegrationTests extends AbstractEntityManagerFactoryIntegrationTests {
@Test

3
spring-orm/src/test/java/org/springframework/orm/jpa/ContainerManagedEntityManagerIntegrationTests.java

@ -24,6 +24,8 @@ import jakarta.persistence.PersistenceException; @@ -24,6 +24,8 @@ import jakarta.persistence.PersistenceException;
import jakarta.persistence.Query;
import jakarta.persistence.TransactionRequiredException;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledOnJre;
import org.junit.jupiter.api.condition.JRE;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DataAccessException;
@ -41,6 +43,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalStateException; @@ -41,6 +43,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
* @author Juergen Hoeller
* @since 2.0
*/
@DisabledOnJre(value = JRE.JAVA_18)
public class ContainerManagedEntityManagerIntegrationTests extends AbstractEntityManagerFactoryIntegrationTests {
@Autowired

3
spring-orm/src/test/java/org/springframework/orm/jpa/eclipselink/EclipseLinkEntityManagerFactoryIntegrationTests.java

@ -18,6 +18,8 @@ package org.springframework.orm.jpa.eclipselink; @@ -18,6 +18,8 @@ package org.springframework.orm.jpa.eclipselink;
import org.eclipse.persistence.jpa.JpaEntityManager;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledOnJre;
import org.junit.jupiter.api.condition.JRE;
import org.springframework.orm.jpa.AbstractContainerEntityManagerFactoryIntegrationTests;
import org.springframework.orm.jpa.EntityManagerFactoryInfo;
@ -29,6 +31,7 @@ import static org.assertj.core.api.Assertions.assertThat; @@ -29,6 +31,7 @@ import static org.assertj.core.api.Assertions.assertThat;
*
* @author Juergen Hoeller
*/
@DisabledOnJre(value = JRE.JAVA_18)
public class EclipseLinkEntityManagerFactoryIntegrationTests extends AbstractContainerEntityManagerFactoryIntegrationTests {
@Test

Loading…
Cancel
Save