Clean up settings and tests

diff --git a/app/settings.py b/app/settings.py
index 1540791e03ef782ef735e3c29f361283624376f3..821ff9af7827180be08b2f40c9ef452e18c94c06 100644 (file)
--- a/app/settings.py
+++ b/app/settings.py
@@ -35,11 +35,10 @@ DATABASES = {
         'PASSWORD': env('MYSQL_PASSWORD'),  # Not used with sqlite3.
         'NAME': env('MYSQL_DATABASE'),
         'HOST': 'db',      # Set to empty string for localhost. Not used with sqlite3.
-        'PORT': '3306',    # Set to empty string for default. Not used with sqlite3.
+        'PORT': '3306',   # Set to empty string for default. Not used with sqlite3.
     }
 }
-if 'test' in sys.argv:
-    DATABASES['default']['ENGINE'] = 'django.db.backends.sqlite3'
+
 # Local time zone for this installation. Choices can be found here:
 # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
 # although not all choices may be available on all operating systems.

diff --git a/telemeta/tests/test_models.py b/telemeta/tests/test_models.py
index b56fbafd1549f364ba61068b5b2714e05a4ba66c..1f9d1855bfc1a1cf992d54c986b8e10bd1278c08 100644 (file)
--- a/telemeta/tests/test_models.py
+++ b/telemeta/tests/test_models.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Copyright (C) 2007-2010 Samalyse SARL
-
+# Copyright (C) 2010-2017 Parisson SARL
 # This file is part of Telemeta.
 
 # This program is free software: you can redistribute it and/or modify
@@ -18,9 +18,10 @@
 #
 # Authors: Olivier Guilyardi <olivier@samalyse.com>
 #          David LIPSZYC <davidlipszyc@gmail.com>
+#          Thomas Fillon <thomas@parisson.com>
 
 from django.contrib.auth.models import User
-
+from django.test import TestCase
 
 from telemeta.models import LocationType, Location, EthnicGroup
 from telemeta.models.enum import Publisher, PublisherCollection
@@ -30,19 +31,14 @@ from telemeta.models.fields import RequiredFieldError
 from datetime import datetime, timedelta
 import pytest
 
-pytestmark = pytest.mark.django_db
 
-@pytest.mark.django_db
-class CollectionItemTestCase:
-    pytestmark = pytest.mark.django_db
+class CollectionItemTestCase(TestCase):
 
     def setUp(self):
         "Create a test database based on objects created in Django"
 
-#        self.david   = User.objects.create(username="david", level="user")
-#        self.olivier = User.objects.create(username="olivier", level="admin")
-        self.david   = User.objects.create_user(username="david")
-        self.olivier = User.objects.create_user(username="olivier")
+        self.user_david   = User.objects.create_user(username="david")
+        self.user_olivier = User.objects.create_user(username="olivier")
 
         self.country = LocationType.objects.create(code="country", name="Country")
         self.continent = LocationType.objects.create(code="continent", name="Continent")
@@ -62,7 +58,7 @@ class CollectionItemTestCase:
         self.c = EthnicGroup.objects.create(value="c")
         self.d = EthnicGroup.objects.create(value="d")
 
-        self.persepolis = MediaCollection(id=1,
+        self.collection_persepolis = MediaCollection(id=1,
                                           code="CNRSMH_E_1970_001_002",
                                           reference="A1",
                                           title="Persepolis",
@@ -73,10 +69,10 @@ class CollectionItemTestCase:
                                           recorded_from_year=1970,
                                           recorded_to_year=1980)
 
-        self.persepolis.set_revision(self.david)
-        self.persepolis.save()
+        self.collection_persepolis.set_revision(self.user_david)
+        self.collection_persepolis.save()
 
-        self.volonte = MediaCollection(id=2,
+        self.collection_volonte = MediaCollection(id=2,
                                        reference="A2",
                                        code="CNRSMH_I_1960_001",
                                        title="Volonté de puissance",
@@ -86,10 +82,10 @@ class CollectionItemTestCase:
                                        recorded_from_year=1960,
                                        recorded_to_year=2000)
 
-        self.volonte.set_revision(self.olivier)
-        self.volonte.save()
+        self.collection_volonte.set_revision(self.user_olivier)
+        self.collection_volonte.save()
 
-        self.nicolas = MediaCollection(id=3,
+        self.collection_nicolas = MediaCollection(id=3,
                                        reference="A3",
                                        code="CNRSMH_I_1967_123",
                                        title="Petit nicolas",
@@ -99,50 +95,50 @@ class CollectionItemTestCase:
                                        recorded_from_year=1967,
                                        recorded_to_year=1968)
 
-        self.nicolas.set_revision(self.olivier)
-        self.nicolas.save()
+        self.collection_nicolas.set_revision(self.user_olivier)
+        self.collection_nicolas.save()
 
-        self.item_1 = MediaItem(id=1, collection=self.persepolis, code="CNRSMH_E_1970_001_002_44",
+        self.item_1 = MediaItem(id=1, collection=self.collection_persepolis, code="CNRSMH_E_1970_001_002_44",
             recorded_from_date="1971-01-12", recorded_to_date="1971-02-24", location=self.paris,
             ethnic_group=self.a, title="item 1", author="Mickael SHEPHERD", collector="Charles PREMIER",
             comment="comment 1")
 
-        self.item_1.set_revision(self.david)
+        self.item_1.set_revision(self.user_david)
 
-        self.item_2 = MediaItem(id=2, collection=self.volonte, code="CNRSMH_I_1960_001_129",
+        self.item_2 = MediaItem(id=2, collection=self.collection_volonte, code="CNRSMH_I_1960_001_129",
             recorded_from_date="1981-01-12", recorded_to_date="1991-02-24", location=self.france,
             ethnic_group=self.a, title="item 2", author="Rick ROLL", comment="comment 2")
 
-        self.item_2.set_revision(self.david)
+        self.item_2.set_revision(self.user_david)
 
-        self.item_3 = MediaItem(id=3, collection=self.nicolas, code="CNRSMH_I_1967_123_456_01",
+        self.item_3 = MediaItem(id=3, collection=self.collection_nicolas, code="CNRSMH_I_1967_123_456_01",
             recorded_from_date="1968-01-12", recorded_to_date="1968-02-24", location=self.belgique,
             ethnic_group=self.b, title="item 3", author="John SMITH", collector="Paul CARLOS",
             comment="comment 3",  )
 
-        self.item_3.set_revision(self.olivier)
+        self.item_3.set_revision(self.user_olivier)
 
-        self.item_4 = MediaItem(id=4, collection=self.persepolis, code="CNRSMH_E_1970_001_002_22_33",
+        self.item_4 = MediaItem(id=4, collection=self.collection_persepolis, code="CNRSMH_E_1970_001_002_22_33",
             recorded_from_date="1972-01-12", recorded_to_date="1972-02-24", location=self.europe,
             ethnic_group=self.a, title="item 4", alt_title="I4", author="Keanu REAVES",
             collector="Christina BARCELONA", comment="comment 4")
 
-        self.item_4.set_revision(self.olivier)
+        self.item_4.set_revision(self.user_olivier)
 
-        self.item_5 = MediaItem(id=5, collection=self.volonte,code="CNRSMH_I_1960_001_789_85_22",
+        self.item_5 = MediaItem(id=5, collection=self.collection_volonte,code="CNRSMH_I_1960_001_789_85_22",
             approx_duration="00:05:00", recorded_from_date="1978-01-12", recorded_to_date="1978-02-24",
             location=self.belgique, ethnic_group=self.a, title="item 5", alt_title="I5",
             author="Simon PAUL", collector="Javier BARDEM",
             comment="comment 5")
 
-        self.item_5.set_revision(self.olivier)
+        self.item_5.set_revision(self.user_olivier)
 
-        self.item_6 = MediaItem(id=6, collection=self.persepolis, code="CNRSMH_E_1970_001_002_90",
+        self.item_6 = MediaItem(id=6, collection=self.collection_persepolis, code="CNRSMH_E_1970_001_002_90",
             recorded_from_date="1968-01-12", recorded_to_date="1968-02-11", location=self.france,
             ethnic_group=self.b, title="item 6", author="Paul ANDERSON",
             collector="Jim CARLSON", comment="comment 10000")
 
-        self.item_6.set_revision(self.david)
+        self.item_6.set_revision(self.user_david)
 
         self.item_1.save()
         self.item_2.save()
@@ -168,10 +164,10 @@ class CollectionItemTestCase:
         self.assertEquals(len(self.collections), 3)
         result = self.collections.quick_search("persepolis")
         self.assertEquals(len(result), 1)
-        self.assertEquals(result[0], self.persepolis)
-        self.assertEquals(self.collections.quick_search("nietzsche")[0], self.volonte)
+        self.assertEquals(result[0], self.collection_persepolis)
+        self.assertEquals(self.collections.quick_search("nietzsche")[0], self.collection_volonte)
         result = self.collections.quick_search("nicolas")
-        self.assertEquals(result[0], self.nicolas)
+        self.assertEquals(result[0], self.collection_nicolas)
 
     def testQuickSearchOnItems(self):
         "Test quick_search property of MediaItem class"
@@ -186,39 +182,39 @@ class CollectionItemTestCase:
     def testWordSearch(self):
         "Test quick_search property of MediaCollection class, specificly quick_search on collection title"
         result = self.collections.quick_search("volonté puissance")
-        self.assertEquals(result[0], self.volonte)
+        self.assertEquals(result[0], self.collection_volonte)
         result = self.collections.quick_search("puissance volonté")
-        self.assertEquals(result[0], self.volonte)
+        self.assertEquals(result[0], self.collection_volonte)
         #result = self.collections.quick_search("volonte puissance")
-        #self.assertEquals(result[0], self.volonte)
+        #self.assertEquals(result[0], self.collection_volonte)
         #result = self.collections.quick_search("puissance volonte")
-        #self.assertEquals(result[0], self.volonte)
+        #self.assertEquals(result[0], self.collection_volonte)
 
     def testLocationSearch(self):
         "Test by_country and by_continent properties of MediaCollection class"
-        self.assertEquals(self.collections.by_location(self.france)[0], self.persepolis)
-        self.assertEquals(self.collections.by_location(self.europe)[0], self.persepolis)
-        self.assertEquals(self.collections.by_location(self.belgique).order_by("title")[0], self.nicolas)
-        self.assertEquals(self.collections.by_location(self.belgique).order_by("title")[1], self.volonte)
+        self.assertEquals(self.collections.by_location(self.france)[0], self.collection_persepolis)
+        self.assertEquals(self.collections.by_location(self.europe)[0], self.collection_persepolis)
+        self.assertEquals(self.collections.by_location(self.belgique).order_by("title")[0], self.collection_nicolas)
+        self.assertEquals(self.collections.by_location(self.belgique).order_by("title")[1], self.collection_volonte)
 
     def testRecordingYear(self):
         "Test by_recording_year property of MediaCollection class"
-        self.assertEquals(self.collections.by_recording_year(1970, 1980)[0], self.persepolis)
+        self.assertEquals(self.collections.by_recording_year(1970, 1980)[0], self.collection_persepolis)
         result = self.collections.by_recording_year(1975).order_by("title")
-        self.assertEquals(result[0], self.persepolis)
-        self.assertEquals(result[1], self.volonte)
+        self.assertEquals(result[0], self.collection_persepolis)
+        self.assertEquals(result[1], self.collection_volonte)
 
     def testPublishYearOnCollection(self):
         "Test by_publish_year property of MediaCollection class"
         result=self.collections.by_publish_year(1999).order_by('title')
-        self.assertEquals(result[0], self.nicolas)
-        self.assertEquals(result[1], self.volonte)
+        self.assertEquals(result[0], self.collection_nicolas)
+        self.assertEquals(result[1], self.collection_volonte)
 
     def testEthnicGroup(self):
         "Test by_ethnic_group property of MediaCollection class"
         result=self.collections.by_ethnic_group(self.a).order_by("title")
-        self.assertEquals(result[0], self.persepolis)
-        self.assertEquals(result[1], self.volonte)
+        self.assertEquals(result[0], self.collection_persepolis)
+        self.assertEquals(result[1], self.collection_volonte)
 
     def testRecordingDate(self):
         "Test by_recording_date property of MediaItem class"
@@ -260,8 +256,8 @@ class CollectionItemTestCase:
 
     def testWordSearchCore(self):
         "Test word_search property of CoreQuerySet class"
-        self.assertEquals(self.collections.word_search("title", "volonté")[0], self.volonte)
-        self.assertEquals(self.collections.word_search("code", "CNRSMH_E_1970_001_002")[0], self.persepolis)
+        self.assertEquals(self.collections.word_search("title", "volonté")[0], self.collection_volonte)
+        self.assertEquals(self.collections.word_search("code", "CNRSMH_E_1970_001_002")[0], self.collection_persepolis)
         self.assertEquals(self.items.word_search("code", "CNRSMH_E_1970_001_002_44")[0], self.item_1)
         result = self.items.word_search("comment", "comment").order_by("title")
         self.assertEquals(result[0], self.item_1)
@@ -277,7 +273,7 @@ class CollectionItemTestCase:
         now = datetime.now()
         print MediaCollection.objects.all()
         result = self.collections.by_change_time(now - timedelta(hours=1), now).order_by("title")
-        self.assertEquals(result[0], self.persepolis)
+        self.assertEquals(result[0], self.collection_persepolis)
 
     @pytest.mark.skip(reason="This test has to be reviewed")
     def testByChangeTimeOnItem(self):
@@ -295,7 +291,7 @@ class CollectionItemTestCase:
         c = MediaCollection(title='test')
         try:
             c.save()
-            #c.set_revision(self.olivier)
+            #c.set_revision(self.user_olivier)
         except RequiredFieldError, e:
             self.assertEquals(e.field.name, 'code')
         else:
@@ -304,7 +300,7 @@ class CollectionItemTestCase:
     def testDomForeignKey(self):
         "Test DOM foreign key embedding"
         doc = self.item_4.to_dom()
-        self.assertEquals(doc.getElementsByTagName('collection')[0].getAttribute('key'), str(self.persepolis.id))
+        self.assertEquals(doc.getElementsByTagName('collection')[0].getAttribute('key'), str(self.collection_persepolis.id))
 
     def testLocationRelation(self):
         "Test location country and continent resolving"
@@ -315,13 +311,10 @@ class CollectionItemTestCase:
 
     def testCollectionCountries(self):
         "Test the MediaCollection.countries() method"
-        self.assertEquals(self.volonte.countries(), [self.belgique, self.france])
+        self.assertEquals(self.collection_volonte.countries(), [self.belgique, self.france])
 
-pytestmark = pytest.mark.django_db
 
-@pytest.mark.django_db
-class RelatedDeleteTestCase:
-    pytestmark = pytest.mark.django_db
+class RelatedDeleteTestCase(TestCase):
 
     def setUp(self):
         self.publisher1 = Publisher.objects.create(id=1, value='publisher1')