backend/tests/test_1.py

@@ -1,206 +0,0 @@
-import os
-
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "backend.settings")
-
-from django.core.wsgi import get_wsgi_application
-application = get_wsgi_application()
-
-from django.urls import reverse
-from rest_framework import status
-from rest_framework.test import APITestCase
-from rest_framework.test import APIClient
-from django.contrib.auth.models import User
-from backend.api import router
-from collections import OrderedDict
-
-def create_todo(client, title):
-    url = reverse('ToDoLists-list')
-    response = client.post(url, {"title": title}, format='json')
-    return response
-
-class ToDoTest(APITestCase):
-    '''Tests API for todo.'''
-    def get(self, expected_titles):
-        url = reverse('ToDoLists-list')
-        response = self.client.get(url, {}, format='json')
-        self.assertEqual(response.status_code, status.HTTP_200_OK)
-        real_titles = [data['title'] for data in response.data['results']]
-        self.assertEqual((response.data['count'], real_titles), \
-            (len(expected_titles), expected_titles))
-
-    def post(self, to_do_title):
-        response = create_todo(self.client, to_do_title)
-        self.assertEqual(response.status_code, status.HTTP_201_CREATED)
-        self.assertEqual(response.data['title'], to_do_title)
-        return response.data['id']
-
-    def get_by_id(self, id, expected_title):
-        url_with_id = reverse('ToDoLists-detail', args=(id,))
-        response = self.client.get(url_with_id, {id: id}, format='json')
-        self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertEqual(response.data['title'], expected_title)
-
-    def put(self, id, new_title):
-        url_with_id = reverse('ToDoLists-detail', args=(id,))
-        response = self.client.put(url_with_id, {"title": new_title}, format='json')
-        self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertEqual(response.data['title'], new_title)
-
-    def patch(self, id, new_title):
-        url_with_id = reverse('ToDoLists-detail', args=(id,))
-        response = self.client.patch(url_with_id, {"title": new_title}, format='json')
-        self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertEqual(response.data['title'], new_title)
-
-    def delete(self, id):
-        url_with_id = reverse('ToDoLists-detail', args=(id,))
-        response = self.client.delete(url_with_id, {}, format='json')
-        self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT)
-
-    def test_todo(self):
-        """
-        lists/: get, post
-        lists/{id}/: get, put (update), patch (partial_update), delete
-        """
-
-        user = User.objects.create_user('test_user', 'test@test.com', 'test_password')
-        self.client.force_authenticate(user=user)
-
-        self.get([])
-        to_do_title_1, to_do_title_2 = "ToDoList1", "ToDoList2"
-        to_do_id1 = self.post(to_do_title_1)
-        self.get([to_do_title_1])
-        to_do_id2 = self.post(to_do_title_2)
-        self.get([to_do_title_1, to_do_title_2])
-
-        self.get_by_id(to_do_id1, to_do_title_1)
-        self.get_by_id(to_do_id2, to_do_title_2)
-
-        self.delete(to_do_id2)
-        self.get([to_do_title_1])
-
-        self.put(to_do_id1, "ToDoList11")
-
-        self.patch(to_do_id1, "ToDoList12")
-
- 
-class ItemTest(APITestCase):
-    '''Tests API for items.'''
-    def get(self, todo_id, finished, expected_titles):
-        url = reverse('ToDoItems-list')
-        data = {}
-        if finished is not None:
-            data["finished"] = finished
-        if todo_id is not None:
-            data["parent"] = todo_id
-
-        response = self.client.get(url, data, format='json')
-        self.assertEqual(response.status_code, status.HTTP_200_OK)
-        real_titles = [(d['text'], d['parent']) for d in response.data['results']]
-        self.assertEqual(real_titles, expected_titles)
-
-        if finished is not None:
-            item_status = [data['finished'] for data in response.data['results']]
-            self.assertEqual(finished, all(item_status))
-
-    def post(self, item_text, todo_id, finished):
-        url = reverse('ToDoItems-list')
-        if finished is not None:
-            data = {"text": item_text, "parent": todo_id, "finished": finished}
-        else:
-            data = {"text": item_text, "parent": todo_id}
-        response = self.client.post(url, data, format='json')
-
-        self.assertEqual(response.status_code, status.HTTP_201_CREATED)
-        check_finished = False if (finished is None) else finished
-        self.assertEqual((response.data['text'], response.data['parent'], response.data['finished']), \
-            (item_text, todo_id, check_finished))
-        return response.data['id'], response.data['finished']
-
-    def get_by_id(self, id, text, finished, parent):
-        url_with_id = reverse('ToDoItems-detail', args=(id,))
-        response = self.client.get(url_with_id, {id: id}, format='json')
-        self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertEqual((response.data['text'], response.data['finished'], response.data['parent']), \
-            (text, finished, parent))
-
-    def put(self, id, text, finished, parent):
-        url_with_id = reverse('ToDoItems-detail', args=(id,))
-        data = {"text": text, "parent": parent}
-        if finished is not None:
-            data["finished"] = finished
-        response = self.client.put(url_with_id, data, format='json')
-        self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertEqual((response.data['text'], response.data['parent']), \
-            (text, parent))
-        if finished is not None:
-            self.assertEqual(response.data['finished'], finished)
-
-    def patch(self, id, text, finished, parent):
-        url_with_id = reverse('ToDoItems-detail', args=(id,))
-        data = {}
-        if text is not None:
-            data["text"] = text
-        if finished is not None:
-            data["finished"] = finished
-        if parent is not None:
-            data["parent"] = parent
-        response = self.client.patch(url_with_id, data, format='json')
-        self.assertEqual(response.status_code, status.HTTP_200_OK)
-        if text is not None:
-            self.assertEqual(response.data['text'], text)
-        if finished is not None:
-            self.assertEqual(response.data['finished'], finished)
-        if parent is not None:
-            self.assertEqual(response.data['parent'], parent)
-            
-    def delete(self, id):
-        url_with_id = reverse('ToDoItems-detail', args=(id,))
-        response = self.client.delete(url_with_id, {}, format='json')
-        self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT)
-    
-    def test_items(self):
-        """
-        /todo_items/: get+, post+ (create)
-        /todo_items/{id}/: get+ (read), put (update), patch (partial_update), delete+
-        """
-        user = User.objects.create_user('test_user', 'test@test.com', 'test_password')
-        self.client.force_authenticate(user=user)
-        to_do_id_1 = create_todo(self.client, "ToDoList1").data['id']
-        to_do_id_2 = create_todo(self.client, "ToDoList2").data['id']
-
-        self.get(to_do_id_1, None, [])
-        item_text_1, item_text_2, item_text_3, item_text_4 = "Item1", "Item2", "Item3", "Item4"
-        item_id_1, item_finished_1 = self.post(item_text_1, to_do_id_1, None)
-        self.get(to_do_id_1, None, [(item_text_1, to_do_id_1)])
-        item_id_2, item_finished_2 = self.post(item_text_2, to_do_id_1, False)
-        self.get(to_do_id_1, None, [(item_text_1, to_do_id_1), (item_text_2, to_do_id_1)])
-        item_id_3, item_finished_3 = self.post(item_text_3, to_do_id_1, True)
-        self.get(to_do_id_1, None, [(item_text_1, to_do_id_1), (item_text_2, to_do_id_1), \
-            (item_text_3, to_do_id_1)])
-        item_id_4, item_finished_4 = self.post(item_text_4, to_do_id_2, True) 
-        self.get(None, None, [(item_text_1, to_do_id_1), (item_text_2, to_do_id_1), \
-            (item_text_3, to_do_id_1), (item_text_4, to_do_id_2)])
-
-        
-        self.get(to_do_id_1, None, [(item_text_1, to_do_id_1), (item_text_2, to_do_id_1), (item_text_3, to_do_id_1)])
-        self.get(to_do_id_1, False, [(item_text_1, to_do_id_1), (item_text_2, to_do_id_1)])
-        self.get(to_do_id_1, True, [(item_text_3, to_do_id_1)])
-
-        self.get_by_id(item_id_1, item_text_1, item_finished_1, to_do_id_1)
-        self.get_by_id(item_id_2, item_text_2, item_finished_2, to_do_id_1)
-        self.get_by_id(item_id_3, item_text_3, item_finished_3, to_do_id_1)
-
-        self.delete(item_id_3)
-        self.get(to_do_id_1, None, [(item_text_1, to_do_id_1), (item_text_2, to_do_id_1)])
-
-        item_text_1_2 = "Item5"
-        self.put(item_id_1, item_text_1_2, None, to_do_id_2)
-        self.put(item_id_1, item_text_1_2, False, to_do_id_2)
-        self.put(item_id_1, item_text_1_2, True, to_do_id_2)
-
-        item_text_1_2 = "Item6"
-        self.patch(item_id_1, None, None, to_do_id_1)
-        self.patch(item_id_1, None, True, None)
-        self.patch(item_id_1, item_text_1_2, None, None)
-

backend/tests/test_item.py

@@ -0,0 +1,157 @@
+import os
+
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "backend.settings")
+
+from django.core.wsgi import get_wsgi_application
+application = get_wsgi_application()
+
+from django.urls import reverse
+from rest_framework import status
+from rest_framework.test import APITestCase
+from rest_framework.test import APIClient
+from django.contrib.auth.models import User
+from backend.api import router
+from .test_todo import create_todo
+
+class ItemTest(APITestCase):
+    '''Tests API for items.'''
+
+    def prepare(self):
+        user = User.objects.create_user('test_user4', 'test@test.com', 'test_password')
+        self.client.force_authenticate(user=user)
+        to_do_id_1 = create_todo(self.client, "ToDoList1").data['id']
+        to_do_id_2 = create_todo(self.client, "ToDoList2").data['id']
+        return to_do_id_1, to_do_id_2
+
+    def get(self, expected_titles, todo_id=None, finished=None):
+        url = reverse('ToDoItems-list')
+        data = {}
+        if finished is not None:
+            data["finished"] = finished
+        if todo_id is not None:
+            data["parent"] = todo_id
+
+        response = self.client.get(url, data, format='json')
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        real_titles = [(d['text'], d['parent']) for d in response.data['results']]
+        self.assertEqual(real_titles, expected_titles)
+
+        if finished is not None:
+            item_status = [data['finished'] for data in response.data['results']]
+            self.assertEqual(finished, all(item_status))
+
+    def post(self, item_text, todo_id, finished=None):
+        url = reverse('ToDoItems-list')
+        if finished is not None:
+            data = {"text": item_text, "parent": todo_id, "finished": finished}
+        else:
+            data = {"text": item_text, "parent": todo_id}
+        response = self.client.post(url, data, format='json')
+
+        self.assertEqual(response.status_code, status.HTTP_201_CREATED)
+        check_finished = False if (finished is None) else finished
+        self.assertEqual(response.data['text'], item_text)
+        self.assertEqual(response.data['parent'], todo_id)
+        self.assertEqual(response.data['finished'], check_finished)
+
+        return response.data['id'], response.data['finished']
+
+    def get_by_id(self, id, text, finished, parent):
+        url_with_id = reverse('ToDoItems-detail', args=(id,))
+        response = self.client.get(url_with_id, {id: id}, format='json')
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertEqual(response.data['text'], text)
+        self.assertEqual(response.data['finished'], finished)
+        self.assertEqual(response.data['parent'], parent)
+    
+    def put(self, id, text, parent, finished=None):
+        url_with_id = reverse('ToDoItems-detail', args=(id,))
+        data = {"text": text, "parent": parent}
+        if finished is not None:
+            data["finished"] = finished
+        response = self.client.put(url_with_id, data, format='json')
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertEqual(response.data['text'], text)
+        self.assertEqual(response.data['parent'], parent)
+        if finished is not None:
+            self.assertEqual(response.data['finished'], finished)
+
+    def patch(self, id, text=None, finished=None, parent=None):
+        url_with_id = reverse('ToDoItems-detail', args=(id,))
+        data = {}
+        if text is not None:
+            data["text"] = text
+        if finished is not None:
+            data["finished"] = finished
+        if parent is not None:
+            data["parent"] = parent
+        response = self.client.patch(url_with_id, data, format='json')
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        if text is not None:
+            self.assertEqual(response.data['text'], text)
+        if finished is not None:
+            self.assertEqual(response.data['finished'], finished)
+        if parent is not None:
+            self.assertEqual(response.data['parent'], parent)
+            
+    def delete(self, id, title, finished, to_do_id):
+        self.get_by_id(id, title, finished, to_do_id)
+        url_with_id = reverse('ToDoItems-detail', args=(id,))
+        response = self.client.delete(url_with_id, {}, format='json')
+        self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT)
+    
+    def test_create_delete(self):
+        """
+        /todo_items/: get, post (create)
+        /todo_items/{id}/: get (read), delete
+        """
+        to_do_id_1, to_do_id_2 = self.prepare()
+        self.get([], to_do_id_1)
+        item_text_1, item_text_2, item_text_3, item_text_4 = "Item1", "Item2", "Item3", "Item4"
+        item_id_1, item_finished_1 = self.post(item_text_1, to_do_id_1)
+        self.get([(item_text_1, to_do_id_1)], to_do_id_1)
+        item_id_2, item_finished_2 = self.post(item_text_2, to_do_id_1, finished=False)
+        self.get([(item_text_1, to_do_id_1), (item_text_2, to_do_id_1)], to_do_id_1)
+        item_id_3, item_finished_3 = self.post(item_text_3, to_do_id_1, finished=True)
+        self.get([(item_text_1, to_do_id_1), (item_text_2, to_do_id_1), \
+            (item_text_3, to_do_id_1)], to_do_id_1)
+        item_id_4, item_finished_4 = self.post(item_text_4, to_do_id_2, finished=False) 
+        self.get([(item_text_1, to_do_id_1), (item_text_2, to_do_id_1), \
+            (item_text_3, to_do_id_1), (item_text_4, to_do_id_2)])
+
+        self.get([(item_text_1, to_do_id_1), (item_text_2, to_do_id_1), (item_text_3, to_do_id_1)], to_do_id_1)
+        self.get([(item_text_1, to_do_id_1), (item_text_2, to_do_id_1)], to_do_id_1, finished=False)
+        self.get([(item_text_3, to_do_id_1)], to_do_id_1, finished=True)
+
+        self.get_by_id(item_id_1, item_text_1, item_finished_1, to_do_id_1)
+        self.get_by_id(item_id_2, item_text_2, item_finished_2, to_do_id_1)
+        self.get_by_id(item_id_3, item_text_3, item_finished_3, to_do_id_1)
+
+        self.delete(item_id_3, item_text_3, item_finished_3, to_do_id_1)
+        self.get([(item_text_1, to_do_id_1), (item_text_2, to_do_id_1)], to_do_id_1)
+
+    def test_update(self):
+        """
+        /todo_items/{id}/: put (update), patch (partial_update)
+        """
+
+        to_do_id_1, to_do_id_2 = self.prepare()
+
+        item_text_1 = "Item1"
+        item_id_1, item_finished_1 = self.post(item_text_1, to_do_id_1)
+
+        item_text_1_2 = "Item5"
+        self.put(item_id_1, item_text_1_2, to_do_id_2)
+        self.put(item_id_1, item_text_1_2, to_do_id_2, finished=False)
+        self.put(item_id_1, item_text_1_2, to_do_id_2, finished=True)
+
+        item_text_1_3 = "Item6"
+        self.patch(item_id_1, parent=to_do_id_1)
+        self.patch(item_id_1, finished=True)
+        self.patch(item_id_1, text=item_text_1_3)
+
+
+
+
+
+

backend/tests/test_todo.py

@@ -0,0 +1,95 @@
+import os
+
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "backend.settings")
+
+from django.core.wsgi import get_wsgi_application
+application = get_wsgi_application()
+
+from django.urls import reverse
+from rest_framework import status
+from rest_framework.test import APITestCase
+from rest_framework.test import APIClient
+from django.contrib.auth.models import User
+from backend.api import router
+from collections import OrderedDict
+
+def create_todo(client, title):
+    url = reverse('ToDoLists-list')
+    response = client.post(url, {"title": title}, format='json')
+    return response
+
+class ToDoTest(APITestCase):
+    '''Tests API for todo.'''
+    def get(self, expected_titles):
+        url = reverse('ToDoLists-list')
+        response = self.client.get(url, {}, format='json')
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        real_titles = [data['title'] for data in response.data['results']]
+        self.assertEqual((response.data['count'], real_titles), \
+            (len(expected_titles), expected_titles))
+
+    def post(self, to_do_title):
+        response = create_todo(self.client, to_do_title)
+        self.assertEqual(response.status_code, status.HTTP_201_CREATED)
+        self.assertEqual(response.data['title'], to_do_title)
+        return response.data['id']
+
+    def get_by_id(self, id, expected_title):
+        url_with_id = reverse('ToDoLists-detail', args=(id,))
+        response = self.client.get(url_with_id, {id: id}, format='json')
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertEqual(response.data['title'], expected_title)
+
+    def put(self, id, new_title):
+        url_with_id = reverse('ToDoLists-detail', args=(id,))
+        response = self.client.put(url_with_id, {"title": new_title}, format='json')
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertEqual(response.data['title'], new_title)
+
+    def patch(self, id, new_title):
+        url_with_id = reverse('ToDoLists-detail', args=(id,))
+        response = self.client.patch(url_with_id, {"title": new_title}, format='json')
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertEqual(response.data['title'], new_title)
+
+    def delete(self, id, title):
+        self.get_by_id(id, title)
+        url_with_id = reverse('ToDoLists-detail', args=(id,))
+        response = self.client.delete(url_with_id, {}, format='json')
+        self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT)
+
+    def prepare(self):
+        user = User.objects.create_user('test_user', 'test@test.com', 'test_password')
+        self.client.force_authenticate(user=user)
+
+    def test_create_delete(self):
+        """
+        lists/{id}/: put (update), patch (partial_update)
+        """
+        self.prepare()
+        to_do_title_1 = "ToDoList1"
+        to_do_id1 = self.post(to_do_title_1)
+        self.put(to_do_id1, "ToDoList11")
+        self.patch(to_do_id1, "ToDoList12")
+
+
+    def test_todo(self):
+        """
+        lists/: get, post
+        lists/{id}/: get, delete
+        """
+
+        self.prepare()
+        self.get([])
+        to_do_title_1, to_do_title_2 = "ToDoList1", "ToDoList2"
+        to_do_id1 = self.post(to_do_title_1)
+        self.get([to_do_title_1])
+        to_do_id2 = self.post(to_do_title_2)
+        self.get([to_do_title_1, to_do_title_2])
+
+        self.get_by_id(to_do_id1, to_do_title_1)
+        self.get_by_id(to_do_id2, to_do_title_2)
+
+        self.delete(to_do_id2, to_do_title_2)
+        self.get([to_do_title_1])
+