diff options
Diffstat (limited to 'tests/gis_tests/geoadmin_deprecated')
| -rw-r--r-- | tests/gis_tests/geoadmin_deprecated/models.py | 4 | ||||
| -rw-r--r-- | tests/gis_tests/geoadmin_deprecated/tests.py | 54 | ||||
| -rw-r--r-- | tests/gis_tests/geoadmin_deprecated/urls.py | 2 |
3 files changed, 32 insertions, 28 deletions
diff --git a/tests/gis_tests/geoadmin_deprecated/models.py b/tests/gis_tests/geoadmin_deprecated/models.py index efd9535977..5e84d0c9fa 100644 --- a/tests/gis_tests/geoadmin_deprecated/models.py +++ b/tests/gis_tests/geoadmin_deprecated/models.py @@ -10,12 +10,12 @@ class City(models.Model): point = models.PointField() class Meta: - app_label = 'geoadmini_deprecated' + app_label = "geoadmini_deprecated" def __str__(self): return self.name -site = admin.AdminSite(name='admin_gis') +site = admin.AdminSite(name="admin_gis") with ignore_warnings(category=RemovedInDjango50Warning): site.register(City, admin.OSMGeoAdmin) diff --git a/tests/gis_tests/geoadmin_deprecated/tests.py b/tests/gis_tests/geoadmin_deprecated/tests.py index 4240de98b1..a2049827a1 100644 --- a/tests/gis_tests/geoadmin_deprecated/tests.py +++ b/tests/gis_tests/geoadmin_deprecated/tests.py @@ -8,9 +8,8 @@ from .models import City, site @ignore_warnings(category=RemovedInDjango50Warning) -@override_settings(ROOT_URLCONF='django.contrib.gis.tests.geoadmin.urls') +@override_settings(ROOT_URLCONF="django.contrib.gis.tests.geoadmin.urls") class GeoAdminTest(SimpleTestCase): - def test_ensure_geographic_media(self): geoadmin = site._registry[City] admin_js = geoadmin.media.render_js() @@ -20,12 +19,14 @@ class GeoAdminTest(SimpleTestCase): delete_all_btn = """<a href="javascript:geodjango_point.clearFeatures()">Delete all Features</a>""" original_geoadmin = site._registry[City] - params = original_geoadmin.get_map_widget(City._meta.get_field('point')).params - result = original_geoadmin.get_map_widget(City._meta.get_field('point'))( - ).render('point', Point(-79.460734, 40.18476), params) + params = original_geoadmin.get_map_widget(City._meta.get_field("point")).params + result = original_geoadmin.get_map_widget( + City._meta.get_field("point") + )().render("point", Point(-79.460734, 40.18476), params) self.assertIn( """geodjango_point.layers.base = new OpenLayers.Layer.OSM("OpenStreetMap (Mapnik)");""", - result) + result, + ) self.assertIn(delete_all_btn, result) @@ -33,9 +34,10 @@ class GeoAdminTest(SimpleTestCase): site.register(City, UnmodifiableAdmin) try: geoadmin = site._registry[City] - params = geoadmin.get_map_widget(City._meta.get_field('point')).params - result = geoadmin.get_map_widget(City._meta.get_field('point'))( - ).render('point', Point(-79.460734, 40.18476), params) + params = geoadmin.get_map_widget(City._meta.get_field("point")).params + result = geoadmin.get_map_widget(City._meta.get_field("point"))().render( + "point", Point(-79.460734, 40.18476), params + ) self.assertNotIn(delete_all_btn, result) finally: @@ -44,12 +46,14 @@ class GeoAdminTest(SimpleTestCase): def test_olmap_WMS_rendering(self): geoadmin = admin.GeoModelAdmin(City, site) - result = geoadmin.get_map_widget(City._meta.get_field('point'))( - ).render('point', Point(-79.460734, 40.18476)) + result = geoadmin.get_map_widget(City._meta.get_field("point"))().render( + "point", Point(-79.460734, 40.18476) + ) self.assertIn( """geodjango_point.layers.base = new OpenLayers.Layer.WMS("OpenLayers WMS", """ """"http://vmap0.tiles.osgeo.org/wms/vmap0", {layers: 'basic', format: 'image/jpeg'});""", - result) + result, + ) def test_olwidget_has_changed(self): """ @@ -57,7 +61,7 @@ class GeoAdminTest(SimpleTestCase): """ geoadmin = site._registry[City] form = geoadmin.get_changelist_form(None)() - has_changed = form.fields['point'].has_changed + has_changed = form.fields["point"].has_changed initial = Point(13.4197458572965953, 52.5194108501149799, srid=4326) data_same = "SRID=3857;POINT(1493879.2754093995 6894592.019687599)" @@ -73,30 +77,30 @@ class GeoAdminTest(SimpleTestCase): def test_olwidget_empty_string(self): geoadmin = site._registry[City] - form = geoadmin.get_changelist_form(None)({'point': ''}) - with self.assertNoLogs('django.contrib.gis', 'ERROR'): - output = str(form['point']) + form = geoadmin.get_changelist_form(None)({"point": ""}) + with self.assertNoLogs("django.contrib.gis", "ERROR"): + output = str(form["point"]) self.assertInHTML( '<textarea id="id_point" class="vWKTField required" cols="150"' ' rows="10" name="point"></textarea>', - output + output, ) def test_olwidget_invalid_string(self): geoadmin = site._registry[City] - form = geoadmin.get_changelist_form(None)({'point': 'INVALID()'}) - with self.assertLogs('django.contrib.gis', 'ERROR') as cm: - output = str(form['point']) + form = geoadmin.get_changelist_form(None)({"point": "INVALID()"}) + with self.assertLogs("django.contrib.gis", "ERROR") as cm: + output = str(form["point"]) self.assertInHTML( '<textarea id="id_point" class="vWKTField required" cols="150"' ' rows="10" name="point"></textarea>', - output + output, ) self.assertEqual(len(cm.records), 1) self.assertEqual( cm.records[0].getMessage(), "Error creating geometry from value 'INVALID()' (String input " - "unrecognized as WKT EWKT, and HEXEWKB.)" + "unrecognized as WKT EWKT, and HEXEWKB.)", ) @@ -109,9 +113,9 @@ class DeprecationTests(SimpleTestCase): pass msg = ( - 'django.contrib.gis.admin.GeoModelAdmin and OSMGeoAdmin are ' - 'deprecated in favor of django.contrib.admin.ModelAdmin and ' - 'django.contrib.gis.admin.GISModelAdmin.' + "django.contrib.gis.admin.GeoModelAdmin and OSMGeoAdmin are " + "deprecated in favor of django.contrib.admin.ModelAdmin and " + "django.contrib.gis.admin.GISModelAdmin." ) with self.assertRaisesMessage(RemovedInDjango50Warning, msg): DeprecatedOSMGeoAdmin(City, site) diff --git a/tests/gis_tests/geoadmin_deprecated/urls.py b/tests/gis_tests/geoadmin_deprecated/urls.py index c27b1d7cda..ce237dbfd1 100644 --- a/tests/gis_tests/geoadmin_deprecated/urls.py +++ b/tests/gis_tests/geoadmin_deprecated/urls.py @@ -2,5 +2,5 @@ from django.contrib import admin from django.urls import include, path urlpatterns = [ - path('admin/', include(admin.site.urls)), + path("admin/", include(admin.site.urls)), ] |
