diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2026-04-09 15:46:37 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2026-04-09 15:55:06 +0200 |
| commit | fa80836933a7ff4786d9d460f41eb4a90f944b08 (patch) | |
| tree | 554e9aa4fa7e139433a441d810dbf1468c22afed | |
| parent | 1515521ec11a29fa463bb0988d1663b6a8cb03ea (diff) | |
| download | Ishtar-fa80836933a7ff4786d9d460f41eb4a90f944b08.tar.bz2 Ishtar-fa80836933a7ff4786d9d460f41eb4a90f944b08.zip | |
🧪 fix tests to test import trigerred by UI
| -rw-r--r-- | archaeological_context_records/tests.py | 10 | ||||
| -rw-r--r-- | archaeological_finds/tests.py | 18 | ||||
| -rw-r--r-- | archaeological_operations/tests.py | 44 | ||||
| -rw-r--r-- | ishtar_common/tests.py | 2 |
4 files changed, 37 insertions, 37 deletions
diff --git a/archaeological_context_records/tests.py b/archaeological_context_records/tests.py index 905b8a3c6..d55d632df 100644 --- a/archaeological_context_records/tests.py +++ b/archaeological_context_records/tests.py @@ -116,7 +116,7 @@ class ImportContextRecordTest(ImportTest, TestCase): models_ope.Operation.objects.get_or_create( code_patriarche="184440", operation_type=models_ope.OperationType.objects.all()[0]) - impt.importation() + impt.start_import() self.assertEqual(models.ContextRecord.objects.count() - nb, new_nb) new = models.ContextRecord.objects.order_by("-pk").all()[:new_nb] for cr in new: @@ -131,7 +131,7 @@ class ImportContextRecordTest(ImportTest, TestCase): impt.initialize() self.init_cr_targetkey(impt) - impt.importation() + impt.start_import() # new context records has now been imported current_nb = models.ContextRecord.objects.count() self.assertEqual(current_nb, old_nb + 4) @@ -154,7 +154,7 @@ class ImportContextRecordTest(ImportTest, TestCase): impt.initialize() self.init_cr_targetkey(impt) - impt.importation() + impt.start_import() # no model defined in created_models: normal import current_nb = models.ContextRecord.objects.count() self.assertEqual(current_nb, old_nb + 4) @@ -170,7 +170,7 @@ class ImportContextRecordTest(ImportTest, TestCase): impt = form.save(self.ishtar_user) impt.initialize() self.init_cr_targetkey(impt) - impt.importation() + impt.start_import() self.assertEqual(len(impt.errors), 4) self.assertTrue( @@ -194,7 +194,7 @@ class ImportContextRecordTest(ImportTest, TestCase): impt = form.save(self.ishtar_user) impt.initialize() self.init_cr_targetkey(impt) - impt.importation() + impt.start_import() current_nb = models.ContextRecord.objects.count() self.assertEqual(current_nb, 4) diff --git a/archaeological_finds/tests.py b/archaeological_finds/tests.py index 04a036137..aaca76d51 100644 --- a/archaeological_finds/tests.py +++ b/archaeological_finds/tests.py @@ -676,7 +676,7 @@ class ImportFindTest(BaseImportFindTest): #base_find.save() base_find = models.BaseFind.objects.get(pk=base_find.pk) - impt.importation() + impt.start_import() if impt.error_file: self.assertIsNone( impt.error_file, @@ -722,7 +722,7 @@ class ImportFindTest(BaseImportFindTest): nb_find = models.Find.objects.count() nb_container = Container.objects.count() nb_docs = Document.objects.count() - impt.importation() + impt.start_import() self.assertEqual(models.BaseFind.objects.count(), nb_base_find + 1) self.assertEqual(models.Find.objects.count(), nb_find + 1) @@ -775,7 +775,7 @@ class ImportFindTest(BaseImportFindTest): glass = models.MaterialType.objects.get(txt_idx="glass").pk self.set_target_key("material_types", "terre-cuite", ceram) self.set_target_key("material_types", "verre", glass) - impt.importation() + impt.start_import() # new finds has now been imported current_nb = models.BaseFind.objects.count() self.assertEqual(current_nb, (old_nb + 4)) @@ -910,7 +910,7 @@ class ImportFindTest(BaseImportFindTest): impt = form.save(self.ishtar_user) impt.initialize() - impt.importation() + impt.start_import() # no new finds has now been imported current_nb = models.BaseFind.objects.count() self.assertEqual(current_nb, old_nb) @@ -976,7 +976,7 @@ class ImportFindTest(BaseImportFindTest): # reimport impt.initialize() - impt.importation() + impt.start_import() # check errors self.assertEqual(len(impt.errors), 2) error_msg = str( @@ -987,7 +987,7 @@ class ImportFindTest(BaseImportFindTest): # test ignore errors impt.importer_type.ignore_errors = error_msg[:-5] impt.importer_type.save() - impt.importation() + impt.start_import() # check errors self.assertEqual(len(impt.errors), 0) @@ -1023,8 +1023,8 @@ class ImportFindTest(BaseImportFindTest): impt.save() impt.initialize() # import 2 times the description field - impt.importation() - impt.importation() + impt.start_import() + impt.start_import() for find in models.Find.objects.filter(imports__pk=impt.pk).all(): sp = find.description.split(" - ") self.assertEqual(len(sp), 2) @@ -1112,7 +1112,7 @@ class ImportFindLiveServerTest(LiveServerTestCase, BaseImportFindTest): self.assertTrue(form.is_valid()) impt = form.save(self.ishtar_user) impt.initialize() - impt.importation() + impt.start_import() # new finds has now been imported current_nb = models.BaseFind.objects.count() self.assertEqual(current_nb, (old_nb + 4)) diff --git a/archaeological_operations/tests.py b/archaeological_operations/tests.py index b239b789d..ae8abb5a6 100644 --- a/archaeological_operations/tests.py +++ b/archaeological_operations/tests.py @@ -298,7 +298,7 @@ class ImportTest(BaseImportTest): impt = form.save(self.ishtar_user) impt.initialize() self.init_ope_targetkey(imp=impt) - impt.importation() + impt.start_import() def init_parcel_import(self): self.init_ope() @@ -327,7 +327,7 @@ class ImportTest(BaseImportTest): importer, form = self.init_parcel_import() impt = form.save(self.ishtar_user) impt.initialize() - impt.importation() + impt.start_import() def init_context_record_import(self): self.init_parcel() @@ -364,7 +364,7 @@ class ImportTest(BaseImportTest): impt = form.save(self.ishtar_user) impt.initialize() self.init_cr_targetkey(impt) - impt.importation() + impt.start_import() class ImportOperationTest(ImportTest, TestCase): @@ -385,14 +385,14 @@ class ImportOperationTest(ImportTest, TestCase): self.assertTrue(TargetKey.objects.count() > target_key_nb) # first try to import - impt.importation() + impt.start_import() current_ope_nb = models.Operation.objects.count() # no new operation imported because of a missing connection for # operation_type value self.assertEqual(current_ope_nb, first_ope_nb) self.init_ope_targetkey(imp=impt) - impt.importation() + impt.start_import() # new operations have now been imported current_ope_nb = models.Operation.objects.count() self.assertEqual(current_ope_nb, first_ope_nb + 2) @@ -413,7 +413,7 @@ class ImportOperationTest(ImportTest, TestCase): # a second importation will be not possible: no two same patriarche # code - impt.importation() + impt.start_import() self.assertEqual(last_ope, models.Operation.objects.order_by("-pk").all()[0]) def test_import_bad_encoding(self): @@ -428,7 +428,7 @@ class ImportOperationTest(ImportTest, TestCase): impt = form.save(self.ishtar_user) impt.initialize() self.init_ope_targetkey(imp=impt) - impt.importation() + impt.start_import() # new operations have now been imported current_ope_nb = models.Operation.objects.count() self.assertEqual(current_ope_nb, first_ope_nb + 2) @@ -457,7 +457,7 @@ class ImportOperationTest(ImportTest, TestCase): impt = form.save(self.ishtar_user) impt.initialize() self.init_ope_targetkey(imp=impt) - impt.importation() + impt.start_import() current_ope_nb = models.Operation.objects.count() self.assertEqual(current_ope_nb, first_ope_nb + 2) @@ -481,7 +481,7 @@ class ImportOperationTest(ImportTest, TestCase): impt = form.save(self.ishtar_user) impt.initialize() self.init_ope_targetkey(imp=impt) - impt.importation() + impt.start_import() self.assertEqual( models.Operation.objects.filter( code_patriarche="4201", @@ -523,7 +523,7 @@ class ImportOperationTest(ImportTest, TestCase): impt = form.save(self.ishtar_user) impt.initialize() self.init_ope_targetkey(imp=impt) - impt.importation() + impt.start_import() self.assertEqual( models.Operation.objects.filter( code_patriarche="4201", @@ -542,7 +542,7 @@ class ImportOperationTest(ImportTest, TestCase): impt = form.save(self.ishtar_user) impt.initialize() self.init_ope_targetkey(imp=impt) - impt.importation() + impt.start_import() self.assertEqual( models.Operation.objects.filter(code_patriarche="oa-4201").count(), 1 ) @@ -559,7 +559,7 @@ class ImportOperationTest(ImportTest, TestCase): impt = form.save(self.ishtar_user) impt.initialize() self.init_ope_targetkey(imp=impt) - impt.importation() + impt.start_import() self.assertEqual( models.Operation.objects.filter(code_patriarche="oa-42014201").count(), 1 ) @@ -595,7 +595,7 @@ class ImportOperationTest(ImportTest, TestCase): tg.associated_import = other_imp tg.save() - impt.importation() + impt.start_import() current_ope_nb = models.Operation.objects.count() # no new operation self.assertEqual(current_ope_nb, init_ope_number) @@ -615,7 +615,7 @@ class ImportOperationTest(ImportTest, TestCase): impt = form.save(self.ishtar_user) impt.initialize() self.init_ope_targetkey(imp=impt) - impt.importation() + impt.start_import() self.assertEqual(len(impt.errors), 2) self.assertTrue("cody" in impt.errors[0]["error"]) self.assertTrue( @@ -632,7 +632,7 @@ class ImportOperationTest(ImportTest, TestCase): # no model defined in created_models: normal import init_ope_number = models.Operation.objects.count() - impt.importation() + impt.start_import() current_ope_nb = models.Operation.objects.count() self.assertEqual(current_ope_nb, init_ope_number + 2) @@ -650,7 +650,7 @@ class ImportOperationTest(ImportTest, TestCase): self.init_ope_targetkey(imp=impt) # no imports - impt.importation() + impt.start_import() current_ope_nb = models.Operation.objects.count() self.assertEqual(current_ope_nb, init_ope_number) @@ -667,7 +667,7 @@ class ImportOperationTest(ImportTest, TestCase): self.init_ope_targetkey(imp=impt) # import of operations - impt.importation() + impt.start_import() current_ope_nb = models.Operation.objects.count() self.assertEqual(current_ope_nb, init_ope_number + 2) @@ -703,7 +703,7 @@ class ImportOperationTest(ImportTest, TestCase): mcc_parcel, form = self.init_parcel_import() impt = form.save(self.ishtar_user) impt.initialize() - impt.importation() + impt.start_import() # new parcels has now been imported current_nb = models.Parcel.objects.count() self.assertEqual(current_nb, old_nb + 3) @@ -752,7 +752,7 @@ class ImportOperationTest(ImportTest, TestCase): impt = form.save(self.ishtar_user) impt.initialize() self.init_ope_targetkey(imp=impt) - impt.importation() + impt.start_import() ope1 = models.Operation.objects.get(code_patriarche="4200") self.assertEqual(ope1.data, {"autre_refs": {"arbitraire": 789}}) ope2 = models.Operation.objects.get(code_patriarche="4201") @@ -767,7 +767,7 @@ class ImportOperationTest(ImportTest, TestCase): impt = form.save(self.ishtar_user) impt.initialize() self.init_ope_targetkey(imp=impt) - impt.importation() + impt.start_import() ope1 = models.Operation.objects.get(code_patriarche="4200") self.assertEqual(ope1.data, {"autre_refs": {"arbitraire": 789}, "autre": 666}) ope2 = models.Operation.objects.get(code_patriarche="4201") @@ -790,7 +790,7 @@ class ImportOperationTest(ImportTest, TestCase): impt = form.save(self.ishtar_user) impt.initialize() self.init_ope_targetkey(imp=impt) - impt.importation() + impt.start_import() ope1 = models.Operation.objects.get(code_patriarche="4200") self.assertEqual(ope1.data, {"code_insee": "45123"}) ope2 = models.Operation.objects.get(code_patriarche="4201") @@ -858,7 +858,7 @@ class ImportDocumentTest(ImportTest, TestCase): importer, form = self.init_doc_import() self.assertTrue(form.is_valid()) impt = form.save(self.ishtar_user) - impt.importation() + impt.start_import() self.assertEqual(doc_nb + 2, Document.objects.count()) self.assertEqual(current_index + 2, Document.get_next_index() - 1) diff --git a/ishtar_common/tests.py b/ishtar_common/tests.py index 022783f64..b4f3cd930 100644 --- a/ishtar_common/tests.py +++ b/ishtar_common/tests.py @@ -3282,7 +3282,7 @@ class ImportTest(BaseImportTest): def test_archive_group_import(self): group_import = self.create_group_import() - group_import.importation() + group_import.start_import() profile = models.get_current_profile() profile.delete_image_zip_on_archive = False profile.save() |
