Skip to content
Snippets Groups Projects
Commit a00d973d authored by Martyn Gigg's avatar Martyn Gigg
Browse files

Minor updates to plotsaver tests for compatability

Changes in matplotlib 2.2 require doubles for sizes
and setting the font manually avoids any issues if
fonts are not available on all platforms.
Refs #27631
parent 8f4e7ecb
No related branches found
No related tags found
No related merge requests found
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
from __future__ import (absolute_import, division, print_function, unicode_literals) from __future__ import (absolute_import, division, print_function, unicode_literals)
import matplotlib import matplotlib
import platform
import unittest import unittest
from mantid.api import AnalysisDataService as ADS from mantid.api import AnalysisDataService as ADS
...@@ -33,11 +32,11 @@ class PlotsSaverTest(unittest.TestCase): ...@@ -33,11 +32,11 @@ class PlotsSaverTest(unittest.TestCase):
u'background_color': u'#ffffff', u'background_color': u'#ffffff',
u'edge_color': u'#000000', u'edge_color': u'#000000',
u'transparency': 0.5, u'transparency': 0.5,
u'entries_font': u'Bitstream Vera Sans', u'entries_font': u'DejaVu Sans',
u'entries_size': 10, u'entries_size': 10.0,
u'entries_color': u'#000000', u'entries_color': u'#000000',
u'title_font': u'Bitstream Vera Sans', u'title_font': u'DejaVu Sans',
u'title_size': 12, u'title_size': 12.0,
u'title_color': u'#000000', u'title_color': u'#000000',
u'marker_size': 2.0, u'marker_size': 2.0,
u'box_visible': True, u'box_visible': True,
...@@ -128,11 +127,6 @@ class PlotsSaverTest(unittest.TestCase): ...@@ -128,11 +127,6 @@ class PlotsSaverTest(unittest.TestCase):
self.loader_plot_dict[u'creationArguments'] = [[{u"specNum": 2, "function": "plot"}]] self.loader_plot_dict[u'creationArguments'] = [[{u"specNum": 2, "function": "plot"}]]
# The original font isn't available on Windows so it has to be changed.
if platform.system() == "Windows":
self.loader_plot_dict[u'axes'][0][u'legend'][u'entries_font'] = 'DejaVu Sans'
self.loader_plot_dict[u'axes'][0][u'legend'][u'title_font'] = 'DejaVu Sans'
self.maxDiff = None self.maxDiff = None
self.assertDictEqual(return_value, self.loader_plot_dict) self.assertDictEqual(return_value, self.loader_plot_dict)
...@@ -142,11 +136,6 @@ class PlotsSaverTest(unittest.TestCase): ...@@ -142,11 +136,6 @@ class PlotsSaverTest(unittest.TestCase):
expected_value = self.loader_plot_dict["axes"][0] expected_value = self.loader_plot_dict["axes"][0]
# The original font isn't available on Windows so it has to be changed.
if platform.system() == "Windows":
self.loader_plot_dict[u'axes'][0][u'legend'][u'entries_font'] = 'DejaVu Sans'
self.loader_plot_dict[u'axes'][0][u'legend'][u'title_font'] = 'DejaVu Sans'
self.maxDiff = None self.maxDiff = None
self.assertDictEqual(return_value, expected_value) self.assertDictEqual(return_value, expected_value)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment