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

merge master

This commit is contained in:
Strong Liu 2013-08-04 00:44:51 +08:00
parent edffc0063c
commit dba8d835f5
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/procedure/JpaTckUsageTest.java
View File

@ -50,6 +50,7 @@ import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.hibernate.testing.FailureExpected; import org.hibernate.testing.FailureExpected;
import org.hibernate.testing.FailureExpectedWithNewMetamodel;
import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.junit4.BaseUnitTestCase;
import static org.hibernate.testing.junit4.ExtraAssertions.assertTyping; import static org.hibernate.testing.junit4.ExtraAssertions.assertTyping;
@ -173,6 +174,7 @@ public class JpaTckUsageTest extends BaseUnitTestCase {
} }
@Test @Test
@FailureExpectedWithNewMetamodel
public void testSettingInParamDefinedOnNamedStoredProcedureQuery() { public void testSettingInParamDefinedOnNamedStoredProcedureQuery() {
EntityManager em = entityManagerFactory.createEntityManager(); EntityManager em = entityManagerFactory.createEntityManager();
em.getTransaction().begin(); em.getTransaction().begin();

2
hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseCoreFunctionalTestCase.java
View File

@ -147,7 +147,7 @@ public abstract class BaseCoreFunctionalTestCase extends BaseFunctionalTestCase
@AfterClassOnce @AfterClassOnce
@SuppressWarnings( {"UnusedDeclaration"}) @SuppressWarnings( {"UnusedDeclaration"})
private void releaseSessionFactory() { public void releaseSessionFactory() {
if ( getSessionFactoryBuilder() != null ) { if ( getSessionFactoryBuilder() != null ) {
getSessionFactoryBuilder().destory(); getSessionFactoryBuilder().destory();
} }