diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-07-14 00:38:00 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-07-14 00:39:45 +0200 |
| commit | e97485cc82e186e9467d0bcbe01e06dcc31b7f18 (patch) | |
| tree | 5e2c6037eb42a917445766e0525ee2705fe88edf /archaeological_finds | |
| parent | fa93b0528bbaaf79fc78cae32c4e625102ec8eb8 (diff) | |
| download | Ishtar-e97485cc82e186e9467d0bcbe01e06dcc31b7f18.tar.bz2 Ishtar-e97485cc82e186e9467d0bcbe01e06dcc31b7f18.zip | |
Imports: remove File from uniqueness detection of instances - forced new are created only one time
Diffstat (limited to 'archaeological_finds')
| -rw-r--r-- | archaeological_finds/tests.py | 7 | ||||
| -rw-r--r-- | archaeological_finds/tests/MCC-finds-example.csv | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/archaeological_finds/tests.py b/archaeological_finds/tests.py index f75e9cfa3..9102a8c1a 100644 --- a/archaeological_finds/tests.py +++ b/archaeological_finds/tests.py @@ -42,6 +42,7 @@ class ImportFindTest(ImportContextRecordTest): self.testMCCImportContextRecords(test=False) old_nb = models.BaseFind.objects.count() + old_nb_find = models.Find.objects.count() MCC = ImporterType.objects.get(name=u"MCC - Mobilier") mcc_file = open( settings.ROOT_PATH + @@ -60,15 +61,21 @@ class ImportFindTest(ImportContextRecordTest): # 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) impt.importation() if not test: return # new finds has now been imported current_nb = models.BaseFind.objects.count() self.assertTrue(current_nb == (old_nb + 4)) + current_nb = models.Find.objects.count() + self.assertTrue(current_nb == (old_nb_find + 4)) self.assertEqual( models.Find.objects.filter(material_types__pk=ceram).count(), 4) + self.assertEqual( + models.Find.objects.filter(material_types__pk=glass).count(), 1) class FindInit(ContextRecordInit): diff --git a/archaeological_finds/tests/MCC-finds-example.csv b/archaeological_finds/tests/MCC-finds-example.csv index 13340b9aa..f2cb58407 100644 --- a/archaeological_finds/tests/MCC-finds-example.csv +++ b/archaeological_finds/tests/MCC-finds-example.csv @@ -2,4 +2,4 @@ code OA,numero INSEE commune,identifiant parcelle,identifiant UE,identifiant mat 4200,75101,XXXX,HC,1,lot,non,,terre cuite,céramique,sfq,1,76,4040,g,,sais pas,,Blah,med,,,, 4200,75101,XXXX,H.-C.,1,lot,non,,terre cuite,céramique,qsdfsqfd,1,56,2280,g,,,,,med,,,, 4200,59350,YY55,US17,1,lot,non,,terre cuite,céramique,sqfdsq,2,44,5210,g,,stable,,,GR,,,, -4200,59350,YY55,US17,2,lot,non,,terre cuite,céramique,sqfdsq,45,43,1500,g,,,,,,,,, +4200,59350,YY55,US17,2,lot,non,,terre cuite & verre,céramique,sqfdsq,45,43,1500,g,,,,,,,,, |