diff --git a/webapp/tests/event_fixture.py b/webapp/tests/event_fixture.py new file mode 100644 index 0000000..6a54476 --- /dev/null +++ b/webapp/tests/event_fixture.py @@ -0,0 +1,37 @@ +from django.utils import timezone +from webapp.models import Event + + +def createEventObject(name="Testitapahtuma1", visible=True, start_time=timezone.now(), end_time=timezone.now(), tag_id=[], signup_id=[]): + return Event.objects.create( + title_fi=name, + title_en=f"title_en {name}", + visible=visible, + description_fi=f"desc_fi {name}", + description_en=f"desc_en {name}", + content_fi=f"content_fi {name}", + content_en=f"content_en {name}", + start_time=start_time, + end_time=end_time, + location=f"loc {name}" + ) + + +def createEventJSON(name="POST1", visible=True, start_time=timezone.now(), end_time=timezone.now(), tag_id=[], signup_id=[]): + return { + "tags": tag_id, + "tag_id": tag_id, + "visible": visible, + "title": f"title_fi {name}", + # "title_fi": f"title_fi {name}",, + # "title_en": f"title_en {name}",, + "description": f"desc_fi {name}", + # "description_fi": f"desc_fi {name}", + # "description_en": f"desc_en {name}", + "content": f"content_fi {name}", + # "content_fi": f"content_fi {name}", + # "content_en": f"content_en {name}", + "start_time": start_time, + "end_time": end_time, + "signup_id": signup_id + } diff --git a/webapp/tests/test_event.py b/webapp/tests/test_event.py index 40d05ec..ccb23eb 100644 --- a/webapp/tests/test_event.py +++ b/webapp/tests/test_event.py @@ -7,6 +7,7 @@ from rest_framework.test import APITestCase, APIRequestFactory, force_authentica from webapp.models import Event from webapp.serializers import EventSerializer from webapp.tests.tag_fixture import tagBuilder, createTagIcon +from webapp.tests.event_fixture import createEventObject, createEventJSON class EventTestCase(APITestCase): @@ -17,64 +18,35 @@ class EventTestCase(APITestCase): self.testTagId = tag1.id # Visible and relevant - Event.objects.create( - title_fi="Testitapahtuma1", - title_en="TestEvent1", - visible=True, - description_fi="diidadaapa", - description_en="diidadaapa EN", - content_fi="lorem ipsum", - content_en="lorem ipsum EN", + test1 = createEventObject( + "Testitapahtuma1", start_time=timezone.datetime(2019, 11, 9, 12, 0, 0), - end_time=timezone.datetime(2020, 11, 9, 13, 0, 0), - location="Testimaa" - ) + end_time=timezone.datetime(2020, 11, 9, 13, 0, 0)) # Invisible but relevant - Event.objects.create( - title_fi="Testitapahtuma1", - title_en="TestEvent2", + createEventObject( + "Testitapahtuma2", visible=False, - description_fi="diidadaapa", - description_en="diidadaapa EN", - content_fi="lorem ipsum", - content_en="lorem ipsum EN", - start_time=timezone.datetime(2018, 12, 9, 12, 0, 0), - end_time=timezone.datetime(2020, 12, 9, 13, 0, 0), - location="Testimaan kerhohuone" - ) + start_time=timezone.datetime(2018, 11, 9, 12, 0, 0), + end_time=timezone.datetime(2020, 11, 9, 13, 0, 0)) # Visible but unrelevant - Event.objects.create( - title_fi="Testitapahtuma3", - title_en="TestEvent3", + test2 = createEventObject( + "Testitapahtuma3", visible=True, - description_fi="diidadaapa", - description_en="diidadaapa EN", - content_fi="lorem ipsum", - content_en="lorem ipsum EN", start_time=timezone.datetime(2018, 12, 9, 12, 0, 0), - end_time=timezone.datetime(2018, 12, 9, 13, 0, 0), - location="Testimaan kerhohuone" - ) + end_time=timezone.datetime(2018, 12, 9, 13, 0, 0)) # Visible and relevant - Event.objects.create( - title_fi="Testitapahtuma4", - title_en="TestEvent4", + createEventObject( + "Testitapahtuma4", visible=True, - description_fi="diidadaapa", - description_en="diidadaapa EN", - content_fi="lorem ipsum", - content_en="lorem ipsum EN", start_time=timezone.datetime(2018, 12, 9, 12, 0, 0), - end_time=timezone.datetime(2020, 12, 9, 13, 0, 0), - location="Testimaan kerhohuone" - ) - Event.objects.get(title_en="TestEvent1").tags.add(tag1) - Event.objects.get(title_en="TestEvent2").tags.add(tag2) - self.testEventId = Event.objects.get(title_en="TestEvent1").id + end_time=timezone.datetime(2020, 12, 9, 13, 0, 0)) + test1.tags.add(tag1) + test2.tags.add(tag2) + self.testEventId = test1.id self.assertEqual(Event.objects.count(), 4) - username, password = 'test_admin', 'password123' - self.authClient = User.objects.create_superuser(username, 'myemail@test.com', password) + username, password = "test_admin", "password123" + self.authClient = User.objects.create_superuser(username, "myemail@test.com", password) def test_get_events(self): # Get from API @@ -85,7 +57,7 @@ class EventTestCase(APITestCase): self.assertEqual(len(response.data["results"]), 2) # Check that serialized data is equal to received response expected_events = EventSerializer( - Event.objects.filter(title_en__in=("TestEvent1", "TestEvent4")).order_by("start_time"), + Event.objects.filter(title_fi__in=("Testitapahtuma1", "Testitapahtuma4")).order_by("start_time"), many=True, context={ "request": APIRequestFactory().get(r"http://testserver/api/events/") @@ -98,7 +70,7 @@ class EventTestCase(APITestCase): self.assertEqual(response.status_code, status.HTTP_200_OK) serializer = EventSerializer( - Event.objects.get(title_en="TestEvent1"), + Event.objects.get(title_fi="Testitapahtuma1"), context={ "request": APIRequestFactory().get(r"http://testserver/api/events/") } @@ -114,24 +86,8 @@ class EventTestCase(APITestCase): self.client.force_authenticate(user=self.authClient) response = self.client.post( "/api/events/", - { - "tags": [self.testTagId], - "tag_id": [self.testTagId], - "visible": True, - "title": "POST Testi", - # "title_fi": "POST Testi", - # "title_en": "POST Test", - "description": "ABC", - # "description_fi": "ABC", - # "description_en": "CBA", - "content": "Benis", - # "content_fi": "Benis", - # "content_en": "Bensels :DDD", - "start_time": timezone.now(), - "end_time": timezone.now(), - "signup_id": [] - }, - format='json' + createEventJSON(tag_id=[self.testTagId]), + format="json" ) self.assertEqual(response.status_code, status.HTTP_201_CREATED) @@ -140,24 +96,8 @@ class EventTestCase(APITestCase): def test_post_event_unauth(self): response = self.client.post( "/api/events/", - { - "tags": [self.testTagId], - "tag_id": [self.testTagId], - "visible": True, - "title": "POST Testi", - # "title_fi": "POST Testi", - # "title_en": "POST Test", - "description": "ABC", - # "description_fi": "ABC", - # "description_en": "CBA", - "content": "Benis", - # "content_fi": "Benis", - # "content_en": "Bensels :DDD", - "start_time": timezone.now(), - "end_time": timezone.now(), - "signup_id": [] - }, - format='json' + createEventJSON(tag_id=[self.testTagId]), + format="json" ) self.assertEqual(response.status_code, status.HTTP_401_UNAUTHORIZED)