diff --git a/qt/applications/workbench/workbench/plugins/test/test_workspacewidget.py b/qt/applications/workbench/workbench/plugins/test/test_workspacewidget.py index 1dfe1c0016163f95c804def2d7a1af20f9ff14ec..3d033e6c0ea2657135cd1275a90b57108bd24c53 100644 --- a/qt/applications/workbench/workbench/plugins/test/test_workspacewidget.py +++ b/qt/applications/workbench/workbench/plugins/test/test_workspacewidget.py @@ -7,23 +7,27 @@ # This file is part of the mantid workbench. # # +from __future__ import (absolute_import, division) import unittest -from qtpy.QtWidgets import QMainWindow, QApplication +import matplotlib as mpl +mpl.use('Agg') # noqa -from mantid.simpleapi import (CreateEmptyTableWorkspace, CreateWorkspace, - GroupWorkspaces) from mantid.py3compat import mock +from mantid.simpleapi import (CreateEmptyTableWorkspace, CreateSampleWorkspace, + GroupWorkspaces) from mantidqt.utils.qt.testing import start_qapplication from mantidqt.utils.qt.testing.qt_widget_finder import QtWidgetFinder -import matplotlib as mpl -mpl.use('Agg') # noqa +from qtpy.QtWidgets import QMainWindow, QApplication from workbench.plugins.workspacewidget import WorkspaceWidget - +ALGORITHM_HISTORY_WINDOW_TYPE = "AlgorithmHistoryWindow" ALGORITHM_HISTORY_WINDOW = "mantidqt.widgets.workspacewidget." \ - "algorithmhistorywindow.AlgorithmHistoryWindow" + "algorithmhistorywindow." + ALGORITHM_HISTORY_WINDOW_TYPE +MATRIXWORKSPACE_DISPLAY = "mantidqt.widgets.workspacedisplay.matrix." \ + "presenter.MatrixWorkspaceDisplay" +MATRIXWORKSPACE_DISPLAY_TYPE = "StatusBarView" app = QApplication([]) @@ -34,8 +38,7 @@ class WorkspaceWidgetTest(unittest.TestCase, QtWidgetFinder): @classmethod def setUpClass(cls): cls.ws_widget = WorkspaceWidget(QMainWindow()) - cls.ahw_type_name = 'AlgorithmHistoryWindow' - mat_ws = CreateWorkspace([1], [2]) + mat_ws = CreateSampleWorkspace() table_ws = CreateEmptyTableWorkspace() group_ws = GroupWorkspaces([mat_ws, table_ws]) cls.w_spaces = [mat_ws, table_ws, group_ws] @@ -46,17 +49,22 @@ class WorkspaceWidgetTest(unittest.TestCase, QtWidgetFinder): def test_algorithm_history_window_opens_with_workspace(self): with mock.patch(ALGORITHM_HISTORY_WINDOW + '.show', lambda x: None): self.ws_widget._do_show_algorithm_history([self.ws_names[0]]) - self.assert_widget_type_exists(self.ahw_type_name) + self.assert_widget_type_exists(ALGORITHM_HISTORY_WINDOW_TYPE) def test_algorithm_history_window_doesnt_open_with_workspace_group(self): with mock.patch(ALGORITHM_HISTORY_WINDOW + '.show', lambda x: None): self.ws_widget._do_show_algorithm_history([self.ws_names[2]]) - self.assert_widget_type_doesnt_exist(self.ahw_type_name) + self.assert_widget_type_doesnt_exist(ALGORITHM_HISTORY_WINDOW_TYPE) def test_algorithm_history_window_opens_multiple(self): with mock.patch(ALGORITHM_HISTORY_WINDOW + '.show', lambda x: None): self.ws_widget._do_show_algorithm_history(self.ws_names) - self.assert_number_of_widgets_matching(self.ahw_type_name, 2) + self.assert_number_of_widgets_matching(ALGORITHM_HISTORY_WINDOW_TYPE, 2) + + def test_detector_table_shows_with_workspace(self): + with mock.patch(MATRIXWORKSPACE_DISPLAY + '.show_view', lambda x: None): + self.ws_widget._do_show_detectors([self.ws_names[0]]) + self.assert_widget_type_exists(MATRIXWORKSPACE_DISPLAY_TYPE) if __name__ == '__main__':