From 80c8d9bc903d55b2d569b922a0c8ef27428179d6 Mon Sep 17 00:00:00 2001
From: Aarni Halinen <aarni.halinen@gmail.com>
Date: Sat, 9 Nov 2019 21:57:55 +0200
Subject: [PATCH] Fix inconsistency

---
 webapp/tests/test_event.py | 18 ++++++++++--------
 webapp/tests/test_tag.py   | 37 ++++++++++++++++++++-----------------
 2 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/webapp/tests/test_event.py b/webapp/tests/test_event.py
index e09d2c3..9aa4ee6 100644
--- a/webapp/tests/test_event.py
+++ b/webapp/tests/test_event.py
@@ -72,8 +72,8 @@ class EventTestCase(APITestCase):
         # Get from API
         response = self.client.get("/api/events/", format="json")
         # Response 200
-        self.assertTrue(status.is_success(response.status_code))
-        # Response should not have old events
+        self.assertTrue(response.status_code, status.HTTP_200_OK)
+        # Response should not have old events and invisible
         self.assertEqual(len(response.data["results"]), 2)
         # Check that serialized data is equal to received response
         expected_events = EventSerializer(
@@ -87,17 +87,19 @@ class EventTestCase(APITestCase):
 
     def test_get_single_event(self):
         response = self.client.get(f"/api/events/{self.testEventId}/", format="json")
-        result = response.data
-        serialized = EventSerializer(
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+
+        serializer = EventSerializer(
             Event.objects.get(title="TestEvent1"),
             context={
                 "request": APIRequestFactory().get(r"http://testserver/api/events/")
             }
-        ).data
-        self.assertEqual(
-            result,
-            serialized
         )
+        self.assertEqual(response.data, serializer.data)
+
+    def test_get_invalid_event(self):
+        response = self.client.get("/api/events/15/", format="json")
+        self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
 
     def test_post_event(self):
         pass
diff --git a/webapp/tests/test_tag.py b/webapp/tests/test_tag.py
index 69f1165..838ad5c 100644
--- a/webapp/tests/test_tag.py
+++ b/webapp/tests/test_tag.py
@@ -22,24 +22,9 @@ class TagsTestCase(APITestCase):
         username, password = 'test_admin', 'password123'
         self.authClient = User.objects.create_superuser(username, 'myemail@test.com', password)
 
-    def test_get_single_tag(self):
-        response = self.client.get(f"/api/tags/{self.tag_id}/", format='json')
-        self.assertEqual(response.status_code, status.HTTP_200_OK)
-
-        tags = Tag.objects.get(id=self.tag_id)
-        serializer = TagSerializer(
-            tags, context={
-                "request": APIRequestFactory().get(r"http://testserver/api/events/")
-            })
-        self.assertEqual(response.data, serializer.data)
-
     def test_get_multiple_tags(self):
         Tag.objects.create(slug='Freshmen', name_fi='Fuksit', icon=self.icon)
         Tag.objects.create(slug='International', name_fi='Ulkkarit', icon=self.icon)
-        self.assertEqual(Tag.objects.count(), 4)
-
-        response = self.client.get('/api/tags/', format='json')
-        self.assertEqual(response.status_code, status.HTTP_200_OK)
 
         expected = TagSerializer(
             Tag.objects.all(), many=True,
@@ -47,16 +32,31 @@ class TagsTestCase(APITestCase):
                 "request": APIRequestFactory().get(r"http://testserver/api/events/")
             }).data
 
+        response = self.client.get('/api/tags/', format='json')
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertEqual(len(response.data['results']), 4)
+
         self.assertEqual(
             response.data['results'],
             expected
         )
 
+    def test_get_single_tag(self):
+        response = self.client.get(f"/api/tags/{self.tag_id}/", format='json')
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+
+        serializer = TagSerializer(
+            Tag.objects.get(id=self.tag_id),
+            context={
+                "request": APIRequestFactory().get(r"http://testserver/api/events/")
+            })
+        self.assertEqual(response.data, serializer.data)
+
     def test_get_invalid_tag(self):
-        response = self.client.get('/api/tags/15/', format='json', follow=True)
+        response = self.client.get('/api/tags/15/', format='json')
         self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
 
-    # READ ONLY API!
+    # READ ONLY API! Modify result code and count
     def test_create_tag(self):
         # Authenticate
         self.client.force_authenticate(user=self.authClient)
@@ -71,5 +71,8 @@ class TagsTestCase(APITestCase):
             },
             format='json'
         )
+
+        # Method Not allowed!
         self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED)
+        # Not created
         self.assertEqual(Tag.objects.count(), 2)