Fix dynamic evaluation of categories

1 files changed, 25 insertions, 2 deletions

diff --git a/chimere/tests.py b/chimere/tests.py
index a865d9b..5fd9f55 100644
--- a/chimere/tests.py
+++ b/chimere/tests.py
@@ -32,7 +32,11 @@ def areas_setup():
                 available=True,
                 upper_left_corner='SRID=4326;POINT(-3 47.5)',
                 lower_right_corner='SRID=4326;POINT(-2.5 47)')
-    return [area_1, area_2]
+    area_3 = Area.objects.create(name='area 3', urn='area-3', order=3,
+                available=True,
+                upper_left_corner='SRID=4326;POINT(-1.5 1.5)',
+                lower_right_corner='SRID=4326;POINT(1.5 -1.5)')
+    return [area_1, area_2, area_3]
 
 def subcategory_setup():
     category = Category.objects.create(name='Main category',
@@ -85,6 +89,21 @@ def marker_setup(sub_categories=[]):
     markers.append(marker_3)
     return markers
 
+def route_setup(sub_categories=[]):
+    if not sub_categories:
+        sub_categories = subcategory_setup()
+    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)')
+    route_1.categories.add(sub_categories[0])
+    routes.append(route_1)
+    route_2 = Route.objects.create(name="Route 2", status='A',
+        has_associated_marker=False, route='SRID=4326;LINESTRING(0 0, 2 2)')
+    route_2.categories.add(sub_categories[1])
+    routes.append(route_2)
+    return routes
+
 class ImporterTest:
     def test_get(self):
         nb_by_cat = {}
@@ -310,11 +329,15 @@ class AreaAdminFormTest(TestCase):
 class DynamicCategoryTest(TestCase):
     def setUp(self):
         self.areas = areas_setup()
-        self.markers = marker_setup()
+        subcategories = subcategory_setup()
+        self.markers = marker_setup(subcategories)
+        self.routes = route_setup(subcategories)
 
     def test_dynamic_evaluation(self):
         cats = self.areas[0].getCategories(status='A', filter_available=True)
         self.assertEqual(len(cats), 1)
+        cats = self.areas[2].getCategories(status='A', filter_available=True)
+        self.assertEqual(len(cats), 2)
 
 class NewsTest(TestCase):
     def setUp(self):