Fixed test implementation to be compatible with current implementation

Author: userlocalhost

api_v1/tests/test_api.py

@@ -756,11 +756,21 @@ def test_get_entry(self):
         self.assertEqual(len(results[0]["attrs"]), entry.attrs.count())
         self.assertEqual(
             [x for x in results[0]["attrs"] if x["name"] == "group"],
-            [{"name": "group", "value": "group1"}],
+            [{
+                "id": entry.attrs.get(schema__name="group").id,
+                "schema_id": entry.attrs.get(schema__name="group").schema.id,
+                "name": "group",
+                "value": "group1"
+            }],
         )
         self.assertEqual(
             [x for x in results[0]["attrs"] if x["name"] == "groups"],
-            [{"name": "groups", "value": ["group1", "group2"]}],
+            [{
+                "id": entry.attrs.get(schema__name="groups").id,
+                "schema_id": entry.attrs.get(schema__name="groups").schema.id,
+                "name": "groups",
+                "value": ["group1", "group2"]
+            }],
         )
 
         # the case to specify only 'entry' parameter

entry/tests/test_model.py

@@ -3773,12 +3773,11 @@ def test_to_dict_entry_with_metainfo_param(self):
             },
         ]
         for info in expected_attrinfos:
-            self.assertEqual(
-                [x["value"] for x in ret_dict["attrs"] if x["name"] == info["name"]],
-                [info["value"]],
-            )
-            self.assertIn("id", info)
-            self.assertIn("schema_id", info)
+            ret_attr_infos = [x for x in ret_dict["attrs"] if x["name"] == info["name"]]
+            self.assertEqual(len(ret_attr_infos), 1)
+            self.assertEqual(ret_attr_infos[0]["value"], info["value"])
+            self.assertIn("id", ret_attr_infos[0])
+            self.assertIn("schema_id", ret_attr_infos[0])
 
     def test_to_dict_entry_for_checking_permission(self):
         admin_user = User.objects.create(username="admin", is_superuser=True)
@@ -3831,7 +3830,12 @@ def test_to_dict_entry_for_checking_permission(self):
                 "name": entries[2].name,
                 "entity": {"id": public_entity.id, "name": public_entity.name},
                 "attrs": [
-                    {"name": "attr1", "value": "hoge"},
+                    {
+                        "id": entries[2].attrs.get(schema__name="attr1").id,
+                        "schema_id": entries[2].attrs.get(schema__name="attr1").schema.id,
+                        "name": "attr1",
+                        "value": "hoge"
+                    },
                 ],
             },
         )

entry/tests/test_view.py

@@ -357,10 +357,20 @@ def test_post_create_entry(self):
         # checks created jobs and its params are as expected
         jobs = Job.objects.filter(user=user, target=entry)
         job_expectations = [
-            {"operation": JobOperation.CREATE_ENTRY, "status": Job.STATUS["DONE"]},
+            {
+                "operation": JobOperation.CREATE_ENTRY,
+                "status": Job.STATUS["DONE"],
+                "dependent_job": None,
+            },
             {
                 "operation": JobOperation.NOTIFY_CREATE_ENTRY,
                 "status": Job.STATUS["DONE"],
+                "dependent_job": None,
+            },
+            {
+                "operation": JobOperation.MAY_INVOKE_TRIGGER,
+                "status": Job.STATUS["PREPARING"],
+                "dependent_job": jobs.get(operation=JobOperation.CREATE_ENTRY.value),
             },
         ]
         self.assertEqual(jobs.count(), len(job_expectations))
@@ -369,7 +379,7 @@ def test_post_create_entry(self):
             self.assertEqual(obj.target.id, entry.id)
             self.assertEqual(obj.target_type, Job.TARGET_ENTRY)
             self.assertEqual(obj.status, expectation["status"])
-            self.assertIsNone(obj.dependent_job)
+            self.assertEqual(obj.dependent_job, expectation["dependent_job"])
 
         # checks specify part of attribute parameter then set AttributeValue
         # which is only specified one
@@ -887,14 +897,25 @@ def test_post_edit_with_valid_param(self):
         # checks created jobs and its params are as expected
         jobs = Job.objects.filter(user=user, target=entry)
         job_expectations = [
-            {"operation": JobOperation.EDIT_ENTRY, "status": Job.STATUS["DONE"]},
+            {
+                "operation": JobOperation.EDIT_ENTRY,
+                "status": Job.STATUS["DONE"],
+                "dependent_job": None,
+            },
             {
                 "operation": JobOperation.REGISTER_REFERRALS,
                 "status": Job.STATUS["PREPARING"],
+                "dependent_job": None,
             },
             {
                 "operation": JobOperation.NOTIFY_UPDATE_ENTRY,
                 "status": Job.STATUS["DONE"],
+                "dependent_job": None,
+            },
+            {
+                "operation": JobOperation.MAY_INVOKE_TRIGGER,
+                "status": Job.STATUS["PREPARING"],
+                "dependent_job": jobs.get(operation=JobOperation.EDIT_ENTRY.value),
             },
         ]
         self.assertEqual(jobs.count(), len(job_expectations))
@@ -903,7 +924,7 @@ def test_post_edit_with_valid_param(self):
             self.assertEqual(obj.target.id, entry.id)
             self.assertEqual(obj.target_type, Job.TARGET_ENTRY)
             self.assertEqual(obj.status, expectation["status"])
-            self.assertIsNone(obj.dependent_job)
+            self.assertEqual(obj.dependent_job, expectation["dependent_job"])
 
         # checks specify part of attribute parameter then set AttributeValue
         # which is only specified one
@@ -5256,10 +5277,20 @@ def test_run_create_entry_task_duplicately(self):
         # checks created jobs and its params are as expected
         jobs = Job.objects.filter(user=user, target=entry)
         job_expectations = [
-            {"operation": JobOperation.CREATE_ENTRY, "status": Job.STATUS["DONE"]},
+            {
+                "operation": JobOperation.CREATE_ENTRY,
+                "status": Job.STATUS["DONE"],
+                "dependent_job": None,
+            },
             {
                 "operation": JobOperation.NOTIFY_CREATE_ENTRY,
                 "status": Job.STATUS["PREPARING"],
+                "dependent_job": None,
+            },
+            {
+                "operation": JobOperation.MAY_INVOKE_TRIGGER,
+                "status": Job.STATUS["PREPARING"],
+                "dependent_job": jobs.get(operation=JobOperation.CREATE_ENTRY.value),
             },
         ]
         self.assertEqual(jobs.count(), len(job_expectations))
@@ -5268,7 +5299,7 @@ def test_run_create_entry_task_duplicately(self):
             self.assertEqual(obj.target.id, entry.id)
             self.assertEqual(obj.target_type, Job.TARGET_ENTRY)
             self.assertEqual(obj.status, expectation["status"])
-            self.assertIsNone(obj.dependent_job)
+            self.assertEqual(obj.dependent_job, expectation["dependent_job"])
 
         # Rerun creating that entry job (This is core processing of this test)
         job_create = Job.objects.get(user=user, operation=JobOperation.CREATE_ENTRY.value)