backend/tests/test_1.py

@@ -82,20 +82,22 @@ class ToDoTest(APITestCase):
         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 = {"parent": todo_id, "finished": finished}
-        else:
-            data = {"parent": todo_id}
+            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'] for d in response.data['results']]
-        self.assertEqual((response.data['count'], real_titles), \
-            (len(expected_titles), expected_titles))
+        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']]
@@ -113,8 +115,45 @@ class ItemTest(APITestCase):
         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']
+        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')
@@ -123,22 +162,45 @@ class ItemTest(APITestCase):
     def test_items(self):
         """
         /todo_items/: get+, post+ (create)
-        /todo_items/{id}/: get (read), put (update), patch (partial_update), delete+
+        /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 = create_todo(self.client, "ToDoList").data['id']
-        self.get(to_do_id, None, [])
-        item_id_1 = self.post("Item1", to_do_id, None)
-        self.get(to_do_id, None, ["Item1"])
-        item_id_2 = self.post("Item2", to_do_id, False)
-        self.get(to_do_id, None, ["Item1", "Item2"])
-        item_id_3 = self.post("Item3", to_do_id, True)
-        self.get(to_do_id, None, ["Item1", "Item2", "Item3"])
-        self.get(to_do_id, False, ["Item1", "Item2"])
-        self.get(to_do_id, True, ["Item3"])
+        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, None, ["Item1", "Item2"])
+        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)