10 files changed, 203 insertions, 8 deletions
diff --git a/silx/gui/widgets/test/__init__.py b/silx/gui/widgets/test/__init__.py
index 5e62393..8d179bc 100644
--- a/silx/gui/widgets/test/__init__.py
+++ b/silx/gui/widgets/test/__init__.py
@@ -31,6 +31,8 @@ from . import test_hierarchicaltableview
 from . import test_printpreview
 from . import test_framebrowser
 from . import test_boxlayoutdockwidget
+from . import test_rangeslider
+from . import test_flowlayout
 
 __authors__ = ["V. Valls", "P. Knobel"]
 __license__ = "MIT"
@@ -47,5 +49,7 @@ def suite():
          test_hierarchicaltableview.suite(),
          test_framebrowser.suite(),
          test_boxlayoutdockwidget.suite(),
+         test_rangeslider.suite(),
+         test_flowlayout.suite(),
          ])
     return test_suite
diff --git a/silx/gui/widgets/test/test_boxlayoutdockwidget.py b/silx/gui/widgets/test/test_boxlayoutdockwidget.py
index 0df262b..9a93ca1 100644
--- a/silx/gui/widgets/test/test_boxlayoutdockwidget.py
+++ b/silx/gui/widgets/test/test_boxlayoutdockwidget.py
@@ -32,7 +32,7 @@ import unittest
 
 from silx.gui.widgets.BoxLayoutDockWidget import BoxLayoutDockWidget
 from silx.gui import qt
-from silx.gui.test.utils import TestCaseQt
+from silx.gui.utils.testutils import TestCaseQt
 
 
 class TestBoxLayoutDockWidget(TestCaseQt):
diff --git a/silx/gui/widgets/test/test_flowlayout.py b/silx/gui/widgets/test/test_flowlayout.py
new file mode 100644
index 0000000..1497945
--- /dev/null
+++ b/silx/gui/widgets/test/test_flowlayout.py
@@ -0,0 +1,77 @@
+# coding: utf-8
+# /*##########################################################################
+#
+# Copyright (c) 2018 European Synchrotron Radiation Facility
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+# ###########################################################################*/
+"""Tests for FlowLayout"""
+
+__authors__ = ["T. Vincent"]
+__license__ = "MIT"
+__date__ = "02/08/2018"
+
+import unittest
+
+from silx.gui.widgets.FlowLayout import FlowLayout
+from silx.gui import qt
+from silx.gui.utils.testutils import TestCaseQt
+
+
+class TestFlowLayout(TestCaseQt):
+    """Tests for FlowLayout"""
+
+    def setUp(self):
+        """Create and show a widget"""
+        self.widget = qt.QWidget()
+        self.widget.show()
+        self.qWaitForWindowExposed(self.widget)
+
+    def tearDown(self):
+        """Delete widget"""
+        self.widget.setAttribute(qt.Qt.WA_DeleteOnClose)
+        self.widget.close()
+        del self.widget
+        self.qapp.processEvents()
+
+    def test(self):
+        """Basic tests"""
+        layout = FlowLayout()
+        self.widget.setLayout(layout)
+
+        layout.addWidget(qt.QLabel('first'))
+        layout.addWidget(qt.QLabel('second'))
+        self.assertEqual(layout.count(), 2)
+
+        layout.setHorizontalSpacing(10)
+        self.assertEqual(layout.horizontalSpacing(), 10)
+        layout.setVerticalSpacing(5)
+        self.assertEqual(layout.verticalSpacing(), 5)
+
+
+def suite():
+    loader = unittest.defaultTestLoader.loadTestsFromTestCase
+    test_suite = unittest.TestSuite()
+    test_suite.addTest(loader(TestFlowLayout))
+    return test_suite
+
+
+if __name__ == '__main__':
+    unittest.main(defaultTest='suite')
diff --git a/silx/gui/widgets/test/test_framebrowser.py b/silx/gui/widgets/test/test_framebrowser.py
index 9988d16..2dfd302 100644
--- a/silx/gui/widgets/test/test_framebrowser.py
+++ b/silx/gui/widgets/test/test_framebrowser.py
@@ -29,7 +29,7 @@ __date__ = "23/03/2018"
 
 import unittest
 
-from silx.gui.test.utils import TestCaseQt
+from silx.gui.utils.testutils import TestCaseQt
 from silx.gui.widgets.FrameBrowser import FrameBrowser
 
 
diff --git a/silx/gui/widgets/test/test_hierarchicaltableview.py b/silx/gui/widgets/test/test_hierarchicaltableview.py
index b3d37ed..9fad54d 100644
--- a/silx/gui/widgets/test/test_hierarchicaltableview.py
+++ b/silx/gui/widgets/test/test_hierarchicaltableview.py
@@ -29,7 +29,7 @@ __date__ = "07/04/2017"
 import unittest
 
 from .. import HierarchicalTableView
-from ...test.utils import TestCaseQt
+from silx.gui.utils.testutils import TestCaseQt
 from silx.gui import qt
 
 
diff --git a/silx/gui/widgets/test/test_periodictable.py b/silx/gui/widgets/test/test_periodictable.py
index c6bed81..3e7eb16 100644
--- a/silx/gui/widgets/test/test_periodictable.py
+++ b/silx/gui/widgets/test/test_periodictable.py
@@ -29,7 +29,7 @@ __date__ = "05/12/2016"
 import unittest
 
 from .. import PeriodicTable
-from ...test.utils import TestCaseQt
+from silx.gui.utils.testutils import TestCaseQt
 from silx.gui import qt
 
 
diff --git a/silx/gui/widgets/test/test_printpreview.py b/silx/gui/widgets/test/test_printpreview.py
index ecb165a..3c29171 100644
--- a/silx/gui/widgets/test/test_printpreview.py
+++ b/silx/gui/widgets/test/test_printpreview.py
@@ -30,7 +30,7 @@ __date__ = "19/07/2017"
 
 
 import unittest
-from silx.gui.test.utils import TestCaseQt
+from silx.gui.utils.testutils import TestCaseQt
 from silx.gui.widgets.PrintPreview import PrintPreviewDialog
 from silx.gui import qt
 
diff --git a/silx/gui/widgets/test/test_rangeslider.py b/silx/gui/widgets/test/test_rangeslider.py
new file mode 100644
index 0000000..2829050
--- /dev/null
+++ b/silx/gui/widgets/test/test_rangeslider.py
@@ -0,0 +1,114 @@
+# coding: utf-8
+# /*##########################################################################
+#
+# Copyright (c) 2018 European Synchrotron Radiation Facility
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+# ###########################################################################*/
+"""Tests for RangeSlider"""
+
+__authors__ = ["T. Vincent"]
+__license__ = "MIT"
+__date__ = "01/08/2018"
+
+import unittest
+
+from silx.gui import qt, colors
+from silx.gui.widgets.RangeSlider import RangeSlider
+from silx.gui.utils.testutils import TestCaseQt
+from silx.utils.testutils import ParametricTestCase
+
+
+class TestRangeSlider(TestCaseQt, ParametricTestCase):
+    """Tests for TestRangeSlider"""
+
+    def setUp(self):
+        self.slider = RangeSlider()
+        self.slider.show()
+        self.qWaitForWindowExposed(self.slider)
+
+    def tearDown(self):
+        self.slider.setAttribute(qt.Qt.WA_DeleteOnClose)
+        self.slider.close()
+        del self.slider
+        self.qapp.processEvents()
+
+    def testRangeValue(self):
+        """Test slider range and values"""
+
+        # Play with range
+        self.slider.setRange(1, 2)
+        self.assertEqual(self.slider.getRange(), (1., 2.))
+        self.assertEqual(self.slider.getValues(), (1., 1.))
+
+        self.slider.setMinimum(-1)
+        self.assertEqual(self.slider.getRange(), (-1., 2.))
+        self.assertEqual(self.slider.getValues(), (1., 1.))
+
+        self.slider.setMaximum(0)
+        self.assertEqual(self.slider.getRange(), (-1., 0.))
+        self.assertEqual(self.slider.getValues(), (0., 0.))
+
+        # Play with values
+        self.slider.setFirstValue(-2.)
+        self.assertEqual(self.slider.getValues(), (-1., 0.))
+
+        self.slider.setFirstValue(-0.5)
+        self.assertEqual(self.slider.getValues(), (-0.5, 0.))
+
+        self.slider.setSecondValue(2.)
+        self.assertEqual(self.slider.getValues(), (-0.5, 0.))
+
+        self.slider.setSecondValue(-0.1)
+        self.assertEqual(self.slider.getValues(), (-0.5, -0.1))
+
+    def testStepCount(self):
+        """Test related to step count"""
+        self.slider.setPositionCount(11)
+        self.assertEqual(self.slider.getPositionCount(), 11)
+        self.slider.setFirstValue(0.32)
+        self.assertEqual(self.slider.getFirstValue(), 0.3)
+        self.assertEqual(self.slider.getFirstPosition(), 3)
+
+        self.slider.setPositionCount(3)  # Value is adjusted
+        self.assertEqual(self.slider.getValues(), (0.5, 1.))
+        self.assertEqual(self.slider.getPositions(), (1, 2))
+
+    def testGroove(self):
+        """Test Groove pixmap"""
+        profile = list(range(100))
+
+        for cmap in ('jet', colors.Colormap('viridis')):
+            with self.subTest(str(cmap)):
+                self.slider.setGroovePixmapFromProfile(profile, cmap)
+                pixmap = self.slider.getGroovePixmap()
+                self.assertIsInstance(pixmap, qt.QPixmap)
+                self.assertEqual(pixmap.width(), len(profile))
+
+
+def suite():
+    loader = unittest.defaultTestLoader.loadTestsFromTestCase
+    test_suite = unittest.TestSuite()
+    test_suite.addTest(loader(TestRangeSlider))
+    return test_suite
+
+
+if __name__ == '__main__':
+    unittest.main(defaultTest='suite')
diff --git a/silx/gui/widgets/test/test_tablewidget.py b/silx/gui/widgets/test/test_tablewidget.py
index 5ad0a06..6822aef 100644
--- a/silx/gui/widgets/test/test_tablewidget.py
+++ b/silx/gui/widgets/test/test_tablewidget.py
@@ -30,7 +30,7 @@ __date__ = "05/12/2016"
 
 
 import unittest
-from silx.gui.test.utils import TestCaseQt
+from silx.gui.utils.testutils import TestCaseQt
 from silx.gui.widgets.TableWidget import TableWidget
 
 
diff --git a/silx/gui/widgets/test/test_threadpoolpushbutton.py b/silx/gui/widgets/test/test_threadpoolpushbutton.py
index a8618a4..e92eb02 100644
--- a/silx/gui/widgets/test/test_threadpoolpushbutton.py
+++ b/silx/gui/widgets/test/test_threadpoolpushbutton.py
@@ -32,8 +32,8 @@ __date__ = "17/01/2018"
 import unittest
 import time
 from silx.gui import qt
-from silx.gui.test.utils import TestCaseQt
-from silx.gui.test.utils import SignalListener
+from silx.gui.utils.testutils import TestCaseQt
+from silx.gui.utils.testutils import SignalListener
 from silx.gui.widgets.ThreadPoolPushButton import ThreadPoolPushButton
 from silx.utils.testutils import TestLogging