Import: manage way imports without marker associated

1 files changed, 34 insertions, 4 deletions

diff --git a/chimere/tests.py b/chimere/tests.py
index e189fb9..5e0ba7c 100644
--- a/chimere/tests.py
+++ b/chimere/tests.py
@@ -120,7 +120,7 @@ class KMLImporterTest(TestCase, ImporterTest):
 
         importer2 = Importer.objects.create(importer_type='KML',
          source=test_dir_path+'tests/sample.kml',
-         filtr="Subcategory 1")
+         filtr="Subcategory 1", associate_marker_to_way=True)
         importer2.categories.add(subcategory_1)
         importer2.categories.add(subcategory_2)
 
@@ -138,14 +138,14 @@ class KMLImporterTest(TestCase, ImporterTest):
 
 class ShapefileImporterTest(TestCase, ImporterTest):
     def setUp(self):
-        subcategory_1, subcategory_2 = subcategory_setup()
+        self.subcategory_1, self.subcategory_2 = subcategory_setup()
         importer = Importer.objects.create(importer_type='SHP',
             source=test_dir_path+'tests/sample_nodes.shp.zip', zipped=True)
-        importer.categories.add(subcategory_1)
+        importer.categories.add(self.subcategory_1)
         importer2 = Importer.objects.create(importer_type='SHP',
             source=test_dir_path+'tests/sample_ways.shp.zip',
             zipped=True)
-        importer2.categories.add(subcategory_2)
+        importer2.categories.add(self.subcategory_2)
 
         self.marker_importers = [(importer, 29),
                                  (importer2, 5),]
@@ -154,6 +154,23 @@ class ShapefileImporterTest(TestCase, ImporterTest):
     def test_export(self):
         filename, zip_stream = ShapefileManager.export(Marker.objects.all())
 
+    def test_associate_marker_to_way(self):
+        importer, nb = self.marker_importers[1]
+
+        importer.associate_marker_to_way = True
+        importer.save()
+        nb, nb_updated, res = importer.manager.get()
+        nb = Marker.objects.filter(categories__pk=self.subcategory_2.pk).count()
+        self.assertEqual(nb, 5)
+        Marker.objects.filter(categories__pk=self.subcategory_2.pk).delete()
+        Route.objects.filter(categories__pk=self.subcategory_2.pk).delete()
+
+        importer.associate_marker_to_way = False
+        importer.save()
+        nb, nb_updated, res = importer.manager.get()
+        nb = Marker.objects.filter(categories__pk=self.subcategory_2.pk).count()
+        self.assertEqual(nb, 0)
+
 class OSMImporterTest(TestCase, ImporterTest):
     def setUp(self):
         subcategory_1, subcategory_2 = subcategory_setup()
@@ -309,3 +326,16 @@ class RapprochementTest(TestCase):
                                                status='M').count(), 0)
         for k in new_vals:
             self.assertEqual(getattr(ref_marker, k), new_vals[k])
+
+class RouteTest(TestCase):
+    def setUp(self):
+        self.subcategories = subcategory_setup()
+
+    def test_route_creation(self):
+        route_1 = Route.objects.create(name='Route 1',
+                      route='SRID=4326;LINESTRING (30 10, 10 30, 40 40)')
+        self.assertEqual(Marker.objects.filter(route=route_1).count(), 1)
+        route_2 = Route.objects.create(name='Route 1',
+                      route='SRID=4326;LINESTRING (30 10, 10 30, 40 40)',
+                      has_associated_marker=False)
+        self.assertEqual(Marker.objects.filter(route=route_2).count(), 0)