Skip to content

Commit ed4f04f

Browse files
committed
Resolve name clash among test models
There were two classes named `StatusCustomManager`: the first is an actual manager, the second a status model that uses a custom manager. The latter is renamed to `CustomManagerStatusModel` in this commit.
1 parent 1e481c4 commit ed4f04f

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

tests/models.py

+6-2
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,9 @@ class StatusCustomManager(Manager):
145145
pass
146146

147147

148-
class AbstractStatusCustomManager(StatusModel):
148+
class AbstractCustomManagerStatusModel(StatusModel):
149+
"""An abstract status model with a custom manager."""
150+
149151
STATUS = Choices(
150152
("first_choice", _("First choice")),
151153
("second_choice", _("Second choice")),
@@ -157,7 +159,9 @@ class Meta:
157159
abstract = True
158160

159161

160-
class StatusCustomManager(AbstractStatusCustomManager):
162+
class CustomManagerStatusModel(AbstractCustomManagerStatusModel):
163+
"""A concrete status model with a custom manager."""
164+
161165
title = models.CharField(max_length=50)
162166

163167

tests/test_models/test_status_model.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import time_machine
44
from django.test.testcases import TestCase
55

6-
from tests.models import Status, StatusCustomManager, StatusPlainTuple
6+
from tests.models import CustomManagerStatusModel, Status, StatusPlainTuple
77

88

99
class StatusModelTests(TestCase):
@@ -87,13 +87,13 @@ def test_default_manager_is_not_status_model_generated_ones(self):
8787
# This situation only happens when we define a model inheriting from an "abstract"
8888
# class which defines an "objects" manager.
8989

90-
StatusCustomManager.objects.create(status='first_choice')
91-
StatusCustomManager.objects.create(status='second_choice')
92-
StatusCustomManager.objects.create(status='second_choice')
90+
CustomManagerStatusModel.objects.create(status='first_choice')
91+
CustomManagerStatusModel.objects.create(status='second_choice')
92+
CustomManagerStatusModel.objects.create(status='second_choice')
9393

9494
# ...which made this count() equal to 1 (only 1 element with status='first_choice')...
95-
self.assertEqual(StatusCustomManager._default_manager.count(), 3)
95+
self.assertEqual(CustomManagerStatusModel._default_manager.count(), 3)
9696

9797
# ...and this one equal to 0, because of 2 successive filters of 'first_choice'
9898
# (default manager) and 'second_choice' (explicit filter below).
99-
self.assertEqual(StatusCustomManager._default_manager.filter(status='second_choice').count(), 2)
99+
self.assertEqual(CustomManagerStatusModel._default_manager.filter(status='second_choice').count(), 2)

0 commit comments

Comments
 (0)