Index: topiatest/src/test/org/codelutin/test2/AppTest.java
diff -u topiatest/src/test/org/codelutin/test2/AppTest.java:1.1.1.1 topiatest/src/test/org/codelutin/test2/AppTest.java:1.2
--- topiatest/src/test/org/codelutin/test2/AppTest.java:1.1.1.1	Thu Jul  1 15:38:39 2004
+++ topiatest/src/test/org/codelutin/test2/AppTest.java	Thu Jul 15 12:38:10 2004
@@ -4,7 +4,6 @@
 import junit.framework.TestCase;
 import org.codelutin.topia.*;
 import org.codelutin.test2.entities.*;
-import org.codelutin.test2.services.*;
 import java.util.Iterator;
 import java.util.List;
 import java.util.ArrayList;
@@ -12,13 +11,12 @@
 
 public class AppTest extends TestCase {
 
-    protected TopiaContext topiaContext = null;
+    protected test2Context topiaContext = null;
     protected CompanyPersistenceService companyPS = null;
 
     public void setUp() throws Exception {
-        topiaContext = TopiaContext.getContext();
-        companyPS = (CompanyPersistenceService)
-            topiaContext.getPersistenceService(Company.class);
+        topiaContext = test2Context.getContext();
+        companyPS = topiaContext.getCompanyPersistenceService();
     }
 
     /**
@@ -63,86 +61,86 @@
         assertTrue(companies.size() == count + 1);
 
         System.out.println("-------- find name=? --------");
-        companies = companyPS.find(new TopiaQuery("name = ?").addArg("Company" + count));
+        companies = companyPS.find(companyPS.newQuery().where("name = ?").addArg("Company" + count));
         assertTrue(companies.size() == 1);
         Company comp = (Company)companies.iterator().next();
         System.out.println("comp:"+comp+" company:"+company);
         assertTrue(comp.equals(company));
 
         System.out.println("-------- find name like 'Compa%' --------");
-        companies = companyPS.find(new TopiaQuery("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);
 
         System.out.println("-------- find name like '%'"+count+" --------");
-        companies = companyPS.find(new TopiaQuery("name like \"%"+count+"\""));
+        companies = companyPS.find(companyPS.newQuery().where("name like \"%"+count+"\""));
         assertTrue(companies.size() == 1);
 
         System.out.println("-------- find name not like 'Compa%' --------");
-        companies = companyPS.find(new TopiaQuery("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);
 
         System.out.println("-------- find name not like '%'"+count+" --------");
-        companies = companyPS.find(new TopiaQuery("name not like \"%"+count+"\""));
+        companies = companyPS.find(companyPS.newQuery().where("name not like \"%"+count+"\""));
         assertTrue(companies.size() == count);
 
         System.out.println("-------- find entier = "+count+" --------");
-        companies = companyPS.find(new TopiaQuery("entier = ?").addArg(count));
+        companies = companyPS.find(companyPS.newQuery().where("entier = ?").addArg(count));
         assertTrue(companies.size() == 1);
 
         System.out.println("-------- find entier > "+count+" --------");
-        companies = companyPS.find(new TopiaQuery("entier > ?").addArg(count));
+        companies = companyPS.find(companyPS.newQuery().where("entier > ?").addArg(count));
         assertTrue(companies.size() == 0);
 
         System.out.println("-------- find entier < "+count+" --------");
-        companies = companyPS.find(new TopiaQuery("entier < ?").addArg(count));
+        companies = companyPS.find(companyPS.newQuery().where("entier < ?").addArg(count));
         assertTrue(companies.size() == count);
 
         System.out.println("-------- find entier >= "+count+" --------");
-        companies = companyPS.find(new TopiaQuery("entier >= ?").addArg(count));
+        companies = companyPS.find(companyPS.newQuery().where("entier >= ?").addArg(count));
         assertTrue(companies.size() == 1);
 
         System.out.println("-------- find entier <= "+count+" --------");
-        companies = companyPS.find(new TopiaQuery("entier <= ?").addArg(count));
+        companies = companyPS.find(companyPS.newQuery().where("entier <= ?").addArg(count));
         assertTrue(companies.size() == count + 1);
 
         System.out.println("-------- find entier != "+count+" --------");
-        companies = companyPS.find(new TopiaQuery("entier != ?").addArg(count));
+        companies = companyPS.find(companyPS.newQuery().where("entier != ?").addArg(count));
         assertTrue(companies.size() == count);
 
         System.out.println("-------- find entier < 3 --------");
-        companies = companyPS.find(new TopiaQuery("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));
 
 
         System.out.println("-------- find and1 --------");
-        companies = companyPS.find(new TopiaQuery("bool = true and entier <= 0 "));
+        companies = companyPS.find(companyPS.newQuery().where("bool = true and entier <= 0 "));
         assertTrue(companies.size() == 1);
 
         System.out.println("-------- find and2 --------");
-        companies = companyPS.find(new TopiaQuery("bool = true and entier <= ? ").addArg(count));
+        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(new TopiaQuery("not bool = true and entier <= ? ").addArg(count));
+        companies = companyPS.find(companyPS.newQuery().where("not bool = true and entier <= ? ").addArg(count));
         assertTrue(companies.size() == (count+1)/2);
 
         System.out.println("-------- find or --------");
-        companies = companyPS.find(new TopiaQuery("bool = true or bool = false"));
+        companies = companyPS.find(companyPS.newQuery().where("bool = true or bool = false"));
         assertTrue(companies.size() == count + 1);
 
         System.out.println("-------- find not (or) --------");
-        companies = companyPS.find(new TopiaQuery("not (bool = true or bool = false)"));
+        companies = companyPS.find(companyPS.newQuery().where("not (bool = true or bool = false)"));
         assertTrue(companies.size() == 0);
 
         System.out.println("-------- find in --------");
-        companies = companyPS.find(new TopiaQuery("entier in (1,2,3)"));
+        companies = companyPS.find(companyPS.newQuery().where("entier in (1,2,3)"));
         assertTrue(companies.size() == 3);
 
         System.out.println("-------- find not in --------");
-        companies = companyPS.find(new TopiaQuery("entier not in (1,2,3)"));
+        companies = companyPS.find(companyPS.newQuery().where("entier not in (1,2,3)"));
         assertTrue(companies.size() == count + 1 - 3);
 
         System.out.println("-------- find in coll --------");
@@ -150,7 +148,7 @@
         list.add("Company1");
         list.add("Company2");
         list.add("Company3");
-        companies = companyPS.find(new TopiaQuery("name in ?").addArg(list));
+        companies = companyPS.find(companyPS.newQuery().where("name in ?").addArg(list));
         assertTrue(companies.size() == 3);
 
         System.out.println("-------- suppression --------");