[Hibernate-commits] Hibernate Code SVN: r9878 - in trunk/HibernateExt/ejb/src: test/org/hibernate/ejb/test test-resources/cfgxmlpar/org/hibernate/ejb/test/pack/cfgxmlpar

[<hib...@li...>]

Author: epbernard
Date: 2006-05-04 14:50:40 -0400 (Thu, 04 May 2006)
New Revision: 9878

Modified:
   trunk/HibernateExt/ejb/src/test-resources/cfgxmlpar/org/hibernate/ejb/test/pack/cfgxmlpar/hibernate.cfg.xml
   trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/PackagedEntityManagerTest.java
Log:
EJB-116 add test to check that sf overrides default event listeners but let the persistence.xml have priority

Modified: trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/PackagedEntityManagerTest.java
===================================================================
--- trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/PackagedEntityManagerTest.java	2006-05-04 18:04:44 UTC (rev 9877)
+++ trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/PackagedEntityManagerTest.java	2006-05-04 18:50:40 UTC (rev 9878)
@@ -10,17 +10,19 @@
 import org.hibernate.ejb.HibernateEntityManagerFactory;
 import org.hibernate.ejb.test.pack.cfgxmlpar.Morito;
 import org.hibernate.ejb.test.pack.defaultpar.ApplicationServer;
+import org.hibernate.ejb.test.pack.defaultpar.IncrementListener;
 import org.hibernate.ejb.test.pack.defaultpar.Lighter;
+import org.hibernate.ejb.test.pack.defaultpar.Money;
 import org.hibernate.ejb.test.pack.defaultpar.Mouse;
+import org.hibernate.ejb.test.pack.defaultpar.OtherIncrementListener;
 import org.hibernate.ejb.test.pack.defaultpar.Version;
-import org.hibernate.ejb.test.pack.defaultpar.IncrementListener;
-import org.hibernate.ejb.test.pack.defaultpar.OtherIncrementListener;
-import org.hibernate.ejb.test.pack.defaultpar.Money;
 import org.hibernate.ejb.test.pack.excludehbmpar.Caipirinha;
 import org.hibernate.ejb.test.pack.explodedpar.Carpet;
 import org.hibernate.ejb.test.pack.explodedpar.Elephant;
 import org.hibernate.ejb.test.pack.externaljar.Scooter;
 import org.hibernate.stat.Statistics;
+import org.hibernate.validator.InvalidStateException;
+import org.hibernate.JDBCException;
 
 //$Id$
 
@@ -172,6 +174,30 @@
 		emf.close();
 	}
 
+	public void testListenersOverridingCfgXmlPar() throws Exception {
+		EntityManagerFactory emf = Persistence.createEntityManagerFactory( "cfgxmlpar", new HashMap() );
+		EntityManager em = emf.createEntityManager();
+		Cat cat = new Cat();
+		cat.setName( "123"); //validator catch that
+		em.getTransaction().begin();
+		try {
+			em.persist( cat );
+			em.flush();
+		}
+		catch (InvalidStateException e) {
+			fail("Shouldn't call the ValidatorEvent listener");
+		}
+		catch (PersistenceException e) {
+			if ( ! (e.getCause() instanceof JDBCException ) ) {
+				fail("Unexpected exception: " + e);
+			}
+		}
+		em.getTransaction().rollback();
+
+		em.close();
+		emf.close();
+	}
+
 	//EM TRANSACTION
 //	public void testEntityManager() {
 //

Modified: trunk/HibernateExt/ejb/src/test-resources/cfgxmlpar/org/hibernate/ejb/test/pack/cfgxmlpar/hibernate.cfg.xml
===================================================================
--- trunk/HibernateExt/ejb/src/test-resources/cfgxmlpar/org/hibernate/ejb/test/pack/cfgxmlpar/hibernate.cfg.xml	2006-05-04 18:04:44 UTC (rev 9877)
+++ trunk/HibernateExt/ejb/src/test-resources/cfgxmlpar/org/hibernate/ejb/test/pack/cfgxmlpar/hibernate.cfg.xml	2006-05-04 18:50:40 UTC (rev 9878)
@@ -22,5 +22,6 @@
         <mapping class="org.hibernate.ejb.test.Distributor"/>
         <class-cache class="org.hibernate.ejb.test.Item" usage="read-write"/>
         <collection-cache collection="org.hibernate.ejb.test.Item.distributors" usage="read-write" region="RegionName"/>
+        <event type="pre-insert"/>
     </session-factory>
 </hibernate-configuration>
\ No newline at end of file