Add proper plotting.

1 files changed, 21 insertions, 12 deletions

diff --git a/test/sca/test_plot.py b/test/sca/test_plot.py
index d004cf5..9158e5c 100644
--- a/test/sca/test_plot.py
+++ b/test/sca/test_plot.py
@@ -1,29 +1,38 @@
 from os import getenv
 
 import numpy as np
-
+import holoviews as hv
 from pyecsca.sca.trace import Trace
-from pyecsca.sca.trace.plot import (new_figure, plot_trace, save_figure, save_figure_png,
-                                    save_figure_svg)
-from .utils import Plottable, disabled
+from pyecsca.sca.trace.plot import (plot_trace, save_figure, save_figure_png, save_figure_svg,
+                                    plot_traces)
+from .utils import Plottable
 
 
 class PlotTests(Plottable):
 
     def setUp(self) -> None:
-        self.trace = Trace(np.array([6, 7, 3, -2, 5, 1], dtype=np.dtype("i1")), None, None)
-        self.fig = new_figure()
-        plot_trace(self.fig, self.trace)
+        self.trace1 = Trace(np.array([6, 7, 3, -2, 5, 1], dtype=np.dtype("i1")), None, None)
+        self.trace2 = Trace(np.array([2, 3, 7, 0, -1, 0], dtype=np.dtype("i1")), None, None)
 
     def test_html(self):
         if getenv("PYECSCA_TEST_PLOTS") is None:
             return
-        save_figure(self.fig, self.get_fname() + ".html", "Trace plot")
+        hv.extension("bokeh")
+        fig = plot_trace(self.trace1)
+        save_figure(fig, self.get_fname())
+        other = plot_traces(self.trace1, self.trace2)
+        save_figure(other, self.get_fname())
 
-    @disabled
     def test_png(self):
-        save_figure_png(self.fig, self.get_fname() + ".png", 1000, 400)
+        if getenv("PYECSCA_TEST_PLOTS") is None:
+            return
+        hv.extension("matplotlib")
+        fig = plot_trace(self.trace1)
+        save_figure_png(fig, self.get_fname())
 
-    @disabled
     def test_svg(self):
-        save_figure_svg(self.fig, self.get_fname() + ".svg")
+        if getenv("PYECSCA_TEST_PLOTS") is None:
+            return
+        hv.extension("matplotlib")
+        fig = plot_trace(self.trace1)
+        save_figure_svg(fig, self.get_fname())