summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2013-06-05 19:42:44 +0200
committerÉtienne Loks <etienne.loks@peacefrogs.net>2013-06-05 19:42:44 +0200
commit9065e677a65707f1449b85fc5fd9b57c989112f7 (patch)
tree16b65858c3340c0e1aab5a42cf56df33cf382049
parent2bcbefae1072c8d1a73e74f59804d5001ca6c7d2 (diff)
downloadChimère-9065e677a65707f1449b85fc5fd9b57c989112f7.tar.bz2
Chimère-9065e677a65707f1449b85fc5fd9b57c989112f7.zip
KML import: Add test for KML with no "Folder".
-rw-r--r--chimere/tests.py17
-rw-r--r--chimere/tests/sample-no-folder.kml26
2 files changed, 41 insertions, 2 deletions
diff --git a/chimere/tests.py b/chimere/tests.py
index 54c1acd..0b1ad59 100644
--- a/chimere/tests.py
+++ b/chimere/tests.py
@@ -76,7 +76,15 @@ def subcategory_setup():
icon=icon,
order=1,
item_type='M',)
- return [subcategory_1, subcategory_2, subcategory_3, subcategory_4]
+
+ subcategory_5 = SubCategory.objects.create(category=category,
+ name='Subcategory 5',
+ available=True,
+ icon=icon,
+ order=1,
+ item_type='M',)
+ return [subcategory_1, subcategory_2, subcategory_3, subcategory_4,
+ subcategory_5]
def marker_setup(sub_categories=[]):
if not sub_categories:
@@ -190,8 +198,13 @@ class KMLImporterTest(TestCase, ImporterTest):
default_description="Default description")
importer4.categories.add(subcategories[3])
+ importer5 = Importer.objects.create(importer_type='KML',
+ source=test_dir_path+'tests/sample-no-folder.kml', zipped=False,
+ default_description="Default description")
+ importer5.categories.add(subcategories[4])
+
self.marker_importers = [(importer1, 1), (importer2, 3), (importer3, 0),
- (importer4, 4)]
+ (importer4, 4), (importer5, 3)]
def test_defaultdescription(self):
Marker.objects.all().delete()
diff --git a/chimere/tests/sample-no-folder.kml b/chimere/tests/sample-no-folder.kml
new file mode 100644
index 0000000..98d44e7
--- /dev/null
+++ b/chimere/tests/sample-no-folder.kml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<kml xmlns="http://www.opengis.net/kml/2.2">
+ <Document>
+ <Placemark>
+ <name><![CDATA[ Name 1]]></name>
+ <description><![CDATA[ <b>Name 1</b>]]></description>
+ <Point>
+ <coordinates>-4.5571311,48.4236268,0</coordinates>
+ </Point>
+ </Placemark>
+ <Placemark>
+ <name>Name 2</name>
+ <description>This is name 2</description>
+ <Point>
+ <coordinates>-4.5571311,48.4236268,0</coordinates>
+ </Point>
+ </Placemark>
+ <Placemark>
+ <name><![CDATA[ Name 3]]></name>
+ <description>And name 3...</description>
+ <Point>
+ <coordinates>-4.4009323055573,48.436176306866,0</coordinates>
+ </Point>
+ </Placemark>
+ </Document>
+</kml>