Index: topiatest/src/test/org/codelutin/test2/AppTest.java
diff -u topiatest/src/test/org/codelutin/test2/AppTest.java:1.12 topiatest/src/test/org/codelutin/test2/AppTest.java:1.13
--- topiatest/src/test/org/codelutin/test2/AppTest.java:1.12	Wed Jan  4 13:30:25 2006
+++ topiatest/src/test/org/codelutin/test2/AppTest.java	Fri Jan  6 18:43:49 2006
@@ -1,5 +1,6 @@
 package org.codelutin.test2;
 
+import java.io.Serializable;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
@@ -10,6 +11,8 @@
 import org.codelutin.test2DAOHelper;
 import org.codelutin.test2.entities.Company;
 import org.codelutin.test2.entities.CompanyDAO;
+//import org.codelutin.test2.entities.Contract;
+//import org.codelutin.test2.entities.ContractDAO;
 import org.codelutin.test2.entities.Employee;
 import org.codelutin.test2.entities.EmployeeDAO;
 import org.codelutin.topia.TopiaContext;
@@ -28,7 +31,7 @@
         config.setProperty("hibernate.show_sql", "true");
         config.setProperty("hibernate.hbm2ddl.auto", "create");
         
-        config.setProperty("topia.persistence.classes", "org.codelutin.test2.entities.Company,org.codelutin.test2.entities.Employee");
+        config.setProperty("topia.persistence.classes", "org.codelutin.test2.entities.Company,org.codelutin.test2.entities.Employee");//,org.codelutin.test2.entities.Contract
         config.setProperty("hibernate.dialect", "org.hibernate.dialect.PostgreSQLDialect");
         config.setProperty("hibernate.connection.driver_class", "org.postgresql.Driver");
         config.setProperty("hibernate.connection.url", "jdbc:postgresql:database");
@@ -78,7 +81,7 @@
             //  - on ajoute un elem dans la 1ere, il existe dans la 2eme,
             Company comp = companyPS1.create();
             comp.setName("thim");
-            String id = comp.getTopiaId();
+            Serializable id = comp.getTopiaId();
             companyPS1.update(comp);
             comp = companyPS1.findByTopiaId(id);
             assertNotSame(null, comp);
@@ -467,6 +470,50 @@
         }
     }
 
+//
+////  @SuppressWarnings("unchecked")
+//  public void testEmployeeWithContract() throws Exception {
+//      try{
+//          CallAnalyse.enter(AppTest.class.getName() + ".testEmployee");
+//          TopiaContext ctx = TopiaContextFactory.getContext(getConfig()).beginTransaction();
+//          EmployeeDAO empPS = test2DAOHelper.getEmployeeDAO(ctx);
+//          CompanyDAO companyPS = test2DAOHelper.getCompanyDAO(ctx);
+//          ContractDAO contractPS = test2DAOHelper.getContractDAO(ctx);
+//  //        for(Employee emp : empPS.findAll()){
+//  //            empPS.delete(emp);
+//  //        }
+//  //        assertEquals(0, empPS.findAll().size());
+//
+//  // bsh.Interpreter.DEBUG = true;
+//  // bsh.Interpreter.TRACE = true;
+//
+//          Company comp = companyPS.create();
+//          comp.setName("Code Lutin");
+//          Employee emp;
+//          int nbEmployees = 12;
+//          for(int i=0; i<nbEmployees; i++){
+//              emp = empPS.create();
+//              emp.setName("Thimel " + i);
+//              empPS.update(emp); //Attention, si on ne fait pas d'update, l'employee n'apparaitra pas dans le getEmployee
+//              Contract cont = contractPS.create();
+//              cont.setEmployee(emp);
+//              comp.addContract(cont);
+//              contractPS.update(cont);
+//          }
+//          companyPS.update(comp);
+//          Collection<Employee> employees;
+//          employees = comp.getEmployee();
+//          assertEquals(nbEmployees, employees.size());
+//          for(Employee e: employees){
+//              assertEquals(comp, e.getCompany());
+//          }
+//          employees = empPS.findAllByCompany(comp);
+//          assertEquals(nbEmployees, employees.size());
+//      } finally {
+//          CallAnalyse.exit(AppTest.class.getName() + ".testEmployee");
+//      }
+//  }
+
     static public void main(String [] args) throws Exception {
         MAX = Integer.parseInt(args[0]);
         AppTest test = new AppTest();