Index: topiatest/src/test/org/codelutin/test2/AppTest.java diff -u topiatest/src/test/org/codelutin/test2/AppTest.java:1.6 topiatest/src/test/org/codelutin/test2/AppTest.java:1.7 --- topiatest/src/test/org/codelutin/test2/AppTest.java:1.6 Mon Aug 1 17:15:21 2005 +++ topiatest/src/test/org/codelutin/test2/AppTest.java Thu Aug 4 17:03:26 2005 @@ -15,14 +15,14 @@ public class AppTest extends TestCase { protected test2Context topiaContext = null; + protected test2Context child = 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(); + child = topiaContext.beginTransaction(); + companyPS = child.getCompanyPersistenceService(); } /** @@ -39,6 +39,8 @@ companyPS.delete(c); } + assertEquals(0, companyPS.findAll().size()); + System.out.println("-------- creation --------"); for(int i=0; i<10; i++){ company = companyPS.create(); @@ -46,12 +48,15 @@ company.setEntier(i); company.setReel((float)(i+i/100.0)); company.setBool(i % 2 == 0); - company = companyPS.makePersistent(company); + company = companyPS.update(company); } System.out.println("-------- size --------"); int count = companyPS.size(); + System.out.println("size: " + count); + assertEquals(10, count); + System.out.println("-------- makePersistent --------"); company = companyPS.create(); System.out.println("company: " + company); @@ -62,7 +67,8 @@ company.setReel((float)(count+count/100.0)); company.setBool(count % 2 == 0); System.out.println("company: " + company); - company = companyPS.makePersistent(company); + company = companyPS.update(company); + System.out.println("company: " + company); assertEquals(count + 1, companyPS.size()); @@ -74,7 +80,7 @@ System.out.println("-------- find name=? --------"); companies = companyPS.find(companyPS.newQuery().where("name = ?").addArg("Company" + count)); System.out.println("companies: " + companies); - assertTrue(companies.size() == 1); + assertEquals(1, companies.size()); Company comp = (Company)companies.iterator().next(); System.out.println("comp:"+comp+" company:"+company); assertEquals(comp, company); @@ -86,86 +92,105 @@ System.out.println("-------- find name like 'Compa%' --------"); companies = companyPS.find(companyPS.newQuery().where("name like \"Compa%\"")); System.out.println("size:" + companies.size() + " count:" + count); - assertTrue(companies.size() == count + 1); + assertEquals(count + 1, companies.size()); System.out.println("-------- find name like '%'"+count+" --------"); companies = companyPS.find(companyPS.newQuery().where("name like \"%"+count+"\"")); - assertTrue(companies.size() == 1); + assertEquals(1, companies.size()); System.out.println("-------- find name not like 'Compa%' --------"); companies = companyPS.find(companyPS.newQuery().where("name not like \"Compa%\"")); System.out.println("size:" + companies.size() + " count:" + count); - assertTrue(companies.size() == 0); + assertEquals(0, companies.size()); System.out.println("-------- find name not like '%'"+count+" --------"); companies = companyPS.find(companyPS.newQuery().where("name not like \"%"+count+"\"")); - assertTrue(companies.size() == count); + assertEquals(count, companies.size()); + +// System.out.println("-------- find entier = "+count+" --------"); +// companies = companyPS.find(companyPS.newQuery().where("entier = " + count)); +// assertEquals(1, companies.size()); - System.out.println("-------- find entier = "+count+" --------"); + System.out.println("-------- find entier = ? ("+count+") --------"); companies = companyPS.find(companyPS.newQuery().where("entier = ?").addArg(count)); - assertTrue(companies.size() == 1); + assertEquals(1, companies.size()); System.out.println("-------- find entier > "+count+" --------"); companies = companyPS.find(companyPS.newQuery().where("entier > ?").addArg(count)); - assertTrue(companies.size() == 0); + assertEquals(0, companies.size()); System.out.println("-------- find entier < "+count+" --------"); companies = companyPS.find(companyPS.newQuery().where("entier < ?").addArg(count)); - assertTrue(companies.size() == count); + assertEquals(count, companies.size()); System.out.println("-------- find entier >= "+count+" --------"); companies = companyPS.find(companyPS.newQuery().where("entier >= ?").addArg(count)); - assertTrue(companies.size() == 1); + assertEquals(1, companies.size()); System.out.println("-------- find entier <= "+count+" --------"); companies = companyPS.find(companyPS.newQuery().where("entier <= ?").addArg(count)); - assertTrue(companies.size() == count + 1); + assertEquals(count + 1, companies.size()); System.out.println("-------- find entier != "+count+" --------"); companies = companyPS.find(companyPS.newQuery().where("entier != ?").addArg(count)); - assertTrue(companies.size() == count); - - System.out.println("-------- find entier < 3 --------"); - companies = companyPS.find(companyPS.newQuery().where("entier < 3")); - System.out.println("size:" + companies.size() + " count:" + count); - assertTrue(companies.size() == Math.min(3,count+1)); + assertEquals(count, companies.size()); - - System.out.println("-------- find and1 --------"); - companies = companyPS.find(companyPS.newQuery().where("bool = true and entier <= 0 ")); - assertTrue(companies.size() == 1); - - System.out.println("-------- find and2 --------"); - companies = companyPS.find(companyPS.newQuery().where("bool = true and entier <= ? ").addArg(count)); - assertTrue(companies.size() == count/2+1); - - System.out.println("-------- find not and3 --------"); - companies = companyPS.find(companyPS.newQuery().where("not bool = true and entier <= ? ").addArg(count)); - assertTrue(companies.size() == (count+1)/2); +// System.out.println("-------- find entier < 3 --------"); +// companies = companyPS.find(companyPS.newQuery().where("entier < 3")); +// System.out.println("size:" + companies.size() + " count:" + count); +// assertEquals(Math.min(3,count+1), companies.size()); +// +// System.out.println("-------- find and1 --------"); +// companies = companyPS.find(companyPS.newQuery().where("bool = true and entier <= 0 ")); +// assertEquals(1, companies.size()); +// +// System.out.println("-------- find and2 --------"); +// companies = companyPS.find(companyPS.newQuery().where("bool = true and entier <= ? ").addArg(count)); +// assertEquals(count/2+1, companies.size()); +// +// System.out.println("-------- find not and3 --------"); +// companies = companyPS.find(companyPS.newQuery().where("not bool = true and entier <= ? ").addArg(count)); +// assertEquals((count+1)/2, companies.size()); + + System.out.println("-------- find and4 --------"); + companies = companyPS.find(companyPS.newQuery().where("name like ? and entier = ? ").addArg("Compa%").addArg(0)); + assertEquals(1, companies.size()); + + System.out.println("-------- find and5 --------"); + companies = companyPS.find(companyPS.newQuery().where("name like ? and entier != ? ").addArg("Compa%").addArg(count)); + assertEquals(count, companies.size()); + + System.out.println("-------- find not and6 --------"); + companies = companyPS.find(companyPS.newQuery().where("name like ? and not entier != ? ").addArg("Compa%").addArg(count)); + assertEquals(1, companies.size()); + + System.out.println("-------- find not and7 --------"); + companies = companyPS.find(companyPS.newQuery().where("not (name like ? and entier != ?)").addArg("Compa%").addArg(count)); + assertEquals(1, companies.size()); System.out.println("-------- find or --------"); companies = companyPS.find(companyPS.newQuery().where("bool = true or bool = false")); - assertTrue(companies.size() == count + 1); + assertEquals(count + 1, companies.size()); System.out.println("-------- find not (or) --------"); companies = companyPS.find(companyPS.newQuery().where("not (bool = true or bool = false)")); - assertTrue(companies.size() == 0); + assertEquals(0, companies.size()); - System.out.println("-------- find in --------"); - companies = companyPS.find(companyPS.newQuery().where("entier in (1,2,3)")); - assertTrue(companies.size() == 3); - - System.out.println("-------- find not in --------"); - companies = companyPS.find(companyPS.newQuery().where("entier not in (1,2,3)")); - assertTrue(companies.size() == count + 1 - 3); - - System.out.println("-------- find in coll --------"); - HashSet list = new HashSet(); - list.add("Company1"); - list.add("Company2"); - list.add("Company3"); - companies = companyPS.find(companyPS.newQuery().where("name in ?").addArg(list)); - assertTrue(companies.size() == 3); +// System.out.println("-------- find in --------"); +// companies = companyPS.find(companyPS.newQuery().where("entier in (1,2,3)")); +// assertEquals(3, companies.size()); +// +// System.out.println("-------- find not in --------"); +// companies = companyPS.find(companyPS.newQuery().where("entier not in (1,2,3)")); +// assertEquals(count + 1 - 3, companies.size()); +// +// System.out.println("-------- find in coll --------"); +// HashSet list = new HashSet(); +// list.add("Company1"); +// list.add("Company2"); +// list.add("Company3"); +// companies = companyPS.find(companyPS.newQuery().where("name in ?").addArg(list)); +// assertEquals(3, companies.size()); System.out.println("-------- suppression --------"); companies = companyPS.findAll(); @@ -173,7 +198,9 @@ companyPS.delete(c); } - assertTrue(companyPS.size() == 0); + assertEquals(companyPS.size(), 0); + + child.commitTransaction(); } static int MAX = 10; @@ -191,7 +218,7 @@ // company.setEntier(i); // company.setReel((float)(i+i/100.0)); // company.setBool(i % 2 == 0); - company = companyPS.makePersistent(company); + company = companyPS.update(company); } long time2 = System.currentTimeMillis(); System.out.println("creation en : " + (time2-time)); @@ -209,6 +236,7 @@ long time4 = System.currentTimeMillis(); System.out.println("delete en : " + (time4-time3)); + child.commitTransaction(); }