Post-merge: handled failing tests

brmeyer · brmeyer · commit bc71c7a76225 · 2012-11-15T15:59:11.000-05:00
diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/DDLTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/DDLTest.java
@@ -86,7 +86,7 @@ public void testNotNullOnlyAppliedIfEmbeddedIsNotNullItself() throws Exception {
 				"Validator annotations are applied on tuner as it is @NotNull", false, column.isNullable()
 		);
 
-		column = SchemaUtil.getColumn( Tv.class, "time", metadata() );
+		column = SchemaUtil.getColumn( Tv.class, "`time`", metadata() );
 		assertEquals(
 				"Validator annotations were not applied on recorder", true, column.isNullable()
 		);
diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/QueryTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/QueryTest.java
@@ -27,12 +27,14 @@
 
 import org.junit.Test;
 
+import org.hibernate.testing.FailureExpectedWithNewMetamodel;
 import org.hibernate.testing.TestForIssue;
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
 
 /**
  * @author Steve Ebersole
  */
+@FailureExpectedWithNewMetamodel
 public class QueryTest extends BaseCoreFunctionalTestCase {
 	@Override
 	protected Class<?>[] getAnnotatedClasses() {
diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/enumerated/mapkey/MapKeyEnumeratedTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/enumerated/mapkey/MapKeyEnumeratedTest.java
@@ -27,11 +27,13 @@
 
 import org.junit.Test;
 
+import org.hibernate.testing.FailureExpectedWithNewMetamodel;
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
 
 /**
  * @author Steve Ebersole
  */
+@FailureExpectedWithNewMetamodel
 public class MapKeyEnumeratedTest extends BaseCoreFunctionalTestCase {
 	@Override
 	protected Class<?>[] getAnnotatedClasses() {
diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/enumerated/ormXml/OrmXmlEnumTypeTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/enumerated/ormXml/OrmXmlEnumTypeTest.java
@@ -29,6 +29,7 @@
 
 import org.junit.Test;
 
+import org.hibernate.testing.FailureExpectedWithNewMetamodel;
 import org.hibernate.testing.TestForIssue;
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
 import org.hibernate.testing.junit4.ExtraAssertions;
@@ -38,6 +39,7 @@
 /**
  * @author Steve Ebersole
  */
+@FailureExpectedWithNewMetamodel
 @TestForIssue( jiraKey = "HHH-7645" )
 public class OrmXmlEnumTypeTest extends BaseCoreFunctionalTestCase {
 	@Override
diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/lob/SerializableToBlobTypeTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/lob/SerializableToBlobTypeTest.java
@@ -16,7 +16,6 @@
  * 
  * @author Janario Oliveira
  */
-@FailureExpectedWithNewMetamodel // TypeDef w/o name
 public class SerializableToBlobTypeTest extends BaseCoreFunctionalTestCase {
 	@Test
 	public void testTypeDefinition() {
@@ -47,6 +46,7 @@ public void testTypeDefinition() {
 		assertEquals( ExplicitSerializableType.class.getName(), overrideType.getName() );
 	}
 
+	@FailureExpectedWithNewMetamodel
 	@Test
 	public void testPersist() {
 		EntitySerialize entitySerialize = new EntitySerialize();

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@`
`16`	`16`	`*`
`17`	`17`	`* @author Janario Oliveira`
`18`	`18`	`*/`
`19`		`-@FailureExpectedWithNewMetamodel // TypeDef w/o name`
`20`	`19`	`public class SerializableToBlobTypeTest extends BaseCoreFunctionalTestCase {`
`21`	`20`	`@Test`
`22`	`21`	`public void testTypeDefinition() {`
`@@ -47,6 +46,7 @@ public void testTypeDefinition() {`
`47`	`46`	`assertEquals( ExplicitSerializableType.class.getName(), overrideType.getName() );`
`48`	`47`	`}`
`49`	`48`
	`49`	`+ @FailureExpectedWithNewMetamodel`
`50`	`50`	`@Test`
`51`	`51`	`public void testPersist() {`
`52`	`52`	`EntitySerialize entitySerialize = new EntitySerialize();`