Commit 3071a37f authored by David Fairbrother's avatar David Fairbrother Committed by Peterson, Peter
Browse files

Fix missing files from upsteam rebase

Some of the merges got complex, so when in doubt we favoured main and
went back in this commit to add-back the missing files
parent e72a7bf9
......@@ -77,6 +77,10 @@ set(PYTHON_TEST_FILES
mantidqt/utils/qt/test/test_line_edit_double_validator.py
mantidqt/utils/qt/test/test_qappthreadcall.py
mantidqt/widgets/test/test_messagedisplay.py
mantidqt/widgets/test/test_scriptrepository.py
mantidqt/widgets/test/test_fittingmode.py
mantidqt/widgets/test/waterfallplotfillareadialog/test/test_waterfallplotfillareadialogpresenter.py
mantidqt/widgets/test/waterfallplotoffsetdialog/test/test_waterfallplotoffsetdialogpresenter.py
mantidqt/widgets/test/test_fitpropertybrowser.py
mantidqt/widgets/test/test_fitpropertybrowserbase.py
mantidqt/widgets/test/test_fitpropertybrowserplotinteraction.py
......@@ -93,6 +97,7 @@ set(PYTHON_TEST_FILES
set(PYTHON_WIDGET_QT5_ONLY_TESTS
mantidqt/widgets/algorithmselector/test/test_algorithm_factory_observer.py
mantidqt/widgets/algorithmselector/test/test_algorithmselector.py
mantidqt/widgets/codeeditor/test/test_codecommenter.py
mantidqt/widgets/codeeditor/test/test_codeeditor.py
mantidqt/widgets/codeeditor/test/test_completion.py
mantidqt/widgets/codeeditor/test/test_execution.py
......@@ -101,6 +106,7 @@ set(PYTHON_WIDGET_QT5_ONLY_TESTS
mantidqt/widgets/codeeditor/test/test_interpreter_view.py
mantidqt/widgets/codeeditor/test/test_multifileinterpreter.py
mantidqt/widgets/codeeditor/test/test_multifileinterpreter_view.py
mantidqt/widgets/codeeditor/test/test_scriptcompatibility.py
mantidqt/widgets/codeeditor/tab_widget/test/test_codeeditor_tab_presenter.py
mantidqt/widgets/codeeditor/tab_widget/test/test_codeeditor_tab_view.py
mantidqt/widgets/fitpropertybrowser/addfunctiondialog/test/test_addfunctiondialogpresenter.py
......@@ -120,6 +126,7 @@ set(PYTHON_WIDGET_QT5_ONLY_TESTS
mantidqt/widgets/samplematerialdialog/test/test_samplematerial_presenter.py
mantidqt/widgets/sliceviewer/test/test_sliceviewer_cursortracker.py
mantidqt/widgets/sliceviewer/test/test_sliceviewer_imageinfowidget.py
mantidqt/widgets/sliceviewer/test/test_sliceviewer_lineplots.py
mantidqt/widgets/sliceviewer/test/test_sliceviewer_model.py
mantidqt/widgets/sliceviewer/test/test_sliceviewer_movemousecursor.py
mantidqt/widgets/sliceviewer/test/test_sliceviewer_presenter.py
......@@ -160,6 +167,7 @@ set(PYTHON_WIDGET_QT5_ONLY_TESTS
mantidqt/widgets/workspacedisplay/table/test/test_tableworkspacedisplay_tableworkspace_item.py
mantidqt/widgets/workspacedisplay/table/test/test_tableworkspacedisplay_model.py
mantidqt/widgets/workspacedisplay/table/test/test_tableworkspacedisplay_presenter.py
mantidqt/widgets/workspacedisplay/table/test/test_tableworkspacedisplay_table_model.py
mantidqt/widgets/workspacedisplay/table/test/test_tableworkspacedisplay_view.py
mantidqt/widgets/workspacedisplay/table/test/test_tableworkspacedisplay_io.py
mantidqt/widgets/workspacewidget/test/test_workspacetreewidget.py
......
......@@ -23,12 +23,15 @@ set(TEST_PY_FILES
elemental_analysis/detectors_presenter_test.py
elemental_analysis/periodic_table_test.py
elemental_analysis/peak_selector_view_test.py
elemental_analysis/peak_data_file_test.py
elemental_analysis/element_button_test.py
elemental_analysis/periodic_combo_test.py
elemental_analysis/periodic_list_test.py
elemental_analysis/periodic_table_item_test.py
elemental_analysis/lmodel_test.py
elemental_analysis/load_model_test.py
elemental_analysis/PeriodicTableModel_test.py
elemental_analysis/PeriodicTablePresenter_test.py
elemental_analysis_2/elemental_analysis_context_test.py
elemental_analysis_2/elemental_analysis_main_GUI_test.py
elemental_analysis_2/EA_loading_tab/elemental_analysis_loadutils_test.py
......@@ -99,6 +102,8 @@ set(TEST_PY_FILES
loading_tab/loadwidget_presenter_failure_test.py
loading_tab/loadwidget_presenter_multiple_file_test.py
loading_tab/loadwidget_presenter_test.py
LoadWidgetPresenter_test.py
LoadWidgetView_test.py
max_ent_presenter_load_interaction_test.py
MaxEntPresenter_test.py
model_fitting_context_test.py
......@@ -119,6 +124,7 @@ set(TEST_PY_FILES
plot_fit_panes/plot_model_fit_pane_model_test.py
plot_fit_panes/plot_model_fit_pane_presenter_test.py
plot_fit_panes/plot_widget_test.py
PlottingView_test.py
plotting_canvas/plot_color_queue_test.py
plotting_canvas/plotting_canvas_model_test.py
plotting_canvas/plotting_canvas_presenter_test.py
......
......@@ -24,7 +24,6 @@ set(TEST_PY_FILES
table_model_test.py
test_run_tab_presenter.py
wavelength_interval_test.py
save_other_presenter_test.py
)
check_tests_valid(${CMAKE_CURRENT_SOURCE_DIR} ${TEST_PY_FILES})
......
......@@ -16,7 +16,6 @@ set(TEST_PY_FILES
slice_event_test.py
save_test.py
state_test.py
StateBuilderTest.py
wavelength_test.py
wavelength_and_pixel_adjustment_test.py
)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment