Re-enabled additional tests

hibernate-core/src/main/java/org/hibernate/query/results/DomainResultCreationStateImpl.java

@@ -351,7 +351,7 @@ public class DomainResultCreationStateImpl
 				}
 				FetchBuilder explicitFetchBuilder = fetchBuilderResolverStack
 						.getCurrent()
-						.apply(  fullPath );
+						.apply( fullPath );
 
 				final FetchBuilder fetchBuilder;
 				if ( explicitFetchBuilder != null ) {

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/Antenna.java

@@ -6,7 +6,7 @@
  */
 
 //$Id$
-package org.hibernate.test.annotations.various;
+package org.hibernate.orm.test.annotations.various;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/Conductor.java

@@ -6,7 +6,7 @@
  */
 
 //$Id$
-package org.hibernate.test.annotations.various;
+package org.hibernate.orm.test.annotations.various;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/GeneratedTest.java

@@ -0,0 +1,37 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
+ * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ */
+package org.hibernate.orm.test.annotations.various;
+
+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.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+/**
+ * @author Emmanuel Bernard
+ */
+@DomainModel(
+		annotatedClasses = Antenna.class
+)
+@SessionFactory
+public class GeneratedTest {
+
+	@Test
+	public void testGenerated(SessionFactoryScope scope) {
+		scope.inTransaction(
+				session -> {
+					Antenna antenna = new Antenna();
+					antenna.id = new Integer( 1 );
+					session.persist( antenna );
+					assertNull( antenna.latitude );
+					assertNull( antenna.longitude );
+				}
+		);
+	}
+}

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/IndexTest.java

@@ -8,70 +8,80 @@ package org.hibernate.orm.test.annotations.various;
 
 import java.util.Date;
 
-import org.junit.Test;
+import org.hibernate.testing.orm.junit.DomainModel;
-
+import org.hibernate.testing.orm.junit.SessionFactory;
-import org.hibernate.Session;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
-import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
+import org.junit.jupiter.api.AfterEach;
-import org.hibernate.test.annotations.various.Conductor;
+import org.junit.jupiter.api.Test;
-import org.hibernate.test.annotations.various.ProfessionalAgreement;
-import org.hibernate.test.annotations.various.Truck;
-import org.hibernate.test.annotations.various.Vehicule;
 
 /**
  * @author Emmanuel Bernard
  */
-public class IndexTest extends BaseCoreFunctionalTestCase {
+@DomainModel(
-	@Test
+		annotatedClasses = {
-	public void testIndexManyToOne() throws Exception {
-		//TODO find a way to test indexes???
-		Session s = openSession();
-		s.getTransaction().begin();
-		Conductor emmanuel = new Conductor();
-		emmanuel.setName( "Emmanuel" );
-		s.persist( emmanuel );
-		Vehicule tank = new Vehicule();
-		tank.setCurrentConductor( emmanuel );
-		tank.setRegistrationNumber( "324VX43" );
-		s.persist( tank );
-		s.flush();
-		s.delete( tank );
-		s.delete( emmanuel );
-		s.getTransaction().rollback();
-		s.close();
-	}
-
-	@Test
-	public void testIndexAndJoined() throws Exception {
-		Session s = openSession();
-		s.getTransaction().begin();
-		Conductor cond = new Conductor();
-		cond.setName( "Bob" );
-		s.persist( cond );
-		ProfessionalAgreement agreement = new ProfessionalAgreement();
-		agreement.setExpirationDate( new Date() );
-		s.persist( agreement );
-		Truck truck = new Truck();
-		truck.setAgreement( agreement );
-		truck.setWeight( 20 );
-		truck.setRegistrationNumber( "2003424" );
-		truck.setYear( 2005 );
-		truck.setCurrentConductor( cond );
-		s.persist( truck );
-		s.flush();
-		s.delete( truck );
-		s.delete( agreement );
-		s.delete( cond );
-		s.getTransaction().rollback();
-		s.close();
-	}
-
-	@Override
-	protected Class[] getAnnotatedClasses() {
-		return new Class[]{
 				Conductor.class,
 				Vehicule.class,
 				ProfessionalAgreement.class,
 				Truck.class
-		};
+		}
+)
+@SessionFactory
+public class IndexTest {
+
+	@AfterEach
+	public void tearDown(SessionFactoryScope scope) {
+		scope.inTransaction(
+				session -> {
+					session.createQuery( "delete from Conductor" ).executeUpdate();
+					session.createQuery( "delete from Vehicule" ).executeUpdate();
+					session.createQuery( "delete from ProfessionalAgreement" ).executeUpdate();
+					session.createQuery( "delete from Truck" ).executeUpdate();
+				}
+		);
 	}
+
+	@Test
+	public void testIndexManyToOne(SessionFactoryScope scope) {
+		//TODO find a way to test indexes???
+		scope.inTransaction(
+				session -> {
+					Conductor emmanuel = new Conductor();
+					emmanuel.setName( "Emmanuel" );
+					session.persist( emmanuel );
+					Vehicule tank = new Vehicule();
+					tank.setCurrentConductor( emmanuel );
+					tank.setRegistrationNumber( "324VX43" );
+					session.persist( tank );
+					session.flush();
+					session.delete( tank );
+					session.delete( emmanuel );
+				}
+		);
+	}
+
+	@Test
+	public void testIndexAndJoined(SessionFactoryScope scope) {
+		scope.inTransaction(
+				session -> {
+					Conductor cond = new Conductor();
+					cond.setName( "Bob" );
+					session.persist( cond );
+					ProfessionalAgreement agreement = new ProfessionalAgreement();
+					agreement.setExpirationDate( new Date() );
+					session.persist( agreement );
+					Truck truck = new Truck();
+					truck.setAgreement( agreement );
+					truck.setWeight( 20 );
+					truck.setRegistrationNumber( "2003424" );
+					truck.setYear( 2005 );
+					truck.setCurrentConductor( cond );
+					session.persist( truck );
+					session.flush();
+					session.delete( truck );
+					session.delete( agreement );
+					session.delete( cond );
+				}
+		);
+	}
+
 }

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/OptimisticLockAnnotationTest.java

@@ -6,50 +6,48 @@
  */
 package org.hibernate.orm.test.annotations.various;
 
-import org.junit.Test;
 
-import org.hibernate.Session;
+import org.hibernate.testing.orm.junit.DomainModel;
-import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.junit.jupiter.api.Test;
 
-import org.hibernate.test.annotations.various.Conductor;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import static org.junit.Assert.assertEquals;
 
 /**
  * Test for the @OptimisticLock annotation.
  *
  * @author Emmanuel Bernard
  */
-public class OptimisticLockAnnotationTest extends BaseCoreFunctionalTestCase {
+@DomainModel(
+		annotatedClasses = Conductor.class
+)
+@SessionFactory
+public class OptimisticLockAnnotationTest {
+
 	@Test
-	public void testOptimisticLockExcludeOnNameProperty() throws Exception {
+	public void testOptimisticLockExcludeOnNameProperty(SessionFactoryScope scope) {
-		Conductor c = new Conductor();
-		c.setName( "Bob" );
-		Session s = openSession();
-		s.getTransaction().begin();
-		s.persist( c );
-		s.flush();
 
-		s.clear();
 
-		c = ( Conductor ) s.get( Conductor.class, c.getId() );
+		scope.inTransaction(
-		Long version = c.getVersion();
+				session -> {
-		c.setName( "Don" );
+					Conductor c = new Conductor();
-		s.flush();
+					c.setName( "Bob" );
+					session.persist( c );
+					session.flush();
 
-		s.clear();
+					session.clear();
 
-		c = ( Conductor ) s.get( Conductor.class, c.getId() );
+					c = session.get( Conductor.class, c.getId() );
-		assertEquals( version, c.getVersion() );
+					Long version = c.getVersion();
+					c.setName( "Don" );
+					session.flush();
 
-		s.getTransaction().rollback();
+					session.clear();
-		s.close();
-	}
 
-	@Override
+					c = session.get( Conductor.class, c.getId() );
-	protected Class[] getAnnotatedClasses() {
+					assertEquals( version, c.getVersion() );
-		return new Class[] {
+				}
-				Conductor.class
+		);
-		};
 	}
 }

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/ProfessionalAgreement.java

@@ -6,7 +6,7 @@
  */
 
 //$Id$
-package org.hibernate.test.annotations.various;
+package org.hibernate.orm.test.annotations.various;
 import java.util.Date;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/Truck.java

@@ -6,7 +6,7 @@
  */
 
 //$Id$
-package org.hibernate.test.annotations.various;
+package org.hibernate.orm.test.annotations.various;
 import jakarta.persistence.Entity;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/Vehicule.java

@@ -6,7 +6,7 @@
  */
 
 //$Id$
-package org.hibernate.test.annotations.various;
+package org.hibernate.orm.test.annotations.various;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;

hibernate-core/src/test/java/org/hibernate/test/annotations/various/GeneratedTest.java

@@ -1,40 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
- */
-package org.hibernate.test.annotations.various;
-
-import org.junit.Test;
-
-import org.hibernate.Session;
-import org.hibernate.Transaction;
-import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
-
-import static org.junit.Assert.assertNull;
-
-/**
- * @author Emmanuel Bernard
- */
-public class GeneratedTest extends BaseCoreFunctionalTestCase {
-	@Test
-	public void testGenerated() throws Exception {
-		Session s = openSession();
-		Transaction tx = s.beginTransaction();
-		Antenna antenna = new Antenna();
-		antenna.id = new Integer(1);
-		s.persist( antenna );
-		assertNull( antenna.latitude );
-		assertNull( antenna.longitude );
-		tx.commit();
-		s.close();
-	}
-
-	@Override
-	protected Class[] getAnnotatedClasses() {
-		return new Class[] {
-				Antenna.class
-		};
-	}
-}