HHH-19846 Drop JUnit 4 usage

Author: dreab8

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/quote/resultsetmappings/ExplicitSqlResultSetMappingTest.java

@@ -4,57 +4,61 @@
  */
 package org.hibernate.orm.test.annotations.quote.resultsetmappings;
 
-import org.hibernate.cfg.Configuration;
 import org.hibernate.cfg.Environment;
+import org.hibernate.dialect.Dialect;
+import org.hibernate.testing.orm.junit.DomainModel;
+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;
 
-import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
-import org.junit.Test;
 
 /**
  * @author Steve Ebersole
  */
-public class ExplicitSqlResultSetMappingTest extends BaseCoreFunctionalTestCase {
+@DomainModel(
+		annotatedClasses = {
+				MyEntity.class
+		}
+)
+@SessionFactory
+@ServiceRegistry(
+		settings = @Setting(name = Environment.GLOBALLY_QUOTED_IDENTIFIERS, value = "true")
+)
+public class ExplicitSqlResultSetMappingTest {
 	private String queryString = null;
 
-	@Override
-	protected Class<?>[] getAnnotatedClasses() {
-		return new Class<?>[] { MyEntity.class };
-	}
-
-	@Override
-	protected void configure(Configuration cfg) {
-		cfg.setProperty( Environment.GLOBALLY_QUOTED_IDENTIFIERS, true );
-	}
 
-	private void prepareTestData() {
-		char open = getDialect().openQuote();
-		char close = getDialect().closeQuote();
-		queryString="select t."+open+"NAME"+close+" as "+open+"QuotEd_nAMe"+close+" from "+open+"MY_ENTITY_TABLE"+close+" t";
-		inTransaction(
+	@BeforeEach
+	public void prepareTestData(SessionFactoryScope scope) {
+		Dialect dialect = scope.getSessionFactory().getJdbcServices().getDialect();
+		char open = dialect.openQuote();
+		char close = dialect.closeQuote();
+		queryString = "select t." + open + "NAME" + close + " as " + open + "QuotEd_nAMe" + close + " from " + open + "MY_ENTITY_TABLE" + close + " t";
+		scope.inTransaction(
 				s -> s.persist( new MyEntity( "mine" ) )
 
 		);
 	}
 
-	@Override
-	protected boolean isCleanupTestDataRequired() {
-		return true;
+	@AfterEach
+	public void cleanup(SessionFactoryScope scope) {
+		scope.getSessionFactory().getSchemaManager().truncateMappedObjects();
 	}
 
 	@Test
-	public void testCompleteScalarAutoDiscovery() {
-		prepareTestData();
-
-		inTransaction(
+	public void testCompleteScalarAutoDiscovery(SessionFactoryScope scope) {
+		scope.inTransaction(
 				s -> s.createNativeQuery( queryString ).list()
 		);
 	}
 
 	@Test
-	public void testPartialScalarAutoDiscovery() {
-		prepareTestData();
-
-		inTransaction(
+	public void testPartialScalarAutoDiscovery(SessionFactoryScope scope) {
+		scope.inTransaction(
 				s -> s.createNativeQuery( queryString, "explicitScalarResultSetMapping" ).list()
 		);
 	}

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/Bag.java

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

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/Clothes.java

@@ -3,6 +3,7 @@
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.referencedcolumnname;
+
 import jakarta.persistence.Entity;
 import jakarta.persistence.Column;
 import jakarta.persistence.GeneratedValue;
@@ -54,14 +55,10 @@ public void setFlavor(String flavor) {
 
 	public boolean equals(Object o) {
 		if ( this == o ) return true;
-		if ( !( o instanceof Clothes ) ) return false;
-
-		final Clothes clothes = (Clothes) o;
+		if ( !(o instanceof Clothes clothes) ) return false;
 
 		if ( !flavor.equals( clothes.flavor ) ) return false;
-		if ( !type.equals( clothes.type ) ) return false;
-
-		return true;
+		return type.equals( clothes.type );
 	}
 
 	public int hashCode() {

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/House.java

@@ -3,6 +3,7 @@
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.referencedcolumnname;
+
 import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Set;
@@ -23,7 +24,7 @@ public class House implements Serializable {
 	private Integer id;
 	private String address;
 	private Postman postman;
-	private Set<Inhabitant> hasInhabitants = new HashSet<Inhabitant>();
+	private Set<Inhabitant> hasInhabitants = new HashSet<>();
 
 	@ManyToOne
 	@JoinColumn(referencedColumnName = "name")
@@ -67,13 +68,9 @@ public void setHasInhabitants(Set<Inhabitant> hasInhabitants) {
 
 	public boolean equals(Object o) {
 		if ( this == o ) return true;
-		if ( !( o instanceof House ) ) return false;
-
-		final House house = (House) o;
-
-		if ( address != null ? !address.equals( house.address ) : house.address != null ) return false;
+		if ( !(o instanceof House house) ) return false;
 
-		return true;
+		return address != null ? address.equals( house.address ) : house.address == null;
 	}
 
 	public int hashCode() {

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/Inhabitant.java

@@ -3,6 +3,7 @@
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.referencedcolumnname;
+
 import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Set;
@@ -18,7 +19,7 @@
 public class Inhabitant implements Serializable {
 	private Integer id;
 	private String name;
-	private Set<House> livesIn = new HashSet<House>();
+	private Set<House> livesIn = new HashSet<>();
 
 	@Id
 	@GeneratedValue
@@ -49,13 +50,9 @@ public void setLivesIn(Set<House> livesIn) {
 
 	public boolean equals(Object o) {
 		if ( this == o ) return true;
-		if ( !( o instanceof Inhabitant ) ) return false;
-
-		final Inhabitant inhabitant = (Inhabitant) o;
-
-		if ( name != null ? !name.equals( inhabitant.name ) : inhabitant.name != null ) return false;
+		if ( !(o instanceof Inhabitant inhabitant) ) return false;
 
-		return true;
+		return name != null ? name.equals( inhabitant.name ) : inhabitant.name == null;
 	}
 
 	public int hashCode() {

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/Item.java

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

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/ItemCost.java

@@ -3,6 +3,7 @@
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.referencedcolumnname;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
 import jakarta.persistence.Entity;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/Luggage.java

@@ -3,6 +3,7 @@
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.referencedcolumnname;
+
 import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Set;
@@ -23,7 +24,7 @@ public class Luggage implements Serializable {
 	private String owner;
 	@Column(name = "`type`")
 	private String type;
-	private Set<Clothes> hasInside = new HashSet<Clothes>();
+	private Set<Clothes> hasInside = new HashSet<>();
 
 	public Luggage() {
 	}
@@ -72,14 +73,10 @@ public void setHasInside(Set<Clothes> hasInside) {
 
 	public boolean equals(Object o) {
 		if ( this == o ) return true;
-		if ( !( o instanceof Luggage ) ) return false;
-
-		final Luggage luggage = (Luggage) o;
+		if ( !(o instanceof Luggage luggage) ) return false;
 
 		if ( !owner.equals( luggage.owner ) ) return false;
-		if ( !type.equals( luggage.type ) ) return false;
-
-		return true;
+		return type.equals( luggage.type );
 	}
 
 	public int hashCode() {

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/Postman.java

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

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/Rambler.java

@@ -3,6 +3,7 @@
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.referencedcolumnname;
+
 import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Set;
@@ -20,7 +21,7 @@
 public class Rambler implements Serializable {
 	private Integer id;
 	private String name;
-	private Set<Bag> bags = new HashSet<Bag>();
+	private Set<Bag> bags = new HashSet<>();
 
 	public Rambler() {
 	}