summaryrefslogtreecommitdiff
path: root/archaeological_operations
diff options
context:
space:
mode:
Diffstat (limited to 'archaeological_operations')
-rw-r--r--archaeological_operations/fixtures/initial_data-fr.json50
-rw-r--r--archaeological_operations/tests.py87
2 files changed, 51 insertions, 86 deletions
diff --git a/archaeological_operations/fixtures/initial_data-fr.json b/archaeological_operations/fixtures/initial_data-fr.json
index 304f07a38..214ab9cad 100644
--- a/archaeological_operations/fixtures/initial_data-fr.json
+++ b/archaeological_operations/fixtures/initial_data-fr.json
@@ -9,7 +9,9 @@
"intented_to": "F",
"label": "AR : Accus\u00e9 de r\u00e9ception dossier",
"indexed": false,
- "associated_template": [],
+ "associated_template": [
+ 2
+ ],
"txt_idx": "a_receipt"
}
},
@@ -317,7 +319,9 @@
"intented_to": "T",
"label": "Constat d'\u00e9tat",
"indexed": false,
- "associated_template": [],
+ "associated_template": [
+ 1
+ ],
"txt_idx": "observation_status"
}
},
@@ -728,6 +732,20 @@
}
},
{
+ "pk": 40,
+ "model": "archaeological_operations.period",
+ "fields": {
+ "comment": "",
+ "available": true,
+ "parent": 39,
+ "end_date": 0,
+ "order": 1,
+ "label": "Antiquit\u00e9 tardive (M\u00e9d.)",
+ "start_date": 0,
+ "txt_idx": "late_antiq_med"
+ }
+ },
+ {
"pk": 39,
"model": "archaeological_operations.period",
"fields": {
@@ -770,20 +788,6 @@
}
},
{
- "pk": 40,
- "model": "archaeological_operations.period",
- "fields": {
- "comment": "",
- "available": true,
- "parent": 39,
- "end_date": 0,
- "order": 1,
- "label": "Antiquit\u00e9 tardive (M\u00e9d.)",
- "start_date": 0,
- "txt_idx": "late_antiq_med"
- }
- },
- {
"pk": 41,
"model": "archaeological_operations.period",
"fields": {
@@ -1970,22 +1974,22 @@
}
},
{
- "pk": 221,
+ "pk": 2,
"model": "archaeological_operations.remaintype",
"fields": {
- "comment": null,
+ "comment": "",
"available": true,
- "txt_idx": "enclos",
+ "txt_idx": "enclosure",
"label": "enclos"
}
},
{
- "pk": 2,
+ "pk": 221,
"model": "archaeological_operations.remaintype",
"fields": {
- "comment": "",
+ "comment": null,
"available": true,
- "txt_idx": "enclosure",
+ "txt_idx": "enclos",
"label": "enclos"
}
},
@@ -3018,4 +3022,4 @@
"label": "Rapport inexistant"
}
}
-]
+] \ No newline at end of file
diff --git a/archaeological_operations/tests.py b/archaeological_operations/tests.py
index 8ca14179f..1c63de93b 100644
--- a/archaeological_operations/tests.py
+++ b/archaeological_operations/tests.py
@@ -42,7 +42,19 @@ from archaeological_context_records.models import Unit
from ishtar_common import forms_common
from ishtar_common.tests import WizardTest, WizardTestFormData as FormData, \
- create_superuser, create_user, TestCase
+ create_superuser, create_user, TestCase, OPERATION_FIXTURES
+
+OPERATION_TOWNS_FIXTURES = \
+ OPERATION_FIXTURES + \
+ [settings.ROOT_PATH + '../ishtar_common/fixtures/test_towns.json']
+
+FILE_FIXTURES = OPERATION_FIXTURES + [
+ settings.ROOT_PATH +
+ '../archaeological_files/fixtures/initial_data.json']
+
+FILE_TOWNS_FIXTURES = OPERATION_TOWNS_FIXTURES + [
+ settings.ROOT_PATH +
+ '../archaeological_files/fixtures/initial_data.json']
class FileInit(object):
@@ -194,16 +206,7 @@ class ImportTest(object):
class ImportOperationTest(ImportTest, TestCase):
- fixtures = [settings.ROOT_PATH +
- '../fixtures/initial_data-auth-fr.json',
- settings.ROOT_PATH +
- '../ishtar_common/fixtures/initial_data-fr.json',
- settings.ROOT_PATH +
- '../ishtar_common/fixtures/test_towns.json',
- settings.ROOT_PATH +
- '../ishtar_common/fixtures/initial_importtypes-fr.json',
- settings.ROOT_PATH +
- '../archaeological_operations/fixtures/initial_data-fr.json']
+ fixtures = OPERATION_TOWNS_FIXTURES
def test_mcc_import_operation(self):
first_ope_nb = models.Operation.objects.count()
@@ -378,16 +381,7 @@ class ImportOperationTest(ImportTest, TestCase):
class ParcelTest(ImportTest, TestCase):
- fixtures = [settings.ROOT_PATH +
- '../fixtures/initial_data-auth-fr.json',
- settings.ROOT_PATH +
- '../ishtar_common/fixtures/initial_data-fr.json',
- settings.ROOT_PATH +
- '../ishtar_common/fixtures/test_towns.json',
- settings.ROOT_PATH +
- '../ishtar_common/fixtures/initial_importtypes-fr.json',
- settings.ROOT_PATH +
- '../archaeological_operations/fixtures/initial_data-fr.json']
+ fixtures = OPERATION_TOWNS_FIXTURES
def test_parse_parcels(self):
# the database needs to be initialised before importing
@@ -732,14 +726,7 @@ class OperationInitTest(object):
class OperationTest(TestCase, OperationInitTest):
- fixtures = [settings.ROOT_PATH +
- '../fixtures/initial_data-auth-fr.json',
- settings.ROOT_PATH +
- '../ishtar_common/fixtures/initial_data-fr.json',
- settings.ROOT_PATH +
- '../archaeological_files/fixtures/initial_data.json',
- settings.ROOT_PATH +
- '../archaeological_operations/fixtures/initial_data-fr.json']
+ fixtures = FILE_FIXTURES
def setUp(self):
IshtarSiteProfile.objects.get_or_create(
@@ -947,14 +934,7 @@ class OperationTest(TestCase, OperationInitTest):
class OperationSearchTest(TestCase, OperationInitTest):
- fixtures = [settings.ROOT_PATH +
- '../fixtures/initial_data-auth-fr.json',
- settings.ROOT_PATH +
- '../ishtar_common/fixtures/initial_data-fr.json',
- settings.ROOT_PATH +
- '../archaeological_files/fixtures/initial_data.json',
- settings.ROOT_PATH +
- '../archaeological_operations/fixtures/initial_data-fr.json']
+ fixtures = FILE_FIXTURES
def setUp(self):
IshtarSiteProfile.objects.get_or_create(
@@ -1068,12 +1048,7 @@ def create_administrativact(user, operation):
class RegisterTest(TestCase, OperationInitTest):
- fixtures = [settings.ROOT_PATH +
- '../ishtar_common/fixtures/initial_data.json',
- settings.ROOT_PATH +
- '../archaeological_files/fixtures/initial_data.json',
- settings.ROOT_PATH +
- '../archaeological_operations/fixtures/initial_data-fr.json']
+ fixtures = FILE_FIXTURES
def setUp(self):
self.username, self.password, self.user = create_superuser()
@@ -1158,14 +1133,7 @@ class RegisterTest(TestCase, OperationInitTest):
class OperationWizardCreationTest(WizardTest, OperationInitTest, TestCase):
- fixtures = [settings.ROOT_PATH +
- '../fixtures/initial_data-auth-fr.json',
- settings.ROOT_PATH +
- '../ishtar_common/fixtures/initial_data-fr.json',
- settings.ROOT_PATH +
- '../archaeological_files/fixtures/initial_data.json',
- settings.ROOT_PATH +
- '../archaeological_operations/fixtures/initial_data-fr.json']
+ fixtures = FILE_FIXTURES
url_name = 'operation_creation'
wizard_name = 'operation_wizard'
steps = views.wizard_steps
@@ -1261,7 +1229,7 @@ class OperationWizardCreationTest(WizardTest, OperationInitTest, TestCase):
class OperationWizardModifTest(WizardTest, OperationInitTest, TestCase):
- fixtures = OperationWizardCreationTest.fixtures
+ fixtures = FILE_FIXTURES
url_name = 'operation_modification'
wizard_name = url_name + '_wizard'
steps = views.operation_modif_wizard_steps
@@ -1413,7 +1381,7 @@ class OperationWizardModifTest(WizardTest, OperationInitTest, TestCase):
class OperationWizardDeleteTest(OperationWizardCreationTest):
- fixtures = OperationWizardCreationTest.fixtures
+ fixtures = FILE_FIXTURES
url_name = 'operation_deletion'
wizard_name = 'operation_deletion_wizard'
steps = views.operation_deletion_steps
@@ -1448,7 +1416,7 @@ class OperationWizardDeleteTest(OperationWizardCreationTest):
class OperationWizardClosingTest(OperationWizardCreationTest):
- fixtures = OperationWizardCreationTest.fixtures
+ fixtures = FILE_FIXTURES
url_name = 'operation_closing'
wizard_name = 'operation_closing_wizard'
steps = views.operation_closing_steps
@@ -1480,14 +1448,7 @@ class OperationWizardClosingTest(OperationWizardCreationTest):
class OperationAdminActWizardCreationTest(WizardTest, OperationInitTest,
TestCase):
- fixtures = [settings.ROOT_PATH +
- '../fixtures/initial_data-auth-fr.json',
- settings.ROOT_PATH +
- '../ishtar_common/fixtures/initial_data-fr.json',
- settings.ROOT_PATH +
- '../archaeological_files/fixtures/initial_data.json',
- settings.ROOT_PATH +
- '../archaeological_operations/fixtures/initial_data-fr.json']
+ fixtures = FILE_FIXTURES
url_name = 'operation_administrativeactop'
wizard_name = 'operation_administrative_act_wizard'
steps = views.administrativeactop_steps
@@ -1522,7 +1483,7 @@ class OperationAdminActWizardCreationTest(WizardTest, OperationInitTest,
class OperationSourceWizardModificationTest(WizardTest, OperationInitTest,
TestCase):
- fixtures = OperationWizardCreationTest.fixtures
+ fixtures = FILE_FIXTURES
url_name = 'operation_source_modification'
wizard_name = 'operation_source_wizard'
steps = views.operation_source_modification_steps