--- a/test/unittest_utils.py	Thu Sep 23 23:28:58 2010 +0200
+++ b/test/unittest_utils.py	Wed Sep 29 16:16:32 2010 +0200
@@ -57,47 +57,47 @@
 
     def test_base(self):
         l = RepeatList(3, (1, 3))
-        self.assertEquals(l[0], (1, 3))
-        self.assertEquals(l[2], (1, 3))
-        self.assertEquals(l[-1], (1, 3))
-        self.assertEquals(len(l), 3)
+        self.assertEqual(l[0], (1, 3))
+        self.assertEqual(l[2], (1, 3))
+        self.assertEqual(l[-1], (1, 3))
+        self.assertEqual(len(l), 3)
         # XXX
-        self.assertEquals(l[4], (1, 3))
+        self.assertEqual(l[4], (1, 3))
 
         self.failIf(RepeatList(0, None))
 
     def test_slice(self):
         l = RepeatList(3, (1, 3))
-        self.assertEquals(l[0:1], [(1, 3)])
-        self.assertEquals(l[0:4], [(1, 3)]*3)
-        self.assertEquals(l[:], [(1, 3)]*3)
+        self.assertEqual(l[0:1], [(1, 3)])
+        self.assertEqual(l[0:4], [(1, 3)]*3)
+        self.assertEqual(l[:], [(1, 3)]*3)
 
     def test_iter(self):
-        self.assertEquals(list(RepeatList(3, (1, 3))),
+        self.assertEqual(list(RepeatList(3, (1, 3))),
                           [(1, 3)]*3)
 
     def test_add(self):
         l = RepeatList(3, (1, 3))
-        self.assertEquals(l + [(1, 4)], [(1, 3)]*3  + [(1, 4)])
-        self.assertEquals([(1, 4)] + l, [(1, 4)] + [(1, 3)]*3)
-        self.assertEquals(l + RepeatList(2, (2, 3)), [(1, 3)]*3 + [(2, 3)]*2)
+        self.assertEqual(l + [(1, 4)], [(1, 3)]*3  + [(1, 4)])
+        self.assertEqual([(1, 4)] + l, [(1, 4)] + [(1, 3)]*3)
+        self.assertEqual(l + RepeatList(2, (2, 3)), [(1, 3)]*3 + [(2, 3)]*2)
 
         x = l + RepeatList(2, (1, 3))
         self.assertIsInstance(x, RepeatList)
-        self.assertEquals(len(x), 5)
-        self.assertEquals(x[0], (1, 3))
+        self.assertEqual(len(x), 5)
+        self.assertEqual(x[0], (1, 3))
 
         x = l + [(1, 3)] * 2
-        self.assertEquals(x, [(1, 3)] * 5)
+        self.assertEqual(x, [(1, 3)] * 5)
 
     def test_eq(self):
-        self.assertEquals(RepeatList(3, (1, 3)),
+        self.assertEqual(RepeatList(3, (1, 3)),
                           [(1, 3)]*3)
 
     def test_pop(self):
         l = RepeatList(3, (1, 3))
         l.pop(2)
-        self.assertEquals(l, [(1, 3)]*2)
+        self.assertEqual(l, [(1, 3)]*2)
 
 
 class SizeConstrainedListTC(TestCase):
@@ -106,7 +106,7 @@
         l = SizeConstrainedList(10)
         for i in xrange(12):
             l.append(i)
-        self.assertEquals(l, range(2, 12))
+        self.assertEqual(l, range(2, 12))
 
     def test_extend(self):
         testdata = [(range(5), range(5)),
@@ -116,44 +116,44 @@
         for extension, expected in testdata:
             l = SizeConstrainedList(10)
             l.extend(extension)
-            yield self.assertEquals, l, expected
+            yield self.assertEqual, l, expected
 
 
 class JSONEncoderTC(TestCase):
     def setUp(self):
         if json is None:
-            self.skip('json not available')
+            self.skipTest('json not available')
 
     def encode(self, value):
         return json.dumps(value, cls=CubicWebJsonEncoder)
 
     def test_encoding_dates(self):
-        self.assertEquals(self.encode(datetime.datetime(2009, 9, 9, 20, 30)),
+        self.assertEqual(self.encode(datetime.datetime(2009, 9, 9, 20, 30)),
                           '"2009/09/09 20:30:00"')
-        self.assertEquals(self.encode(datetime.date(2009, 9, 9)),
+        self.assertEqual(self.encode(datetime.date(2009, 9, 9)),
                           '"2009/09/09"')
-        self.assertEquals(self.encode(datetime.time(20, 30)),
+        self.assertEqual(self.encode(datetime.time(20, 30)),
                           '"20:30:00"')
 
     def test_encoding_decimal(self):
-        self.assertEquals(self.encode(decimal.Decimal('1.2')), '1.2')
+        self.assertEqual(self.encode(decimal.Decimal('1.2')), '1.2')
 
     def test_encoding_bare_entity(self):
         e = Entity(None)
         e.cw_attr_cache['pouet'] = 'hop'
         e.eid = 2
-        self.assertEquals(json.loads(self.encode(e)),
+        self.assertEqual(json.loads(self.encode(e)),
                           {'pouet': 'hop', 'eid': 2})
 
     def test_encoding_entity_in_list(self):
         e = Entity(None)
         e.cw_attr_cache['pouet'] = 'hop'
         e.eid = 2
-        self.assertEquals(json.loads(self.encode([e])),
+        self.assertEqual(json.loads(self.encode([e])),
                           [{'pouet': 'hop', 'eid': 2}])
 
     def test_encoding_unknown_stuff(self):
-        self.assertEquals(self.encode(TestCase), 'null')
+        self.assertEqual(self.encode(TestCase), 'null')
 
 
 if __name__ == '__main__':