summaryrefslogtreecommitdiff
path: root/archaeological_operations/tests.py
diff options
context:
space:
mode:
Diffstat (limited to 'archaeological_operations/tests.py')
-rw-r--r--archaeological_operations/tests.py26
1 files changed, 21 insertions, 5 deletions
diff --git a/archaeological_operations/tests.py b/archaeological_operations/tests.py
index 6781cf531..3f659ef3b 100644
--- a/archaeological_operations/tests.py
+++ b/archaeological_operations/tests.py
@@ -115,7 +115,8 @@ class ImportTest(object):
tg.is_set = True
tg.save()
- def init_ope_import(self, filename='MCC-operations-example.csv'):
+ def init_ope_import(self, filename='MCC-operations-example.csv',
+ sep=u","):
mcc_operation = ImporterType.objects.get(name=u"MCC - Opérations")
mcc_operation_file = open(
settings.ROOT_PATH +
@@ -126,7 +127,7 @@ class ImportTest(object):
group, c = TargetKeyGroup.objects.get_or_create(name="My group")
post_dict = {'importer_type': mcc_operation.pk, 'skip_lines': 1,
"encoding": 'utf-8', "name": 'init_ope_import',
- "associated_group": group.pk}
+ "associated_group": group.pk, "csv_sep": sep}
form = forms_common.NewImportForm(data=post_dict, files=file_dict,
user=self.user)
form.is_valid()
@@ -222,7 +223,8 @@ class ImportTest(object):
file_dict = {'imported_file': SimpleUploadedFile(mcc_file.name,
mcc_file.read())}
post_dict = {'importer_type': mcc_parcel.pk, 'skip_lines': 1,
- "encoding": 'utf-8', "name": 'init_parcel_import'}
+ "encoding": 'utf-8', "name": 'init_parcel_import',
+ "csv_sep": u","}
form = forms_common.NewImportForm(data=post_dict, files=file_dict,
user=self.user)
form.is_valid()
@@ -244,7 +246,8 @@ class ImportTest(object):
file_dict = {'imported_file': SimpleUploadedFile(mcc_file.name,
mcc_file.read())}
post_dict = {'importer_type': mcc.pk, 'skip_lines': 1,
- "encoding": 'utf-8', "name": 'init_context_record_import'}
+ "encoding": 'utf-8', "name": 'init_context_record_import',
+ 'csv_sep': u","}
form = forms_common.NewImportForm(data=post_dict, files=file_dict,
user=self.user)
form.is_valid()
@@ -318,6 +321,19 @@ class ImportOperationTest(ImportTest, TestCase):
def test_import_bad_encoding(self):
self.init_ope_import('MCC-operations-example-bad-encoding.csv')
+ def test_import_semi_colon_sep(self):
+ first_ope_nb = models.Operation.objects.count()
+ importer, form = self.init_ope_import(
+ 'MCC-operations-example-semi-colon.csv', sep=u";")
+ self.assertTrue(form.is_valid())
+ impt = form.save(self.ishtar_user)
+ impt.initialize()
+ self.init_ope_targetkey(imp=impt)
+ impt.importation()
+ # new operations have now been imported
+ current_ope_nb = models.Operation.objects.count()
+ self.assertEqual(current_ope_nb, first_ope_nb + 2)
+
def test_keys_limitation(self):
# each key association associated to the import
init_ope_number = models.Operation.objects.count()
@@ -537,7 +553,7 @@ class ImportDocumentTest(ImportTest, TestCase):
group, c = TargetKeyGroup.objects.get_or_create(name="My group")
post_dict = {'importer_type': doc_import.pk, 'skip_lines': 1,
"encoding": 'utf-8', "name": 'init_ope_import',
- "associated_group": group.pk}
+ "associated_group": group.pk, "csv_sep": u","}
form = forms_common.NewImportForm(data=post_dict, files=file_dict,
user=self.user)
form.is_valid()