diff -r f7709d28fb79 -r 5238d9a8dfee hooks/test/unittest_hooks.py --- a/hooks/test/unittest_hooks.py Fri Mar 26 06:57:52 2010 +0100 +++ b/hooks/test/unittest_hooks.py Fri Mar 26 08:28:22 2010 +0100 @@ -102,9 +102,9 @@ 'WHERE FE name "CWUser", RT name "in_group", TE name "String"')[0][0] self.execute('SET X read_permission Y WHERE X eid %(x)s, Y name "managers"', {'x': releid}, 'x') - ex = self.assertRaises(ValidationError, - self.commit) - self.assertEquals(ex.errors, {'to_entity': 'RQLConstraint O final FALSE failed'}) + ex = self.assertRaises(ValidationError, self.commit) + self.assertEquals(ex.errors, + {'to_entity-object': 'RQLConstraint O final FALSE failed'}) def test_html_tidy_hook(self): req = self.request() @@ -217,23 +217,23 @@ def test_unexistant_eproperty(self): ex = self.assertRaises(ValidationError, self.execute, 'INSERT CWProperty X: X pkey "bla.bla", X value "hop", X for_user U') - self.assertEquals(ex.errors, {'pkey': 'unknown property key'}) + self.assertEquals(ex.errors, {'pkey-subject': 'unknown property key'}) ex = self.assertRaises(ValidationError, self.execute, 'INSERT CWProperty X: X pkey "bla.bla", X value "hop"') - self.assertEquals(ex.errors, {'pkey': 'unknown property key'}) + self.assertEquals(ex.errors, {'pkey-subject': 'unknown property key'}) def test_site_wide_eproperty(self): ex = self.assertRaises(ValidationError, self.execute, 'INSERT CWProperty X: X pkey "ui.site-title", X value "hop", X for_user U') - self.assertEquals(ex.errors, {'for_user': "site-wide property can't be set for user"}) + self.assertEquals(ex.errors, {'for_user-subject': "site-wide property can't be set for user"}) def test_bad_type_eproperty(self): ex = self.assertRaises(ValidationError, self.execute, 'INSERT CWProperty X: X pkey "ui.language", X value "hop", X for_user U') - self.assertEquals(ex.errors, {'value': u'unauthorized value'}) + self.assertEquals(ex.errors, {'value-subject': u'unauthorized value'}) ex = self.assertRaises(ValidationError, self.execute, 'INSERT CWProperty X: X pkey "ui.language", X value "hop"') - self.assertEquals(ex.errors, {'value': u'unauthorized value'}) + self.assertEquals(ex.errors, {'value-subject': u'unauthorized value'}) class SchemaHooksTC(CubicWebTC): @@ -253,7 +253,7 @@ self.execute('INSERT CWUser X: X login "admin"') except ValidationError, ex: self.assertIsInstance(ex.entity, int) - self.assertEquals(ex.errors, {'login': 'the value "admin" is already used, use another one'}) + self.assertEquals(ex.errors, {'login-subject': 'the value "admin" is already used, use another one'}) if __name__ == '__main__':