Various test improvements

.github/workflows/ci-testing.yml

@@ -70,7 +70,7 @@ jobs:
           # Check that the downloader tool at least knows where to get the data from (but don't actually download it)
           python tools/cartopy_feature_download.py gshhs physical --dry-run
           CARTOPY_GIT_DIR=$PWD
-          PYPROJ_GLOBAL_CONTEXT=ON pytest -n 4 --doctest-modules --pyargs cartopy ${EXTRA_TEST_ARGS}
+          PYPROJ_GLOBAL_CONTEXT=ON pytest -ra -n 4 --doctest-modules --pyargs cartopy ${EXTRA_TEST_ARGS}
 
       - name: Coveralls
         if: steps.coverage.conclusion == 'success'

lib/cartopy/tests/io/test_downloaders.py

@@ -6,14 +6,13 @@
 
 import contextlib
 import os
-import warnings
+from unittest import mock
 
 import pytest
 
 import cartopy
 import cartopy.io as cio
 from cartopy.io.shapereader import NEShpDownloader
-from cartopy.tests.mpl.test_caching import CallCounter
 
 
 def test_Downloader_data():
@@ -110,21 +109,18 @@ def test_downloading_simple_ascii(download_to_temp):
 
     assert dnld_item.target_path(format_dict) == tmp_fname
 
-    with warnings.catch_warnings(record=True) as w:
+    with pytest.warns(cio.DownloadWarning):
         assert dnld_item.path(format_dict) == tmp_fname
 
-        assert len(w) == 1, \
-            f'Expected a single download warning to be raised. Got {len(w)}.'
-        assert issubclass(w[0].category, cio.DownloadWarning)
-
     with open(tmp_fname) as fh:
         fh.readline()
         assert fh.readline() == " * jQuery JavaScript Library v1.8.2\n"
 
     # check that calling path again doesn't try re-downloading
-    with CallCounter(dnld_item, 'acquire_resource') as counter:
+    with mock.patch.object(dnld_item, 'acquire_resource',
+                           wraps=dnld_item.acquire_resource) as counter:
         assert dnld_item.path(format_dict) == tmp_fname
-    assert counter.count == 0, 'Item was re-downloaded.'
+    counter.assert_not_called()
 
 
 @pytest.mark.network
@@ -147,17 +143,19 @@ def test_natural_earth_downloader(tmp_path):
     dnld_item = NEShpDownloader(target_path_template=shp_path_template)
 
     # check that the file gets downloaded the first time path is called
-    with CallCounter(dnld_item, 'acquire_resource') as counter:
+    with mock.patch.object(dnld_item, 'acquire_resource',
+                           wraps=dnld_item.acquire_resource) as counter:
         with pytest.warns(cartopy.io.DownloadWarning, match="Downloading:"):
             shp_path = dnld_item.path(format_dict)
-    assert counter.count == 1, 'Item not downloaded.'
+    counter.assert_called_once()
 
     assert shp_path_template.format(**format_dict) == shp_path
 
     # check that calling path again doesn't try re-downloading
-    with CallCounter(dnld_item, 'acquire_resource') as counter:
+    with mock.patch.object(dnld_item, 'acquire_resource',
+                           wraps=dnld_item.acquire_resource) as counter:
         assert dnld_item.path(format_dict) == shp_path
-    assert counter.count == 0, 'Item was re-downloaded.'
+    counter.assert_not_called()
 
     # check that we have the shp and the shx
     exts = ['.shp', '.shx']
@@ -168,11 +166,11 @@ def test_natural_earth_downloader(tmp_path):
 
     # check that providing a pre downloaded path actually works
     pre_dnld = NEShpDownloader(target_path_template='/not/a/real/file.txt',
-                               pre_downloaded_path_template=shp_path
-                               )
+                               pre_downloaded_path_template=shp_path)
+
     # check that the pre_dnld downloader doesn't re-download, but instead
     # uses the path of the previously downloaded item
-
-    with CallCounter(pre_dnld, 'acquire_resource') as counter:
+    with mock.patch.object(pre_dnld, 'acquire_resource',
+                           wraps=pre_dnld.acquire_resource) as counter:
         assert pre_dnld.path(format_dict) == shp_path
-    assert counter.count == 0, 'Aquire resource called more than once.'
+    counter.assert_not_called()

lib/cartopy/tests/io/test_srtm.py

@@ -4,8 +4,6 @@
 # See COPYING and COPYING.LESSER in the root of the repository for full
 # licensing details.
 
-import warnings
-
 import numpy as np
 from numpy.testing import assert_array_equal
 import pytest
@@ -65,10 +63,8 @@ class TestRetrieve:
     def test_srtm_retrieve(self, Source, read_SRTM, max_, min_, pt,
                            download_to_temp):  # noqa: F811
         # test that the download mechanism for SRTM works
-        with warnings.catch_warnings(record=True) as w:
+        with pytest.warns(cartopy.io.DownloadWarning):
             r = Source().srtm_fname(-4, 50)
-            assert len(w) == 1
-            assert issubclass(w[0].category, cartopy.io.DownloadWarning)
 
         assert r.startswith(str(download_to_temp)), \
             'File not downloaded to tmp dir'

lib/cartopy/tests/mpl/test_axes.py

@@ -15,18 +15,13 @@
 import cartopy.crs as ccrs
 from cartopy.mpl.geoaxes import InterProjectionTransform, GeoAxes
 from cartopy.tests.mpl import ImageTesting
-from cartopy.tests.mpl.test_caching import CallCounter
 
 
 class TestNoSpherical:
     def setup_method(self):
         self.ax = plt.axes(projection=ccrs.PlateCarree())
         self.data = np.arange(12).reshape((3, 4))
 
-    def teardown_method(self):
-        plt.clf()
-        plt.close()
-
     def test_contour(self):
         with pytest.raises(ValueError):
             self.ax.contour(self.data, transform=ccrs.Geodetic())
@@ -55,20 +50,21 @@ def test_transform_PlateCarree_shortcut():
 
     trans = InterProjectionTransform(src, target)
 
-    counter = CallCounter(target, 'project_geometry')
-
-    with counter:
+    with mock.patch.object(target, 'project_geometry',
+                           wraps=target.project_geometry) as counter:
         trans.transform_path(pth1)
         # pth1 should allow a short-cut.
-        assert counter.count == 0
+        counter.assert_not_called()
 
-    with counter:
+    with mock.patch.object(target, 'project_geometry',
+                           wraps=target.project_geometry) as counter:
         trans.transform_path(pth2)
-        assert counter.count == 1
+        counter.assert_called_once()
 
-    with counter:
+    with mock.patch.object(target, 'project_geometry',
+                           wraps=target.project_geometry) as counter:
         trans.transform_path(pth3)
-        assert counter.count == 2
+        counter.assert_called_once()
 
 
 class Test_InterProjectionTransform:
@@ -98,8 +94,6 @@ def test_ne(self):
 
 
 class Test_Axes_add_geometries:
-    def teardown_method(self):
-        plt.close()
 
     @mock.patch('cartopy.mpl.geoaxes.GeoAxes.add_feature')
     @mock.patch('cartopy.feature.ShapelyFeature')