diff -r 00b1b6b906cf -r 97c55baefa0c entities/test/unittest_base.py --- a/entities/test/unittest_base.py Thu Jul 15 12:03:13 2010 +0200 +++ b/entities/test/unittest_base.py Mon Jul 19 15:37:02 2010 +0200 @@ -27,7 +27,7 @@ from cubicweb.devtools.testlib import CubicWebTC from cubicweb import ValidationError -from cubicweb.interfaces import IMileStone, IWorkflowable +from cubicweb.interfaces import IMileStone, ICalendarable from cubicweb.entities import AnyEntity @@ -106,7 +106,7 @@ def test_allowed_massmail_keys(self): e = self.execute('CWUser U WHERE U login "member"').get_entity(0, 0) # Bytes/Password attributes should be omited - self.assertEquals(e.allowed_massmail_keys(), + self.assertEquals(e.cw_adapt_to('IEmailable').allowed_massmail_keys(), set(('surname', 'firstname', 'login', 'last_login_time', 'creation_date', 'modification_date', 'cwuri', 'eid')) ) @@ -115,8 +115,9 @@ class InterfaceTC(CubicWebTC): def test_nonregr_subclasses_and_mixins_interfaces(self): + from cubicweb.entities.wfobjs import WorkflowableMixIn + WorkflowableMixIn.__implements__ = (ICalendarable,) CWUser = self.vreg['etypes'].etype_class('CWUser') - self.failUnless(implements(CWUser, IWorkflowable)) class MyUser(CWUser): __implements__ = (IMileStone,) self.vreg._loadedmods[__name__] = {} @@ -126,10 +127,10 @@ # a copy is done systematically self.failUnless(issubclass(MyUser_, MyUser)) self.failUnless(implements(MyUser_, IMileStone)) - self.failUnless(implements(MyUser_, IWorkflowable)) + self.failUnless(implements(MyUser_, ICalendarable)) # original class should not have beed modified, only the copy self.failUnless(implements(MyUser, IMileStone)) - self.failIf(implements(MyUser, IWorkflowable)) + self.failIf(implements(MyUser, ICalendarable)) class SpecializedEntityClassesTC(CubicWebTC):