diff -r 6cbc7bc8ea6d -r 5fe84a5f7035 web/test/unittest_urlpublisher.py --- a/web/test/unittest_urlpublisher.py Fri Apr 17 13:21:05 2009 +0200 +++ b/web/test/unittest_urlpublisher.py Fri Apr 17 16:55:37 2009 +0200 @@ -41,32 +41,32 @@ def test_rest_path(self): """tests the rest path resolution""" - ctrl, rset = self.process('EUser') + ctrl, rset = self.process('CWUser') self.assertEquals(ctrl, 'view') - self.assertEquals(rset.description[0][0], 'EUser') + self.assertEquals(rset.description[0][0], 'CWUser') self.assertEquals(rset.printable_rql(), - "Any X,AA,AB,AC,AD ORDERBY AA WHERE X is EUser, X login AA, X firstname AB, X surname AC, X modification_date AD") - ctrl, rset = self.process('EUser/login/admin') + "Any X,AA,AB,AC,AD ORDERBY AA WHERE X is CWUser, X login AA, X firstname AB, X surname AC, X modification_date AD") + ctrl, rset = self.process('CWUser/login/admin') self.assertEquals(ctrl, 'view') self.assertEquals(len(rset), 1) - self.assertEquals(rset.description[0][0], 'EUser') - self.assertEquals(rset.printable_rql(), 'Any X WHERE X is EUser, X login "admin"') + self.assertEquals(rset.description[0][0], 'CWUser') + self.assertEquals(rset.printable_rql(), 'Any X WHERE X is CWUser, X login "admin"') ctrl, rset = self.process('euser/admin') self.assertEquals(ctrl, 'view') self.assertEquals(len(rset), 1) - self.assertEquals(rset.description[0][0], 'EUser') - self.assertEquals(rset.printable_rql(), 'Any X WHERE X is EUser, X login "admin"') + self.assertEquals(rset.description[0][0], 'CWUser') + self.assertEquals(rset.printable_rql(), 'Any X WHERE X is CWUser, X login "admin"') ctrl, rset = self.process('euser/eid/%s'%rset[0][0]) self.assertEquals(ctrl, 'view') self.assertEquals(len(rset), 1) - self.assertEquals(rset.description[0][0], 'EUser') - self.assertEquals(rset.printable_rql(), 'Any X WHERE X is EUser, X eid 5') + self.assertEquals(rset.description[0][0], 'CWUser') + self.assertEquals(rset.printable_rql(), 'Any X WHERE X is CWUser, X eid 5') # test non-ascii paths - ctrl, rset = self.process('EUser/login/%C3%BFsa%C3%BFe') + ctrl, rset = self.process('CWUser/login/%C3%BFsa%C3%BFe') self.assertEquals(ctrl, 'view') self.assertEquals(len(rset), 1) - self.assertEquals(rset.description[0][0], 'EUser') - self.assertEquals(rset.printable_rql(), u'Any X WHERE X is EUser, X login "ÿsaÿe"') + self.assertEquals(rset.description[0][0], 'CWUser') + self.assertEquals(rset.printable_rql(), u'Any X WHERE X is CWUser, X login "ÿsaÿe"') # test quoted paths ctrl, rset = self.process('BlogEntry/title/hell%27o') self.assertEquals(ctrl, 'view') @@ -74,9 +74,9 @@ self.assertEquals(rset.description[0][0], 'BlogEntry') self.assertEquals(rset.printable_rql(), u'Any X WHERE X is BlogEntry, X title "hell\'o"') # errors - self.assertRaises(NotFound, self.process, 'EUser/eid/30000') + self.assertRaises(NotFound, self.process, 'CWUser/eid/30000') self.assertRaises(NotFound, self.process, 'Workcases') - self.assertRaises(NotFound, self.process, 'EUser/inexistant_attribute/joe') + self.assertRaises(NotFound, self.process, 'CWUser/inexistant_attribute/joe') def test_action_path(self): """tests the action path resolution""" @@ -85,7 +85,7 @@ self.assertRaises(Redirect, self.process, 'Tag/yo/edit') self.assertRaises(NotFound, self.process, 'view/edit') self.assertRaises(NotFound, self.process, '1/non_action') - self.assertRaises(NotFound, self.process, 'EUser/login/admin/non_action') + self.assertRaises(NotFound, self.process, 'CWUser/login/admin/non_action') def test_regexp_path(self):