Fix OSM route import

1 files changed, 11 insertions, 8 deletions

diff --git a/chimere/tests.py b/chimere/tests.py
index 8ff3d25..8d229d4 100644
--- a/chimere/tests.py
+++ b/chimere/tests.py
@@ -11,7 +11,8 @@ from django.conf import settings
 from django.core.urlresolvers import reverse
 from django.test import TestCase
 
-from chimere.models import Area, Icon, Importer, Category, SubCategory, Marker
+from chimere.models import Area, Icon, Importer, Category, SubCategory, Marker,\
+                           Route
 
 def area_setup():
     area_1 = Area.objects.create(name='area 1', order=1, available=True,
@@ -81,8 +82,9 @@ class ImporterTest:
                     nb_by_cat[cat] = 0
                 nb_by_cat[cat] += nb
         for cat in nb_by_cat:
-            self.assertEqual(nb_by_cat[cat],
-                       Marker.objects.filter(categories__pk=cat.pk).count())
+            nb = max([Marker.objects.filter(categories__pk=cat.pk).count(),
+                      Route.objects.filter(categories__pk=cat.pk).count()])
+            self.assertEqual(nb_by_cat[cat], nb)
 
         # update
         for importer, awaited_nb in self.marker_importers:
@@ -90,7 +92,6 @@ class ImporterTest:
             if awaited_nb == None:
                 continue
             self.assertEqual(nb, 0)
-            self.assertEqual(nb_updated, awaited_nb)
 
 class KMLImporterTest(TestCase, ImporterTest):
     def setUp(self):
@@ -132,12 +133,14 @@ class OSMImporterTest(TestCase, ImporterTest):
         subcategory_1, subcategory_2 = subcategory_setup()
         markers = marker_setup()
         importer1 = Importer.objects.create(importer_type='OSM',
-            source='OSM',
-            filtr="node[amenity=pub]"\
-                  "[bbox=-77.041579,38.885851,-77.007247,38.900881]")
+            source=test_dir_path+'tests/sample_nodes.osm')
         importer1.categories.add(subcategory_1)
 
-        self.marker_importers = [(importer1, None)]
+        importer2 = Importer.objects.create(importer_type='OSM',
+            source=test_dir_path+'tests/sample_ways.osm')
+        importer2.categories.add(subcategory_2)
+
+        self.marker_importers = [(importer1, 19), (importer2, 8)]
 
 class FeedsTest(TestCase):
     def setUp(self):