diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-10-14 16:55:22 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-10-14 16:55:22 +0200 |
| commit | ea65e5512c236b81e7f4b8757521facadae4b3b8 (patch) | |
| tree | 739cdf40fb6a89de90c4189936d695288a82849f /chimere/tests.py | |
| parent | 4b0f0777c434f5fa1366ca408c34d257d4833fad (diff) | |
| parent | a55f77a246f99764ff6289686f80825526654e2b (diff) | |
| download | Chimère-ea65e5512c236b81e7f4b8757521facadae4b3b8.tar.bz2 Chimère-ea65e5512c236b81e7f4b8757521facadae4b3b8.zip | |
Merge branch 'master' into saclay
Conflicts:
chimere/admin.py
chimere/fixtures/initial_data.json
chimere/forms.py
chimere/locale/fr/LC_MESSAGES/django.po
chimere/models.py
chimere/static/chimere/css/styles.css
chimere/templates/chimere/detail.html
chimere/templatetags/chimere_tags.py
chimere/views.py
chimere/widgets.py
Diffstat (limited to 'chimere/tests.py')
| -rw-r--r-- | chimere/tests.py | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/chimere/tests.py b/chimere/tests.py index b3ad3fb..ddd59b1 100644 --- a/chimere/tests.py +++ b/chimere/tests.py @@ -117,7 +117,7 @@ class KMLImporterTest(TestCase, ImporterTest): source=test_dir_path+'tests/sample.kml.zip', zipped=True) importer4.categories.add(subcategory_1) - self.marker_importers = [(importer1, 1), (importer2, 2), (importer3, 0), + self.marker_importers = [(importer1, 1), (importer2, 3), (importer3, 0), (importer4, 4)] class ShapefileImporterTest(TestCase, ImporterTest): @@ -152,6 +152,15 @@ class OSMImporterTest(TestCase, ImporterTest): self.marker_importers = [(importer1, 19), (importer2, 8)] +class GeoRSSImporterTest(TestCase, ImporterTest): + def setUp(self): + subcategory_1, subcategory_2 = subcategory_setup() + importer1 = Importer.objects.create(importer_type='RSS', + source=test_dir_path+'tests/georss.xml') + importer1.categories.add(subcategory_1) + + self.marker_importers = [(importer1, 1)] + class FeedsTest(TestCase): def setUp(self): self.area = area_setup() |