mirror of
https://github.com/django/django.git
synced 2025-10-31 09:41:08 +00:00
Refs #26022 -- Used context manager version of assertRaises in tests.
This commit is contained in:
@@ -17,7 +17,8 @@ class EarliestOrLatestTests(TestCase):
|
||||
|
||||
def test_earliest(self):
|
||||
# Because no Articles exist yet, earliest() raises ArticleDoesNotExist.
|
||||
self.assertRaises(Article.DoesNotExist, Article.objects.earliest)
|
||||
with self.assertRaises(Article.DoesNotExist):
|
||||
Article.objects.earliest()
|
||||
|
||||
a1 = Article.objects.create(
|
||||
headline="Article 1", pub_date=datetime(2005, 7, 26),
|
||||
@@ -66,7 +67,8 @@ class EarliestOrLatestTests(TestCase):
|
||||
|
||||
def test_latest(self):
|
||||
# Because no Articles exist yet, latest() raises ArticleDoesNotExist.
|
||||
self.assertRaises(Article.DoesNotExist, Article.objects.latest)
|
||||
with self.assertRaises(Article.DoesNotExist):
|
||||
Article.objects.latest()
|
||||
|
||||
a1 = Article.objects.create(
|
||||
headline="Article 1", pub_date=datetime(2005, 7, 26),
|
||||
@@ -119,7 +121,8 @@ class EarliestOrLatestTests(TestCase):
|
||||
# "get_latest_by" set -- just pass in the field name manually.
|
||||
Person.objects.create(name="Ralph", birthday=datetime(1950, 1, 1))
|
||||
p2 = Person.objects.create(name="Stephanie", birthday=datetime(1960, 2, 3))
|
||||
self.assertRaises(AssertionError, Person.objects.latest)
|
||||
with self.assertRaises(AssertionError):
|
||||
Person.objects.latest()
|
||||
self.assertEqual(Person.objects.latest("birthday"), p2)
|
||||
|
||||
|
||||
@@ -164,9 +167,12 @@ class TestFirstLast(TestCase):
|
||||
def check():
|
||||
# We know that we've broken the __iter__ method, so the queryset
|
||||
# should always raise an exception.
|
||||
self.assertRaises(IndexError, lambda: IndexErrorArticle.objects.all()[0])
|
||||
self.assertRaises(IndexError, IndexErrorArticle.objects.all().first)
|
||||
self.assertRaises(IndexError, IndexErrorArticle.objects.all().last)
|
||||
with self.assertRaises(IndexError):
|
||||
IndexErrorArticle.objects.all()[0]
|
||||
with self.assertRaises(IndexError):
|
||||
IndexErrorArticle.objects.all().first()
|
||||
with self.assertRaises(IndexError):
|
||||
IndexErrorArticle.objects.all().last()
|
||||
|
||||
check()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user