Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-11214 : Fix test to work on pre-5.2 branches

This commit is contained in:
Gail Badner 2017-06-20 16:10:55 -07:00
parent 9b45536dc1
commit 422f8c0de4
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/strategy/ValidityAuditStrategyComponentCollectionRevEndTest.java
View File

@ -15,6 +15,7 @@ import javax.persistence.CollectionTable;
import javax.persistence.ElementCollection; import javax.persistence.ElementCollection;
import javax.persistence.Embeddable; import javax.persistence.Embeddable;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.EntityManager;
import javax.persistence.Id; import javax.persistence.Id;
import javax.persistence.JoinColumn; import javax.persistence.JoinColumn;
import javax.persistence.OrderColumn; import javax.persistence.OrderColumn;
@ -25,7 +26,6 @@ import org.hibernate.envers.strategy.ValidityAuditStrategy;
import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase;
import org.hibernate.envers.test.Priority; import org.hibernate.envers.test.Priority;
import org.hibernate.testing.TestForIssue; import org.hibernate.testing.TestForIssue;
import org.hibernate.testing.transaction.TransactionUtil;
import org.junit.Test; import org.junit.Test;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
@ -56,26 +56,38 @@ public class ValidityAuditStrategyComponentCollectionRevEndTest extends BaseEnve
@Priority(10) @Priority(10)
public void initData() { public void initData() {
// Revision 1 // Revision 1
this.productId = TransactionUtil.doInJPA( this::entityManagerFactory, entityManager -> { EntityManager entityManager = getOrCreateEntityManager();
entityManager.getTransaction().begin();
{
Product product = new Product( 1 , "Test" ); Product product = new Product( 1 , "Test" );
product.getItems().add( new Item( "bread", null ) ); product.getItems().add( new Item( "bread", null ) );
entityManager.persist( product ); entityManager.persist( product );
return product.getId(); this.productId = product.getId();
} ); }
entityManager.getTransaction().commit();
entityManager.close();
// Revision 2 // Revision 2
TransactionUtil.doInJPA( this::entityManagerFactory, entityManager -> { entityManager = getOrCreateEntityManager();
entityManager.getTransaction().begin();
{
Product product = entityManager.find( Product.class, productId ); Product product = entityManager.find( Product.class, productId );
product.getItems().add( new Item( "bread2", 2 ) ); product.getItems().add( new Item( "bread2", 2 ) );
entityManager.merge( product ); entityManager.merge( product );
} ); }
entityManager.getTransaction().commit();
entityManager.close();
// Revision 3 // Revision 3
TransactionUtil.doInJPA( this::entityManagerFactory, entityManager -> { entityManager = getOrCreateEntityManager();
entityManager.getTransaction().begin();
{
Product product = entityManager.find( Product.class, productId ); Product product = entityManager.find( Product.class, productId );
product.getItems().remove( 0 ); product.getItems().remove( 0 );
entityManager.merge( product ); entityManager.merge( product );
} ); }
entityManager.getTransaction().commit();
entityManager.close();
} }
@Test @Test