mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-24 13:44:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

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

Browse source 
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
This commit is contained in:
Russell Keith-Magee 2011-03-03 15:04:39 +00:00
parent b7c41c1fbb
commit afd040d4d3
110 changed files with 1197 additions and 1197 deletions
Download patch file Download diff file Expand all files Collapse all files

34
tests/regressiontests/admin_util/tests.py
View file

@ -24,7 +24,7 @@ class NestedObjectsTests(TestCase):
self.objs = [Count.objects.create(num=i) for i in range(5)]
def _check(self, target):
self.assertEquals(self.n.nested(lambda obj: obj.num), target)
self.assertEqual(self.n.nested(lambda obj: obj.num), target)
def _connect(self, i, j):
self.objs[i].parent = self.objs[j]
@ -146,24 +146,24 @@ class UtilTests(unittest.TestCase):
"""
Tests for label_for_field
"""
self.assertEquals(
self.assertEqual(
label_for_field("title", Article),
"title"
)
self.assertEquals(
self.assertEqual(
label_for_field("title2", Article),
"another name"
)
self.assertEquals(
self.assertEqual(
label_for_field("title2", Article, return_attr=True),
("another name", None)
)
self.assertEquals(
self.assertEqual(
label_for_field("__unicode__", Article),
"article"
)
self.assertEquals(
self.assertEqual(
label_for_field("__str__", Article),
"article"
)
@ -175,29 +175,29 @@ class UtilTests(unittest.TestCase):
def test_callable(obj):
return "nothing"
self.assertEquals(
self.assertEqual(
label_for_field(test_callable, Article),
"Test callable"
)
self.assertEquals(
self.assertEqual(
label_for_field(test_callable, Article, return_attr=True),
("Test callable", test_callable)
)
self.assertEquals(
self.assertEqual(
label_for_field("test_from_model", Article),
"Test from model"
)
self.assertEquals(
self.assertEqual(
label_for_field("test_from_model", Article, return_attr=True),
("Test from model", Article.test_from_model)
)
self.assertEquals(
self.assertEqual(
label_for_field("test_from_model_with_override", Article),
"not What you Expect"
)
self.assertEquals(
self.assertEqual(
label_for_field(lambda x: "nothing", Article),
"--"
)
@ -207,11 +207,11 @@ class UtilTests(unittest.TestCase):
return "nothing"
test_from_model.short_description = "not Really the Model"
self.assertEquals(
self.assertEqual(
label_for_field("test_from_model", Article, model_admin=MockModelAdmin),
"not Really the Model"
)
self.assertEquals(
self.assertEqual(
label_for_field("test_from_model", Article,
model_admin = MockModelAdmin,
return_attr = True
@ -223,15 +223,15 @@ class UtilTests(unittest.TestCase):
"""
Regression test for #13963
"""
self.assertEquals(
self.assertEqual(
label_for_field('location', Event, return_attr=True),
('location', None),
)
self.assertEquals(
self.assertEqual(
label_for_field('event', Location, return_attr=True),
('awesome event', None),
)
self.assertEquals(
self.assertEqual(
label_for_field('guest', Event, return_attr=True),
('awesome guest', None),
)