From 8dbac8d44c601ec6c953426d6cbbc2069edc75c5 Mon Sep 17 00:00:00 2001 From: Andrea Boriero Date: Thu, 19 Aug 2021 11:16:16 +0200 Subject: [PATCH] Re-enabled additional tests --- .../test/unconstrained/Employee.java | 2 +- .../test/unconstrained/Person.hbm.xml | 2 +- .../{ => orm}/test/unconstrained/Person.java | 2 +- .../test/unconstrained/UnconstrainedTest.java | 88 ++++++++++--------- 4 files changed, 50 insertions(+), 44 deletions(-) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/unconstrained/Employee.java (92%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/unconstrained/Person.hbm.xml (94%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/unconstrained/Person.java (95%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/unconstrained/UnconstrainedTest.java (64%) diff --git a/hibernate-core/src/test/java/org/hibernate/test/unconstrained/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/unconstrained/Employee.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/test/unconstrained/Employee.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/unconstrained/Employee.java index fe7394ac9a..456b3c14e3 100755 --- a/hibernate-core/src/test/java/org/hibernate/test/unconstrained/Employee.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/unconstrained/Employee.java @@ -6,7 +6,7 @@ */ //$Id: Employee.java 6298 2005-04-03 03:56:22Z oneovthafew $ -package org.hibernate.test.unconstrained; +package org.hibernate.orm.test.unconstrained; /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/unconstrained/Person.hbm.xml b/hibernate-core/src/test/java/org/hibernate/orm/test/unconstrained/Person.hbm.xml similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/test/unconstrained/Person.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/orm/test/unconstrained/Person.hbm.xml index 20cd42ad7b..fc917de791 100755 --- a/hibernate-core/src/test/java/org/hibernate/test/unconstrained/Person.hbm.xml +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/unconstrained/Person.hbm.xml @@ -10,7 +10,7 @@ "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> . */ -package org.hibernate.test.unconstrained; +package org.hibernate.orm.test.unconstrained; import javax.persistence.criteria.CriteriaBuilder; import javax.persistence.criteria.CriteriaQuery; @@ -12,36 +12,55 @@ import javax.persistence.criteria.Root; import org.hibernate.Hibernate; +import org.hibernate.cache.spi.CacheImplementor; -import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; -import org.junit.Test; +import org.hibernate.testing.orm.junit.DomainModel; +import org.hibernate.testing.orm.junit.SessionFactory; +import org.hibernate.testing.orm.junit.SessionFactoryScope; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; /** * @author Gavin King */ -public class UnconstrainedTest extends BaseCoreFunctionalTestCase { - @Override - public String[] getMappings() { - return new String[] { "unconstrained/Person.hbm.xml" }; - } +@DomainModel( + xmlMappings = "org/hibernate/orm/test/unconstrained/Person.hbm.xml" +) +@SessionFactory +public class UnconstrainedTest { - @Test - public void testUnconstrainedNoCache() { - inTransaction( + @BeforeEach + public void setUp(SessionFactoryScope scope) { + scope.inTransaction( session -> { Person p = new Person( "gavin" ); p.setEmployeeId( "123456" ); session.persist( p ); } ); + } - sessionFactory().getCache().evictEntityRegion( Person.class ); + @AfterEach + public void tearDown(SessionFactoryScope scope) { + scope.inTransaction( + session -> + session.createQuery( "delete from Person" ).executeUpdate() + ); + } - inTransaction( + @Test + public void testUnconstrainedNoCache(SessionFactoryScope scope) { + + final CacheImplementor cache = scope.getSessionFactory().getCache(); + cache.evictEntityRegion( Person.class ); + + scope.inTransaction( session -> { Person p = session.get( Person.class, "gavin" ); assertNull( p.getEmployee() ); @@ -49,9 +68,9 @@ public void testUnconstrainedNoCache() { } ); - sessionFactory().getCache().evictEntityRegion( Person.class ); + cache.evictEntityRegion( Person.class ); - inTransaction( + scope.inTransaction( session -> { Person p = session.get( Person.class, "gavin" ); assertTrue( Hibernate.isInitialized( p.getEmployee() ) ); @@ -62,18 +81,13 @@ public void testUnconstrainedNoCache() { } @Test - public void testUnconstrainedOuterJoinFetch() { - inTransaction( - session -> { - Person p = new Person( "gavin" ); - p.setEmployeeId( "123456" ); - session.persist( p ); - } - ); + public void testUnconstrainedOuterJoinFetch(SessionFactoryScope scope) { - sessionFactory().getCache().evictEntityRegion( Person.class ); + final CacheImplementor cache = scope.getSessionFactory().getCache(); - inTransaction( + cache.evictEntityRegion( Person.class ); + + scope.inTransaction( session -> { CriteriaBuilder criteriaBuilder = session.getCriteriaBuilder(); CriteriaQuery criteria = criteriaBuilder.createQuery( Person.class ); @@ -90,10 +104,9 @@ public void testUnconstrainedOuterJoinFetch() { } ); + cache.evictEntityRegion( Person.class ); - sessionFactory().getCache().evictEntityRegion( Person.class ); - - inTransaction( + scope.inTransaction( session -> { CriteriaBuilder criteriaBuilder = session.getCriteriaBuilder(); CriteriaQuery criteria = criteriaBuilder.createQuery( Person.class ); @@ -114,16 +127,9 @@ public void testUnconstrainedOuterJoinFetch() { } @Test - public void testUnconstrained() { - inTransaction( - session -> { - Person p = new Person( "gavin" ); - p.setEmployeeId( "123456" ); - session.persist( p ); - } - ); + public void testUnconstrained(SessionFactoryScope scope) { - inTransaction( + scope.inTransaction( session -> { Person p = session.get( Person.class, "gavin" ); assertNull( p.getEmployee() ); @@ -131,7 +137,7 @@ public void testUnconstrained() { } ); - inTransaction( + scope.inTransaction( session -> { Person p = session.get( Person.class, "gavin" ); assertTrue( Hibernate.isInitialized( p.getEmployee() ) );