Post-merge: handled failing tests

hibernate · Nov 15, 2012 · bc71c7a · bc71c7a
1 parent 18e44d1
commit bc71c7a
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 2 deletions.
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/.../src/test/java/org/hibernate/test/annotations/enumerated/mapkey/MapKeyEnumeratedTest.java b/.../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/...re/src/test/java/org/hibernate/test/annotations/enumerated/ormXml/OrmXmlEnumTypeTest.java b/...re/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/...ate-core/src/test/java/org/hibernate/test/annotations/lob/SerializableToBlobTypeTest.java b/...ate-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();