diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/hbm/Helper.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/hbm/Helper.java index e117d85c72..d284fc0ce2 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/hbm/Helper.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/hbm/Helper.java @@ -196,7 +196,7 @@ public class Helper { } ); } - + /** * Qualify a (supposed class) name with the unqualified-class package name if it is not already qualified * @@ -252,7 +252,7 @@ public class Helper { if ( StringHelper.isEmpty( cascades ) ) { cascades = bindingContext.getMappingDefaults().getCascadeStyle(); } - for ( String cascade : StringHelper.split( ",", cascades ) ) { + for ( String cascade : StringHelper.split( " ,", cascades ) ) { cascadeStyles.add( CascadeStyles.getCascadeStyle( cascade ) ); } return cascadeStyles; diff --git a/hibernate-core/src/test/java/org/hibernate/test/cascade/RefreshTest.java b/hibernate-core/src/test/java/org/hibernate/test/cascade/RefreshTest.java index 68725db045..3e065ce576 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cascade/RefreshTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/cascade/RefreshTest.java @@ -33,7 +33,6 @@ import org.junit.Test; import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.jdbc.Work; -import org.hibernate.testing.FailureExpectedWithNewMetamodel; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertEquals; @@ -43,7 +42,6 @@ import static org.junit.Assert.assertEquals; * * @author Steve Ebersole */ -@FailureExpectedWithNewMetamodel public class RefreshTest extends BaseCoreFunctionalTestCase { @Override public String[] getMappings() { diff --git a/hibernate-core/src/test/java/org/hibernate/test/generatedkeys/identity/IdentityGeneratedKeysTest.java b/hibernate-core/src/test/java/org/hibernate/test/generatedkeys/identity/IdentityGeneratedKeysTest.java index 2bf9720687..7ece626be2 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/generatedkeys/identity/IdentityGeneratedKeysTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/generatedkeys/identity/IdentityGeneratedKeysTest.java @@ -6,7 +6,6 @@ import org.hibernate.Session; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.testing.DialectChecks; -import org.hibernate.testing.FailureExpectedWithNewMetamodel; import org.hibernate.testing.RequiresDialectFeature; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; @@ -18,7 +17,6 @@ import static org.junit.Assert.assertNull; * @author Steve Ebersole */ @RequiresDialectFeature( DialectChecks.SupportsIdentityColumns.class ) -@FailureExpectedWithNewMetamodel public class IdentityGeneratedKeysTest extends BaseCoreFunctionalTestCase { @Override public void configure(Configuration cfg) { diff --git a/hibernate-core/src/test/java/org/hibernate/test/jpa/naturalid/MutableNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/test/jpa/naturalid/MutableNaturalIdTest.java index 3ff47e142c..52c88b7e1f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/jpa/naturalid/MutableNaturalIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/jpa/naturalid/MutableNaturalIdTest.java @@ -27,15 +27,12 @@ import org.junit.Test; import org.hibernate.Session; import org.hibernate.test.jpa.AbstractJPATest; -import org.hibernate.testing.FailureExpectedWithNewMetamodel; - import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; /** * @author Steve Ebersole */ -@FailureExpectedWithNewMetamodel public class MutableNaturalIdTest extends AbstractJPATest { @Override protected Class[] getAnnotatedClasses() { diff --git a/hibernate-core/src/test/java/org/hibernate/test/jpa/ql/FunctionKeywordTest.java b/hibernate-core/src/test/java/org/hibernate/test/jpa/ql/FunctionKeywordTest.java index 1a403b0ee7..d58c840418 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/jpa/ql/FunctionKeywordTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/jpa/ql/FunctionKeywordTest.java @@ -27,14 +27,12 @@ import org.junit.Test; import org.hibernate.Session; import org.hibernate.test.jpa.AbstractJPATest; -import org.hibernate.testing.FailureExpectedWithNewMetamodel; /** * Test use of the JPA 2.1 FUNCTION keyword. * * @author Steve Ebersole */ -@FailureExpectedWithNewMetamodel public class FunctionKeywordTest extends AbstractJPATest { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/test/jpa/ql/JPAQLComplianceTest.java b/hibernate-core/src/test/java/org/hibernate/test/jpa/ql/JPAQLComplianceTest.java index df4a3b6a95..c07276ff8e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/jpa/ql/JPAQLComplianceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/jpa/ql/JPAQLComplianceTest.java @@ -27,14 +27,12 @@ import org.junit.Test; import org.hibernate.Session; import org.hibernate.test.jpa.AbstractJPATest; -import org.hibernate.testing.FailureExpectedWithNewMetamodel; /** * Tests for various JPAQL compliance issues * * @author Steve Ebersole */ -@FailureExpectedWithNewMetamodel public class JPAQLComplianceTest extends AbstractJPATest { @Test public void testAliasNameSameAsUnqualifiedEntityName() { diff --git a/hibernate-core/src/test/java/org/hibernate/test/jpa/ql/NativeQueryTest.java b/hibernate-core/src/test/java/org/hibernate/test/jpa/ql/NativeQueryTest.java index 6d507002e2..7bc2c42a41 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/jpa/ql/NativeQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/jpa/ql/NativeQueryTest.java @@ -27,12 +27,10 @@ import org.junit.Test; import org.hibernate.Session; import org.hibernate.test.jpa.AbstractJPATest; -import org.hibernate.testing.FailureExpectedWithNewMetamodel; /** * @author Steve Ebersole */ -@FailureExpectedWithNewMetamodel public class NativeQueryTest extends AbstractJPATest { @Test public void testJpaStylePositionalParametersInNativeSql() { diff --git a/hibernate-core/src/test/java/org/hibernate/test/jpa/ql/OnKeywordTest.java b/hibernate-core/src/test/java/org/hibernate/test/jpa/ql/OnKeywordTest.java index ef6df1a414..2f0ce865b7 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/jpa/ql/OnKeywordTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/jpa/ql/OnKeywordTest.java @@ -29,14 +29,12 @@ import org.junit.Test; import org.hibernate.Session; import org.hibernate.test.jpa.AbstractJPATest; -import org.hibernate.testing.FailureExpectedWithNewMetamodel; /** * Tests of the JPA decision (ugh) to use ON as a keyword for what Hibernate/HQL termed WITH. * * @author Steve Ebersole */ -@FailureExpectedWithNewMetamodel public class OnKeywordTest extends AbstractJPATest { @Test public void basicTest() { diff --git a/hibernate-core/src/test/java/org/hibernate/test/jpa/removed/RemovedEntityTest.java b/hibernate-core/src/test/java/org/hibernate/test/jpa/removed/RemovedEntityTest.java index 8d4b4ca06a..0342d0e726 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/jpa/removed/RemovedEntityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/jpa/removed/RemovedEntityTest.java @@ -31,8 +31,6 @@ import org.hibernate.Session; import org.hibernate.test.jpa.AbstractJPATest; import org.hibernate.test.jpa.Item; import org.hibernate.test.jpa.Part; -import org.hibernate.testing.FailureExpectedWithNewMetamodel; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -42,7 +40,6 @@ import static org.junit.Assert.assertTrue; /** * @author Steve Ebersole */ -@FailureExpectedWithNewMetamodel public class RemovedEntityTest extends AbstractJPATest { @Test public void testRemoveThenContains() { diff --git a/hibernate-core/src/test/java/org/hibernate/test/jpa/txn/TransactionJoiningTest.java b/hibernate-core/src/test/java/org/hibernate/test/jpa/txn/TransactionJoiningTest.java index 12075d9e1d..db6bb0675b 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/jpa/txn/TransactionJoiningTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/jpa/txn/TransactionJoiningTest.java @@ -33,7 +33,6 @@ import org.hibernate.engine.transaction.internal.jta.CMTTransactionFactory; import org.hibernate.engine.transaction.internal.jta.JtaStatusHelper; import org.hibernate.engine.transaction.spi.TransactionImplementor; import org.hibernate.test.jpa.AbstractJPATest; -import org.hibernate.testing.FailureExpectedWithNewMetamodel; import org.hibernate.testing.jta.TestingJtaBootstrap; import org.hibernate.testing.jta.TestingJtaPlatformImpl; @@ -43,7 +42,6 @@ import static org.junit.Assert.assertTrue; /** * @author Steve Ebersole */ -@FailureExpectedWithNewMetamodel public class TransactionJoiningTest extends AbstractJPATest { @Override public void configure(Configuration cfg) { diff --git a/hibernate-core/src/test/java/org/hibernate/test/manytomanyassociationclass/surrogateid/assigned/ManyToManyAssociationClassAssignedIdTest.java b/hibernate-core/src/test/java/org/hibernate/test/manytomanyassociationclass/surrogateid/assigned/ManyToManyAssociationClassAssignedIdTest.java index dadc48824e..8808908f29 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/manytomanyassociationclass/surrogateid/assigned/ManyToManyAssociationClassAssignedIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/manytomanyassociationclass/surrogateid/assigned/ManyToManyAssociationClassAssignedIdTest.java @@ -25,14 +25,12 @@ package org.hibernate.test.manytomanyassociationclass.surrogateid.assigned; import org.hibernate.test.manytomanyassociationclass.AbstractManyToManyAssociationClassTest; import org.hibernate.test.manytomanyassociationclass.Membership; -import org.hibernate.testing.FailureExpectedWithNewMetamodel; /** * Tests on many-to-many association using an association class with a surrogate ID that is assigned. * * @author Gail Badner */ -@FailureExpectedWithNewMetamodel public class ManyToManyAssociationClassAssignedIdTest extends AbstractManyToManyAssociationClassTest { @Override public String[] getMappings() { diff --git a/hibernate-core/src/test/java/org/hibernate/test/manytomanyassociationclass/surrogateid/generated/ManyToManyAssociationClassGeneratedIdTest.java b/hibernate-core/src/test/java/org/hibernate/test/manytomanyassociationclass/surrogateid/generated/ManyToManyAssociationClassGeneratedIdTest.java index c72151aa1b..516e5c311e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/manytomanyassociationclass/surrogateid/generated/ManyToManyAssociationClassGeneratedIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/manytomanyassociationclass/surrogateid/generated/ManyToManyAssociationClassGeneratedIdTest.java @@ -39,7 +39,6 @@ import static org.junit.Assert.fail; * * @author Gail Badner */ -@FailureExpectedWithNewMetamodel public class ManyToManyAssociationClassGeneratedIdTest extends AbstractManyToManyAssociationClassTest { @Override public String[] getMappings() { @@ -53,6 +52,7 @@ public class ManyToManyAssociationClassGeneratedIdTest extends AbstractManyToMan @Override @Test + @FailureExpectedWithNewMetamodel public void testRemoveAndAddEqualElement() { deleteMembership( getUser(), getGroup(), getMembership() ); addMembership( getUser(), getGroup(), createMembership( "membership" ) ); @@ -80,10 +80,11 @@ public class ManyToManyAssociationClassGeneratedIdTest extends AbstractManyToMan @Override @Test + @FailureExpectedWithNewMetamodel public void testRemoveAndAddEqualCollection() { deleteMembership( getUser(), getGroup(), getMembership() ); - getUser().setMemberships( new HashSet() ); - getGroup().setMemberships( new HashSet() ); + getUser().setMemberships( new HashSet< Membership >() ); + getGroup().setMemberships( new HashSet< Membership >() ); addMembership( getUser(), getGroup(), createMembership( "membership" ) ); Session s = openSession(); @@ -109,6 +110,7 @@ public class ManyToManyAssociationClassGeneratedIdTest extends AbstractManyToMan @Override @Test + @FailureExpectedWithNewMetamodel public void testRemoveAndAddEqualElementNonKeyModified() { deleteMembership( getUser(), getGroup(), getMembership() ); Membership membershipNew = createMembership( "membership" );