fix up test

Author: dreab8

hibernate-core/src/test/java/org/hibernate/orm/test/refresh/RefreshUninitializedAssociationsTest.java renamed to hibernate-core/src/test/java/org/hibernate/orm/test/refresh/RefreshAndBatchTest.java

@@ -4,12 +4,14 @@
 import java.util.List;
 
 import org.hibernate.annotations.BatchSize;
+import org.hibernate.cfg.AvailableSettings;
 
-import org.hibernate.testing.orm.junit.DomainModel;
-import org.hibernate.testing.orm.junit.SessionFactory;
-import org.hibernate.testing.orm.junit.SessionFactoryScope;
-
+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.Setting;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;
@@ -23,21 +25,41 @@
 import jakarta.persistence.OneToOne;
 import jakarta.persistence.Table;
 
-@DomainModel(
+@Jpa(
 		annotatedClasses = {
-				RefreshUninitializedAssociationsTest.User.class,
-				RefreshUninitializedAssociationsTest.UserInfo.class,
-				RefreshUninitializedAssociationsTest.Phone.class,
+				RefreshAndBatchTest.User.class,
+				RefreshAndBatchTest.UserInfo.class,
+				RefreshAndBatchTest.Phone.class,
+		},
+		properties = {
+				@Setting(name = AvailableSettings.DEFAULT_BATCH_FETCH_SIZE, value = "100")
+
 		}
 )
-@SessionFactory
-public class RefreshUninitializedAssociationsTest {
+@JiraKey("HHH-18608")
+public class RefreshAndBatchTest {
 
 	@BeforeEach
-	public void setUp(SessionFactoryScope scope) {
+	public void setUp(EntityManagerFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
+					UserInfo info = new UserInfo( "info" );
+					Phone phone = new Phone( "123456" );
+					info.addPhone( phone );
+					User user = new User( 1l, "user1", info );
+					session.persist( user );
+				}
+		);
+	}
 
+	@Test
+	public void testRefresh(EntityManagerFactoryScope scope) {
+		scope.inTransaction(
+				session -> {
+					User user = session.createQuery( "select u from User u where u.id = :id", User.class )
+							.setParameter( "id", 1l )
+							.getSingleResult();
+					session.refresh( user.getInfo() );
 				}
 		);
 	}
@@ -48,8 +70,7 @@ public void setUp(SessionFactoryScope scope) {
 	public static class User {
 
 		@Id
-		@GeneratedValue
-		private long id;
+		private Long id;
 
 		@Column
 		private String name;
@@ -85,22 +106,24 @@ public UserInfo getInfo() {
 	public static class UserInfo {
 		@Id
 		@GeneratedValue
-		private long id;
+		private Long id;
 
 		@OneToOne(mappedBy = "info", fetch = FetchType.LAZY)
 		private User user;
 
 		private String info;
 
-		@OneToMany(mappedBy = "info", cascade = CascadeType.ALL, fetch = FetchType.LAZY, orphanRemoval = true)
-		private List<Phone> phoneList = new ArrayList<>();
+		@OneToMany(mappedBy = "info", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+		private List<Phone> phoneList;
 
 		public long getId() {
 			return id;
 		}
 
-		public UserInfo(long id, String info) {
-			this.id = id;
+		public UserInfo() {
+		}
+
+		public UserInfo(String info) {
 			this.info = info;
 		}
 
@@ -117,8 +140,11 @@ public List<Phone> getPhoneList() {
 		}
 
 		public void addPhone(Phone phone) {
-			this.phoneList.add(phone);
-			phone.setInfo(this);
+			if ( phoneList == null ) {
+				phoneList = new ArrayList<>();
+			}
+			this.phoneList.add( phone );
+			phone.info = this;
 		}
 	}
 
@@ -131,20 +157,19 @@ public static class Phone {
 		@JoinColumn(name = "INFO_ID")
 		private UserInfo info;
 
-		public String getNumber() {
-			return number;
+		public Phone() {
 		}
 
-		public void setNumber(String number) {
+		public Phone(String number) {
 			this.number = number;
 		}
 
-		public UserInfo getInfo() {
-			return info;
+		public String getNumber() {
+			return number;
 		}
 
-		public void setInfo(UserInfo info) {
-			this.info = info;
+		public UserInfo getInfo() {
+			return info;
 		}
 	}
 }