refs #22861 removed silx dependence

scripts/Muon/GUI/ElementalAnalysis/PeriodicTable/periodic_table_view.py

@@ -2,7 +2,7 @@ from __future__ import absolute_import
 
 from PyQt4 import QtCore, QtGui
 
-from silx.gui.widgets import PeriodicTable
+from Muon.GUI.ElementalAnalysis.PeriodicTable import periodic_table
 
 
 class PeriodicTableView(QtGui.QWidget):
@@ -12,7 +12,7 @@ class PeriodicTableView(QtGui.QWidget):
     def __init__(self, parent=None):
         super(PeriodicTableView, self).__init__(parent)
 
-        self.ptable = PeriodicTable.PeriodicTable(self, selectable=True)
+        self.ptable = periodic_table.PeriodicTable(self, selectable=True)
         self.ptable.sigElementClicked.connect(self.table_clicked)
         self.ptable.sigSelectionChanged.connect(self.table_changed)
 

scripts/test/Muon/PeriodicTableWidget_test.py

@@ -2,16 +2,11 @@ from __future__ import absolute_import, print_function
 
 import unittest
 
-from Muon.GUI.ElementalAnalysis.PeriodicTable.periodic_table_view import PeriodicTableView
-from Muon.GUI.ElementalAnalysis.PeriodicTable.periodic_table_presenter import PeriodicTablePresenter
 from Muon.GUI.ElementalAnalysis.PeriodicTable.periodic_table_widget import PeriodicTable
-from Muon.GUI.Common import mock_widget
-
-from PyQt4 import QtGui
+from Muon.GUI.ElementalAnalysis.PeriodicTable.periodic_table import PeriodicTable as silxPT
 
-from silx.gui.widgets import PeriodicTable as silxPT
+from Muon.GUI.Common import mock_widget
 
-from silx.gui.widgets.PeriodicTable import ColoredPeriodicTableItem
 
 try:
     from unittest import mock
@@ -32,12 +27,11 @@ class PeriodicTableWidgetTest(unittest.TestCase):
         self._qapp = mock_widget.mockQapp()
         self.widget = PeriodicTable()
         self.view = self.widget.presenter.view
-        self.mock_elem = ColoredPeriodicTableItem("T", 0, "", 1, "Test", 0)
-        self.mock_symbol = "T"
+        self.mock_elem = mock.Mock()
 
         self.view.ptable = mock.create_autospec(silxPT)
         self.view.ptable.getSelection = mock.Mock(
-            return_value=self.mock_symbol)
+            return_value=self.mock_elem)
         self.view.ptable.setSelection = mock.Mock()
         self.view.ptable.isElementSelected = mock.Mock(return_value=True)
         self.view.ptable.setElementSelected = mock.Mock()
@@ -50,42 +44,41 @@ class PeriodicTableWidgetTest(unittest.TestCase):
         if unregister and unreg_event is not None:
             unreg_event(handler.handler)
             func(args)
-        return handler.call_count
+        return handler.call_count == 1
 
     def test_table_clicked(self):
         assert self.call_event_once(self.widget.register_table_clicked,
-                                    self.view.table_clicked, self.mock_elem) == 1
+                                    self.view.table_clicked, self.mock_elem)
 
     def test_unregister_table_clicked(self):
         assert self.call_event_once(self.widget.register_table_clicked,
                                     self.view.table_clicked,
                                     self.mock_elem,
                                     unregister=True,
-                                    unreg_event=self.widget.unregister_table_clicked) == 1
+                                    unreg_event=self.widget.unregister_table_clicked)
 
     def test_register_table_changed(self):
         assert self.call_event_once(self.widget.register_table_changed,
-                                    self.view.table_changed, [self.mock_symbol]) == 1
+                                    self.view.table_changed, self.mock_elem)
 
     def test_unregister_table_changed(self):
         assert self.call_event_once(self.widget.register_table_changed,
                                     self.view.table_changed,
-                                    [self.mock_elem],
+                                    self.mock_elem,
                                     unregister=True,
-                                    unreg_event=self.widget.unregister_table_changed) == 1
+                                    unreg_event=self.widget.unregister_table_changed)
 
     def test_selection(self):
-        assert self.widget.selection == self.mock_symbol
+        assert self.widget.selection == self.mock_elem
 
     def test_is_selected(self):
-        assert self.widget.is_selected(self.mock_symbol)
+        assert self.widget.is_selected(self.mock_elem)
 
     def test_select_element(self):
-        self.widget.select_element(self.mock_symbol, deselect=False)
+        self.widget.select_element(self.mock_elem, deselect=False)
 
     def test_add_elements(self):
-        el = [self.mock_symbol] * 3
-        self.widget.add_elements(*el)
+        self.widget.add_elements(self.mock_elem)
 
 
 if __name__ == "__main__":