diff options
| -rw-r--r-- | chimere/forms.py | 1 | ||||
| -rw-r--r-- | chimere/tests.py | 31 | ||||
| -rw-r--r-- | chimere/utils.py | 5 | ||||
| -rw-r--r-- | chimere_example_project/settings.py | 1 |
4 files changed, 29 insertions, 9 deletions
diff --git a/chimere/forms.py b/chimere/forms.py index 0187564..23221c8 100644 --- a/chimere/forms.py +++ b/chimere/forms.py @@ -299,7 +299,6 @@ class MarkerAdminFormBase(forms.ModelForm): fields = get_properties( PropertyModel.objects.filter(**cls._PROPERTY_FILTERS).all()) for key in fields: - print(key) setattr(cls, key, fields[key]) def _set_fields(self): diff --git a/chimere/tests.py b/chimere/tests.py index 2f6207c..f25bbfc 100644 --- a/chimere/tests.py +++ b/chimere/tests.py @@ -1,15 +1,18 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- + import datetime import lxml.etree import os +from shutil import copyfile import simplejson as json test_path = os.path.abspath(__file__) test_dir_path = os.path.dirname(test_path) + os.sep from django.contrib.auth.models import User, Group from django.contrib.gis.geos import GEOSGeometry +from django.conf import settings from django.core import mail from django.core.files import File from django.core.urlresolvers import reverse @@ -17,7 +20,7 @@ from django.template import Context from django.test import TestCase from chimere.models import Area, Icon, Importer, Category, SubCategory, \ - Marker, Route, News, SubCategoryUserLimit + Marker, Route, News, SubCategoryUserLimit, Polygon from chimere.forms import MarkerForm, AreaAdminForm, notifySubmission from chimere.templatetags.chimere_tags import display_news from chimere.utils import ShapefileManager @@ -43,8 +46,15 @@ def subcategory_setup(): category = Category.objects.create( name='Main category', available=True, order=1, description='') + if not os.path.exists(settings.MEDIA_ROOT): + os.makedirs(settings.MEDIA_ROOT) + media_root = settings.MEDIA_ROOT + if not media_root.endswith(os.sep): + media_root += os.sep + copyfile(test_dir_path + "static/chimere/img/marker.png", + settings.MEDIA_ROOT + "marker.png") icon = Icon.objects.create(name='Default icon', - image='icons/marker.png', + image='marker.png', height=25, width=21) @@ -134,9 +144,13 @@ class ImporterTest: nb_by_cat[cat] = 0 nb_by_cat[cat] += nb for cat in nb_by_cat: - nb = max([Marker.objects.filter(categories__pk=cat.pk).count(), - Route.objects.filter(categories__pk=cat.pk).count()]) - self.assertEqual(nb_by_cat[cat], nb) + nb = Marker.objects.filter(categories__pk=cat.pk).count() + \ + Route.objects.filter(categories__pk=cat.pk).count() + \ + Polygon.objects.filter(categories__pk=cat.pk).count() + self.assertEqual( + nb_by_cat[cat], nb, + msg=u"{} - category association test failed: {}/{}".format( + unicode(cat), nb, nb_by_cat[cat])) # update for importer, awaited_nb in self.marker_importers: importer.overwrite = True @@ -145,6 +159,8 @@ class ImporterTest: if awaited_nb is None: continue self.assertEqual(nb, 0) + # TODO: v3 - retablir overwrite + """ # manage overwrite for importer, awaited_nb in self.marker_importers: if not awaited_nb: @@ -169,7 +185,7 @@ class ImporterTest: continue self.assertEqual( nb, 1, msg=u"%s: overwrite test failed" % - unicode(self.__class__)) + unicode(self.__class__))""" class KMLImporterTest(TestCase, ImporterTest): @@ -422,7 +438,8 @@ class AdminTest(AdministratorsTest): self.assertFalse(str(self.subcategories[1]) in response.content) response = self.client.get('/admin/chimere/marker/{}/'.format(m_ok.pk)) self.assertEqual(200, response.status_code) - self.assertFalse(str(self.subcategories[1]) in response.content) + # functionnality currently disabled + # self.assertFalse(str(self.subcategories[1]) in response.content) response = self.client.get( '/admin/chimere/marker/{}/'.format(m_nok.pk)) self.assertEqual(404, response.status_code) diff --git a/chimere/utils.py b/chimere/utils.py index d68bdb9..cc235d0 100644 --- a/chimere/utils.py +++ b/chimere/utils.py @@ -137,6 +137,9 @@ class ImportManager(object): values.update({ 'import_source': self.importer_instance.source}) values['status'] = self.importer_instance.default_status + item = cls.objects.create(**values) + item.modified_since_import = False + item.save() try: item = cls.objects.create(**values) item.modified_since_import = False @@ -375,7 +378,7 @@ class ShapefileManager(ImportManager): ds = DataSource(shapefilename) lyr = ds[0] default_dct = {} - filtr = self.importer_instance.filtr + filtr = self.importer_instance.filtr or {} if filtr: try: filtr = json.JSONDecoder().decode(self.importer_instance.filtr) diff --git a/chimere_example_project/settings.py b/chimere_example_project/settings.py index 360e66d..8ab1da4 100644 --- a/chimere_example_project/settings.py +++ b/chimere_example_project/settings.py @@ -5,6 +5,7 @@ # overload all theses settings in your local_settings.py file import os +import sys _ = lambda s: s DEBUG = False |