tests: refactor across multiple files

Author: thisislawatts

chores/tests/__init__.py

@@ -10,7 +10,7 @@
 
 from members.models import User
 
-from .models import Chore, ChoreNotification, ChoreVolunteer
+from ..models import Chore, ChoreNotification, ChoreVolunteer
 
 
 class CustomCommandTest(TestCase):
@@ -247,171 +247,6 @@ def test_email_reminding_volunteers(self):
         self.assertIn("Volunteering reminder", email.subject)
         self.assertIn("friendly reminder that you signed up for", email.body)
 
-
-class ChoreModelTest(TestCase):
-    def setUp(self):
-        self.user = User.objects.create_user(
-            email="[email protected]",
-            password="testpass123",
-            first_name="Test",
-            last_name="User",
-        )
-
-    def test_chore_creation(self):
-        """Test basic chore creation"""
-        chore = Chore.objects.create(
-            name="Test Chore",
-            description="A test chore",
-            class_type="BasicChore",
-            configuration={"min_required_people": 1},
-            creator=self.user,
-        )
-        self.assertEqual(chore.name, "Test Chore")
-        self.assertEqual(chore.description, "A test chore")
-        self.assertEqual(chore.class_type, "BasicChore")
-        self.assertEqual(chore.creator, self.user)
-
-    def test_chore_str_representation(self):
-        """Test string representation of chore"""
-        chore = Chore.objects.create(
-            name="Test Chore",
-            description="A test chore",
-            class_type="BasicChore",
-            configuration={"min_required_people": 1},
-            creator=self.user,
-        )
-        self.assertEqual(str(chore), "Test Chore")
-
-    def test_chore_unique_name_constraint(self):
-        """Test that chore names must be unique"""
-        Chore.objects.create(
-            name="Test Chore",
-            description="A test chore",
-            class_type="BasicChore",
-            configuration={"min_required_people": 1},
-            creator=self.user,
-        )
-
-        with self.assertRaises(Exception):  # Should raise IntegrityError
-            Chore.objects.create(
-                name="Test Chore",  # Same name
-                description="Another test chore",
-                class_type="BasicChore",
-                configuration={"min_required_people": 1},
-                creator=self.user,
-            )
-
-
-class ChoreVolunteerModelTest(TestCase):
-    def setUp(self):
-        self.user = User.objects.create_user(
-            email="[email protected]",
-            password="testpass123",
-            first_name="Test",
-            last_name="User",
-        )
-        self.chore = Chore.objects.create(
-            name="Test Chore",
-            description="A test chore",
-            class_type="BasicChore",
-            configuration={"min_required_people": 1},
-            creator=self.user,
-        )
-
-    def test_chore_volunteer_creation(self):
-        """Test basic chore volunteer creation"""
-        volunteer = ChoreVolunteer.objects.create(
-            user=self.user,
-            chore=self.chore,
-            timestamp=1753041600,
-        )
-        self.assertEqual(volunteer.user, self.user)
-        self.assertEqual(volunteer.chore, self.chore)
-        self.assertEqual(volunteer.timestamp, 1753041600)
-
-    def test_chore_volunteer_properties(self):
-        """Test chore volunteer properties"""
-        volunteer = ChoreVolunteer.objects.create(
-            user=self.user,
-            chore=self.chore,
-            timestamp=1753041600,
-        )
-        self.assertEqual(volunteer.first_name, "Test")
-        self.assertEqual(volunteer.full_name, "Test User")
-
-
-class ChoreNotificationModelTest(TestCase):
-    def setUp(self):
-        self.user = User.objects.create_user(
-            email="[email protected]",
-            password="testpass123",
-            first_name="Test",
-            last_name="User",
-        )
-        self.chore = Chore.objects.create(
-            name="Test Chore",
-            description="A test chore",
-            class_type="BasicChore",
-            configuration={"min_required_people": 1},
-            creator=self.user,
-        )
-
-    def test_notification_with_user_recipient(self):
-        """Test notification creation with user recipient"""
-        notification = ChoreNotification.objects.create(
-            event_key="test-key-123",
-            chore=self.chore,
-            recipient_user=self.user,
-        )
-        self.assertEqual(notification.event_key, "test-key-123")
-        self.assertEqual(notification.chore, self.chore)
-        self.assertEqual(notification.recipient_user, self.user)
-        self.assertIsNone(notification.recipient_other)
-
-    def test_notification_with_email_recipient(self):
-        """Test notification creation with email recipient"""
-        notification = ChoreNotification.objects.create(
-            event_key="test-key-456",
-            chore=self.chore,
-            recipient_other="[email protected]",
-        )
-        self.assertEqual(notification.event_key, "test-key-456")
-        self.assertEqual(notification.chore, self.chore)
-        self.assertIsNone(notification.recipient_user)
-        self.assertEqual(notification.recipient_other, "[email protected]")
-
-    def test_notification_validation_both_recipients(self):
-        """Test that notification cannot have both user and email recipients"""
-        notification = ChoreNotification(
-            event_key="test-key-789",
-            chore=self.chore,
-            recipient_user=self.user,
-            recipient_other="[email protected]",
-        )
-        with self.assertRaises(ValidationError):
-            notification.clean()
-
-    def test_notification_validation_no_recipients(self):
-        """Test that notification must have at least one recipient"""
-        notification = ChoreNotification(
-            event_key="test-key-789",
-            chore=self.chore,
-        )
-        with self.assertRaises(ValidationError):
-            notification.clean()
-
-    def test_notification_str_representation(self):
-        """Test string representation of notification"""
-        notification = ChoreNotification.objects.create(
-            event_key="test-key-123",
-            chore=self.chore,
-            recipient_user=self.user,
-        )
-        self.assertIn("Notification to", str(notification))
-        self.assertIn("Test User", str(notification))
-        self.assertIn("Test Chore", str(notification))
-
-
 class SingleOccurrenceChoreTest(TestCase):
     def setUp(self):
         self.user = User.objects.create_user(
@@ -920,9 +755,6 @@ def test_volunteer_cross_contamination_defect(self):
         out = StringIO()
         call_command("send_reminders", stdout=out)
 
-        # DEFECT: Due to ChoreVolunteer.objects.all() query, chore2 should NOT get a reminder
-        # because the volunteer from chore1 is incorrectly counted for chore2
         # Verify that chore2 should have gotten a reminder if the bug was fixed
-        # (This assertion documents the expected correct behavior)
         self.assertEqual(len(mail.outbox), 1)
         self.assertIn("Chore 2 needs volunteers", mail.outbox[0].subject)

chores/tests.py chores/tests/test_commands.pychores/tests.py renamed to chores/tests/test_commands.py

@@ -0,0 +1,171 @@
+# Model tests for chores app
+from django.core.exceptions import ValidationError
+from django.test import TestCase
+
+from members.models import User
+
+from ..models import Chore, ChoreNotification, ChoreVolunteer
+
+
+class ChoreModelTest(TestCase):
+    def setUp(self):
+        self.user = User.objects.create_user(
+            email="[email protected]",
+            password="testpass123",
+            first_name="Test",
+            last_name="User",
+        )
+
+    def test_chore_creation(self):
+        """Test basic chore creation"""
+        chore = Chore.objects.create(
+            name="Test Chore",
+            description="A test chore",
+            class_type="BasicChore",
+            configuration={"min_required_people": 1},
+            creator=self.user,
+        )
+        self.assertEqual(chore.name, "Test Chore")
+        self.assertEqual(chore.description, "A test chore")
+        self.assertEqual(chore.class_type, "BasicChore")
+        self.assertEqual(chore.creator, self.user)
+
+    def test_chore_str_representation(self):
+        """Test string representation of chore"""
+        chore = Chore.objects.create(
+            name="Test Chore",
+            description="A test chore",
+            class_type="BasicChore",
+            configuration={"min_required_people": 1},
+            creator=self.user,
+        )
+        self.assertEqual(str(chore), "Test Chore")
+
+    def test_chore_unique_name_constraint(self):
+        """Test that chore names must be unique"""
+        Chore.objects.create(
+            name="Test Chore",
+            description="A test chore",
+            class_type="BasicChore",
+            configuration={"min_required_people": 1},
+            creator=self.user,
+        )
+
+        with self.assertRaises(Exception):  # Should raise IntegrityError
+            Chore.objects.create(
+                name="Test Chore",  # Same name
+                description="Another test chore",
+                class_type="BasicChore",
+                configuration={"min_required_people": 1},
+                creator=self.user,
+            )
+
+
+class ChoreVolunteerModelTest(TestCase):
+    def setUp(self):
+        self.user = User.objects.create_user(
+            email="[email protected]",
+            password="testpass123",
+            first_name="Test",
+            last_name="User",
+        )
+        self.chore = Chore.objects.create(
+            name="Test Chore",
+            description="A test chore",
+            class_type="BasicChore",
+            configuration={"min_required_people": 1},
+            creator=self.user,
+        )
+
+    def test_chore_volunteer_creation(self):
+        """Test basic chore volunteer creation"""
+        volunteer = ChoreVolunteer.objects.create(
+            user=self.user,
+            chore=self.chore,
+            timestamp=1753041600,
+        )
+        self.assertEqual(volunteer.user, self.user)
+        self.assertEqual(volunteer.chore, self.chore)
+        self.assertEqual(volunteer.timestamp, 1753041600)
+
+    def test_chore_volunteer_properties(self):
+        """Test chore volunteer properties"""
+        volunteer = ChoreVolunteer.objects.create(
+            user=self.user,
+            chore=self.chore,
+            timestamp=1753041600,
+        )
+        self.assertEqual(volunteer.first_name, "Test")
+        self.assertEqual(volunteer.full_name, "Test User")
+
+
+class ChoreNotificationModelTest(TestCase):
+    def setUp(self):
+        self.user = User.objects.create_user(
+            email="[email protected]",
+            password="testpass123",
+            first_name="Test",
+            last_name="User",
+        )
+        self.chore = Chore.objects.create(
+            name="Test Chore",
+            description="A test chore",
+            class_type="BasicChore",
+            configuration={"min_required_people": 1},
+            creator=self.user,
+        )
+
+    def test_notification_with_user_recipient(self):
+        """Test notification creation with user recipient"""
+        notification = ChoreNotification.objects.create(
+            event_key="test-key-123",
+            chore=self.chore,
+            recipient_user=self.user,
+        )
+        self.assertEqual(notification.event_key, "test-key-123")
+        self.assertEqual(notification.chore, self.chore)
+        self.assertEqual(notification.recipient_user, self.user)
+        self.assertIsNone(notification.recipient_other)
+
+    def test_notification_with_email_recipient(self):
+        """Test notification creation with email recipient"""
+        notification = ChoreNotification.objects.create(
+            event_key="test-key-456",
+            chore=self.chore,
+            recipient_other="[email protected]",
+        )
+        self.assertEqual(notification.event_key, "test-key-456")
+        self.assertEqual(notification.chore, self.chore)
+        self.assertIsNone(notification.recipient_user)
+        self.assertEqual(notification.recipient_other, "[email protected]")
+
+    def test_notification_validation_both_recipients(self):
+        """Test that notification cannot have both user and email recipients"""
+        notification = ChoreNotification(
+            event_key="test-key-789",
+            chore=self.chore,
+            recipient_user=self.user,
+            recipient_other="[email protected]",
+        )
+        with self.assertRaises(ValidationError):
+            notification.clean()
+
+    def test_notification_validation_no_recipients(self):
+        """Test that notification must have at least one recipient"""
+        notification = ChoreNotification(
+            event_key="test-key-789",
+            chore=self.chore,
+        )
+        with self.assertRaises(ValidationError):
+            notification.clean()
+
+    def test_notification_str_representation(self):
+        """Test string representation of notification"""
+        notification = ChoreNotification.objects.create(
+            event_key="test-key-123",
+            chore=self.chore,
+            recipient_user=self.user,
+        )
+        self.assertIn("Notification to", str(notification))
+        self.assertIn("Test User", str(notification))
+        self.assertIn("Test Chore", str(notification))