Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
mantidproject
mantid
Commits
e412af07
Unverified
Commit
e412af07
authored
Jan 21, 2021
by
Gigg, Martyn Anthony
Committed by
GitHub
Jan 21, 2021
Browse files
Merge pull request #30425 from mantidproject/30422_move_indirect_tests_to_qt5
Make the Indirect unit tests run on Qt5
parents
1b136e68
3a11d23b
Changes
4
Hide whitespace changes
Inline
Side-by-side
qt/scientific_interfaces/Indirect/test/CMakeLists.txt
View file @
e412af07
...
...
@@ -32,7 +32,7 @@ set(CXXTEST_EXTRA_HEADER_INCLUDE
mtd_add_qt_tests
(
TARGET_NAME MantidQtInterfacesIndirectTest
QT_VERSION
4
QT_VERSION
5
SRC
${
TEST_FILES
}
INCLUDE_DIRS
../../../../Framework/CurveFitting/inc
...
...
@@ -53,11 +53,16 @@ mtd_add_qt_tests(
gmock
${
POCO_LIBRARIES
}
${
Boost_LIBRARIES
}
QT4_LINK_LIBS
Qwt5
PythonInterfaceCore
${
PYTHON_LIBRARIES
}
QT5_LINK_LIBS
Qt5::OpenGL
Qt5::Concurrent
MTD_QT_LINK_LIBS
MantidScientificInterfacesIndirect
MantidQtWidgetsCommon
MantidQtWidgetsPlotting
MantidQtWidgetsMplCpp
PARENT_DEPENDENCIES
GUITests
)
qt/scientific_interfaces/Indirect/test/IndirectDataTablePresenterTest.h
View file @
e412af07
...
...
@@ -110,6 +110,8 @@ public:
IDA
::
WorkspaceIndex
spectrum
));
MOCK_METHOD2
(
setResolution
,
void
(
const
std
::
string
&
name
,
TableDatasetIndex
index
));
MOCK_METHOD2
(
setExcludeRegion
,
void
(
const
std
::
string
&
exclude
,
FitDomainIndex
index
));
MOCK_CONST_METHOD1
(
getWorkspace
,
Mantid
::
API
::
MatrixWorkspace_sptr
(
FitDomainIndex
index
));
...
...
qt/scientific_interfaces/Indirect/test/IndirectPlotterTest.h
View file @
e412af07
...
...
@@ -16,6 +16,7 @@
#include
"MantidAPI/MatrixWorkspace.h"
#include
"MantidDataObjects/Workspace2D.h"
#include
"MantidKernel/WarningSuppressions.h"
#include
"MantidQtWidgets/MplCpp/BackendQt.h"
#include
"MantidTestHelpers/WorkspaceCreationHelper.h"
using
namespace
Mantid
::
API
;
...
...
@@ -60,6 +61,7 @@ GNU_DIAG_ON_SUGGEST_OVERRIDE
class
IndirectPlotterTest
:
public
CxxTest
::
TestSuite
{
public:
IndirectPlotterTest
()
:
m_ads
(
AnalysisDataService
::
Instance
())
{
MantidQt
::
Widgets
::
MplCpp
::
backendModule
();
m_ads
.
clear
();
}
...
...
@@ -86,22 +88,18 @@ public:
TS_ASSERT
(
m_plotter
);
}
void
test_that_plotSpectra_will_attempt_to_run_python_code_using_the_IPyRunner
()
{
void
test_that_plotSpectra_will_not_throw
()
{
m_ads
.
addOrReplace
(
WORKSPACE_NAME
,
createMatrixWorkspace
(
5
,
5
));
EXPECT_CALL
(
*
m_pyRunner
,
runPythonCode
(
_
)).
Times
(
1
);
m_plotter
->
plotSpectra
(
WORKSPACE_NAME
,
WORKSPACE_INDICES
);
TS_ASSERT_THROWS_NOTHING
(
m_plotter
->
plotSpectra
(
WORKSPACE_NAME
,
WORKSPACE_INDICES
));
}
void
test_that_plotBins_will_attempt_to_run_python_code_using_the_IPyRunner
()
{
void
test_that_plotBins_will_not_throw
()
{
m_ads
.
addOrReplace
(
WORKSPACE_NAME
,
createMatrixWorkspace
(
5
,
5
));
EXPECT_CALL
(
*
m_pyRunner
,
runPythonCode
(
_
)).
Times
(
1
);
m_plotter
->
plotBins
(
WORKSPACE_NAME
,
WORKSPACE_INDICES
);
TS_ASSERT_THROWS_NOTHING
(
m_plotter
->
plotBins
(
WORKSPACE_NAME
,
WORKSPACE_INDICES
));
}
void
...
...
qt/scientific_interfaces/Indirect/test/InterfacesIndirectTestInitialization.h
View file @
e412af07
...
...
@@ -6,6 +6,7 @@
// SPDX - License - Identifier: GPL - 3.0 +
#pragma once
#include
"MantidPythonInterface/core/Testing/PythonInterpreterGlobalFixture.h"
#include
"MantidQtWidgets/Common/Testing/QApplicationGlobalFixture.h"
//------------------------------------------------------------------------------
...
...
@@ -14,4 +15,5 @@
// We rely on cxxtest only including this file once so that the following
// statements do not cause multiple-definition errors.
//------------------------------------------------------------------------------
static
PythonInterpreterGlobalFixture
PYTHON_INTERPRETER
;
static
QApplicationGlobalFixture
MAIN_QAPPLICATION
;
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment