Skip to content

Commit bb7c923

Browse files
committed
chore: apply code review
1 parent 96d6f8e commit bb7c923

File tree

4 files changed

+8
-25
lines changed

4 files changed

+8
-25
lines changed

codesamples/tests.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,7 @@ def setUp(self):
1616
is_published=False)
1717

1818
def test_published(self):
19-
expected = ['<CodeSample: Copy One>']
20-
published_qs = CodeSample.objects.published()
21-
actual = [f'<CodeSample: {str(obj)}>' for obj in published_qs]
22-
self.assertEqual(actual, expected)
19+
self.assertQuerySetEqual(CodeSample.objects.published(),['<CodeSample: Copy One>'], transform=repr)
2320

2421
def test_draft(self):
25-
expected = ['<CodeSample: Copy Two>']
26-
draft_qs = CodeSample.objects.draft()
27-
actual = [f'<CodeSample: {str(obj)}>' for obj in draft_qs]
28-
self.assertEqual(actual, expected)
22+
self.assertQuerySetEqual(CodeSample.objects.draft(),['<CodeSample: Copy Two>'], transform=repr)

minutes/tests/test_models.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,10 @@ def setUp(self):
2121
)
2222

2323
def test_draft(self):
24-
expected = ['<Minutes: PSF Meeting Minutes January 01, 2013>']
25-
draft_qs = Minutes.objects.draft()
26-
actual = [f'<Minutes: {str(obj)}>' for obj in draft_qs]
27-
self.assertEqual(actual, expected)
24+
self.assertQuerySetEqual(Minutes.objects.draft(), ['<Minutes: PSF Meeting Minutes January 01, 2013>'], transform=repr)
2825

2926
def test_published(self):
30-
expected = ['<Minutes: PSF Meeting Minutes January 01, 2012>']
31-
published_qs = Minutes.objects.published()
32-
actual = [f'<Minutes: {str(obj)}>' for obj in published_qs]
33-
self.assertEqual(actual, expected)
27+
self.assertQuerySetEqual(Minutes.objects.published(), ['<Minutes: PSF Meeting Minutes January 01, 2012>'], transform=repr)
3428

3529
def test_date_methods(self):
3630
self.assertEqual(self.m1.get_date_year(), '2012')

pages/tests/test_models.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,10 @@
99

1010
class PageModelTests(BasePageTests):
1111
def test_draft(self):
12-
expected_pages = ['Two']
13-
draft_pages = list(Page.objects.draft())
14-
draft_pages_str = [str(page) for page in draft_pages]
15-
self.assertEqual(draft_pages_str, expected_pages)
12+
self.assertQuerySetEqual(Page.objects.draft(), ['<Page: Two>'], transform=repr)
1613

1714
def test_published(self):
18-
expected_pages = ['One']
19-
published_pages = list(Page.objects.published())
20-
published_pages_str = [str(page) for page in published_pages]
21-
self.assertEqual(published_pages_str, expected_pages)
15+
self.assertQuerySetEqual(Page.objects.published(), ['<Page: One>'], transform=repr)
2216

2317
def test_get_title(self):
2418
one = Page.objects.get(path='one')

successstories/tests/test_models.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ def test_draft(self):
2020

2121
def test_featured(self):
2222
featured_stories = Story.objects.featured()
23-
self.assertTrue(all(story.name == 'Featured Story' for story in featured_stories))
23+
expected_repr = [f'<Story: {self.story3.name}>']
24+
self.assertQuerysetEqual(featured_stories, expected_repr, transform=repr)
2425

2526
def test_get_admin_url(self):
2627
self.assertEqual(self.story1.get_admin_url(),

0 commit comments

Comments
 (0)