Merge branch 'master' into nef

Conflicts:
	chimere/admin.py
	chimere/forms.py
	chimere/models.py
	chimere/settings.sample.py
	chimere/static/chimere/js/jquery.chimere-ol.js
	chimere/templates/chimere/base.html
	chimere/templates/chimere/blocks/head_chimere.html
	chimere/templates/chimere/blocks/map.html
	chimere/templates/chimere/main_map.html
	chimere/templatetags/chimere_tags.py
	chimere/tests.py
	chimere/urls.py
	chimere/views.py
	chimere/widgets.py

1 files changed, 34 insertions, 5 deletions

diff --git a/chimere/tests.py b/chimere/tests.py
index f97afab..e06b073 100644
--- a/chimere/tests.py
+++ b/chimere/tests.py
@@ -12,6 +12,7 @@ from django.conf import settings
 from django.contrib.auth.models import User, Group
 from django.contrib.gis.geos import GEOSGeometry
 from django.contrib.messages.storage.fallback import FallbackStorage
+from django.core.files import File
 from django.core.urlresolvers import reverse
 from django.template import Context
 from django.test import TestCase
@@ -163,7 +164,9 @@ class ImporterTest:
             nb, nb_updated, res = importer.manager.get()
             if awaited_nb == None:
                 continue
-            self.assertEqual(nb, awaited_nb)
+            self.assertEqual(nb, awaited_nb,
+		msg=u"%s: get test failed - got %d when %d was awaited" %
+				    (unicode(self.__class__), nb, awaited_nb))
             self.assertEqual(nb_updated, 0)
             for cat in importer.categories.all():
                 if cat not in nb_by_cat:
@@ -203,7 +206,8 @@ class ImporterTest:
             nb, nb_updated, res = importer.manager.get()
             if awaited_nb == None:
                 continue
-            self.assertEqual(nb, 1)
+            self.assertEqual(nb, 1, msg=u"%s: overwrite test failed" %
+                                             unicode(self.__class__))
 
 class KMLImporterTest(TestCase, ImporterTest):
     def setUp(self):
@@ -338,6 +342,29 @@ class CSVImporterTest(TestCase, ImporterTest):
     def tearDown(self):
         settings.CHIMERE_NOMINATIM_FIELDS = self.old_settings
 
+class HtmlXsltImporterTest(TestCase, ImporterTest):
+    def setUp(self):
+        subcategories = subcategory_setup()
+        xslt1 = File(open(test_dir_path + 'tests/villiers-le-bacle.xslt'))
+        xslt2 = File(open(test_dir_path + 'tests/villiers-le-bacle-detail.xslt'))
+        importer1 = Importer.objects.create(importer_type='XSLT',
+             source='http://www.chymeres.net/test/ville-villierslebacle.fr/',
+             source_file=xslt1, source_file_alt=xslt2,
+             default_localisation='SRID=4326;POINT(-4.5 48.4)',)
+        importer1.categories.add(subcategories[0])
+        self.marker_importers = [(importer1, 7),]
+
+class XmlXsltImporterTest(TestCase, ImporterTest):
+    def setUp(self):
+        subcategories = subcategory_setup()
+        xslt1 = File(open(test_dir_path + 'tests/magny-xml.xslt'))
+        importer1 = Importer.objects.create(importer_type='XXLT',
+             source='http://www.chymeres.net/test/magny.xml',
+             source_file=xslt1,
+             default_localisation='SRID=4326;POINT(-4.5 48.4)',)
+        importer1.categories.add(subcategories[0])
+        self.marker_importers = [(importer1, 10),]
+
 class FeedsTest(TestCase):
     def setUp(self):
         self.areas = areas_setup()
@@ -469,7 +496,7 @@ class DynamicCategoryTest(TestCase):
         response = self.client.get(url)
         self.assertEqual(200, response.status_code)
         cats = json.loads(response.content)['categories']
-        self.assertEqual(len(cats), 2)
+        self.assertEqual(len(cats), 5)
 
 class NewsTest(TestCase):
     def setUp(self):
@@ -483,9 +510,11 @@ class NewsTest(TestCase):
                       end_date=None)
         self.news = []
         self.news.append(News.objects.create(is_front_page=True,
-                            title=u"Test news 1", available=True))
+                            title=u"Test news 1", available=True,
+                            date=datetime.date.today()))
         self.news.append(News.objects.create(is_front_page=True,
-                            title=u"Test news 2", available=False))
+                            title=u"Test news 2", available=False,
+                            date=datetime.date.today()))
 
     def test_news_display(self):
         context = display_news(Context({}))