[Pypersyst-cvs] pypersyst/pypersyst/test test_twisted_entity.py,1.5,1.6 test_entity.py,1.19,1.20
Brought to you by:
pobrien
From: Patrick K. O'B. <po...@us...> - 2004-06-26 14:36:40
|
Update of /cvsroot/pypersyst/pypersyst/pypersyst/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30112/test Modified Files: test_twisted_entity.py test_entity.py Log Message: As a step towards better namespace management, make all remaining attributes of Entity semi-private, such as self._oid and self._rev. Index: test_twisted_entity.py =================================================================== RCS file: /cvsroot/pypersyst/pypersyst/pypersyst/test/test_twisted_entity.py,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** test_twisted_entity.py 17 Jun 2004 17:36:45 -0000 1.5 --- test_twisted_entity.py 26 Jun 2004 14:36:30 -0000 1.6 *************** *** 45,49 **** def test_oid(self): ! self.assert_(self.entity.oid > 0) def test_getattr(self): --- 45,49 ---- def test_oid(self): ! self.assert_(self.entity._oid > 0) def test_getattr(self): Index: test_entity.py =================================================================== RCS file: /cvsroot/pypersyst/pypersyst/pypersyst/test/test_entity.py,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** test_entity.py 19 Jun 2004 21:33:11 -0000 1.19 --- test_entity.py 26 Jun 2004 14:36:30 -0000 1.20 *************** *** 66,73 **** def test_oid(self): ! self.assert_(self.entity.oid > 0) def test_rev(self): ! self.assert_(self.entity.rev == 0) def test_get_nonexistent_attribute(self): --- 66,73 ---- def test_oid(self): ! self.assert_(self.entity._oid > 0) def test_rev(self): ! self.assert_(self.entity._rev == 0) def test_get_nonexistent_attribute(self): *************** *** 158,163 **** self.extent._delete(TIME, e1) e2 = self.EntityClass(self.root, name='unique') ! self.assert_(self.extent.get(e1.oid) is None) ! self.assert_(self.extent.get(e2.oid) is e2) self.assertEqual(e1.name, e2.name) self.assertRaises(KeyError, self.EntityClass, self.root, name='unique') --- 158,163 ---- self.extent._delete(TIME, e1) e2 = self.EntityClass(self.root, name='unique') ! self.assert_(self.extent.get(e1._oid) is None) ! self.assert_(self.extent.get(e2._oid) is e2) self.assertEqual(e1.name, e2.name) self.assertRaises(KeyError, self.EntityClass, self.root, name='unique') *************** *** 353,361 **** def test_key(self): ! self.assert_(self.entity.oid > 0) def test_attrs(self): known = {'testfield': self.testvalue} ! attrs = self.entity._attrs() self.assertEqual(attrs, known) --- 353,361 ---- def test_key(self): ! self.assert_(self.entity._oid > 0) def test_attrs(self): known = {'testfield': self.testvalue} ! attrs = self.entity._attrs self.assertEqual(attrs, known) *************** *** 432,441 **** def test_oid(self): ! self.assert_(self.entity.oid > 0) def test_attrs(self): known = {'testfield': self.testvalue, 'anotherfield': self.anothervalue} ! attrs = self.entity._attrs() self.assertEqual(attrs, known) --- 432,441 ---- def test_oid(self): ! self.assert_(self.entity._oid > 0) def test_attrs(self): known = {'testfield': self.testvalue, 'anotherfield': self.anothervalue} ! attrs = self.entity._attrs self.assertEqual(attrs, known) *************** *** 452,456 **** _fieldSpec = { ! 'oid': field.Field, } --- 452,456 ---- _fieldSpec = { ! '_oid': field.Field, } *************** *** 463,467 **** Root._EntityClasses = [OidEntity] self.root = Root() ! self.assertRaises(AttributeError, OidEntity, self.root, oid=1) --- 463,467 ---- Root._EntityClasses = [OidEntity] self.root = Root() ! self.assertRaises(AttributeError, OidEntity, self.root, _oid=1) *************** *** 477,485 **** def test_one_entity(self): e = Entity(self.root) ! self.assertEqual(e.oid, 1) self.assertEqual(len(e._extent), 1) ! self.assert_(e.oid in e._extent) ! self.assert_(e._extent[e.oid] is e) ! self.assert_(e._extent.get(e.oid) is e) self.assert_(e._extent.all()[0] is e) --- 477,485 ---- def test_one_entity(self): e = Entity(self.root) ! self.assertEqual(e._oid, 1) self.assertEqual(len(e._extent), 1) ! self.assert_(e._oid in e._extent) ! self.assert_(e._extent[e._oid] is e) ! self.assert_(e._extent.get(e._oid) is e) self.assert_(e._extent.all()[0] is e) *************** *** 489,502 **** e2 = Entity(self.root) e3 = Entity(self.root) ! self.assertEqual(e1.oid, 1) ! self.assertEqual(e2.oid, 2) ! self.assertEqual(e3.oid, 3) self.assertEqual(len(extent), 3) ! self.assert_(e1.oid in extent) ! self.assert_(e2.oid in extent) ! self.assert_(e3.oid in extent) ! self.assert_(extent[e1.oid] is e1) ! self.assert_(extent[e2.oid] is e2) ! self.assert_(extent[e3.oid] is e3) --- 489,502 ---- e2 = Entity(self.root) e3 = Entity(self.root) ! self.assertEqual(e1._oid, 1) ! self.assertEqual(e2._oid, 2) ! self.assertEqual(e3._oid, 3) self.assertEqual(len(extent), 3) ! self.assert_(e1._oid in extent) ! self.assert_(e2._oid in extent) ! self.assert_(e3._oid in extent) ! self.assert_(extent[e1._oid] is e1) ! self.assert_(extent[e2._oid] is e2) ! self.assert_(extent[e3._oid] is e3) |