Rework get_cap(join)style, add tests

deep-jkl · deep-jkl · commit 66a122afadee · 2021-09-28T15:30:05.000+02:00
Check for user style in get_cap(join)style is removed.
This is also supported with two new tests.
Additional test checks that get_transform returns combination of
supplied and internal transformation.
diff --git a/lib/matplotlib/markers.py b/lib/matplotlib/markers.py
@@ -322,10 +322,10 @@ def _set_fillstyle(self, fillstyle):
         self._recache()
 
     def get_joinstyle(self):
-        return self._user_joinstyle or self._joinstyle
+        return self._joinstyle
 
     def get_capstyle(self):
-        return self._user_capstyle or self._capstyle
+        return self._capstyle
 
     def get_marker(self):
         return self._marker
diff --git a/lib/matplotlib/tests/test_marker.py b/lib/matplotlib/tests/test_marker.py
@@ -207,6 +207,30 @@ def test_marker_clipping(fig_ref, fig_test):
     ax_test.axis('off')
 
 
+def test_marker_init_transforms():
+    """Test that initializing marker with transform is a simple addition."""
+    marker = markers.MarkerStyle("o")
+    t = Affine2D().translate(1, 1)
+    t_marker = markers.MarkerStyle("o", transform=t)
+    assert marker.get_transform() + t == t_marker.get_transform()
+
+
+def test_marker_init_joinstyle():
+    marker = markers.MarkerStyle("*")
+    jstl = markers.JoinStyle.round
+    styled_marker = markers.MarkerStyle("*", joinstyle=jstl)
+    assert styled_marker.get_joinstyle() == jstl
+    assert marker.get_joinstyle() != jstl
+
+
+def test_marker_init_captyle():
+    marker = markers.MarkerStyle("*")
+    capstl = markers.CapStyle.round
+    styled_marker = markers.MarkerStyle("*", capstyle=capstl)
+    assert styled_marker.get_capstyle() == capstl
+    assert marker.get_capstyle() != capstl
+
+
 @pytest.mark.parametrize("marker,transform,expected", [
     (markers.MarkerStyle("o"), Affine2D().translate(1, 1),
         Affine2D().translate(1, 1)),
