Fix route rapprochement: prevent delete of associated marker

1 files changed, 29 insertions, 3 deletions

diff --git a/chimere/tests.py b/chimere/tests.py
index 5fd9f55..0bfd830 100644
--- a/chimere/tests.py
+++ b/chimere/tests.py
@@ -95,7 +95,7 @@ def route_setup(sub_categories=[]):
     current_date = datetime.datetime.now()
     routes = []
     route_1 = Route.objects.create(name="Route 1", status='A',
-         has_associated_marker=False, route='SRID=4326;LINESTRING(-1 1, 1 -1)')
+         has_associated_marker=True, route='SRID=4326;LINESTRING(-1 1, 1 -1)')
     route_1.categories.add(sub_categories[0])
     routes.append(route_1)
     route_2 = Route.objects.create(name="Route 2", status='A',
@@ -358,13 +358,15 @@ class NewsTest(TestCase):
 class RapprochementTest(TestCase):
     def setUp(self):
         self.areas = areas_setup()
-        self.markers = marker_setup()
+        self.subcategories = subcategory_setup()
+        self.markers = marker_setup(self.subcategories)
+        self.routes = route_setup(self.subcategories)
         self.adminuser = User.objects.create_superuser('admin',
                                                   'admin@test.com',
                                                   'pass')
         self.client.login(username='admin', password='pass')
 
-    def test_managed_modified(self):
+    def test_managed_modified_markers(self):
         ref_marker = self.markers[0]
         new_vals = {'name':"Marker 1 - modified",
                     'point':GEOSGeometry('SRID=4326;POINT(-4 48)')}
@@ -384,6 +386,30 @@ class RapprochementTest(TestCase):
         for k in new_vals:
             self.assertEqual(getattr(ref_marker, k), new_vals[k])
 
+    def test_managed_modified_routes(self):
+        ref_route = self.routes[0]
+        new_vals = {'name':"Route 1 - modified",
+                    'route':GEOSGeometry('SRID=4326;LINESTRING(1 1,2 2)')}
+        values = {'status':'M', 'ref_item':ref_route,
+                  'has_associated_marker':True}
+        values.update(new_vals)
+        modified_route = Route.objects.create(**values)
+        modified_route.categories.add(self.subcategories[1])
+        response = self.client.post('/admin/chimere/route/',
+                       data={'action':['managed_modified'],
+                             'index':0, 'rapprochement':1,
+                             'name':1, 'route':1, 'categories':1,
+                             '_selected_action':[unicode(ref_route.pk)]
+                            })
+        ref_route = Route.objects.get(pk=ref_route.pk)
+        self.assertEqual(Route.objects.filter(ref_item=ref_route,
+                                               status='M').count(), 0)
+        self.assertEqual(ref_route.name, new_vals['name'])
+        self.assertEqual(ref_route.route.wkt, new_vals['route'].wkt)
+        self.assertEqual(ref_route.categories.all()[0], self.subcategories[1])
+        self.assertEqual(ref_route.associated_marker.all()[0].name,
+                         ref_route.name)
+
 class RouteTest(TestCase):
     def setUp(self):
         self.subcategories = subcategory_setup()