summaryrefslogtreecommitdiff
path: root/chimere/tests.py
diff options
context:
space:
mode:
Diffstat (limited to 'chimere/tests.py')
-rw-r--r--chimere/tests.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/chimere/tests.py b/chimere/tests.py
index 7a3960f..7d84394 100644
--- a/chimere/tests.py
+++ b/chimere/tests.py
@@ -65,19 +65,19 @@ class KMLImporterTest(TestCase, ImporterTest):
def setUp(self):
subcategory_1, subcategory_2 = self._baseSetUp()
importer1 = Importer.objects.create(importer_type='KML',
- source_url=test_dir_path+'sample.kml',
- filtr="//kml:Folder/kml:name[text()='Category 1']/../kml:Placemark")
+ source=test_dir_path+'sample.kml',
+ filtr="Category 1")
importer1.categories.add(subcategory_1)
importer2 = Importer.objects.create(importer_type='KML',
- source_url=test_dir_path+'sample.kml',
- filtr="//kml:Folder/kml:name[text()='Subcategory 1']/../kml:Placemark")
+ source=test_dir_path+'sample.kml',
+ filtr="Subcategory 1")
importer2.categories.add(subcategory_1)
importer2.categories.add(subcategory_2)
importer3 = Importer.objects.create(importer_type='KML',
- source_url=test_path+'sample.kml',
- filtr="//kml:Folder/kml:name[text()='Subcategory 3']/../kml:Placemark")
+ source=test_path+'sample.kml',
+ filtr="Subcategory 3")
importer3.categories.add(subcategory_2)
self.marker_importers = [(importer1, 1), (importer2, 2), (importer3, 0)]
@@ -86,7 +86,7 @@ class OSMImporterTest(TestCase, ImporterTest):
def setUp(self):
subcategory_1, subcategory_2 = self._baseSetUp()
importer1 = Importer.objects.create(importer_type='OSM',
- source_url=settings.CHIMERE_XAPI_URL,
+ source='OSM',
filtr="node[amenity=pub]"\
"[bbox=-77.041579,38.885851,-77.007247,38.900881]")
importer1.categories.add(subcategory_1)