--- a/web/test/test_views.py	Fri Apr 17 13:21:05 2009 +0200
+++ b/web/test/test_views.py	Fri Apr 17 16:55:37 2009 +0200
@@ -4,9 +4,9 @@
 from cubicweb.view import AnyRsetView
 
 AutomaticWebTest.application_rql = [
-    'Any L,F WHERE E is EUser, E login L, E firstname F',
-    'Any L,F,E WHERE E is EUser, E login L, E firstname F',
-    'Any COUNT(X) WHERE X is EUser',
+    'Any L,F WHERE E is CWUser, E login L, E firstname F',
+    'Any L,F,E WHERE E is CWUser, E login L, E firstname F',
+    'Any COUNT(X) WHERE X is CWUser',
     ]
 
 class ComposityCopy(WebTest):
@@ -15,7 +15,7 @@
         """regression test: make sure we can ask a copy of a
         composite entity
         """
-        rset = self.execute('EUser X WHERE X login "admin"')
+        rset = self.execute('CWUser X WHERE X login "admin"')
         self.view('copy', rset)
 
 
@@ -33,21 +33,21 @@
         self.auto_populate(10)
 
     def test_manual_tests(self):
-        rset = self.execute('Any P,F,S WHERE P is EUser, P firstname F, P surname S')
+        rset = self.execute('Any P,F,S WHERE P is CWUser, P firstname F, P surname S')
         self.view('table', rset, template=None, displayfilter=True, displaycols=[0,2])        
 
     def test_sortable_js_added(self):
-        rset = self.execute('EUser X')
+        rset = self.execute('CWUser X')
         # sortable.js should not be included by default
         self.failIf('jquery.tablesorter.js' in self.view('oneline', rset))
         # but should be included by the tableview
-        rset = self.execute('Any P,F,S LIMIT 1 WHERE P is EUser, P firstname F, P surname S')
+        rset = self.execute('Any P,F,S LIMIT 1 WHERE P is CWUser, P firstname F, P surname S')
         self.failUnless('jquery.tablesorter.js' in self.view('table', rset))
 
     def test_js_added_only_once(self):
         self.vreg._loadedmods[__name__] = {}
         self.vreg.register_vobject_class(SomeView)
-        rset = self.execute('EUser X')
+        rset = self.execute('CWUser X')
         source = self.view('someview', rset).source
         self.assertEquals(source.count('spam.js'), 1)
 
@@ -56,8 +56,8 @@
 class ExplicitViewsTest(WebTest):
     
     def test_unrelateddivs(self):
-        rset = self.execute('Any X WHERE X is EUser, X login "admin"')
-        group = self.add_entity('EGroup', name=u'R&D')
+        rset = self.execute('Any X WHERE X is CWUser, X login "admin"')
+        group = self.add_entity('CWGroup', name=u'R&D')
         req = self.request(relation='in_group_subject')
         self.view('unrelateddivs', rset, req)