Tests: fix fixtures management

6 files changed, 92 insertions, 185 deletions

diff --git a/archaeological_context_records/tests.py b/archaeological_context_records/tests.py
index b64754ad6..7277eaef0 100644
--- a/archaeological_context_records/tests.py
+++ b/archaeological_context_records/tests.py
@@ -29,7 +29,7 @@ from django.test.client import Client
 from ishtar_common.models import IshtarSiteProfile, ImporterModel
 
 from archaeological_operations.tests import OperationInitTest, \
-    ImportTest, ImportOperationTest
+    ImportTest, FILE_TOWNS_FIXTURES, FILE_FIXTURES, OPERATION_TOWNS_FIXTURES
 from archaeological_operations import models as models_ope
 from archaeological_context_records import models
 
@@ -38,12 +38,19 @@ from ishtar_common.tests import WizardTest, WizardTestFormData as FormData, \
 
 from archaeological_context_records import views
 
-class ImportContextRecordTest(ImportTest, TestCase):
+CONTEXT_RECORD_FIXTURES = FILE_FIXTURES + [
+    settings.ROOT_PATH +
+    '../archaeological_context_records/fixtures/initial_data-fr.json',
+]
 
-    fixtures = ImportOperationTest.fixtures + [
-        settings.ROOT_PATH +
-        '../archaeological_context_records/fixtures/initial_data-fr.json',
-    ]
+CONTEXT_RECORD_TOWNS_FIXTURES = FILE_TOWNS_FIXTURES + [
+    settings.ROOT_PATH +
+    '../archaeological_context_records/fixtures/initial_data-fr.json',
+]
+
+
+class ImportContextRecordTest(ImportTest, TestCase):
+    fixtures = CONTEXT_RECORD_TOWNS_FIXTURES
 
     def test_mcc_import_contextrecords(self):
         old_nb = models.ContextRecord.objects.count()
@@ -193,7 +200,7 @@ class ContextRecordInit(OperationInitTest):
 
 
 class ExportTest(ContextRecordInit, TestCase):
-    fixtures = ImportContextRecordTest.fixtures
+    fixtures = CONTEXT_RECORD_TOWNS_FIXTURES
 
     def setUp(self):
         self.username, self.password, self.user = create_superuser()
@@ -222,7 +229,7 @@ class ExportTest(ContextRecordInit, TestCase):
 
 
 class ContextRecordTest(ContextRecordInit, TestCase):
-    fixtures = ImportContextRecordTest.fixtures
+    fixtures = CONTEXT_RECORD_TOWNS_FIXTURES
 
     def setUp(self):
         IshtarSiteProfile.objects.create()
@@ -369,7 +376,7 @@ class ContextRecordTest(ContextRecordInit, TestCase):
 
 
 class ContextRecordSearchTest(ContextRecordInit, TestCase):
-    fixtures = ImportContextRecordTest.fixtures
+    fixtures = CONTEXT_RECORD_TOWNS_FIXTURES
 
     def setUp(self):
         IshtarSiteProfile.objects.create()
@@ -511,7 +518,7 @@ class ContextRecordSearchTest(ContextRecordInit, TestCase):
 
 
 class RecordRelationsTest(ContextRecordInit, TestCase):
-    fixtures = ImportOperationTest.fixtures
+    fixtures = OPERATION_TOWNS_FIXTURES
     model = models.ContextRecord
 
     def setUp(self):
@@ -561,7 +568,7 @@ class RecordRelationsTest(ContextRecordInit, TestCase):
 
 
 class ContextRecordWizardCreationTest(WizardTest, ContextRecordInit, TestCase):
-    fixtures = ImportOperationTest.fixtures
+    fixtures = OPERATION_TOWNS_FIXTURES
     url_name = 'record_creation'
     wizard_name = 'record_wizard'
     steps = views.record_creation_steps
diff --git a/archaeological_files/tests.py b/archaeological_files/tests.py
index 82f85e7c9..b23c91a95 100644
--- a/archaeological_files/tests.py
+++ b/archaeological_files/tests.py
@@ -25,12 +25,13 @@ from django.contrib.auth.models import User
 from django.core.urlresolvers import reverse
 from django.test.client import Client
 
-from ishtar_common.tests import TestCase
+from ishtar_common.tests import TestCase, COMMON_FIXTURES
 
 from ishtar_common.models import PersonType, Town, IshtarSiteProfile
 from archaeological_files import models
 from archaeological_operations.models import Parcel, ParcelOwner
-from archaeological_operations.tests import OperationInitTest
+from archaeological_operations.tests import OperationInitTest, \
+    FILE_TOWNS_FIXTURES
 
 
 class FileInit(object):
@@ -69,10 +70,7 @@ class FileInit(object):
 
 
 class FileTest(TestCase, FileInit):
-    fixtures = [settings.ROOT_PATH +
-                '../fixtures/initial_data-auth-fr.json',
-                settings.ROOT_PATH +
-                '../ishtar_common/fixtures/initial_data-fr.json']
+    fixtures = COMMON_FIXTURES
     model = models.File
 
     def setUp(self):
@@ -241,18 +239,7 @@ class FileTest(TestCase, FileInit):
 
 class FileOperationTest(TestCase, OperationInitTest, FileInit):
     model = models.File
-    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_files/fixtures/initial_data.json',
-                settings.ROOT_PATH +
-                '../archaeological_operations/fixtures/initial_data-fr.json']
+    fixtures = FILE_TOWNS_FIXTURES
 
     def setUp(self):
         self.create_file()
diff --git a/archaeological_finds/tests.py b/archaeological_finds/tests.py
index 86c7936ba..f8f134c0a 100644
--- a/archaeological_finds/tests.py
+++ b/archaeological_finds/tests.py
@@ -38,8 +38,24 @@ from ishtar_common import forms_common
 from ishtar_common.tests import WizardTest, WizardTestFormData as FormData, \
     TestCase
 from archaeological_operations.tests import ImportTest
-from archaeological_context_records.tests import ImportContextRecordTest, \
-    ContextRecordInit
+from archaeological_context_records.tests import ContextRecordInit, \
+    CONTEXT_RECORD_FIXTURES, CONTEXT_RECORD_TOWNS_FIXTURES
+
+
+FIND_FIXTURES = CONTEXT_RECORD_FIXTURES + [
+    settings.ROOT_PATH +
+    '../archaeological_finds/fixtures/initial_data-fr.json',
+]
+
+FIND_TOWNS_FIXTURES = CONTEXT_RECORD_TOWNS_FIXTURES + [
+    settings.ROOT_PATH +
+    '../archaeological_finds/fixtures/initial_data-fr.json',
+]
+
+WAREHOUSE_FIXTURES = FIND_FIXTURES + [
+    settings.ROOT_PATH +
+    '../archaeological_warehouse/fixtures/initial_data-fr.json',
+]
 
 
 class FindInit(ContextRecordInit):
@@ -92,19 +108,7 @@ class FindInit(ContextRecordInit):
 
 
 class FindWizardCreationTest(WizardTest, FindInit, TestCase):
-    fixtures = [settings.ROOT_PATH +
-                '../fixtures/initial_data.json',
-                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',
-                settings.ROOT_PATH +
-                '../archaeological_finds/fixtures/initial_data-fr.json',
-                settings.ROOT_PATH +
-                '../archaeological_warehouse/fixtures/initial_data-fr.json',
-                ]
+    fixtures = WAREHOUSE_FIXTURES
     url_name = 'find_creation'
     wizard_name = 'find_wizard'
     steps = views.find_creation_steps
@@ -160,7 +164,7 @@ class FindWizardCreationTest(WizardTest, FindInit, TestCase):
 
 
 class FindWizardDeletionWithWarehouseModTest(WizardTest, FindInit, TestCase):
-    fixtures = FindWizardCreationTest.fixtures
+    fixtures = WAREHOUSE_FIXTURES
     url_name = 'find_deletion'
     wizard_name = 'find_deletion_wizard'
     steps = views.find_deletion_steps
@@ -191,19 +195,7 @@ class FindWizardDeletionWithWarehouseModTest(WizardTest, FindInit, TestCase):
 
 
 class TreatmentWizardCreationTest(WizardTest, FindInit, TestCase):
-    fixtures = [settings.ROOT_PATH +
-                '../fixtures/initial_data.json',
-                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',
-                settings.ROOT_PATH +
-                '../archaeological_finds/fixtures/initial_data-fr.json',
-                settings.ROOT_PATH +
-                '../archaeological_warehouse/fixtures/initial_data-fr.json',
-                ]
+    fixtures = WAREHOUSE_FIXTURES
     url_name = 'treatment_creation'
     wizard_name = 'treatment_wizard'
     steps = views.treatment_wizard_steps
@@ -261,10 +253,7 @@ class TreatmentWizardCreationTest(WizardTest, FindInit, TestCase):
 
 
 class ImportFindTest(ImportTest, TestCase):
-    fixtures = ImportContextRecordTest.fixtures + [
-        settings.ROOT_PATH +
-        '../archaeological_finds/fixtures/initial_data-fr.json',
-    ]
+    fixtures = FIND_TOWNS_FIXTURES
 
     def test_mcc_import_finds(self):
         self.init_context_record()
@@ -318,17 +307,7 @@ class ImportFindTest(ImportTest, TestCase):
 
 
 class FindTest(FindInit, TestCase):
-    fixtures = [settings.ROOT_PATH +
-                '../fixtures/initial_data.json',
-                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',
-                settings.ROOT_PATH +
-                '../archaeological_finds/fixtures/initial_data-fr.json',
-                ]
+    fixtures = FIND_FIXTURES
     model = models.Find
 
     def setUp(self):
@@ -435,17 +414,7 @@ class FindTest(FindInit, TestCase):
 
 
 class FindSearchTest(FindInit, TestCase):
-    fixtures = [settings.ROOT_PATH +
-                '../fixtures/initial_data.json',
-                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',
-                settings.ROOT_PATH +
-                '../archaeological_finds/fixtures/initial_data-fr.json',
-                ]
+    fixtures = FIND_FIXTURES
     model = models.Find
 
     def setUp(self):
@@ -575,17 +544,7 @@ class FindSearchTest(FindInit, TestCase):
 
 
 class PackagingTest(FindInit, TestCase):
-    fixtures = [settings.ROOT_PATH +
-                '../fixtures/initial_data.json',
-                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',
-                settings.ROOT_PATH +
-                '../archaeological_finds/fixtures/initial_data-fr.json',
-                ]
+    fixtures = FIND_FIXTURES
     model = models.Find
 
     def setUp(self):
diff --git a/archaeological_operations/tests.py b/archaeological_operations/tests.py
index 2cb6dd035..a475667b1 100644
--- a/archaeological_operations/tests.py
+++ b/archaeological_operations/tests.py
@@ -37,7 +37,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 ImportTest(object):
@@ -154,16 +166,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()
@@ -337,16 +340,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
@@ -689,14 +683,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(
@@ -890,14 +877,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(
@@ -1011,12 +991,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()
@@ -1037,14 +1012,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
@@ -1113,7 +1081,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
@@ -1265,7 +1233,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
@@ -1300,7 +1268,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
@@ -1332,14 +1300,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
@@ -1374,7 +1335,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
diff --git a/archaeological_warehouse/tests.py b/archaeological_warehouse/tests.py
index 10b2318b2..cf3c1febc 100644
--- a/archaeological_warehouse/tests.py
+++ b/archaeological_warehouse/tests.py
@@ -23,26 +23,13 @@ from archaeological_finds.tests import FindInit
 
 from ishtar_common.tests import WizardTest, WizardTestFormData as FormData, \
     TestCase
+from archaeological_finds.tests import WAREHOUSE_FIXTURES
 
 from archaeological_warehouse import models, views, forms
 
-warehouse_fixtures = [settings.ROOT_PATH +
-                '../fixtures/initial_data.json',
-                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',
-                settings.ROOT_PATH +
-                '../archaeological_finds/fixtures/initial_data-fr.json',
-                settings.ROOT_PATH +
-                '../archaeological_warehouse/fixtures/initial_data-fr.json',
-                ]
-
 
 class WarehouseWizardCreationTest(WizardTest, FindInit, TestCase):
-    fixtures = warehouse_fixtures
+    fixtures = WAREHOUSE_FIXTURES
     url_name = 'warehouse_creation'
     wizard_name = 'warehouse_wizard'
     steps = views.warehouse_creation_steps
@@ -103,7 +90,7 @@ class WarehouseWizardCreationTest(WizardTest, FindInit, TestCase):
 
 
 class ContainerWizardCreationTest(WizardTest, FindInit, TestCase):
-    fixtures = warehouse_fixtures
+    fixtures = WAREHOUSE_FIXTURES
     url_name = 'container_creation'
     wizard_name = 'container_wizard'
     steps = views.container_creation_steps
@@ -185,7 +172,7 @@ class ContainerWizardCreationTest(WizardTest, FindInit, TestCase):
 
 
 class ContainerTest(FindInit, TestCase):
-    fixtures = warehouse_fixtures
+    fixtures = WAREHOUSE_FIXTURES
 
     def testFormCreation(self):
         main_warehouse = models.Warehouse.objects.create(
diff --git a/ishtar_common/tests.py b/ishtar_common/tests.py
index 536d6d4a8..b862b4ea7 100644
--- a/ishtar_common/tests.py
+++ b/ishtar_common/tests.py
@@ -69,6 +69,21 @@ class OOOGenerationTest(TestCase):
 """
 
 
+COMMON_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/initial_spatialrefsystem-fr.json',
+    settings.ROOT_PATH +
+    '../ishtar_common/fixtures/initial_importtypes-fr.json',
+    ]
+
+OPERATION_FIXTURES = COMMON_FIXTURES + [
+    settings.ROOT_PATH +
+    '../archaeological_operations/fixtures/initial_data-fr.json'
+]
+
+
 def create_superuser():
     username = 'username4277'
     password = 'dcbqj756456!@%'
@@ -337,16 +352,7 @@ class AccessControlTest(TestCase):
 
 
 class AdminGenTypeTest(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/initial_spatialrefsystem-fr.json',
-                settings.ROOT_PATH +
-                '../ishtar_common/fixtures/initial_importtypes-fr.json',
-                settings.ROOT_PATH +
-                '../archaeological_operations/fixtures/initial_data-fr.json']
+    fixtures = OPERATION_FIXTURES
     gen_models = [
         models.OrganizationType, models.PersonType, models.TitleType,
         models.AuthorType, models.SourceType, models.OperationType,