Merge branch 'HHH-8897-replace-metamodel'

This commit is contained in:
Gail Badner 2014-01-31 12:25:36 -08:00
commit e0d118d8c6
3 changed files with 10 additions and 0 deletions

View File

@ -10,6 +10,7 @@
import org.junit.Assert; import org.junit.Assert;
import org.junit.Test; import org.junit.Test;
import org.hibernate.testing.FailureExpectedWithNewMetamodel;
import org.hibernate.testing.TestForIssue; import org.hibernate.testing.TestForIssue;
/** /**
@ -24,6 +25,7 @@ protected Class<?>[] getAnnotatedClasses() {
@Test @Test
@Priority(10) @Priority(10)
@FailureExpectedWithNewMetamodel
public void initData() { public void initData() {
// Revision 1 // Revision 1
Session session = openSession(); Session session = openSession();
@ -52,6 +54,7 @@ public void initData() {
} }
@Test @Test
@FailureExpectedWithNewMetamodel
public void testRevisionsCountOfGivenIdStrEntity() { public void testRevisionsCountOfGivenIdStrEntity() {
// Revision 2 has not changed entity's state. // Revision 2 has not changed entity's state.
Assert.assertEquals( Arrays.asList( 1, 3 ), getAuditReader().getRevisions( GivenIdStrEntity.class, 1 ) ); Assert.assertEquals( Arrays.asList( 1, 3 ), getAuditReader().getRevisions( GivenIdStrEntity.class, 1 ) );
@ -60,6 +63,7 @@ public void testRevisionsCountOfGivenIdStrEntity() {
} }
@Test @Test
@FailureExpectedWithNewMetamodel
public void testHistoryOfGivenIdStrEntity() { public void testHistoryOfGivenIdStrEntity() {
Assert.assertEquals( new GivenIdStrEntity( 1, "data" ), getAuditReader().find( GivenIdStrEntity.class, 1, 1 ) ); Assert.assertEquals( new GivenIdStrEntity( 1, "data" ), getAuditReader().find( GivenIdStrEntity.class, 1, 1 ) );
Assert.assertEquals( Assert.assertEquals(

View File

@ -10,6 +10,7 @@
import org.junit.Assert; import org.junit.Assert;
import org.junit.Test; import org.junit.Test;
import org.hibernate.testing.FailureExpectedWithNewMetamodel;
import org.hibernate.testing.TestForIssue; import org.hibernate.testing.TestForIssue;
/** /**
@ -25,6 +26,7 @@ protected Class<?>[] getAnnotatedClasses() {
@Test @Test
@Priority(10) @Priority(10)
@FailureExpectedWithNewMetamodel
public void initData() { public void initData() {
// Revision 1 // Revision 1
getSession().getTransaction().begin(); getSession().getTransaction().begin();
@ -37,6 +39,7 @@ public void initData() {
@Test @Test
@TestForIssue(jiraKey = "HHH-4760") @TestForIssue(jiraKey = "HHH-4760")
@FailureExpectedWithNewMetamodel
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void testQueryingWithProxyObject() { public void testQueryingWithProxyObject() {
StrTestEntity originalSte = new StrTestEntity( "data", id ); StrTestEntity originalSte = new StrTestEntity( "data", id );

View File

@ -11,6 +11,7 @@
import org.junit.Assert; import org.junit.Assert;
import org.junit.Test; import org.junit.Test;
import org.hibernate.testing.FailureExpectedWithNewMetamodel;
import org.hibernate.testing.TestForIssue; import org.hibernate.testing.TestForIssue;
/** /**
@ -32,6 +33,7 @@ protected boolean createSchema() {
@Test @Test
@Priority(10) @Priority(10)
@FailureExpectedWithNewMetamodel
public void testSchemaCreation() { public void testSchemaCreation() {
// Generate complete schema. // Generate complete schema.
new EnversSchemaGenerator( configuration() ).export().create( true, true ); new EnversSchemaGenerator( configuration() ).export().create( true, true );
@ -48,6 +50,7 @@ public void testSchemaCreation() {
@Test @Test
@Priority(9) @Priority(9)
@FailureExpectedWithNewMetamodel
public void testAuditDataRetrieval() { public void testAuditDataRetrieval() {
Assert.assertEquals( Arrays.asList( 1 ), getAuditReader().getRevisions( StrTestEntity.class, id ) ); Assert.assertEquals( Arrays.asList( 1 ), getAuditReader().getRevisions( StrTestEntity.class, id ) );
Assert.assertEquals( new StrTestEntity( "data", id ), getAuditReader().find( StrTestEntity.class, id, 1 ) ); Assert.assertEquals( new StrTestEntity( "data", id ), getAuditReader().find( StrTestEntity.class, id, 1 ) );