diff --git a/src/backend/apps/cms/tests/test_advisory_api.py b/src/backend/apps/cms/tests/test_advisory_api.py index e9fb3a305..4f134419d 100644 --- a/src/backend/apps/cms/tests/test_advisory_api.py +++ b/src/backend/apps/cms/tests/test_advisory_api.py @@ -13,8 +13,7 @@ def setUp(self): super().setUp() advisory = Advisory.objects.create( title="Advisory title", - description="Advisory description", - active=True, + body="Advisory body", geometry=LineString([(-119, 35), (-118, 32)]), path="000100010001", depth=3, @@ -25,8 +24,7 @@ def setUp(self): advisory_2 = Advisory.objects.create( title="Advisory title 2", - description="Advisory description 2", - active=True, + body="Advisory body 2", geometry=LineString([(-119, 35), (-118, 32)]), path="000100010002", depth=3, diff --git a/src/backend/apps/cms/tests/test_advisory_serializer.py b/src/backend/apps/cms/tests/test_advisory_serializer.py index 05730cd2f..eb8cb2377 100644 --- a/src/backend/apps/cms/tests/test_advisory_serializer.py +++ b/src/backend/apps/cms/tests/test_advisory_serializer.py @@ -10,30 +10,28 @@ def setUp(self): self.advisory = Advisory( title="Advisory title 1", - active=True, - description="Advisory description 1", - geometry=LineString([(-123.569743, 48.561231), + body="Advisory body 1", + geometry=LineString([(-123.569743, 48.561231), (-123.569743, 48.561231)]), path="000100010001", depth=3, ) self.advisory.save() self.serializer = AdvisorySerializer(self.advisory) - + def test_serializer_valid_data(self): # Check if the serializer data matches the expected data assert self.serializer.data["title"] == \ 'Advisory title 1' - assert self.serializer.data["active"], "The value is not True" - assert self.serializer.data["description"] == \ - 'Advisory description 1' + assert self.serializer.data["body"] == \ + 'Advisory body 1' assert self.serializer.data["geometry"] is not None def test_serializer_invalid_data(self): # Create a serializer with invalid data invalid_data = { 'title': '', # advisory title is required, invalid data - 'description': 'Advisory description 1', + 'body': 'Advisory body 1', } self.serializer = AdvisorySerializer(data=invalid_data) @@ -42,9 +40,8 @@ def test_serializer_save(self): valid_data = { 'id': 3, 'title': 'Advisory title 1', - 'active': True, - 'description': 'Advisory description 1', - 'geometry': LineString([(-123.569743, 48.561231), + 'body': 'Advisory body 1', + 'geometry': LineString([(-123.569743, 48.561231), (-123.569743, 48.561231)]), 'content_type': 55, 'depth': 1, @@ -57,4 +54,4 @@ def test_serializer_save(self): assert serializer.is_valid() is True # Save the serializer data to create a new Advisory instance saved_advisory = serializer.save() - assert saved_advisory.title == "Advisory title 1" \ No newline at end of file + assert saved_advisory.title == "Advisory title 1" diff --git a/src/backend/apps/cms/tests/test_bulletin_api.py b/src/backend/apps/cms/tests/test_bulletin_api.py index 8949fa9ce..b15d9f35e 100644 --- a/src/backend/apps/cms/tests/test_bulletin_api.py +++ b/src/backend/apps/cms/tests/test_bulletin_api.py @@ -12,8 +12,7 @@ def setUp(self): super().setUp() bulletin = Bulletin.objects.create( title="Bulletin title", - description="Bulletin description", - active=True, + body="Bulletin body", path="000100010001", depth=3, content_type=ContentType.objects.get(app_label='cms', @@ -23,8 +22,7 @@ def setUp(self): bulletin_2 = Bulletin.objects.create( title="Bulletin title 2", - description="Bulletin description 2", - active=True, + body="Bulletin body 2", path="000100010002", depth=3, content_type=ContentType.objects.get(app_label='cms', diff --git a/src/backend/apps/cms/tests/test_bulletin_serializer.py b/src/backend/apps/cms/tests/test_bulletin_serializer.py index c331b86e5..e442d155d 100644 --- a/src/backend/apps/cms/tests/test_bulletin_serializer.py +++ b/src/backend/apps/cms/tests/test_bulletin_serializer.py @@ -1,7 +1,6 @@ from apps.cms.models import Bulletin from apps.cms.serializers import BulletinSerializer from apps.shared.tests import BaseTest -from django.contrib.gis.geos import LineString class TestBulletinSerializer(BaseTest): @@ -10,27 +9,25 @@ def setUp(self): self.bulletin = Bulletin( title="Bulletin title 1", - active=True, - description="Bulletin description 1", + body="Bulletin body 1", path="000100010001", depth=3, ) self.bulletin.save() self.serializer = BulletinSerializer(self.bulletin) - + def test_serializer_valid_data(self): # Check if the serializer data matches the expected data assert self.serializer.data["title"] == \ 'Bulletin title 1' - assert self.serializer.data["active"], "The value is not True" - assert self.serializer.data["description"] == \ - 'Bulletin description 1' + assert self.serializer.data["body"] == \ + 'Bulletin body 1' def test_serializer_invalid_data(self): # Create a serializer with invalid data invalid_data = { 'title': '', # bulletin title is required, invalid data - 'description': 'Bulletin description 1', + 'body': 'Bulletin body 1', } self.serializer = BulletinSerializer(data=invalid_data) @@ -39,8 +36,7 @@ def test_serializer_save(self): valid_data = { 'id': 3, 'title': 'Bulletin title 1', - 'active': True, - 'description': 'Bulletin description 1', + 'body': 'Bulletin body 1', 'content_type': 55, 'depth': 1, 'path': '000100010005', @@ -52,4 +48,4 @@ def test_serializer_save(self): assert serializer.is_valid() is True # Save the serializer data to create a new Bulletin instance saved_bulletin = serializer.save() - assert saved_bulletin.title == "Bulletin title 1" \ No newline at end of file + assert saved_bulletin.title == "Bulletin title 1"