HHH-8360 HHH-7843 : one-to-one and mappedBy associations

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 {

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 {

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 {

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" )

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() {

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() {

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() {

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;
 

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;
 

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;
 

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;
 

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() {

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() {

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() {

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() {

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() {

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() {