Index: topiatest/src/test/org/codelutin/test2/AppTest.java diff -u topiatest/src/test/org/codelutin/test2/AppTest.java:1.5 topiatest/src/test/org/codelutin/test2/AppTest.java:1.6 --- topiatest/src/test/org/codelutin/test2/AppTest.java:1.5 Wed Jul 6 22:33:26 2005 +++ topiatest/src/test/org/codelutin/test2/AppTest.java Mon Aug 1 17:15:21 2005 @@ -9,15 +9,19 @@ import org.codelutin.test2Context; import org.codelutin.test2.entities.Company; import org.codelutin.test2.entities.CompanyPersistenceService; +import org.codelutin.topia.persistence.TopiaTransaction; import org.codelutin.test2EntitiesHelper; public class AppTest extends TestCase { protected test2Context topiaContext = null; protected CompanyPersistenceService companyPS = null; + protected TopiaTransaction trans = null; public void setUp() throws Exception { topiaContext = test2Context.getContext(); + trans = topiaContext.getTransaction(); + topiaContext.beginTransaction(); companyPS = topiaContext.getCompanyPersistenceService(); } @@ -26,19 +30,18 @@ */ public void testApp() throws Exception { Company company; - List companies; + List companies; System.out.println("-------- suppression --------"); companies = companyPS.findAll(); System.out.println("companies: " + companies); - for(Iterator i=companies.iterator(); i.hasNext();){ - company = (Company)i.next(); - companyPS.delete(company); + for(Company c : companies){ + companyPS.delete(c); } System.out.println("-------- creation --------"); for(int i=0; i<10; i++){ - company = companyPS.createCompany(); + company = companyPS.create(); company.setName("Company" + i); company.setEntier(i); company.setReel((float)(i+i/100.0)); @@ -50,7 +53,7 @@ int count = companyPS.size(); System.out.println("-------- makePersistent --------"); - company = companyPS.createCompany(); + company = companyPS.create(); System.out.println("company: " + company); System.out.println("company: " + test2EntitiesHelper.toString(company)); System.out.println("company.getClass()" + company.getClass().getName()); @@ -166,9 +169,8 @@ System.out.println("-------- suppression --------"); companies = companyPS.findAll(); - for(Iterator i=companies.iterator(); i.hasNext();){ - company = (Company)i.next(); - companyPS.delete(company); + for(Company c : companies){ + companyPS.delete(c); } assertTrue(companyPS.size() == 0); @@ -184,7 +186,7 @@ System.out.println("-------- creation "+MAX+" --------"); long time = System.currentTimeMillis(); for(int i=0; i