Various code cleanup

Author: sebersole

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/loader/LoaderTest.java

@@ -4,87 +4,65 @@
  */
 package org.hibernate.orm.test.annotations.loader;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import org.hibernate.ObjectNotFoundException;
+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.AfterEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Iterator;
 import java.util.Set;
 
-import org.hibernate.ObjectNotFoundException;
-import org.hibernate.Session;
-import org.hibernate.Transaction;
-import org.hibernate.resource.transaction.spi.TransactionStatus;
-
-import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
-import org.junit.Test;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * @author Emmanuel Bernard
  */
-public class LoaderTest extends BaseCoreFunctionalTestCase {
-
-	@Override
-	protected Class[] getAnnotatedClasses() {
-		return new Class[]{
-				Player.class,
-				Team.class
-		};
-	}
-
+@SuppressWarnings("JUnitMalformedDeclaration")
+@DomainModel( annotatedClasses = { Player.class, Team.class } )
+@SessionFactory
+public class LoaderTest {
 	@Test
-	public void testBasic() throws Exception {
+	public void testBasic(SessionFactoryScope sessions) throws Exception {
 		// set up data...
-		Session s = openSession( );
-		Transaction tx = s.beginTransaction();
-		Team t = new Team();
-		Player p = new Player();
-		p.setName( "me" );
-		t.getPlayers().add( p );
-		p.setTeam( t );
-		s.persist(p);
-		s.persist( t );
-		tx.commit();
-		s.close();
-
-		s = openSession();
-		tx = s.beginTransaction();
-		Team t2 = s.getReference( Team.class, t.getId() );
-		Set<Player> players = t2.getPlayers();
-		Iterator<Player> iterator = players.iterator();
-		assertEquals( "me", iterator.next().getName() );
-		tx.commit();
-		s.close();
+		sessions.inTransaction( (session) -> {
+			Team t = new Team( 1L );
+			Player p = new Player( 1L, "me" );
+			t.addPlayer( p );
+			session.persist( p );
+			session.persist( t );
+		} );
 
-		// clean up data
-		s = openSession();
-		tx = s.beginTransaction();
-		t = s.get( Team.class, t2.getId() );
-		p = s.get( Player.class, p.getId() );
-		s.remove( p );
-		s.remove( t );
-		tx.commit();
-		s.close();
+		// test
+		sessions.inTransaction( (session) -> {
+			Team t2 = session.getReference( Team.class, 1 );
+			Set<Player> players = t2.getPlayers();
+			Iterator<Player> iterator = players.iterator();
+			assertThat( iterator.next().getName() ).isEqualTo( "me" );
+		} );
 	}
 
 	@Test
-	public void testGetNotExisting() {
-		Session s = openSession();
-		s.beginTransaction();
+	public void testGetNotExisting(SessionFactoryScope sessions) {
+		sessions.inTransaction( (session) -> {
+			final Team reference = session.getReference( Team.class, 1 );
+			assertThat( reference ).isNotNull();
 
-		try {
-			long notExistingId = 1l;
-			s.getReference( Team.class, notExistingId );
-			s.get( Team.class, notExistingId );
-			s.getTransaction().commit();
-		}
-		catch (ObjectNotFoundException e) {
-			if ( s.getTransaction().getStatus() == TransactionStatus.ACTIVE ) {
-				s.getTransaction().rollback();
+			// now try a find which should return us a null
+			try {
+				final Team found = session.find( Team.class, 1 );
+				assertThat( found ).isNull();
+			}
+			catch (ObjectNotFoundException unexpected) {
+				fail( "#find threw an ObjectNotFoundException" );
 			}
-			fail("#get threw an ObjectNotFoundExcepton");
-		}
-		finally {
-			s.close();
-		}
+		} );
+	}
+
+	@AfterEach
+	public void dropTestData(SessionFactoryScope sessions) {
+		sessions.dropData();
 	}
 }

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/loader/Player.java

@@ -4,7 +4,6 @@
  */
 package org.hibernate.orm.test.annotations.loader;
 import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
@@ -14,13 +13,33 @@
 
 @Entity
 public class Player {
-
 	private Long id;
-	private Team team;
 	private String name;
+	private Team team;
+
+	public Player() {
+	}
+
+	public Player(Long id) {
+		this( id, "Player #" + id );
+	}
+
+	public Player(Long id, String name) {
+		this.id = id;
+		this.name = name;
+	}
+
+	public Player(Long id, Team team) {
+		this( id, "Player #" + id, team );
+	}
+
+	public Player(Long id, String name, Team team) {
+		this.id = id;
+		this.name = name;
+		this.team = team;
+	}
 
 	@Id
-	@GeneratedValue
 	public Long getId() {
 		return id;
 	}

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/loader/Team.java

@@ -3,27 +3,39 @@
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.loader;
-import java.util.HashSet;
-import java.util.Set;
+
 import jakarta.persistence.Entity;
 import jakarta.persistence.EntityResult;
 import jakarta.persistence.FetchType;
-import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
 import jakarta.persistence.OneToMany;
-
 import jakarta.persistence.SqlResultSetMapping;
 import org.hibernate.annotations.Fetch;
 import org.hibernate.annotations.FetchMode;
 import org.hibernate.annotations.SQLSelect;
 
+import java.util.HashSet;
+import java.util.Set;
+
 @Entity
 public class Team {
 	private Long id;
-	private Set<Player> players = new HashSet<Player>();
+	private String name;
+	private Set<Player> players = new HashSet<>();
+
+	public Team() {
+	}
+
+	public Team(Long id) {
+		this( id, "Team #" + id );
+	}
+
+	public Team(Long id, String name) {
+		this.id = id;
+		this.name = name;
+	}
 
 	@Id
-	@GeneratedValue
 	public Long getId() {
 		return id;
 	}
@@ -32,6 +44,14 @@ public void setId(Long id) {
 		this.id = id;
 	}
 
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
 	@OneToMany(targetEntity = Player.class, mappedBy = "team", fetch = FetchType.EAGER)
 	@Fetch(FetchMode.SELECT)
 	@SQLSelect(sql = "select * from Player where team_id = ?1",
@@ -44,4 +64,9 @@ public Set<Player> getPlayers() {
 	public void setPlayers(Set<Player> players) {
 		this.players = players;
 	}
+
+	public void addPlayer(Player p) {
+		players.add( p );
+		p.setTeam( this );
+	}
 }

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/CollectionElementConversionTest.java

@@ -30,6 +30,7 @@
 /**
  * @author Steve Ebersole
  */
+@SuppressWarnings("JUnitMalformedDeclaration")
 @JiraKey(value = "HHH-8529")
 @DomainModel( annotatedClasses = { CollectionElementConversionTest.Customer.class, CollectionElementConversionTest.ColorConverter.class } )
 @SessionFactory

hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/SessionFactoryExtension.java

@@ -409,5 +409,14 @@ public void inStatelessTransaction(StatelessSession session, Consumer<StatelessS
 
 			TransactionUtil.inTransaction( session, action );
 		}
+
+		@Override
+		public void dropData() {
+			if ( sessionFactory == null ) {
+				return;
+			}
+
+			sessionFactory.getSchemaManager().truncateMappedObjects();
+		}
 	}
 }

hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/SessionFactoryScope.java

@@ -40,4 +40,6 @@ default void withSessionFactory(Consumer<SessionFactoryImplementor> action) {
 	void inStatelessSession(Consumer<StatelessSession> action);
 	void inStatelessTransaction(Consumer<StatelessSession> action);
 	void inStatelessTransaction(StatelessSession session, Consumer<StatelessSession> action);
+
+	void dropData();
 }