Fixed and refactored various AsinhScale tests

rwpenney · rwpenney · commit 8495f7b2f488 · 2021-10-21T16:57:45.000+01:00
diff --git a/lib/matplotlib/scale.py b/lib/matplotlib/scale.py
@@ -22,7 +22,7 @@
 from matplotlib import _api, docstring
 from matplotlib.ticker import (
     NullFormatter, ScalarFormatter, LogFormatterSciNotation, LogitFormatter,
-    Locator, NullLocator, LogLocator, AutoLocator, AutoMinorLocator,
+    NullLocator, LogLocator, AutoLocator, AutoMinorLocator,
     SymmetricalLogLocator, AsinhLocator, LogitLocator)
 from matplotlib.transforms import Transform, IdentityTransform
 
diff --git a/lib/matplotlib/tests/test_scale.py b/lib/matplotlib/tests/test_scale.py
@@ -2,7 +2,7 @@
 
 import matplotlib.pyplot as plt
 from matplotlib.scale import (
-    AsinhTransform,
+    AsinhScale, AsinhTransform,
     LogTransform, InvertedLogTransform,
     SymmetricalLogTransform)
 import matplotlib.scale as mscale
@@ -222,17 +222,38 @@ def test_scale_deepcopy():
     assert sc._transform is not sc2._transform
 
 
-def test_asinh_transforms():
-    a0 = 17.0
-    a = np.linspace(-50, 50, 100)
+class TestAsinhScale:
+    def test_transforms(self):
+        a0 = 17.0
+        a = np.linspace(-50, 50, 100)
 
-    forward = AsinhTransform(a0)
-    inverse = forward.inverted()
-    invinv = inverse.inverted()
+        forward = AsinhTransform(a0)
+        inverse = forward.inverted()
+        invinv = inverse.inverted()
 
-    a_forward = forward.transform_non_affine(a)
-    a_inverted = inverse.transform_non_affine(a_forward)
-    assert_allclose(a_inverted, a)
+        a_forward = forward.transform_non_affine(a)
+        a_inverted = inverse.transform_non_affine(a_forward)
+        assert_allclose(a_inverted, a)
 
-    a_invinv = invinv.transform_non_affine(a)
-    assert_allclose(a_invinv, a0 * np.asinh(a / a0))
+        a_invinv = invinv.transform_non_affine(a)
+        assert_allclose(a_invinv, a0 * np.arcsinh(a / a0))
+
+    def test_init(self):
+        fig, ax = plt.subplots()
+
+        s = AsinhScale(axis=None, linear_width=23.0)
+        assert s.linear_width == 23
+
+        tx = s.get_transform()
+        assert isinstance(tx, AsinhTransform)
+        assert tx.linear_width == s.linear_width
+
+    def test_bad_scale(self):
+        fig, ax = plt.subplots()
+
+        with pytest.raises(ValueError):
+            AsinhScale(axis=None, linear_width=0)
+        with pytest.raises(ValueError):
+            AsinhScale(axis=None, linear_width=-1)
+        s0 = AsinhScale(axis=None, )
+        s1 = AsinhScale(axis=None, linear_width=3.0)
diff --git a/lib/matplotlib/tests/test_ticker.py b/lib/matplotlib/tests/test_ticker.py
@@ -444,11 +444,18 @@ def test_set_params(self):
 
 
 class TestAsinhLocator:
+    def test_init(self):
+        lctr = mticker.AsinhLocator(linear_width=2.718, numticks=19)
+        assert lctr.linear_width == 2.718
+        assert lctr.numticks == 19
+
     def test_set_params(self):
         lctr = mticker.AsinhLocator(linear_width=5, numticks=17)
         assert lctr.numticks == 17
         lctr.set_params(numticks=23)
         assert lctr.numticks == 23
+        lctr.set_params(None)
+        assert lctr.numticks == 23
 
 
 class TestScalarFormatter:
