fix up test

Author: dreab8

hibernate-core/src/test/java/org/hibernate/orm/test/refresh/RefreshAndBatchTest.java renamed to hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/batch/RefreshAndBatchTest.java

@@ -1,15 +1,22 @@
-package org.hibernate.orm.test.refresh;
+package org.hibernate.orm.test.bytecode.enhancement.batch;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import org.hibernate.Hibernate;
 import org.hibernate.annotations.BatchSize;
 import org.hibernate.cfg.AvailableSettings;
 
+import org.hibernate.testing.bytecode.enhancement.extension.BytecodeEnhanced;
+import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.Jpa;
+import org.hibernate.testing.orm.junit.ServiceRegistry;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.hibernate.testing.orm.junit.Setting;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -25,22 +32,29 @@
 import jakarta.persistence.OneToOne;
 import jakarta.persistence.Table;
 
-@Jpa(
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+
+@DomainModel(
 		annotatedClasses = {
 				RefreshAndBatchTest.User.class,
 				RefreshAndBatchTest.UserInfo.class,
 				RefreshAndBatchTest.Phone.class,
-		},
-		properties = {
+		}
+
+)
+@SessionFactory
+@ServiceRegistry(
+		settings = {
 				@Setting(name = AvailableSettings.DEFAULT_BATCH_FETCH_SIZE, value = "100")
 
 		}
 )
 @JiraKey("HHH-18608")
+@BytecodeEnhanced(runNotEnhancedAsWell = true)
 public class RefreshAndBatchTest {
 
 	@BeforeEach
-	public void setUp(EntityManagerFactoryScope scope) {
+	public void setUp(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
 					UserInfo info = new UserInfo( "info" );
@@ -52,14 +66,27 @@ public void setUp(EntityManagerFactoryScope scope) {
 		);
 	}
 
+	@AfterEach
+	public void tearDown(SessionFactoryScope scope) {
+		scope.inTransaction(
+				session -> {
+					session.createQuery( "delete User" ).executeUpdate();
+					session.createQuery( "delete Phone" ).executeUpdate();
+					session.createQuery( "delete UserInfo" ).executeUpdate();
+				}
+		);
+	}
+
 	@Test
-	public void testRefresh(EntityManagerFactoryScope scope) {
+	public void testRefresh(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
 					User user = session.createQuery( "select u from User u where u.id = :id", User.class )
 							.setParameter( "id", 1l )
 							.getSingleResult();
+					assertThat( Hibernate.isInitialized( user.getInfo() ) ).isFalse();
 					session.refresh( user.getInfo() );
+					assertThat( Hibernate.isInitialized( user.getInfo() ) ).isTrue();
 				}
 		);
 	}