Index: topia2/src/test/org/codelutin/topia/TopiaContextTest.java
diff -u topia2/src/test/org/codelutin/topia/TopiaContextTest.java:1.5 topia2/src/test/org/codelutin/topia/TopiaContextTest.java:1.6
--- topia2/src/test/org/codelutin/topia/TopiaContextTest.java:1.5	Mon Jan 23 13:51:53 2006
+++ topia2/src/test/org/codelutin/topia/TopiaContextTest.java	Mon Jan 30 14:38:53 2006
@@ -23,9 +23,9 @@
  * 
  * @author poussin
  * 
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
  * 
- * Last update: $Date: 2006/01/23 13:51:53 $ by : $Author: bpoussin $
+ * Last update: $Date: 2006/01/30 14:38:53 $ by : $Author: thimel $
  */
 
 package org.codelutin.topia;
@@ -38,8 +38,12 @@
 import org.apache.commons.logging.LogFactory;
 import org.codelutin.topia.event.TopiaEntityEvent;
 import org.codelutin.topia.event.TopiaEntityListener;
+import org.codelutin.topia.event.TopiaEntityLoadEvent;
+import org.codelutin.topia.event.TopiaEntityLoadListener;
 import org.codelutin.topia.event.TopiaVetoableEntityEvent;
 import org.codelutin.topia.event.TopiaVetoableEntityListener;
+import org.codelutin.topia.event.TopiaVetoableEntityLoadEvent;
+import org.codelutin.topia.event.TopiaVetoableEntityLoadListener;
 import org.codelutin.topia.framework.TopiaContextImplementor;
 import org.codelutin.topia.persistence.TopiaDAO;
 
@@ -313,10 +317,6 @@
                 .beginTransaction();
         
         TopiaVetoableEntityListener v = new TopiaVetoableEntityListener() {
-            public void loadEntity(TopiaVetoableEntityEvent event) {
-                System.out.println("vetoLoad " + event.getEntityClass() + " id: " + event.getId());
-                state = "vetoLoad";
-            }
             public void createEntity(TopiaVetoableEntityEvent event) {
                 System.out.println("vetoCreate " + event.getEntityClass() + " id: " + event.getId());
                 state = "vetoCreate";
@@ -331,11 +331,14 @@
             }
         };
         
-        TopiaEntityListener l = new TopiaEntityListener() {
-            public void entityLoaded(TopiaEntityEvent event) {
-                System.out.println("entityLoaded " + event.getTopiaEntities());
-                state = "entityLoaded";
+        TopiaVetoableEntityLoadListener vl = new TopiaVetoableEntityLoadListener() {
+            public void loadEntity(TopiaVetoableEntityLoadEvent event) {
+                System.out.println("vetoLoad " + event.getEntityClass() + " id: " + event.getId());
+                state = "vetoLoad";
             }
+        };
+        
+        TopiaEntityListener l = new TopiaEntityListener() {
             public void entityCreated(TopiaEntityEvent event) {
                 System.out.println("entityCreated " + event.getTopiaEntities());
                 state = "entityCreated";
@@ -349,10 +352,18 @@
                 state = "entityDeleted";
             }
         };
-        
+
+        TopiaEntityLoadListener ll = new TopiaEntityLoadListener() {
+            public void entityLoaded(TopiaEntityLoadEvent event) {
+                System.out.println("entityLoaded " + event.getTopiaEntities());
+                state = "entityLoaded";
+            }
+        };
         
         childContext.addVetoableListener(v);
+        childContext.addVetoableLoadListener(vl);
         childContext.addTopiaEntityListener(l);
+        childContext.addTopiaEntityLoadListener(ll);
         
         TopiaDAO<Person> persons = childContext.getDAO(Person.class);
         Person p = persons.create();
@@ -371,7 +382,9 @@
         TopiaContextImplementor childContext2 = (TopiaContextImplementor) context
         .beginTransaction();
         childContext2.addVetoableListener(v);
+        childContext2.addVetoableLoadListener(vl);
         childContext2.addTopiaEntityListener(l);
+        childContext2.addTopiaEntityLoadListener(ll);
         TopiaDAO<Person> persons2 = childContext2.getDAO(Person.class);
         
         Person pp = persons2.findByTopiaId(p.getTopiaId());