Minor cleanup and add test for offsetbox

oscargus · oscargus · commit fb4f7eb4221e · 2022-11-17T16:40:52.000+01:00
diff --git a/lib/matplotlib/offsetbox.py b/lib/matplotlib/offsetbox.py
@@ -114,7 +114,7 @@ def _get_packed_offsets(widths, total, sep, mode="fixed"):
         offsets = offsets_[:-1]
         return total, offsets
 
-    elif mode == "equal":
+    else:  # "equal"
         maxh = max(widths)
         if total is None:
             if sep is None:
@@ -166,13 +166,13 @@ def _get_aligned_offsets(hd_list, height, align="baseline"):
         descent = max(d for h, d in hd_list)
         height = height_descent + descent
         offsets = [0. for h, d in hd_list]
-    elif align in ["left", "top"]:
+    elif align in ("left", "top"):
         descent = 0.
         offsets = [d for h, d in hd_list]
-    elif align in ["right", "bottom"]:
+    elif align in ("right", "bottom"):
         descent = 0.
         offsets = [height - h + d for h, d in hd_list]
-    elif align == "center":
+    else:  # "center"
         descent = 0.
         offsets = [(height - h) * .5 + d for h, d in hd_list]
 
diff --git a/lib/matplotlib/tests/test_offsetbox.py b/lib/matplotlib/tests/test_offsetbox.py
@@ -5,7 +5,7 @@
 from numpy.testing import assert_allclose
 import pytest
 
-from matplotlib.testing.decorators import image_comparison
+from matplotlib.testing.decorators import check_figures_equal, image_comparison
 import matplotlib.pyplot as plt
 import matplotlib.patches as mpatches
 import matplotlib.lines as mlines
@@ -28,6 +28,7 @@ def test_offsetbox_clipping():
     fig, ax = plt.subplots()
     size = 100
     da = DrawingArea(size, size, clip=True)
+    assert da.clip_children
     bg = mpatches.Rectangle((0, 0), size, size,
                             facecolor='#CCCCCC',
                             edgecolor='None',
@@ -335,3 +336,39 @@ def test_arrowprops_copied():
                         arrowprops=arrowprops)
     assert ab.arrowprops is not ab
     assert arrowprops["relpos"] == (.3, .7)
+
+
+def test_annotationbbox_properties():
+    ab = AnnotationBbox(DrawingArea(20, 20, 0, 0, clip=True), (0.5, 0.5),
+                        xycoords='data')
+    assert ab.xyann == (0.5, 0.5)  # xy if xybox not given
+    assert ab.anncoords == 'data'  # xycoords if boxcoords not given
+
+    ab = AnnotationBbox(DrawingArea(20, 20, 0, 0, clip=True), (0.5, 0.5),
+                        xybox=(-0.2, 0.4), xycoords='data',
+                        boxcoords='axes fraction')
+    assert ab.xyann == (-0.2, 0.4)  # xybox if given
+    assert ab.anncoords == 'axes fraction'  # boxcoords if given
+
+
+def test_textarea_properties():
+    ta = TextArea('Foo')
+    assert ta.get_text() == 'Foo'
+    assert not ta.get_multilinebaseline()
+
+    ta.set_text('Bar')
+    ta.set_multilinebaseline(True)
+    assert ta.get_text() == 'Bar'
+    assert ta.get_multilinebaseline()
+
+
+@check_figures_equal()
+def test_textarea_set_text(fig_test, fig_ref):
+    ax_ref = fig_ref.add_subplot()
+    text0 = AnchoredText("Foo", "upper left")
+    ax_ref.add_artist(text0)
+
+    ax_test = fig_test.add_subplot()
+    text1 = AnchoredText("Bar", "upper left")
+    ax_test.add_artist(text1)
+    text1.txt.set_text("Foo")
