Merge branch 'tests' into metamodel

This commit is contained in:
John Verhaeg 2012-09-14 15:51:31 -05:00
commit 9df7185948
1 changed files with 7 additions and 9 deletions

View File

@ -23,12 +23,14 @@
*/ */
package org.hibernate.test.annotations.immutable; package org.hibernate.test.annotations.immutable;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.jboss.logging.Logger;
import org.junit.Test;
import org.hibernate.AnnotationException; import org.hibernate.AnnotationException;
import org.hibernate.HibernateException; import org.hibernate.HibernateException;
import org.hibernate.Session; import org.hibernate.Session;
@ -37,11 +39,8 @@ import org.hibernate.cfg.Configuration;
import org.hibernate.testing.FailureExpectedWithNewMetamodel; import org.hibernate.testing.FailureExpectedWithNewMetamodel;
import org.hibernate.testing.ServiceRegistryBuilder; import org.hibernate.testing.ServiceRegistryBuilder;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
import org.jboss.logging.Logger;
import static org.junit.Assert.assertEquals; import org.junit.Test;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
/** /**
* Tests for <code>Immutable</code> annotation. * Tests for <code>Immutable</code> annotation.
@ -53,7 +52,6 @@ public class ImmutableTest extends BaseCoreFunctionalTestCase {
private static final Logger log = Logger.getLogger( ImmutableTest.class ); private static final Logger log = Logger.getLogger( ImmutableTest.class );
@Test @Test
@FailureExpectedWithNewMetamodel
public void testImmutableEntity() throws Exception { public void testImmutableEntity() throws Exception {
Session s = openSession(); Session s = openSession();
Transaction tx = s.beginTransaction(); Transaction tx = s.beginTransaction();