[hibernate-commits] Hibernate SVN: r19416 - in entitymanager/branches/v3_4_0_GA_CP/src: test/java/org/hibernate/ejb/test and 4 other directories.

Author: stliu Date: 2010-05-08 02:11:23 -0400 (Sat, 08 May 2010) New Revision: 19416 Modified: entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/packaging/JarVisitorFactory.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/TestCase.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/FetchTest.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/ejb3configuration/TestCase.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/lob/BlobTest.java entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/xml/sequences/XmlTest.java Log: JBPAPP-4235 HHH-4822 Add @FailureExpected annotation to annotations and entitymananger modules to allow the skipping of tests Modified: entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/packaging/JarVisitorFactory.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/packaging/JarVisitorFactory.java 2010-05-08 06:05:16 UTC (rev 19415) +++ entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/packaging/JarVisitorFactory.java 2010-05-08 06:11:23 UTC (rev 19416) @@ -58,7 +58,7 @@ jarUrl = new File(file).toURI().toURL(); //goes by toURI to escape the path } else { - jarUrl = new File(file).toURL(); + jarUrl = new File(file).toURI().toURL(); } } else { Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/TestCase.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/TestCase.java 2010-05-08 06:05:16 UTC (rev 19415) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/TestCase.java 2010-05-08 06:11:23 UTC (rev 19416) @@ -40,13 +40,12 @@ import org.apache.commons.logging.LogFactory; import org.hibernate.cfg.Environment; -import org.hibernate.dialect.Dialect; import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.HibernatePersistence; import org.hibernate.test.annotations.HibernateTestCase; /** - * A base class for all ejb tests. + * A base class for all EJB tests. * * @author Emmanuel Bernard * @author Hardy Ferentschik @@ -69,10 +68,6 @@ } - public void tearDown() throws Exception { - super.tearDown(); - } - @Override protected void buildConfiguration() throws Exception { Ejb3Configuration ejbconfig = new Ejb3Configuration(); @@ -140,7 +135,7 @@ } /** - * always reopen a new EM and clse the existing one + * always reopen a new EM and close the existing one */ protected EntityManager createEntityManager(Map properties) { if ( em != null && em.isOpen() ) { @@ -214,15 +209,4 @@ protected void addConfigOptions(Map options) { } - @Override - public void runBare() throws Throwable { - if ( !appliesTo( Dialect.getDialect() ) ) { - return; - } - super.runBare(); - } - - public boolean appliesTo(Dialect dialect) { - return true; - } } Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/FetchTest.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/FetchTest.java 2010-05-08 06:05:16 UTC (rev 19415) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/cascade/FetchTest.java 2010-05-08 06:11:23 UTC (rev 19416) @@ -41,7 +41,6 @@ em.getTransaction().begin(); troop = em.find( Troop.class, disney.getId() ); em.remove( troop ); - //Fail because of HHH-1187 em.getTransaction().commit(); em.close(); } @@ -69,7 +68,6 @@ em.getTransaction().begin(); Troop troop = em.find( Troop.class, disney.getId() ); em.remove( troop ); - //Fail because of HHH-1187 em.getTransaction().commit(); em.close(); } Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/ejb3configuration/TestCase.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/ejb3configuration/TestCase.java 2010-05-08 06:05:16 UTC (rev 19415) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/ejb3configuration/TestCase.java 2010-05-08 06:11:23 UTC (rev 19416) @@ -40,8 +40,6 @@ return true; } - ; - private void buildConfiguration() { configuration = new Ejb3Configuration(); configuration.addProperties( loadProperties() ); Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/lob/BlobTest.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/lob/BlobTest.java 2010-05-08 06:05:16 UTC (rev 19415) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/lob/BlobTest.java 2010-05-08 06:11:23 UTC (rev 19416) @@ -4,7 +4,6 @@ import java.io.ByteArrayOutputStream; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; -import java.sql.Blob; import java.util.HashMap; import java.util.Map; @@ -12,6 +11,7 @@ import org.hibernate.Hibernate; import org.hibernate.dialect.Dialect; +import org.hibernate.ejb.HibernateEntityManager; import org.hibernate.ejb.test.TestCase; /** @@ -29,7 +29,7 @@ ByteArrayOutputStream baos = new ByteArrayOutputStream(); ObjectOutputStream oos = new ObjectOutputStream( baos ); oos.writeObject( image ); - reader.setImage( (Blob) Hibernate.createBlob( baos.toByteArray() ) ); + reader.setImage( Hibernate.createBlob( baos.toByteArray(), ((HibernateEntityManager)em).getSession() ) ); em.persist( reader ); em.getTransaction().commit(); em.close(); //useless but y'a know @@ -42,14 +42,12 @@ em.getTransaction().commit(); em.close(); } - + @Override - public boolean appliesTo(Dialect dialect) { + protected boolean runForCurrentDialect( Dialect dialect ) { return dialect.supportsExpectedLobUsagePattern(); } - - public Class[] getAnnotatedClasses() { return new Class[]{ ImageReader.class Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/xml/sequences/XmlTest.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/xml/sequences/XmlTest.java 2010-05-08 06:05:16 UTC (rev 19415) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/xml/sequences/XmlTest.java 2010-05-08 06:11:23 UTC (rev 19416) @@ -1,4 +1,3 @@ -//$Id: $ package org.hibernate.ejb.test.xml.sequences; import javax.persistence.EntityManager; @@ -19,11 +18,12 @@ return new Class[0]; } + @Override - public boolean appliesTo(Dialect dialect) { + protected boolean runForCurrentDialect( Dialect dialect ) { return dialect.supportsSequences(); } - + @Override public String[] getEjb3DD() { return new String[] {