HHH-19846 Drop JUnit 4 usage

Author: dreab8

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/GenerationGroup.java

@@ -3,6 +3,7 @@
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.indexcoll;
+
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/GenerationUser.java

@@ -3,6 +3,7 @@
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.indexcoll;
+
 import java.util.HashMap;
 import java.util.Map;
 import jakarta.persistence.Entity;
@@ -23,7 +24,7 @@ public class GenerationUser {
 
 	@OneToMany
 	@MapKey(name="generation")
-	private Map<Generation, GenerationGroup> ref = new HashMap<Generation, GenerationGroup>();
+	private Map<Generation, GenerationGroup> ref = new HashMap<>();
 
 	public int getId() {
 		return id;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/MapKeyTest.java

@@ -4,48 +4,47 @@
  */
 package org.hibernate.orm.test.annotations.indexcoll;
 
-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.Test;
 
-import org.hibernate.Session;
-import org.hibernate.Transaction;
-import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
-
-import static org.junit.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * @author Emmanuel Bernard
  */
-public class MapKeyTest extends BaseCoreFunctionalTestCase {
-	@Test
-	public void testMapKeyOnEmbeddedId() {
-		Session s = openSession();
-		Transaction tx = s.beginTransaction();
-		Generation c = new Generation();
-		c.setAge( "a" );
-		c.setCulture( "b" );
-		c.setSubGeneration( new Generation.SubGeneration( "description" ) );
-		GenerationGroup r = new GenerationGroup();
-		r.setGeneration( c );
-		s.persist( r );
-		GenerationUser m = new GenerationUser();
-		s.persist( m );
-		m.getRef().put( c, r );
-		s.flush();
-		s.clear();
-
-		m = (GenerationUser) s.get( GenerationUser.class, m.getId() );
-		Generation cRead =  m.getRef().keySet().iterator().next();
-		assertEquals( "a",cRead.getAge() );
-		assertEquals( "description", cRead.getSubGeneration().getDescription() );
-		tx.rollback();
-		s.close();
-	}
-
-	@Override
-	protected Class[] getAnnotatedClasses() {
-		return new Class[] {
+@DomainModel(
+		annotatedClasses = {
 				GenerationUser.class,
 				GenerationGroup.class
-		};
+		}
+)
+@SessionFactory
+public class MapKeyTest {
+
+	@Test
+	public void testMapKeyOnEmbeddedId(SessionFactoryScope scope) {
+		scope.inTransaction(
+				session -> {
+					Generation c = new Generation();
+					c.setAge( "a" );
+					c.setCulture( "b" );
+					c.setSubGeneration( new Generation.SubGeneration( "description" ) );
+					GenerationGroup r = new GenerationGroup();
+					r.setGeneration( c );
+					session.persist( r );
+					GenerationUser m = new GenerationUser();
+					session.persist( m );
+					m.getRef().put( c, r );
+					session.flush();
+					session.clear();
+
+					m = session.find( GenerationUser.class, m.getId() );
+					Generation cRead = m.getRef().keySet().iterator().next();
+					assertThat( cRead.getAge() ).isEqualTo( "a" );
+					assertThat( cRead.getSubGeneration().getDescription() ).isEqualTo( "description" );
+				}
+		);
 	}
 }

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/eager/Atmosphere.java

@@ -3,9 +3,7 @@
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.indexcoll.eager;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
+
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;
 import jakarta.persistence.ElementCollection;
@@ -23,17 +21,20 @@
 import jakarta.persistence.MapKeyJoinColumns;
 import jakarta.persistence.MapKeyTemporal;
 import jakarta.persistence.TemporalType;
-
 import org.hibernate.orm.test.annotations.indexcoll.Gas;
 import org.hibernate.orm.test.annotations.indexcoll.GasKey;
 
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * @author Emmanuel Bernard
  */
 @Entity
 public class Atmosphere {
 
-	public static enum Level {
+	public enum Level {
 		LOW,
 		HIGH
 	}
@@ -43,45 +44,45 @@ public static enum Level {
 	public Integer id;
 
 	@ManyToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
-	@MapKeyColumn(name="gas_name")
-	public Map<String, Gas> gases = new HashMap<String, Gas>();
+	@MapKeyColumn(name = "gas_name")
+	public Map<String, Gas> gases = new HashMap<>();
 
 	@MapKeyTemporal(TemporalType.DATE)
 	@ElementCollection(fetch = FetchType.EAGER)
-	@MapKeyColumn(nullable=false)
-	public Map<Date, String> colorPerDate = new HashMap<Date,String>();
+	@MapKeyColumn(nullable = false)
+	public Map<Date, String> colorPerDate = new HashMap<>();
 
 	@ElementCollection(fetch = FetchType.EAGER)
 	@MapKeyEnumerated(EnumType.STRING)
-	@MapKeyColumn(nullable=false)
-	public Map<Level, String> colorPerLevel = new HashMap<Level,String>();
+	@MapKeyColumn(nullable = false)
+	public Map<Level, String> colorPerLevel = new HashMap<>();
 
 	@ManyToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
-	@MapKeyJoinColumn(name="gas_id" )
+	@MapKeyJoinColumn(name = "gas_id")
 	@JoinTable(name = "Gas_per_key")
 	public Map<GasKey, Gas> gasesPerKey = new HashMap<GasKey, Gas>();
 
 	@ElementCollection(fetch = FetchType.EAGER)
-	@Column(name="composition_rate")
-	@MapKeyJoinColumns( { @MapKeyJoinColumn(name="gas_id" ) } ) //use @MapKeyJoinColumns explicitly for tests
+	@Column(name = "composition_rate")
+	@MapKeyJoinColumns({@MapKeyJoinColumn(name = "gas_id")}) //use @MapKeyJoinColumns explicitly for tests
 	@JoinTable(name = "Composition", joinColumns = @JoinColumn(name = "atmosphere_id"))
-	public Map<Gas, Double> composition = new HashMap<Gas, Double>();
+	public Map<Gas, Double> composition = new HashMap<>();
 
 	//use default JPA 2 column name for map key
 	@ManyToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
 	@MapKeyColumn
-	@JoinTable(name="Atm_Gas_Def")
-	public Map<String, Gas> gasesDef = new HashMap<String, Gas>();
+	@JoinTable(name = "Atm_Gas_Def")
+	public Map<String, Gas> gasesDef = new HashMap<>();
 
 	//use default HAN legacy column name for map key
 	@ManyToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
 	@MapKeyColumn
-	@JoinTable(name="Atm_Gas_DefLeg")
-	public Map<String, Gas> gasesDefLeg = new HashMap<String, Gas>();
+	@JoinTable(name = "Atm_Gas_DefLeg")
+	public Map<String, Gas> gasesDefLeg = new HashMap<>();
 
 	@ManyToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
 	@MapKeyJoinColumn
 	@JoinTable(name = "Gas_p_key_def")
-	public Map<GasKey, Gas> gasesPerKeyDef = new HashMap<GasKey, Gas>();
+	public Map<GasKey, Gas> gasesPerKeyDef = new HashMap<>();
 
 }