Merge pull request #181 from knutfrode/dev

Added mock-based test, made by Copilot

Author: knutfrode

tests/opendrift/test_plot_opendrift.py

@@ -10,3 +10,5 @@ def test_opendrift(opendrift_sim, plot):
 
     if plot:
         plt.show()
+    else:
+        plt.close()

tests/parcels/__init__.py

@@ -20,7 +20,7 @@ def moving_eddies_fieldset(xdim=200, ydim=350, mesh='flat'):
     time = np.arange(0., 8. * 86400., 86400., dtype=np.float64)
 
     # Coordinates of the test fieldset (on A-grid in m)
-    if mesh is 'spherical':
+    if mesh == 'spherical':
         lon = np.linspace(0, 4, xdim, dtype=np.float32)
         lat = np.linspace(45, 52, ydim, dtype=np.float32)
     else:
@@ -32,9 +32,9 @@ def cosd(x):
         return math.cos(math.radians(float(x)))
 
     dx = (lon[1] - lon[0]) * 1852 * 60 * cosd(
-        lat.mean()) if mesh is 'spherical' else lon[1] - lon[0]
+        lat.mean()) if mesh == 'spherical' else lon[1] - lon[0]
     dy = (lat[1] -
-          lat[0]) * 1852 * 60 if mesh is 'spherical' else lat[1] - lat[0]
+          lat[0]) * 1852 * 60 if mesh == 'spherical' else lat[1] - lat[0]
 
     # Define arrays U (zonal), V (meridional), and P (sea surface height) on A-grid
     U = np.zeros((lon.size, lat.size, time.size), dtype=np.float32)

tests/parcels/test_flatmesh.py

@@ -20,9 +20,10 @@ def test_parcels_flatmesh_animate(plot):
     ds = xr.open_dataset('tests/test_data/parcels.zarr', engine='zarr')
     ds = ds.traj.set_crs(None)
     print(ds)
-    ds.traj.animate()
+    anim = ds.traj.animate()
 
     if plot:
         plt.show()
     else:
+        anim._draw_was_started = True  # avoiding warning
         plt.close()

tests/test_animate_drifters.py

@@ -2,11 +2,12 @@
 import xarray as xr
 import matplotlib.pyplot as plt
 
-def test_barents(barents, plot):
-    print(barents)
+def test_animate_barents(barents, plot):
 
-    barents.traj.animate()
+    anim = barents.traj.animate()
 
     if plot:
         plt.show()
-
+    else:
+        anim._draw_was_started = True  # To avoid warning
+        plt.close('all')

tests/test_convert_datalayout.py

@@ -17,7 +17,7 @@ def test_to2d(barents):
 
 def test_to1d(barents):
     # print(barents)
-    gr = barents.traj.gridtime('1H')
+    gr = barents.traj.gridtime('1h')
     assert gr.traj.is_1d()
 
     gr = gr.traj.to_1d()

tests/test_convert_ragged.py

@@ -13,6 +13,8 @@ def test_convert_ragged(test_data, plot):
 
     if plot:
         plt.show()
+    else:
+        plt.close()
 
     print("----------------------------------------")
     print("the raw ds:")

tests/test_crs.py

@@ -2,10 +2,9 @@
 import trajan as ta
 import xarray as xr
 import cf_xarray as _
-import matplotlib.pyplot as plt
 
 
-def test_barents_detect_lonlat(barents, plot):
+def test_barents_detect_lonlat(barents):
     print(barents.traj.crs)
 
     crs = barents.traj.crs
@@ -16,7 +15,7 @@ def test_barents_detect_lonlat(barents, plot):
     print(barents.traj.ccrs)
 
 
-def test_barents_set_crs(barents, plot):
+def test_barents_set_crs(barents):
     crs = barents.traj.crs
     barents = barents.traj.set_crs(crs)
 
@@ -25,7 +24,7 @@ def test_barents_set_crs(barents, plot):
     assert barents.traj.crs == crs
 
 
-def test_barents_tlat_tlon(barents, plot):
+def test_barents_tlat_tlon(barents):
     np.testing.assert_array_equal(barents.lon, barents.traj.tlon)
     np.testing.assert_array_equal(barents.lat, barents.traj.tlat)
 

tests/test_interpolate.py

@@ -35,6 +35,8 @@ def test_interpolate_barents(barents, plot):
 
         plt.legend()
         plt.show()
+    else:
+        plt.close()
 
 
 def test_distance(barents):
@@ -50,7 +52,7 @@ def test_length(barents):
     l = barents.traj.length()
     print(l)
 
-    lg = barents.traj.gridtime('1H').traj.length()
+    lg = barents.traj.gridtime('1h').traj.length()
     print(lg)
 
     np.testing.assert_allclose(l, lg, atol=20000)
@@ -152,6 +154,8 @@ def test_speed(barents, plot):
         plt.xlabel('Drifter speed  [m/s]')
         plt.ylabel('Number')
         plt.show()
+    else:
+        plt.close()
 
 def test_speed_2d(barents):
     s = barents.traj.speed()
@@ -169,9 +173,11 @@ def test_insert_nan_where(barents, plot):
         barents.traj.plot(color='b', linewidth=2)
         b2.traj.plot(color='r')
         plt.show()
+    else:
+        plt.close()
 
 
-def test_drop_where(barents, plot):
+def test_drop_where(barents):
 
     t2n = barents.traj.time_to_next() / np.timedelta64(1, 'm')
     assert_almost_equal(t2n.min(), 0.0166, 3)

tests/test_plot_drifters.py

@@ -9,6 +9,8 @@ def test_barents(barents, plot):
 
     if plot:
         plt.show()
+    else:
+        plt.close()
 
 def test_barents_linecolor(barents, plot):
     speed = barents.traj.speed()
@@ -25,3 +27,5 @@ def test_barents_linecolor(barents, plot):
 
     if plot:
         plt.show()
+    else:
+        plt.close()

tests/test_plot_landmask.py

@@ -11,6 +11,8 @@ def test_defaults(opendrift_sim, plot):
 
     if plot:
         plt.show()
+    else:
+        plt.close()
 
 
 @pytest.mark.parametrize("land", ["auto", "c", "f", "mask"])
@@ -22,3 +24,5 @@ def test_land_specs(opendrift_sim, plot, land):
 
     if plot:
         plt.show()
+    else:
+        plt.close()