Added validation

diegopetrola · diegopetrola · commit ccaffe262b8a · 2020-08-13T18:55:59.000-03:00
Adjusted the error with the cache

There was a bug you would get the same text even with different fontsets arguments because of the cache
diff --git a/lib/matplotlib/font_manager.py b/lib/matplotlib/font_manager.py
@@ -41,6 +41,7 @@
 from matplotlib import afm, cbook, ft2font, rcParams
 from matplotlib.fontconfig_pattern import (
     parse_fontconfig_pattern, generate_fontconfig_pattern)
+from matplotlib.rcsetup import _validators
 
 _log = logging.getLogger(__name__)
 
@@ -694,7 +695,6 @@ def __init__(self,
         self._stretch = rcParams['font.stretch']
         self._size = rcParams['font.size']
         self._file = None
-        self._mathtext_fontset = rcParams['mathtext.fontset']
 
         if isinstance(family, str):
             # Treat family as a fontconfig pattern if it is the only
@@ -743,7 +743,8 @@ def __hash__(self):
              self.get_weight(),
              self.get_stretch(),
              self.get_size_in_points(),
-             self.get_file())
+             self.get_file(),
+             self.get_mathtext_fontset())
         return hash(l)
 
     def __eq__(self, other):
@@ -950,19 +951,15 @@ def set_mathtext_fontset(self, fontset):
         See Also
         --------
         .text.set_mathtext_fontset
-        
-        TO DO: make the same validations as made when atributing a fontset
-        to the rcParams[]
         """
-        
-        #if fontset not in _validators()
-        
-        self._mathtext_fontset = \
-                rcParams["mathtext.fontset"] if fontset is None else fontset
-        
-        
-        
-            
+        if fontset is None:
+            self._mathtext_fontset = rcParams['mathtext.fontset']
+            return
+        #this function validates the parameter fontset just as if it were
+        #passed to rcParams['mathtext.fontset']
+        _validators['mathtext.fontset'](fontset)
+        self._mathtext_fontset = fontset       
+
     def copy(self):
         """Return a copy of self."""
         new = type(self)()
diff --git a/lib/matplotlib/tests/test_mathtext.py b/lib/matplotlib/tests/test_mathtext.py
@@ -364,3 +364,59 @@ def test_mathtext_to_png(tmpdir):
     mt = mathtext.MathTextParser('bitmap')
     mt.to_png(str(tmpdir.join('example.png')), '$x^2$')
     mt.to_png(io.BytesIO(), '$x^2$')
+
+
+def test_mathtext_fontset():
+    #This is my first time doing this kinds of tests, so I am not sure if I am 
+    #doing it the right way, here's my plan for this testing:
+    #
+    #1) Create two figures, one without my implementation 
+    # (should produce 2 texts with the same font) 
+    # and one with (should create two texts with different fonts)
+    #2) Save the figures on Disk
+    #3) Load the figures and compare them, if they are equal, the test fails
+    #4) Delete the figures 
+    #
+    # I am making the test a bit slower but avoiding the burden of adding 
+    # more figures to the repo. On my computer at least, the time for this
+    # test was of the order of a few seconds.
+    
+    plt.rcParams["mathtext.fontset"] = "dejavusans"
+
+    #figure 1 setup
+    #this figure IS NOT using the 'fontset' argument, therefore, 
+    #the font should be equal to the font set in rcParams["mathtext.fontset"]
+    f1, ax1 = plt.subplots(figsize=(12,10))
+    ax1.plot(range(11),color="0.9")
+    ax1.text(0.2,9,r"$\mathit{This\ text\ should\ have\ a\ one\ font} $",
+             size=18)
+    
+    ax1.text(0.2,8,r"$\mathit{This\ text\ should\ have\ another} $",
+             size=18)
+    
+    #figure 2 setup
+    #this figure IS using the 'fontset' parameter and must have two texts
+    #with distinct fonts in the final image
+    f2, ax2 = plt.subplots(figsize=(12,10))
+    ax2.plot(range(11),color="0.9")
+    ax2.text(0.2,9,r"$\mathit{This\ text\ should\ have\ a\ one\ font} $",
+             size=18, fontset = 'dejavusans' )
+    
+    ax2.text(0.2,8,r"$\mathit{This\ text\ should\ have\ another} $",
+             size = 18, fontset = 'dejavuserif' )
+    
+    f1.savefig('mathtext_fontset_image1.png')
+    f2.savefig('mathtext_fontset_image2.png')
+    
+    figureLoaded1 = io.FileIO('mathtext_fontset_image1.png').readall()
+    figureLoaded2 = io.FileIO('mathtext_fontset_image2.png').readall()
+    
+    figuresEqual = figureLoaded1 == figureLoaded2
+    
+    os.remove('mathtext_fontset_image1.png')
+    os.remove('mathtext_fontset_image2.png')
+    
+    #if the parameter fontset is not working, the figures will be equal and the
+    #test will fail
+    assert not figuresEqual
+    
