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, 22 insertions, 22 deletions

diff --git a/tests/regressiontests/text/tests.py b/tests/regressiontests/text/tests.py
index 3036f8ec2e..98f4398717 100644
--- a/tests/regressiontests/text/tests.py
+++ b/tests/regressiontests/text/tests.py
@@ -23,70 +23,70 @@ class TextTests(TestCase):
 
     def test_smart_split(self):
 
-        self.assertEquals(list(smart_split(r'''This is "a person" test.''')),
+        self.assertEqual(list(smart_split(r'''This is "a person" test.''')),
             [u'This', u'is', u'"a person"', u'test.'])
 
-        self.assertEquals(list(smart_split(r'''This is "a person's" test.'''))[2],
+        self.assertEqual(list(smart_split(r'''This is "a person's" test.'''))[2],
             u'"a person\'s"')
 
-        self.assertEquals(list(smart_split(r'''This is "a person\"s" test.'''))[2],
+        self.assertEqual(list(smart_split(r'''This is "a person\"s" test.'''))[2],
             u'"a person\\"s"')
 
-        self.assertEquals(list(smart_split('''"a 'one''')), [u'"a', u"'one"])
+        self.assertEqual(list(smart_split('''"a 'one''')), [u'"a', u"'one"])
 
-        self.assertEquals(list(smart_split(r'''all friends' tests'''))[1],
+        self.assertEqual(list(smart_split(r'''all friends' tests'''))[1],
             "friends'")
 
-        self.assertEquals(list(smart_split(u'url search_page words="something else"')),
+        self.assertEqual(list(smart_split(u'url search_page words="something else"')),
             [u'url', u'search_page', u'words="something else"'])
 
-        self.assertEquals(list(smart_split(u"url search_page words='something else'")),
+        self.assertEqual(list(smart_split(u"url search_page words='something else'")),
             [u'url', u'search_page', u"words='something else'"])
 
-        self.assertEquals(list(smart_split(u'url search_page words "something else"')),
+        self.assertEqual(list(smart_split(u'url search_page words "something else"')),
             [u'url', u'search_page', u'words', u'"something else"'])
 
-        self.assertEquals(list(smart_split(u'url search_page words-"something else"')),
+        self.assertEqual(list(smart_split(u'url search_page words-"something else"')),
             [u'url', u'search_page', u'words-"something else"'])
 
-        self.assertEquals(list(smart_split(u'url search_page words=hello')),
+        self.assertEqual(list(smart_split(u'url search_page words=hello')),
             [u'url', u'search_page', u'words=hello'])
 
-        self.assertEquals(list(smart_split(u'url search_page words="something else')),
+        self.assertEqual(list(smart_split(u'url search_page words="something else')),
             [u'url', u'search_page', u'words="something', u'else'])
 
-        self.assertEquals(list(smart_split("cut:','|cut:' '")),
+        self.assertEqual(list(smart_split("cut:','|cut:' '")),
             [u"cut:','|cut:' '"])
 
     def test_urlquote(self):
 
-        self.assertEquals(urlquote(u'Paris & Orl\xe9ans'),
+        self.assertEqual(urlquote(u'Paris & Orl\xe9ans'),
             u'Paris%20%26%20Orl%C3%A9ans')
-        self.assertEquals(urlquote(u'Paris & Orl\xe9ans', safe="&"),
+        self.assertEqual(urlquote(u'Paris & Orl\xe9ans', safe="&"),
             u'Paris%20&%20Orl%C3%A9ans')
-        self.assertEquals(urlquote_plus(u'Paris & Orl\xe9ans'),
+        self.assertEqual(urlquote_plus(u'Paris & Orl\xe9ans'),
             u'Paris+%26+Orl%C3%A9ans')
-        self.assertEquals(urlquote_plus(u'Paris & Orl\xe9ans', safe="&"),
+        self.assertEqual(urlquote_plus(u'Paris & Orl\xe9ans', safe="&"),
             u'Paris+&+Orl%C3%A9ans')
 
     def test_cookie_date(self):
         t = 1167616461.0
-        self.assertEquals(cookie_date(t), 'Mon, 01-Jan-2007 01:54:21 GMT')
+        self.assertEqual(cookie_date(t), 'Mon, 01-Jan-2007 01:54:21 GMT')
 
     def test_http_date(self):
         t = 1167616461.0
-        self.assertEquals(http_date(t), 'Mon, 01 Jan 2007 01:54:21 GMT')
+        self.assertEqual(http_date(t), 'Mon, 01 Jan 2007 01:54:21 GMT')
 
     def test_iri_to_uri(self):
-        self.assertEquals(iri_to_uri(u'red%09ros\xe9#red'),
+        self.assertEqual(iri_to_uri(u'red%09ros\xe9#red'),
             'red%09ros%C3%A9#red')
 
-        self.assertEquals(iri_to_uri(u'/blog/for/J\xfcrgen M\xfcnster/'),
+        self.assertEqual(iri_to_uri(u'/blog/for/J\xfcrgen M\xfcnster/'),
             '/blog/for/J%C3%BCrgen%20M%C3%BCnster/')
 
-        self.assertEquals(iri_to_uri(u'locations/%s' % urlquote_plus(u'Paris & Orl\xe9ans')),
+        self.assertEqual(iri_to_uri(u'locations/%s' % urlquote_plus(u'Paris & Orl\xe9ans')),
             'locations/Paris+%26+Orl%C3%A9ans')
 
     def test_iri_to_uri_idempotent(self):
-        self.assertEquals(iri_to_uri(iri_to_uri(u'red%09ros\xe9#red')),
+        self.assertEqual(iri_to_uri(iri_to_uri(u'red%09ros\xe9#red')),
             'red%09ros%C3%A9#red')