diff options
Diffstat (limited to 'chimere/tests.py')
| -rw-r--r-- | chimere/tests.py | 39 |
1 files changed, 4 insertions, 35 deletions
diff --git a/chimere/tests.py b/chimere/tests.py index e192bcc..2f6207c 100644 --- a/chimere/tests.py +++ b/chimere/tests.py @@ -105,12 +105,12 @@ def route_setup(sub_categories=[]): # current_date = datetime.datetime.now() routes = [] route_1 = Route.objects.create( - name="Route 1", status='A', has_associated_marker=True, + name="Route 1", status='A', 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, + name="Route 2", status='A', route='SRID=4326;LINESTRING(0 0, 2 2)') route_2.categories.add(sub_categories[1]) routes.append(route_2) @@ -184,7 +184,7 @@ class KMLImporterTest(TestCase, ImporterTest): importer2 = Importer.objects.create( importer_type='KML', source=test_dir_path + 'tests/sample.kml', - filtr="Subcategory 1", associate_marker_to_way=True) + filtr="Subcategory 1") importer2.categories.add(subcategories[1]) importer3 = Importer.objects.create( @@ -248,25 +248,6 @@ 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.subcategories[1].pk - ).count() - self.assertEqual(nb, 5) - Marker.objects.filter(categories__pk=self.subcategories[1].pk).delete() - Route.objects.filter(categories__pk=self.subcategories[1].pk).delete() - - importer.associate_marker_to_way = False - importer.save() - nb, nb_updated, res = importer.manager.get() - nb = Marker.objects.filter(categories__pk=self.subcategories[1].pk - ).count() - self.assertEqual(nb, 0) - class OSMImporterTest(TestCase, ImporterTest): def setUp(self): @@ -645,8 +626,7 @@ class RapprochementTest(TestCase): 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 = {'status': 'M', 'ref_item': ref_route} values.update(new_vals) modified_route = Route.objects.create(**values) modified_route.categories.add(self.subcategories[1]) @@ -662,19 +642,8 @@ class RapprochementTest(TestCase): 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() - - 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) |