fix tests

jdav_web/members/tests/basic.py

@@ -30,7 +30,8 @@ from members.models import Member, Group, PermissionMember, PermissionGroup, Fre
 from members.admin import MemberWaitingListAdmin, MemberAdmin, FreizeitAdmin, MemberNoteListAdmin,\
         MemberUnconfirmedAdmin, FilteredMemberFieldMixin,\
         MemberAdminForm, StatementOnListForm, KlettertreffAdmin, GroupAdmin,\
-        InvitationToGroupAdmin, AgeFilter, InvitedToGroupFilter
+        InvitationToGroupAdmin, AgeFilter, InvitedToGroupFilter,\
+        MemberTrainingAdmin
 from members.pdf import fill_pdf_form, render_tex, media_path, serve_pdf, find_template, merge_pdfs, render_docx, pdf_add_attachments, scale_pdf_page_to_a4, scale_pdf_to_a4
 from members.excel import generate_ljp_vbk
 from members.views import render_register_success, render_register_failed
@@ -2505,29 +2506,37 @@ class TrainingCategoryTestCase(TestCase):
 
     def test_str(self):
         self.assertEqual(str(self.cat), 'school')
-        
-        
-class MemberTrainingAdminTestCase(AdminTestCase):
+
+
+class MemberTrainingTestCase(TestCase):
     def setUp(self):
-        class MemberTrainingAdmin(admin.ModelAdmin):
-            list_display = ('member', 'training', 'completion_date')
-        super().setUp(model=MemberTraining, admin=MemberTrainingAdmin)
         self.member_training = MemberTraining.objects.create(
             member=Member.objects.create(**REGISTRATION_DATA),
             category=TrainingCategory.objects.create(name='Test Training', permission_needed=False),
             date=timezone.now().date()
         )
-        
-        self.member_training2 = MemberTraining.objects.create(
+        self.member_training_no_date = MemberTraining.objects.create(
             member=Member.objects.create(**REGISTRATION_DATA),
             category=TrainingCategory.objects.create(name='Test Training', permission_needed=False),
             date=None
         )
-        
-        self.activity = ActivityCategory.objects.create(name='Test Activity', ljp_category='Sonstiges', description='Test')
-        
+
+    def test_str(self):
+        self.assertIn(self.member_training.date.strftime('%d.%m.%Y'), str(self.member_training))
+        self.assertIn(str(_('(no date)')), str(self.member_training_no_date))
+
+
+class MemberTrainingAdminTestCase(AdminTestCase):
+    def setUp(self):
+        super().setUp(model=MemberTraining, admin=MemberTrainingAdmin)
+        self.member_training = MemberTraining.objects.create(
+            member=Member.objects.create(**REGISTRATION_DATA),
+            category=TrainingCategory.objects.create(name='Test Training', permission_needed=False),
+            date=timezone.now().date()
+        )
+        self.activity = ActivityCategory.objects.create(name='Test Activity',
+                                                        ljp_category='Sonstiges', description='Test')
         self.member_training.activity.add(self.activity)
-        self.member_training2.activity.add(self.activity)
 
     def test_changelist(self):
         c = self._login('superuser')
@@ -2540,10 +2549,7 @@ class MemberTrainingAdminTestCase(AdminTestCase):
         url = reverse('admin:members_membertraining_change', args=(self.member_training.pk,))
         response = c.get(url)
         self.assertEqual(response.status_code, HTTPStatus.OK)
-    
-    def test_membertraining_title(self):
-        self.assertNotEqual(self.member_training, self.member_training2)
-        
+
 
 class PermissionMemberGroupTestCase(BasicMemberTestCase):
     def setUp(self):