Fix the rest of the tests

scottshambaugh · scottshambaugh · commit 40fc8f0ede28 · 2023-04-29T07:33:42.000-06:00
diff --git a/lib/mpl_toolkits/mplot3d/axes3d.py b/lib/mpl_toolkits/mplot3d/axes3d.py
@@ -702,12 +702,12 @@ def _set_bound3d(self, get_bound, set_lim, axis_inverted,
     def set_xbound(self, lower=None, upper=None, view_margin=None):
         # docstring inherited
         self._set_bound3d(self.get_xbound, self.set_xlim, self.xaxis_inverted,
-                          upper, lower, view_margin)
+                          lower, upper, view_margin)
 
     def set_ybound(self, lower=None, upper=None, view_margin=None):
         # docstring inherited
         self._set_bound3d(self.get_ybound, self.set_ylim, self.yaxis_inverted,
-                          upper, lower, view_margin)
+                          lower, upper, view_margin)
 
     def set_zbound(self, lower=None, upper=None, view_margin=None):
         """
@@ -731,7 +731,7 @@ def set_zbound(self, lower=None, upper=None, view_margin=None):
         invert_zaxis, zaxis_inverted
         """
         self._set_bound3d(self.get_zbound, self.set_zlim, self.zaxis_inverted,
-                          upper, lower, view_margin)
+                          lower, upper, view_margin)
 
     def _set_lim3d(self, axis, lower=None, upper=None, *, emit=True,
                    auto=False, view_margin=None, axmin=None, axmax=None):
@@ -742,10 +742,10 @@ def _set_lim3d(self, axis, lower=None, upper=None, *, emit=True,
         if upper is None:
             if np.iterable(lower):
                 lower, upper = lower
-            else:
-                raise ValueError("Must provide an upper bound.")
-        if lower is None:
-            raise ValueError("Must provide a lower bound.")
+            elif axmax is None:
+                upper = axis.get_view_interval()[1]
+        if lower is None and axmin is None:
+            lower = axis.get_view_interval()[0]
         if axmin is not None:
             if lower is not None:
                 raise TypeError("Cannot pass both 'lower' and 'min'")
diff --git a/lib/mpl_toolkits/mplot3d/tests/test_axes3d.py b/lib/mpl_toolkits/mplot3d/tests/test_axes3d.py
@@ -1196,6 +1196,7 @@ def test_lines_dists_nowarning():
 def test_autoscale():
     fig, ax = plt.subplots(subplot_kw={"projection": "3d"})
     assert ax.get_zscale() == 'linear'
+    ax._view_margin = 0
     ax.margins(x=0, y=.1, z=.2)
     ax.plot([0, 1], [0, 1], [0, 1])
     assert ax.get_w_lims() == (0, 1, -.1, 1.1, -.2, 1.2)
@@ -1675,6 +1676,7 @@ def test_colorbar_pos():
 def test_inverted_zaxis():
     fig = plt.figure()
     ax = fig.add_subplot(projection='3d')
+    ax.set_zlim(0, 1)
     assert not ax.zaxis_inverted()
     assert ax.get_zlim() == (0, 1)
     assert ax.get_zbound() == (0, 1)
@@ -1707,17 +1709,17 @@ def test_inverted_zaxis():
 def test_set_zlim():
     fig = plt.figure()
     ax = fig.add_subplot(projection='3d')
-    assert ax.get_zlim() == (0, 1)
+    assert np.allclose(ax.get_zlim(), (-1/48, 49/48))
     ax.set_zlim(zmax=2)
-    assert ax.get_zlim() == (0, 2)
+    assert np.allclose(ax.get_zlim(), (-1/48, 2))
     ax.set_zlim(zmin=1)
     assert ax.get_zlim() == (1, 2)
 
     with pytest.raises(
-            TypeError, match="Cannot pass both 'bottom' and 'zmin'"):
+            TypeError, match="Cannot pass both 'lower' and 'min'"):
         ax.set_zlim(bottom=0, zmin=1)
     with pytest.raises(
-            TypeError, match="Cannot pass both 'top' and 'zmax'"):
+            TypeError, match="Cannot pass both 'upper' and 'max'"):
         ax.set_zlim(top=0, zmax=1)
 
 
@@ -1777,13 +1779,13 @@ def convert_lim(dmin, dmax):
                           ("zoom", MouseButton.LEFT, 'x',  # zoom in
                           ((-0.01, 0.10), (-0.03, 0.08), (-0.06, 0.06))),
                           ("zoom", MouseButton.LEFT, 'y',  # zoom in
-                          ((-0.07, 0.04), (-0.03, 0.08), (0.00, 0.11))),
+                          ((-0.07, 0.05), (-0.04, 0.08), (0.00, 0.12))),
                           ("zoom", MouseButton.RIGHT, None,  # zoom out
-                          ((-0.09, 0.15), (-0.07, 0.17), (-0.06, 0.18))),
+                          ((-0.09, 0.15), (-0.08, 0.17), (-0.07, 0.18))),
                           ("pan", MouseButton.LEFT, None,
-                          ((-0.70, -0.58), (-1.03, -0.91), (-1.27, -1.15))),
+                          ((-0.70, -0.58), (-1.04, -0.91), (-1.27, -1.15))),
                           ("pan", MouseButton.LEFT, 'x',
-                          ((-0.96, -0.84), (-0.58, -0.46), (-0.06, 0.06))),
+                          ((-0.97, -0.84), (-0.58, -0.46), (-0.06, 0.06))),
                           ("pan", MouseButton.LEFT, 'y',
                           ((0.20, 0.32), (-0.51, -0.39), (-1.27, -1.15)))])
 def test_toolbar_zoom_pan(tool, button, key, expected):
@@ -1968,15 +1970,15 @@ def test_format_coord():
     x = np.arange(10)
     ax.plot(x, np.sin(x))
     fig.canvas.draw()
-    assert ax.format_coord(0, 0) == 'x=1.8066, y=1.0367, z=−0.0553'
+    assert ax.format_coord(0, 0) == 'x=1.6944, y=1.0799, z=−0.0576'
     # Modify parameters
     ax.view_init(roll=30, vertical_axis="y")
     fig.canvas.draw()
-    assert ax.format_coord(0, 0) == 'x=9.1651, y=−0.9215, z=−0.0359'
+    assert ax.format_coord(0, 0) == 'x=9.3595, y=−0.9599, z=−0.0374'
     # Reset parameters
     ax.view_init()
     fig.canvas.draw()
-    assert ax.format_coord(0, 0) == 'x=1.8066, y=1.0367, z=−0.0553'
+    assert ax.format_coord(0, 0) == 'x=1.6944, y=1.0799, z=−0.0576'
 
 
 def test_get_axis_position():
