From fb4c4dd50fe069bd691876e9e2c830be11c41691 Mon Sep 17 00:00:00 2001 From: Philipp Rudiger Date: Thu, 15 Aug 2019 14:54:40 +0200 Subject: [PATCH] Small fixes for bokeh renderer tests --- .../tests/plotting/bokeh/testrenderer.py | 38 ++++++++++++++++--- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/holoviews/tests/plotting/bokeh/testrenderer.py b/holoviews/tests/plotting/bokeh/testrenderer.py index ee18598065..16bb52c743 100644 --- a/holoviews/tests/plotting/bokeh/testrenderer.py +++ b/holoviews/tests/plotting/bokeh/testrenderer.py @@ -6,7 +6,8 @@ import numpy as np -from holoviews import HoloMap, Image, GridSpace, Table, Curve, Store +from holoviews import DynamicMap, HoloMap, Image, GridSpace, Table, Curve, Store +from holoviews.streams import Stream from holoviews.plotting import Renderer from holoviews.element.comparison import ComparisonTestCase @@ -17,7 +18,7 @@ from holoviews.plotting.bokeh import BokehRenderer from bokeh.themes.theme import Theme - from panel.widgets import DiscreteSlider, Player + from panel.widgets import DiscreteSlider, Player, FloatSlider except: pn = None @@ -165,14 +166,41 @@ def test_render_holomap_individual_widget_position(self): def test_render_dynamicmap_with_dims(self): dmap = DynamicMap(lambda y: Curve([1, 2, y]), kdims=['y']).redim.range(y=(0.1, 5)) obj, _ = self.renderer._validate(dmap, None) - + self.renderer.components(obj) + [(plot, pane)] = obj._plots.values() + cds = plot.handles['cds'] + + self.assertEqual(cds.data['y'][2], 0.1) + slider = obj.layout.select(FloatSlider)[0] + slider.value = 3.1 + self.assertEqual(cds.data['y'][2], 3.1) + def test_render_dynamicmap_with_stream(self): - stream = Stream.define('Custom', y=2)() + stream = Stream.define(str('Custom'), y=2)() dmap = DynamicMap(lambda y: Curve([1, 2, y]), kdims=['y'], streams=[stream]) obj, _ = self.renderer._validate(dmap, None) + self.renderer.components(obj) + [(plot, pane)] = obj._plots.values() + cds = plot.handles['cds'] + + self.assertEqual(cds.data['y'][2], 2) + stream.event(y=3) + self.assertEqual(cds.data['y'][2], 3) def test_render_dynamicmap_with_stream_dims(self): - stream = Stream.define('Custom', y=2)() + stream = Stream.define(str('Custom'), y=2)() dmap = DynamicMap(lambda x, y: Curve([x, 1, y]), kdims=['x', 'y'], streams=[stream]).redim.values(x=[1, 2, 3]) obj, _ = self.renderer._validate(dmap, None) + self.renderer.components(obj) + [(plot, pane)] = obj._plots.values() + cds = plot.handles['cds'] + + self.assertEqual(cds.data['y'][2], 2) + stream.event(y=3) + self.assertEqual(cds.data['y'][2], 3) + + self.assertEqual(cds.data['y'][0], 1) + slider = obj.layout.select(DiscreteSlider)[0] + slider.value = 3 + self.assertEqual(cds.data['y'][0], 3)