summaryrefslogtreecommitdiff
path: root/archaeological_finds/tests.py
diff options
context:
space:
mode:
Diffstat (limited to 'archaeological_finds/tests.py')
-rw-r--r--archaeological_finds/tests.py28
1 files changed, 11 insertions, 17 deletions
diff --git a/archaeological_finds/tests.py b/archaeological_finds/tests.py
index f0112123b..a1dc33dd8 100644
--- a/archaeological_finds/tests.py
+++ b/archaeological_finds/tests.py
@@ -33,11 +33,12 @@ from archaeological_context_records.models import Period, Dating
from archaeological_finds import models, views
from archaeological_warehouse.models import Warehouse, WarehouseType
-from archaeological_context_records.tests import ImportContextRecordTest, \
- ContextRecordInit
-
from ishtar_common import forms_common
+
from ishtar_common.tests import WizardTest, WizardTestFormData as FormData
+from archaeological_operations.tests import ImportTest
+from archaeological_context_records.tests import ImportContextRecordTest, \
+ ContextRecordInit
class FindInit(ContextRecordInit):
@@ -217,17 +218,14 @@ class ATreatmentWizardCreationTest(WizardTest, FindInit, TestCase):
treat)
-class ImportFindTest(ImportContextRecordTest):
- test_operations = False
- test_context_records = False
-
+class ImportFindTest(ImportTest, TestCase):
fixtures = ImportContextRecordTest.fixtures + [
settings.ROOT_PATH +
'../archaeological_finds/fixtures/initial_data-fr.json',
]
- def testMCCImportFinds(self, test=True):
- self.testMCCImportContextRecords(test=False)
+ def test_mcc_import_finds(self):
+ self.init_context_record()
old_nb = models.BaseFind.objects.count()
old_nb_find = models.Find.objects.count()
@@ -252,22 +250,18 @@ class ImportFindTest(ImportContextRecordTest):
mcc_images.read())}
post_dict = {'importer_type': MCC.pk, 'skip_lines': 1,
"encoding": 'utf-8'}
- form = forms_common.NewImportForm(data=post_dict, files=file_dict,
- instance=None)
+ form = forms_common.NewImportForm(data=post_dict, files=file_dict)
form.is_valid()
- if test:
- self.assertTrue(form.is_valid())
+ self.assertTrue(form.is_valid())
impt = form.save(self.ishtar_user)
impt.initialize()
# doing manual connections
ceram = models.MaterialType.objects.get(txt_idx='ceramic').pk
glass = models.MaterialType.objects.get(txt_idx='glass').pk
- self.setTargetKey('find__material_types', 'terre-cuite', ceram)
- self.setTargetKey('find__material_types', 'verre', glass)
+ self.set_target_key('find__material_types', 'terre-cuite', ceram)
+ self.set_target_key('find__material_types', 'verre', glass)
impt.importation()
- if not test:
- return
# new finds has now been imported
current_nb = models.BaseFind.objects.count()
self.assertEqual(current_nb, (old_nb + 4))