1 files changed, 14 insertions, 48 deletions

diff --git a/archaeological_context_records/tests.py b/archaeological_context_records/tests.py
index 852cd3aa7..ea29ce938 100644
--- a/archaeological_context_records/tests.py
+++ b/archaeological_context_records/tests.py
@@ -162,30 +162,14 @@ class ImportContextRecordTest(ImportTest, TestCase):
         impt = form.save(self.ishtar_user)
         impt.initialize()
         self.init_cr_targetkey(impt)
-        # Dating is not in models that can be created but force new is
-        # set for a column that references Dating
         impt.importation()
-        self.assertEqual(len(impt.errors), 5)
+
+        self.assertEqual(len(impt.errors), 4)
         self.assertTrue(
             "doesn't exist in the database." in impt.errors[0]["error"]
             or "n'existe pas dans la base" in impt.errors[0]["error"]
         )
 
-        # retry with only Dating (no context record)
-        for cr in models.ContextRecord.objects.all():
-            cr.delete()
-        mcc, form = self.init_context_record_import()
-        mcc.created_models.clear()
-        dat_model, c = ImporterModel.objects.get_or_create(
-            klass="archaeological_context_records.models.Dating",
-            defaults={"name": "Dating"},
-        )
-        mcc.created_models.add(dat_model)
-        impt = form.save(self.ishtar_user)
-        impt.initialize()
-        self.init_cr_targetkey(impt)
-        impt.importation()
-
         current_nb = models.ContextRecord.objects.count()
         self.assertEqual(current_nb, 0)
 
@@ -199,30 +183,12 @@ class ImportContextRecordTest(ImportTest, TestCase):
                 klass="archaeological_context_records.models.ContextRecord"
             )
         )
-        mcc.created_models.add(dat_model)
         impt = form.save(self.ishtar_user)
         impt.initialize()
         self.init_cr_targetkey(impt)
         impt.importation()
         current_nb = models.ContextRecord.objects.count()
         self.assertEqual(current_nb, 4)
-        """
-
-        # add a context record model
-        for cr in models.ContextRecord.objects.all():
-            cr.delete()
-        mcc, form = self.init_context_record_import()
-        mcc.created_models.clear()
-        mcc.created_models.add(ImporterModel.objects.get(
-            klass='archaeological_context_records.models.ContextRecord'
-        ))
-        impt = form.save(self.ishtar_user)
-        impt.initialize()
-        self.init_cr_targetkey(impt)
-        impt.importation()
-        current_nb = models.ContextRecord.objects.count()
-        self.assertEqual(current_nb, 4)
-        """
 
 
 class ContextRecordInit(OperationInitTest):
@@ -282,10 +248,10 @@ class SerializationTest(GenericSerializationTest, ContextRecordInit, TestCase):
         ope2 = self.create_operation()[1]
         cr = self.create_context_record(data={"label": "CR 1", "operation": ope1})[0]
         cr2 = self.create_context_record(data={"label": "CR 2", "operation": ope2})[1]
-        dating = models.Dating.objects.create(
+        models.ContextRecordDating.objects.create(
             period=models.Period.objects.all()[0],
+            context_record=cr
         )
-        cr.datings.add(dating)
         rlt = models.RelationType.objects.create(
             label="Test", txt_idx="test", symmetrical=False
         )
@@ -560,16 +526,20 @@ class ContextRecordTest(ContextRecordInit, TestCase):
 
     def test_redundant_dating_clean(self):
         obj = self.context_records[0]
-        values = {"period": models.Period.objects.all()[0]}
+        values = {
+            "period": models.Period.objects.all()[0],
+            "context_record": obj
+        }
         values_2 = {
             "period": models.Period.objects.all()[0],
             "quality": models.DatingQuality.objects.all()[0],
+            "context_record": obj
         }
 
-        obj.datings.add(models.Dating.objects.create(**values))
-        obj.datings.add(models.Dating.objects.create(**values))
-        obj.datings.add(models.Dating.objects.create(**values_2))
-        obj.datings.add(models.Dating.objects.create(**values_2))
+        models.ContextRecordDating.objects.create(**values)
+        models.ContextRecordDating.objects.create(**values)
+        models.ContextRecordDating.objects.create(**values_2)
+        models.ContextRecordDating.objects.create(**values_2)
         self.assertEqual(obj.datings.count(), 4)
         obj.fix()
         self.assertEqual(obj.datings.count(), 2)
@@ -898,8 +868,7 @@ class ContextRecordSearchTest(ContextRecordInit, TestCase, SearchText):
         neo = models.Period.objects.get(txt_idx="neolithic")
         final_neo = models.Period.objects.get(txt_idx="final-neolithic")
         recent_neo = models.Period.objects.get(txt_idx="recent-neolithic")
-        dating = models.Dating.objects.create(period=final_neo)
-        cr.datings.add(dating)
+        models.ContextRecordDating.objects.create(period=final_neo, context_record=cr)
 
         search = {"datings__period": final_neo.pk}
 
@@ -1664,9 +1633,6 @@ class ContextRecordWizardCreationTest(WizardTest, ContextRecordInit, TestCase):
 
     def post_wizard(self):
         self.assertEqual(models.ContextRecord.objects.count(), self.cr_nb + 2)
-        # identical datings, only one should be finaly save
-        cr = models.ContextRecord.objects.order_by("-pk")[0]
-        self.assertEqual(cr.datings.count(), 1)
 
 
 class ContextRecordRelationTest(ContextRecordInit, TestCase):