diff --git a/qt/scientific_interfaces/Indirect/test/CMakeLists.txt b/qt/scientific_interfaces/Indirect/test/CMakeLists.txt index 8c47169d1c2cc585543f6f0f4ae822b336185584..62a31d5c5d9b5a9a56a6b88dcc5931fdae2c2cc1 100644 --- a/qt/scientific_interfaces/Indirect/test/CMakeLists.txt +++ b/qt/scientific_interfaces/Indirect/test/CMakeLists.txt @@ -13,6 +13,9 @@ mtd_add_qt_tests (TARGET_NAME MantidQtInterfacesIndirectTest ../../../../Framework/TestHelpers/inc ../ TEST_HELPER_SRCS + ../../../../Framework/TestHelpers/src/ComponentCreationHelper.cpp + ../../../../Framework/TestHelpers/src/InstrumentCreationHelper.cpp + ../../../../Framework/TestHelpers/src/WorkspaceCreationHelper.cpp ../../../../Framework/TestHelpers/src/TearDownWorld.cpp LINK_LIBS ${TCMALLOC_LIBRARIES_LINKTIME} diff --git a/qt/scientific_interfaces/Indirect/test/IndirectFitDataTest.h b/qt/scientific_interfaces/Indirect/test/IndirectFitDataTest.h index d85e641aadbe1a1497933c463d085e092fbc916c..3eaa09e6d32f8b0360b4c764076dda7bf6261a3f 100644 --- a/qt/scientific_interfaces/Indirect/test/IndirectFitDataTest.h +++ b/qt/scientific_interfaces/Indirect/test/IndirectFitDataTest.h @@ -5,7 +5,7 @@ #include "IndirectFitData.h" #include "MantidAPI/MatrixWorkspace.h" -#include "MantidAPI/WorkspaceFactory.h" +#include "MantidTestHelpers/WorkspaceCreationHelper.h" #include <iostream> @@ -21,24 +21,27 @@ public: static void destroySuite(IndirectFitDataTest *suite) { delete suite; } void test_data_is_instantiated_correctly() { - MatrixWorkspace_sptr workspace = - WorkspaceFactory::Instance().create("Workspace2D", 1, 9, 9); + auto workspace = WorkspaceCreationHelper::create2DWorkspace123(1, 3); const Spectra spec = std::make_pair(0u, workspace->getNumberHistograms() - 1); - // IndirectFitData data(workspace, spec); - // const std::string name = data.workspace()->getName(); - // std::cout << name << "\n"; - std::cout << "HELLO"; + workspace->setTitle("Test Title"); + IndirectFitData data(workspace, spec); + + TS_ASSERT_EQUALS(data.workspace()->getTitle(), "Test Title"); + TS_ASSERT_EQUALS(data.workspace()->getNumberHistograms(), 1); } void test_displayName_returns_correct_name() { - // given - - // the workspace and data - // when - - // the parameters equal so and so - // then - - // the output name should be + auto workspace = WorkspaceCreationHelper::create2DWorkspace123(1, 3); + const Spectra spec = + std::make_pair(0u, workspace->getNumberHistograms() - 1); + IndirectFitData data(workspace, spec); + + const std::string formatString = "%1%_s%2%_Result"; + const std::string rangeDelimiter = "_to_"; + + TS_ASSERT_EQUALS(data.displayName(formatString, rangeDelimiter), "_s0_Result"); } };