diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/association/AssociationTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/association/AssociationTest.java index 0bce6b2624..f4d041c62f 100644 --- a/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/association/AssociationTest.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/association/AssociationTest.java @@ -5,12 +5,10 @@ import javax.persistence.EntityManager; import org.junit.Test; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; -import org.hibernate.testing.FailureExpectedWithNewMetamodel; /** * @author Emmanuel Bernard */ -@FailureExpectedWithNewMetamodel public class AssociationTest extends BaseEntityManagerFunctionalTestCase { @Test public void testBidirOneToOne() throws Exception { diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/cascade/CascadeTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/cascade/CascadeTest.java index 135bd772b5..cac652d542 100644 --- a/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/cascade/CascadeTest.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/cascade/CascadeTest.java @@ -29,12 +29,10 @@ import javax.persistence.EntityTransaction; import org.junit.Test; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; -import org.hibernate.testing.FailureExpectedWithNewMetamodel; /** * @author Max Rydahl Andersen */ -@FailureExpectedWithNewMetamodel public class CascadeTest extends BaseEntityManagerFunctionalTestCase { @Test public void testCascade() throws Exception { diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/cascade/FetchTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/cascade/FetchTest.java index e763b814db..a49c644281 100644 --- a/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/cascade/FetchTest.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/cascade/FetchTest.java @@ -34,7 +34,6 @@ import org.junit.Test; import org.hibernate.Hibernate; import org.hibernate.ejb.HibernateEntityManager; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; -import org.hibernate.testing.FailureExpectedWithNewMetamodel; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -42,7 +41,6 @@ import static org.junit.Assert.assertTrue; /** * @author Emmanuel Bernard */ -@FailureExpectedWithNewMetamodel public class FetchTest extends BaseEntityManagerFunctionalTestCase { @Test public void testCascadeAndFetchCollection() throws Exception { diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/cascade/multilevel/MultiLevelCascadeTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/cascade/multilevel/MultiLevelCascadeTest.java index ebcc81d5f7..61fc84c3f1 100644 --- a/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/cascade/multilevel/MultiLevelCascadeTest.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/cascade/multilevel/MultiLevelCascadeTest.java @@ -29,14 +29,12 @@ import javax.persistence.EntityTransaction; import org.junit.Test; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; -import org.hibernate.testing.FailureExpectedWithNewMetamodel; import org.hibernate.testing.TestForIssue; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertSame; -@FailureExpectedWithNewMetamodel public class MultiLevelCascadeTest extends BaseEntityManagerFunctionalTestCase { @TestForIssue( jiraKey = "HHH-5299" ) diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/ManipulationCriteriaTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/ManipulationCriteriaTest.java index ba8afadf9d..07690367dc 100644 --- a/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/ManipulationCriteriaTest.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/ManipulationCriteriaTest.java @@ -37,14 +37,12 @@ import org.hibernate.dialect.MySQLDialect; import org.hibernate.jpa.test.metamodel.AbstractMetamodelSpecificTest; import org.hibernate.jpa.test.metamodel.Customer; import org.hibernate.jpa.test.metamodel.Customer_; -import org.hibernate.testing.FailureExpectedWithNewMetamodel; import org.hibernate.testing.SkipForDialect; import org.junit.Test; /** * @author Steve Ebersole */ -@FailureExpectedWithNewMetamodel public class ManipulationCriteriaTest extends AbstractMetamodelSpecificTest { @Test public void basicTest() { diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/OnKeywordTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/OnKeywordTest.java index 3e88386619..ae79bda3bf 100644 --- a/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/OnKeywordTest.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/OnKeywordTest.java @@ -33,7 +33,6 @@ import org.hibernate.jpa.test.metamodel.LineItem; import org.hibernate.jpa.test.metamodel.LineItem_; import org.hibernate.jpa.test.metamodel.Order; import org.hibernate.jpa.test.metamodel.Order_; -import org.hibernate.testing.FailureExpectedWithNewMetamodel; import org.junit.Test; @@ -42,7 +41,6 @@ import org.junit.Test; * * @author Steve Ebersole */ -@FailureExpectedWithNewMetamodel public class OnKeywordTest extends AbstractMetamodelSpecificTest { @Test public void basicTest() { diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/QueryBuilderTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/QueryBuilderTest.java index bdcdad46d4..a6dc103bd4 100644 --- a/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/QueryBuilderTest.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/QueryBuilderTest.java @@ -51,14 +51,12 @@ import org.hibernate.jpa.test.metamodel.Product; import org.hibernate.jpa.test.metamodel.ShelfLife; import org.hibernate.jpa.test.metamodel.Spouse; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; -import org.hibernate.testing.FailureExpectedWithNewMetamodel; import static org.junit.Assert.assertEquals; /** * @author Steve Ebersole */ -@FailureExpectedWithNewMetamodel public class QueryBuilderTest extends BaseEntityManagerFunctionalTestCase { @Override public Class[] getAnnotatedClasses() { diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/basic/AggregationResultTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/basic/AggregationResultTest.java index 7b1151757e..11348c8865 100644 --- a/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/basic/AggregationResultTest.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/basic/AggregationResultTest.java @@ -38,12 +38,10 @@ import org.junit.Test; import org.hibernate.jpa.test.metamodel.AbstractMetamodelSpecificTest; import org.hibernate.jpa.test.metamodel.Product; import org.hibernate.jpa.test.metamodel.Product_; -import org.hibernate.testing.FailureExpectedWithNewMetamodel; /** * @author Steve Ebersole */ -@FailureExpectedWithNewMetamodel(message = "@OneToOne with mappedBy specified is not supported yet") public class AggregationResultTest extends AbstractMetamodelSpecificTest { private CriteriaBuilder builder; diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/basic/CastTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/basic/CastTest.java index a5950132dc..72c159d2f6 100644 --- a/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/basic/CastTest.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/basic/CastTest.java @@ -38,10 +38,8 @@ import org.hibernate.jpa.test.metamodel.AbstractMetamodelSpecificTest; import org.hibernate.jpa.test.metamodel.Product; import org.hibernate.jpa.test.metamodel.Product_; -import org.hibernate.testing.FailureExpectedWithNewMetamodel; import org.hibernate.testing.TestForIssue; -@FailureExpectedWithNewMetamodel(message = "@OneToOne with mappedBy specified is not supported yet") public class CastTest extends AbstractMetamodelSpecificTest { private static final int QUANTITY = 2; diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/basic/ExpressionsTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/basic/ExpressionsTest.java index 1728733a6d..81632e2661 100644 --- a/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/basic/ExpressionsTest.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/basic/ExpressionsTest.java @@ -46,7 +46,6 @@ import org.hibernate.jpa.test.metamodel.Phone; import org.hibernate.jpa.test.metamodel.Product; import org.hibernate.jpa.test.metamodel.Product_; import org.hibernate.internal.AbstractQueryImpl; -import org.hibernate.testing.FailureExpectedWithNewMetamodel; import org.hibernate.testing.RequiresDialect; import org.hibernate.testing.TestForIssue; @@ -57,7 +56,6 @@ import static org.junit.Assert.assertEquals; * * @author Steve Ebersole */ -@FailureExpectedWithNewMetamodel(message = "@OneToOne with mappedBy specified is not supported yet") public class ExpressionsTest extends AbstractMetamodelSpecificTest { private CriteriaBuilder builder; diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/basic/PredicateTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/basic/PredicateTest.java index eda7071bd1..8e8f6a36af 100644 --- a/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/basic/PredicateTest.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/basic/PredicateTest.java @@ -39,7 +39,6 @@ import org.hibernate.jpa.test.metamodel.Customer_; import org.hibernate.jpa.test.metamodel.Order; import org.hibernate.jpa.test.metamodel.Order_; -import org.hibernate.testing.FailureExpectedWithNewMetamodel; import org.hibernate.testing.TestForIssue; import static org.junit.Assert.assertEquals; @@ -51,7 +50,6 @@ import static org.junit.Assert.assertTrue; * @author Steve Ebersole * @author Hardy Ferentschik */ -@FailureExpectedWithNewMetamodel public class PredicateTest extends AbstractMetamodelSpecificTest { private CriteriaBuilder builder; diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/paths/AbstractPathImplTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/paths/AbstractPathImplTest.java index 84fbaf1728..fef848f7e2 100644 --- a/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/paths/AbstractPathImplTest.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/paths/AbstractPathImplTest.java @@ -36,7 +36,6 @@ import org.hibernate.jpa.test.metamodel.AbstractMetamodelSpecificTest; import org.hibernate.jpa.test.metamodel.Order; import org.hibernate.jpa.test.metamodel.Thing; import org.hibernate.jpa.test.metamodel.ThingWithQuantity; -import org.hibernate.testing.FailureExpectedWithNewMetamodel; import static org.junit.Assert.assertEquals; @@ -44,7 +43,6 @@ import static org.junit.Assert.assertEquals; * @author Michael Rudolf * @author James Gilbertson */ -@FailureExpectedWithNewMetamodel public class AbstractPathImplTest extends AbstractMetamodelSpecificTest { @Before public void prepareTestData() { diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/paths/ImplicitJoinTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/paths/ImplicitJoinTest.java index 3031c9bb59..c3185ba801 100644 --- a/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/paths/ImplicitJoinTest.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/paths/ImplicitJoinTest.java @@ -37,12 +37,10 @@ import org.hibernate.jpa.test.metamodel.LineItem; import org.hibernate.jpa.test.metamodel.LineItem_; import org.hibernate.jpa.test.metamodel.Order; import org.hibernate.jpa.test.metamodel.Order_; -import org.hibernate.testing.FailureExpectedWithNewMetamodel; /** * @author Steve Ebersole */ -@FailureExpectedWithNewMetamodel public class ImplicitJoinTest extends AbstractMetamodelSpecificTest { @Test public void testImplicitJoinFromExplicitCollectionJoin() { diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/subquery/CorrelatedSubqueryTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/subquery/CorrelatedSubqueryTest.java index 8b538f3359..4f7364f9ec 100644 --- a/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/subquery/CorrelatedSubqueryTest.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/subquery/CorrelatedSubqueryTest.java @@ -40,13 +40,11 @@ import org.hibernate.jpa.test.metamodel.LineItem; import org.hibernate.jpa.test.metamodel.LineItem_; import org.hibernate.jpa.test.metamodel.Order; import org.hibernate.jpa.test.metamodel.Order_; -import org.hibernate.testing.FailureExpectedWithNewMetamodel; import org.hibernate.testing.SkipForDialect; /** * @author Steve Ebersole */ -@FailureExpectedWithNewMetamodel public class CorrelatedSubqueryTest extends AbstractMetamodelSpecificTest { @Test public void testBasicCorrelation() { diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/subquery/UncorrelatedSubqueryTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/subquery/UncorrelatedSubqueryTest.java index 5902ec710a..c3282b5e38 100644 --- a/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/subquery/UncorrelatedSubqueryTest.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/subquery/UncorrelatedSubqueryTest.java @@ -35,7 +35,6 @@ import org.hibernate.jpa.test.metamodel.Customer; import org.hibernate.jpa.test.metamodel.Customer_; import org.hibernate.jpa.test.metamodel.Order; import org.hibernate.jpa.test.metamodel.Order_; -import org.hibernate.testing.FailureExpectedWithNewMetamodel; import org.junit.Test; @@ -44,7 +43,6 @@ import static org.junit.Assert.fail; /** * @author Steve Ebersole */ -@FailureExpectedWithNewMetamodel public class UncorrelatedSubqueryTest extends AbstractMetamodelSpecificTest { @Test public void testEqualAll() { diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/tuple/TupleCriteriaTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/tuple/TupleCriteriaTest.java index 086776fda2..c0ea0eb5f9 100644 --- a/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/tuple/TupleCriteriaTest.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/tuple/TupleCriteriaTest.java @@ -36,7 +36,6 @@ import org.junit.Test; import org.hibernate.jpa.test.metamodel.AbstractMetamodelSpecificTest; import org.hibernate.jpa.test.metamodel.Customer; import org.hibernate.jpa.test.metamodel.Customer_; -import org.hibernate.testing.FailureExpectedWithNewMetamodel; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -44,7 +43,6 @@ import static org.junit.Assert.assertTrue; /** * @author Emmanuel Bernard */ -@FailureExpectedWithNewMetamodel public class TupleCriteriaTest extends AbstractMetamodelSpecificTest { @Test public void testArray() { diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/emops/MergeTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/emops/MergeTest.java index e319ee40dc..d424cf4b4d 100644 --- a/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/emops/MergeTest.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/emops/MergeTest.java @@ -30,7 +30,6 @@ import javax.persistence.EntityManager; import org.junit.Test; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; -import org.hibernate.testing.FailureExpectedWithNewMetamodel; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @@ -38,7 +37,6 @@ import static org.junit.Assert.fail; /** * @author Emmanuel Bernard */ -@FailureExpectedWithNewMetamodel public class MergeTest extends BaseEntityManagerFunctionalTestCase { @Test public void testMergeWithIndexColumn() {