Updated test assertions that have been deprecated by the move to unittest2. In summary, this means:

 assert_ -> assertTrue
 assertEquals -> assertEqual
 failUnless -> assertTrue

For full details, see http://www.voidspace.org.uk/python/articles/unittest2.shtml#deprecations

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15728 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 48 insertions, 48 deletions

diff --git a/tests/regressiontests/utils/datastructures.py b/tests/regressiontests/utils/datastructures.py
index 3c29a24a63..3d01ab8b6f 100644
--- a/tests/regressiontests/utils/datastructures.py
+++ b/tests/regressiontests/utils/datastructures.py
@@ -32,19 +32,19 @@ class SortedDictTests(DatastructuresTestCase):
         self.d2[7] = 'seven'
 
     def test_basic_methods(self):
-        self.assertEquals(self.d1.keys(), [7, 1, 9])
-        self.assertEquals(self.d1.values(), ['seven', 'one', 'nine'])
-        self.assertEquals(self.d1.items(), [(7, 'seven'), (1, 'one'), (9, 'nine')])
+        self.assertEqual(self.d1.keys(), [7, 1, 9])
+        self.assertEqual(self.d1.values(), ['seven', 'one', 'nine'])
+        self.assertEqual(self.d1.items(), [(7, 'seven'), (1, 'one'), (9, 'nine')])
 
     def test_overwrite_ordering(self):
         """ Overwriting an item keeps it's place. """
         self.d1[1] = 'ONE'
-        self.assertEquals(self.d1.values(), ['seven', 'ONE', 'nine'])
+        self.assertEqual(self.d1.values(), ['seven', 'ONE', 'nine'])
 
     def test_append_items(self):
         """ New items go to the end. """
         self.d1[0] = 'nil'
-        self.assertEquals(self.d1.keys(), [7, 1, 9, 0])
+        self.assertEqual(self.d1.keys(), [7, 1, 9, 0])
 
     def test_delete_and_insert(self):
         """
@@ -52,9 +52,9 @@ class SortedDictTests(DatastructuresTestCase):
         at the end.
         """
         del self.d2[7]
-        self.assertEquals(self.d2.keys(), [1, 9, 0])
+        self.assertEqual(self.d2.keys(), [1, 9, 0])
         self.d2[7] = 'lucky number 7'
-        self.assertEquals(self.d2.keys(), [1, 9, 0, 7])
+        self.assertEqual(self.d2.keys(), [1, 9, 0, 7])
 
     def test_change_keys(self):
         """
@@ -63,7 +63,7 @@ class SortedDictTests(DatastructuresTestCase):
         """
         k = self.d2.keys()
         k.remove(9)
-        self.assertEquals(self.d2.keys(), [1, 9, 0, 7])
+        self.assertEqual(self.d2.keys(), [1, 9, 0, 7])
 
     def test_init_keys(self):
         """
@@ -75,13 +75,13 @@ class SortedDictTests(DatastructuresTestCase):
         tuples = ((2, 'two'), (1, 'one'), (2, 'second-two'))
         d = SortedDict(tuples)
 
-        self.assertEquals(d.keys(), [2, 1])
+        self.assertEqual(d.keys(), [2, 1])
 
         real_dict = dict(tuples)
-        self.assertEquals(sorted(real_dict.values()), ['one', 'second-two'])
+        self.assertEqual(sorted(real_dict.values()), ['one', 'second-two'])
 
         # Here the order of SortedDict values *is* what we are testing
-        self.assertEquals(d.values(), ['second-two', 'one'])
+        self.assertEqual(d.values(), ['second-two', 'one'])
 
     def test_overwrite(self):
         self.d1[1] = 'not one'
@@ -90,39 +90,39 @@ class SortedDictTests(DatastructuresTestCase):
 
     def test_append(self):
         self.d1[13] = 'thirteen'
-        self.assertEquals(
+        self.assertEqual(
             repr(self.d1),
             "{7: 'seven', 1: 'one', 9: 'nine', 13: 'thirteen'}"
         )
 
     def test_pop(self):
-        self.assertEquals(self.d1.pop(1, 'missing'), 'one')
-        self.assertEquals(self.d1.pop(1, 'missing'), 'missing')
+        self.assertEqual(self.d1.pop(1, 'missing'), 'one')
+        self.assertEqual(self.d1.pop(1, 'missing'), 'missing')
 
         # We don't know which item will be popped in popitem(), so we'll
         # just check that the number of keys has decreased.
         l = len(self.d1)
         self.d1.popitem()
-        self.assertEquals(l - len(self.d1), 1)
+        self.assertEqual(l - len(self.d1), 1)
 
     def test_dict_equality(self):
         d = SortedDict((i, i) for i in xrange(3))
-        self.assertEquals(d, {0: 0, 1: 1, 2: 2})
+        self.assertEqual(d, {0: 0, 1: 1, 2: 2})
 
     def test_tuple_init(self):
         d = SortedDict(((1, "one"), (0, "zero"), (2, "two")))
-        self.assertEquals(repr(d), "{1: 'one', 0: 'zero', 2: 'two'}")
+        self.assertEqual(repr(d), "{1: 'one', 0: 'zero', 2: 'two'}")
 
     def test_pickle(self):
-        self.assertEquals(
+        self.assertEqual(
             pickle.loads(pickle.dumps(self.d1, 2)),
             {7: 'seven', 1: 'one', 9: 'nine'}
         )
 
     def test_clear(self):
         self.d1.clear()
-        self.assertEquals(self.d1, {})
-        self.assertEquals(self.d1.keyOrder, [])
+        self.assertEqual(self.d1, {})
+        self.assertEqual(self.d1.keyOrder, [])
 
 class MergeDictTests(DatastructuresTestCase):
 
@@ -140,12 +140,12 @@ class MergeDictTests(DatastructuresTestCase):
 
         md = MergeDict(d1, d2, d3)
 
-        self.assertEquals(md['chris'], 'cool')
-        self.assertEquals(md['camri'], 'cute')
-        self.assertEquals(md['twoofme'], 'firstone')
+        self.assertEqual(md['chris'], 'cool')
+        self.assertEqual(md['camri'], 'cute')
+        self.assertEqual(md['twoofme'], 'firstone')
 
         md2 = md.copy()
-        self.assertEquals(md2['chris'], 'cool')
+        self.assertEqual(md2['chris'], 'cool')
 
     def test_mergedict_merges_multivaluedict(self):
         """ MergeDict can merge MultiValueDicts """
@@ -160,20 +160,20 @@ class MergeDictTests(DatastructuresTestCase):
 
         # Although 'key2' appears in both dictionaries,
         # only the first value is used.
-        self.assertEquals(mm.getlist('key2'), ['value2', 'value3'])
-        self.assertEquals(mm.getlist('key4'), ['value5', 'value6'])
-        self.assertEquals(mm.getlist('undefined'), [])
+        self.assertEqual(mm.getlist('key2'), ['value2', 'value3'])
+        self.assertEqual(mm.getlist('key4'), ['value5', 'value6'])
+        self.assertEqual(mm.getlist('undefined'), [])
 
-        self.assertEquals(sorted(mm.keys()), ['key1', 'key2', 'key4'])
-        self.assertEquals(len(mm.values()), 3)
+        self.assertEqual(sorted(mm.keys()), ['key1', 'key2', 'key4'])
+        self.assertEqual(len(mm.values()), 3)
 
         self.assertTrue('value1' in mm.values())
 
-        self.assertEquals(sorted(mm.items(), key=lambda k: k[0]),
+        self.assertEqual(sorted(mm.items(), key=lambda k: k[0]),
                           [('key1', 'value1'), ('key2', 'value3'),
                            ('key4', 'value6')])
 
-        self.assertEquals([(k,mm.getlist(k)) for k in sorted(mm)],
+        self.assertEqual([(k,mm.getlist(k)) for k in sorted(mm)],
                           [('key1', ['value1']),
                            ('key2', ['value2', 'value3']),
                            ('key4', ['value5', 'value6'])])
@@ -184,13 +184,13 @@ class MultiValueDictTests(DatastructuresTestCase):
         d = MultiValueDict({'name': ['Adrian', 'Simon'],
                             'position': ['Developer']})
 
-        self.assertEquals(d['name'], 'Simon')
-        self.assertEquals(d.get('name'), 'Simon')
-        self.assertEquals(d.getlist('name'), ['Adrian', 'Simon'])
-        self.assertEquals(list(d.iteritems()),
+        self.assertEqual(d['name'], 'Simon')
+        self.assertEqual(d.get('name'), 'Simon')
+        self.assertEqual(d.getlist('name'), ['Adrian', 'Simon'])
+        self.assertEqual(list(d.iteritems()),
                           [('position', 'Developer'), ('name', 'Simon')])
 
-        self.assertEquals(list(d.iterlists()),
+        self.assertEqual(list(d.iterlists()),
                           [('position', ['Developer']),
                            ('name', ['Adrian', 'Simon'])])
 
@@ -202,14 +202,14 @@ class MultiValueDictTests(DatastructuresTestCase):
             ' [\'Developer\'], \'name\': [\'Adrian\', \'Simon\']}>"',
             d.__getitem__, 'lastname')
 
-        self.assertEquals(d.get('lastname'), None)
-        self.assertEquals(d.get('lastname', 'nonexistent'), 'nonexistent')
-        self.assertEquals(d.getlist('lastname'), [])
+        self.assertEqual(d.get('lastname'), None)
+        self.assertEqual(d.get('lastname', 'nonexistent'), 'nonexistent')
+        self.assertEqual(d.getlist('lastname'), [])
 
         d.setlist('lastname', ['Holovaty', 'Willison'])
-        self.assertEquals(d.getlist('lastname'), ['Holovaty', 'Willison'])
-        self.assertEquals(d.values(), ['Developer', 'Simon', 'Willison'])
-        self.assertEquals(list(d.itervalues()),
+        self.assertEqual(d.getlist('lastname'), ['Holovaty', 'Willison'])
+        self.assertEqual(d.values(), ['Developer', 'Simon', 'Willison'])
+        self.assertEqual(list(d.itervalues()),
                           ['Developer', 'Simon', 'Willison'])
 
     def test_copy(self):
@@ -242,9 +242,9 @@ class DotExpandedDictTests(DatastructuresTestCase):
                              'person.2.firstname': ['Adrian'],
                              'person.2.lastname': ['Holovaty']})
 
-        self.assertEquals(d['person']['1']['lastname'], ['Willison'])
-        self.assertEquals(d['person']['2']['lastname'], ['Holovaty'])
-        self.assertEquals(d['person']['2']['firstname'], ['Adrian'])
+        self.assertEqual(d['person']['1']['lastname'], ['Willison'])
+        self.assertEqual(d['person']['2']['lastname'], ['Holovaty'])
+        self.assertEqual(d['person']['2']['firstname'], ['Adrian'])
 
 
 class ImmutableListTests(DatastructuresTestCase):
@@ -256,12 +256,12 @@ class ImmutableListTests(DatastructuresTestCase):
         self.assertRaisesErrorWithMessage(AttributeError,
             'ImmutableList object is immutable.', d.sort)
 
-        self.assertEquals(repr(d), '(0, 1, 2, 3, 4, 5, 6, 7, 8, 9)')
+        self.assertEqual(repr(d), '(0, 1, 2, 3, 4, 5, 6, 7, 8, 9)')
 
     def test_custom_warning(self):
         d = ImmutableList(range(10), warning="Object is immutable!")
 
-        self.assertEquals(d[1], 1)
+        self.assertEqual(d[1], 1)
 
         # AttributeError: Object is immutable!
         self.assertRaisesErrorWithMessage(AttributeError,
@@ -273,5 +273,5 @@ class DictWrapperTests(DatastructuresTestCase):
     def test_dictwrapper(self):
         f = lambda x: "*%s" % x
         d = DictWrapper({'a': 'a'}, f, 'xx_')
-        self.assertEquals("Normal: %(a)s. Modified: %(xx_a)s" % d,
+        self.assertEqual("Normal: %(a)s. Modified: %(xx_a)s" % d,
                           'Normal: a. Modified: *a')