diff -r 48f468f33704 -r e4580e5f0703 test/unittest_utils.py --- a/test/unittest_utils.py Fri Dec 10 12:17:18 2010 +0100 +++ b/test/unittest_utils.py Fri Mar 11 09:46:45 2011 +0100 @@ -33,8 +33,8 @@ class MakeUidTC(TestCase): def test_1(self): - self.assertNotEquals(make_uid('xyz'), make_uid('abcd')) - self.assertNotEquals(make_uid('xyz'), make_uid('xyz')) + self.assertNotEqual(make_uid('xyz'), make_uid('abcd')) + self.assertNotEqual(make_uid('xyz'), make_uid('xyz')) def test_2(self): d = set() @@ -140,14 +140,14 @@ def test_encoding_bare_entity(self): e = Entity(None) - e['pouet'] = 'hop' + e.cw_attr_cache['pouet'] = 'hop' e.eid = 2 self.assertEqual(json.loads(self.encode(e)), {'pouet': 'hop', 'eid': 2}) def test_encoding_entity_in_list(self): e = Entity(None) - e['pouet'] = 'hop' + e.cw_attr_cache['pouet'] = 'hop' e.eid = 2 self.assertEqual(json.loads(self.encode([e])), [{'pouet': 'hop', 'eid': 2}])