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

HHH-11037 : Fix tests to be jdk6-compliant 

(cherry picked from commit 840258a00e)
This commit is contained in:
Gail Badner 2016-08-18 16:03:48 -07:00
parent 2335716be8
commit 9ad8e1ae88
3 changed files with 48 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
hibernate-core/src/test/java/org/hibernate/test/inheritancediscriminator/embeddable/JoinedSubclassWithEmbeddableTest.java
View File

@ -32,11 +32,10 @@ import java.util.Set;
import org.junit.Test; import org.junit.Test;
import org.hibernate.Session;
import org.hibernate.testing.TestForIssue; import org.hibernate.testing.TestForIssue;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate;
/** /**
* @author Andrea Boriero * @author Andrea Boriero
*/ */
@ -49,23 +48,29 @@ public class JoinedSubclassWithEmbeddableTest extends BaseCoreFunctionalTestCase
@Test @Test
public void testSelectFromEmbeddedField() { public void testSelectFromEmbeddedField() {
doInHibernate( this::sessionFactory, session -> { Session session = openSession();
session.createNativeQuery( "select * from employee_embeddable_person_map" ).getResultList(); session.getTransaction().begin();
} ); session.createSQLQuery( "select * from employee_embeddable_person_map" ).list();
session.getTransaction().commit();
session.close();
} }
@Test @Test
public void testSelectFromSubclass() { public void testSelectFromSubclass() {
doInHibernate( this::sessionFactory, session -> { Session session = openSession();
session.createNativeQuery( "select * from embeddable_person_map" ).getResultList(); session.getTransaction().begin();
} ); session.createSQLQuery( "select * from embeddable_person_map" ).list();
session.getTransaction().commit();
session.close();
} }
@Test @Test
public void testSelectFromParent() { public void testSelectFromParent() {
doInHibernate( this::sessionFactory, session -> { Session session = openSession();
session.createNativeQuery( "select * from person_map" ).getResultList(); session.getTransaction().begin();
} ); session.createSQLQuery( "select * from person_map" ).list();
session.getTransaction().commit();
session.close();
} }
@Entity @Entity

27
hibernate-core/src/test/java/org/hibernate/test/inheritancediscriminator/embeddable/SingleTableWithEmbeddableTest.java
View File

@ -32,11 +32,10 @@ import java.util.Set;
import org.junit.Test; import org.junit.Test;
import org.hibernate.Session;
import org.hibernate.testing.TestForIssue; import org.hibernate.testing.TestForIssue;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate;
/** /**
* @author Andrea Boriero * @author Andrea Boriero
*/ */
@ -50,23 +49,29 @@ public class SingleTableWithEmbeddableTest extends BaseCoreFunctionalTestCase {
@Test @Test
public void testSelectFromEmbeddedField() { public void testSelectFromEmbeddedField() {
doInHibernate( this::sessionFactory, session -> { Session session = openSession();
session.createNativeQuery( "select * from employee_embeddable_person_map" ).getResultList(); session.getTransaction().begin();
} ); session.createSQLQuery( "select * from employee_embeddable_person_map" ).list();
session.getTransaction().commit();
session.close();
} }
@Test @Test
public void testSelectFromSubclass() { public void testSelectFromSubclass() {
doInHibernate( this::sessionFactory, session -> { Session session = openSession();
session.createNativeQuery( "select * from embeddable_person_map" ).getResultList(); session.getTransaction().begin();
} ); session.createSQLQuery( "select * from embeddable_person_map" ).list();
session.getTransaction().commit();
session.close();
} }
@Test @Test
public void testSelectFromParent() { public void testSelectFromParent() {
doInHibernate( this::sessionFactory, session -> { Session session = openSession();
session.createNativeQuery( "select * from person_map" ).getResultList(); session.getTransaction().begin();
} ); session.createSQLQuery( "select * from person_map" ).list();
session.getTransaction().commit();
session.close();
} }
@Entity @Entity

27
hibernate-core/src/test/java/org/hibernate/test/inheritancediscriminator/embeddable/TablePerClassWithEmbeddableTest.java
View File

@ -32,11 +32,10 @@ import java.util.Set;
import org.junit.Test; import org.junit.Test;
import org.hibernate.Session;
import org.hibernate.testing.TestForIssue; import org.hibernate.testing.TestForIssue;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate;
/** /**
* @author Andrea Boriero * @author Andrea Boriero
*/ */
@ -49,23 +48,29 @@ public class TablePerClassWithEmbeddableTest extends BaseCoreFunctionalTestCase
@Test @Test
public void testSelectFromEmbeddedField() { public void testSelectFromEmbeddedField() {
doInHibernate( this::sessionFactory, session -> { Session session = openSession();
session.createNativeQuery( "select * from employee_embeddable_person_map" ).getResultList(); session.getTransaction().begin();
} ); session.createSQLQuery( "select * from employee_embeddable_person_map" ).list();
session.getTransaction().commit();
session.close();
} }
@Test @Test
public void testSelectFromSubclass() { public void testSelectFromSubclass() {
doInHibernate( this::sessionFactory, session -> { Session session = openSession();
session.createNativeQuery( "select * from embeddable_person_map" ).getResultList(); session.getTransaction().begin();
} ); session.createSQLQuery( "select * from embeddable_person_map" ).list();
session.getTransaction().commit();
session.close();
} }
@Test @Test
public void testSelectFromParent() { public void testSelectFromParent() {
doInHibernate( this::sessionFactory, session -> { Session session = openSession();
session.createNativeQuery( "select * from person_map" ).getResultList(); session.getTransaction().begin();
} ); session.createSQLQuery( "select * from person_map" ).list();
session.getTransaction().commit();
session.close();
} }
@Entity @Entity