HHH-7846 : Add messages and throw NotYetImplementedException to help categorize test failures

gbadner · gbadner · commit f87596ac2643 · 2012-12-05T16:50:09.000-08:00
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/hbm/AbstractEntitySourceImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/hbm/AbstractEntitySourceImpl.java
@@ -30,6 +30,7 @@
 import java.util.Set;
 
 import org.hibernate.EntityMode;
+import org.hibernate.cfg.NotYetImplementedException;
 import org.hibernate.internal.util.StringHelper;
 import org.hibernate.internal.util.collections.CollectionHelper;
 import org.hibernate.jaxb.spi.Origin;
@@ -47,7 +48,6 @@
 import org.hibernate.jaxb.spi.hbm.JaxbOneToOneElement;
 import org.hibernate.jaxb.spi.hbm.JaxbPropertyElement;
 import org.hibernate.jaxb.spi.hbm.JaxbSetElement;
-import org.hibernate.jaxb.spi.hbm.JaxbSynchronizeElement;
 import org.hibernate.jaxb.spi.hbm.JaxbTuplizerElement;
 import org.hibernate.jaxb.spi.hbm.JoinElementSource;
 import org.hibernate.metamodel.spi.binding.CustomSQL;
@@ -280,7 +280,10 @@ protected void processSetAttributes(List<AttributeSource> results,
 	}
 	protected void processIdBagAttributes(List<AttributeSource> results,
 											 List<JaxbIdbagElement> propertyElements){
-		// todo : implement
+
+		if ( !propertyElements.isEmpty() ) {
+			throw new NotYetImplementedException( "<idbag> is not supported yet" );
+		}
 	}
 	protected void processBagAttributes(List<AttributeSource> results,
 											 List<JaxbBagElement> propertyElements) {
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/SingleTableEntityPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/SingleTableEntityPersister.java
@@ -34,6 +34,7 @@
 import org.hibernate.MappingException;
 import org.hibernate.cache.spi.access.EntityRegionAccessStrategy;
 import org.hibernate.cache.spi.access.NaturalIdRegionAccessStrategy;
+import org.hibernate.cfg.NotYetImplementedException;
 import org.hibernate.engine.spi.ExecuteUpdateResultCheckStyle;
 import org.hibernate.engine.spi.Mapping;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
@@ -622,6 +623,19 @@ else if ( entityBinding.isDiscriminatorMatchValueNotNull() ) {
 				continue; // skip identifier binding
 			}
 			propertyTableNumbers[ i++ ] = 0;
+
+			if ( attributeBinding.getAttribute().isSingular() ) {
+				SingularAttributeBinding singularAttributeBinding = (SingularAttributeBinding) attributeBinding;
+				for ( RelationalValueBinding relationalValueBinding : singularAttributeBinding.getRelationalValueBindings() ) {
+					if ( ! relationalValueBinding.isDerived() ) {
+						org.hibernate.metamodel.spi.relational.Column column =
+								(org.hibernate.metamodel.spi.relational.Column) relationalValueBinding.getValue();
+						if ( ! entityBinding.getPrimaryTable().equals( column.getTable() ) ) {
+							throw new NotYetImplementedException( "joined attributes are not supported yet." );
+						}
+					}
+				}
+			}
 		}
 
 		//TODO: code duplication with JoinedSubclassEntityPersister
diff --git a/hibernate-core/src/test/java/org/hibernate/test/collection/idbag/PersistentIdBagTest.java b/hibernate-core/src/test/java/org/hibernate/test/collection/idbag/PersistentIdBagTest.java
@@ -39,14 +39,14 @@
  *
  * @author Steve Ebersole
  */
+@FailureExpectedWithNewMetamodel( message = "<idbag> not supported" )
 public class PersistentIdBagTest extends BaseCoreFunctionalTestCase {
 	@Override
 	public String[] getMappings() {
 		return new String[] { "collection/idbag/Mappings.hbm.xml" };
 	}
 
 	@Test
-	@FailureExpectedWithNewMetamodel
 	public void testWriteMethodDirtying() {
 		IdbagOwner parent = new IdbagOwner( "root" );
 		IdbagOwner child = new IdbagOwner( "c1" );
diff --git a/hibernate-core/src/test/java/org/hibernate/test/idbag/IdBagTest.java b/hibernate-core/src/test/java/org/hibernate/test/idbag/IdBagTest.java
@@ -40,6 +40,7 @@
 /**
  * @author Gavin King
  */
+@FailureExpectedWithNewMetamodel( message = "<idbag> not supported" )
 public class IdBagTest extends BaseCoreFunctionalTestCase {
 	@Override
 	public String[] getMappings() {
@@ -86,7 +87,6 @@ public void testUpdateIdBag() throws HibernateException, SQLException {
 	}
 
 	@Test
-	@FailureExpectedWithNewMetamodel
 	public void testJoin() throws HibernateException, SQLException {
 		Session s = openSession();
 		Transaction t = s.beginTransaction();
diff --git a/hibernate-core/src/test/java/org/hibernate/test/manytomanyassociationclass/compositeid/ManyToManyAssociationClassCompositeIdTest.java b/hibernate-core/src/test/java/org/hibernate/test/manytomanyassociationclass/compositeid/ManyToManyAssociationClassCompositeIdTest.java
@@ -35,7 +35,7 @@
  *
  * @author Gail Badner
  */
-@FailureExpectedWithNewMetamodel
+@FailureExpectedWithNewMetamodel( message = "Bug with qualified entity class not in specified package" )
 public class ManyToManyAssociationClassCompositeIdTest extends AbstractManyToManyAssociationClassTest {
 	@Override
 	public String[] getMappings() {
@@ -56,5 +56,5 @@ public void deleteMembership(User u, Group g, Membership ug) {
 		g.getMemberships().remove( ug );
 		ug.setId(null);
 	}
-
-}
+
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/test/onetomany/OneToManyTest.java b/hibernate-core/src/test/java/org/hibernate/test/onetomany/OneToManyTest.java
@@ -37,6 +37,7 @@
 /**
  * @author Gavin King
  */
+@FailureExpectedWithNewMetamodel( message = "Joined attributes are not supported yet" )
 public class OneToManyTest extends BaseCoreFunctionalTestCase {
 	@Override
 	public String[] getMappings() {
@@ -51,7 +52,6 @@ public String[] getMappings() {
                     "HibernateException: cannot doAfterTransactionCompletion multi-table deletes using dialect not supporting temp tables"
     )
 
-	@FailureExpectedWithNewMetamodel
 	public void testOneToManyLinkTable() {
 		Session s = openSession();
 		Transaction t = s.beginTransaction();
diff --git a/hibernate-core/src/test/java/org/hibernate/test/onetoone/link/OneToOneLinkTest.java b/hibernate-core/src/test/java/org/hibernate/test/onetoone/link/OneToOneLinkTest.java
@@ -42,14 +42,14 @@
 /**
  * @author Gavin King
  */
+@FailureExpectedWithNewMetamodel( message = "Joined attributes are not supported yet" )
 public class OneToOneLinkTest extends BaseCoreFunctionalTestCase {
 	@Override
 	public String[] getMappings() {
 		return new String[] { "onetoone/link/Person.hbm.xml" };
 	}
 
 	@Test
-	@FailureExpectedWithNewMetamodel
 	public void testOneToOneViaAssociationTable() {
 		Person p = new Person();
 		p.setName("Gavin King");
