summaryrefslogtreecommitdiff
path: root/chimere/tests.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2012-05-04 16:06:47 +0200
committerÉtienne Loks <etienne.loks@peacefrogs.net>2012-05-04 16:06:47 +0200
commit8919f3e7ea6fd2572da3fafabc5dcdd252d8fbab (patch)
tree38d0edb7f90401b8e6f92d4e315a096740d00e39 /chimere/tests.py
parent24638f6d715da09a78ffe255389f2217e628ac4b (diff)
downloadChimère-8919f3e7ea6fd2572da3fafabc5dcdd252d8fbab.tar.bz2
Chimère-8919f3e7ea6fd2572da3fafabc5dcdd252d8fbab.zip
Manage zipfile for imports
Diffstat (limited to 'chimere/tests.py')
-rw-r--r--chimere/tests.py13
1 files changed, 9 insertions, 4 deletions
diff --git a/chimere/tests.py b/chimere/tests.py
index 7d84394..6f9a59f 100644
--- a/chimere/tests.py
+++ b/chimere/tests.py
@@ -65,22 +65,27 @@ class KMLImporterTest(TestCase, ImporterTest):
def setUp(self):
subcategory_1, subcategory_2 = self._baseSetUp()
importer1 = Importer.objects.create(importer_type='KML',
- source=test_dir_path+'sample.kml',
+ source=test_dir_path+'tests/sample.kml',
filtr="Category 1")
importer1.categories.add(subcategory_1)
importer2 = Importer.objects.create(importer_type='KML',
- source=test_dir_path+'sample.kml',
+ source=test_dir_path+'tests/sample.kml',
filtr="Subcategory 1")
importer2.categories.add(subcategory_1)
importer2.categories.add(subcategory_2)
importer3 = Importer.objects.create(importer_type='KML',
- source=test_path+'sample.kml',
+ source=test_path+'tests/sample.kml',
filtr="Subcategory 3")
importer3.categories.add(subcategory_2)
- self.marker_importers = [(importer1, 1), (importer2, 2), (importer3, 0)]
+ importer4 = Importer.objects.create(importer_type='KML',
+ source=test_dir_path+'tests/sample.kml.zip', zipped=True)
+ importer4.categories.add(subcategory_1)
+
+ self.marker_importers = [(importer1, 1), (importer2, 2), (importer3, 0),
+ (importer4, 4)]
class OSMImporterTest(TestCase, ImporterTest):
def setUp(self):