Skip to content

Commit 8f6f745

Browse files
temp prints
1 parent 525db43 commit 8f6f745

File tree

1 file changed

+29
-8
lines changed

1 file changed

+29
-8
lines changed

Framework/Algorithms/test/FindPeaksConvolveTest.h

Lines changed: 29 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,22 +68,35 @@ class FindPeaksConvolveTest : public CxxTest::TestSuite {
6868
// This pair of boilerplate methods prevent the suite being created statically
6969
// This means the constructor isn't called when running other tests
7070
static FindPeaksConvolveTest *createSuite() { return new FindPeaksConvolveTest(); }
71-
static void destroySuite(FindPeaksConvolveTest *suite) { delete suite; }
71+
static void destroySuite(FindPeaksConvolveTest *suite) {
72+
std::cout << "destroySuite started" << std::endl; // TODO remove
7273

73-
FindPeaksConvolveTest() { Mantid::API::FrameworkManager::Instance(); }
74+
delete suite;
75+
76+
std::cout << "destroySuite end" << std::endl; // TODO remove
77+
}
78+
79+
FindPeaksConvolveTest() {
80+
std::cout << "FindPeaksConvolveTest" << std::endl; // TODO remove
81+
Mantid::API::FrameworkManager::Instance();
82+
}
7483

7584
void setUp() override {
7685
// Load data file into ADS once
7786
TS_ASSERT_THROWS_NOTHING(loadNexusProcessed("ENGINX_277208_focused_bank_2.nxs", INPUT_TEST_WS_NAME));
7887
TS_ASSERT_THROWS_NOTHING(loadNexusProcessed("VesuvioCalibSpec177.nxs", INPUT_TEST_WS_NAME + "_noisy"));
7988
TS_ASSERT_THROWS_NOTHING(loadNexusProcessed("focussed.nxs", INPUT_TEST_WS_NAME + "_focussed"));
89+
90+
std::cout << "setup End" << std::endl; // TODO remove
8091
}
8192

8293
void tearDown() override {
8394
// Clean up workspaces to avoid interference between tests
8495
Mantid::API::AnalysisDataService::Instance().remove(INPUT_TEST_WS_NAME);
8596
Mantid::API::AnalysisDataService::Instance().remove(INPUT_TEST_WS_NAME + "_noisy");
8697
Mantid::API::AnalysisDataService::Instance().remove(INPUT_TEST_WS_NAME + "_focussed");
98+
99+
std::cout << "tearDown End" << std::endl; // TODO remove
87100
}
88101

89102
void test_exec() {
@@ -210,25 +223,33 @@ class FindPeaksConvolveTest : public CxxTest::TestSuite {
210223
TS_ASSERT_THROWS(alg->execute(), std::invalid_argument &);
211224
}
212225

213-
void test_execValidRange() {
226+
void test_execNoRange() {
227+
std::cout << "Start of: test_execNoRange" << std::endl; // TODO remove
228+
214229
auto alg = set_up_alg(INPUT_TEST_WS_NAME + "_focussed", OUTPUT_TEST_WS_NAME + "_focussed");
215230
alg->setProperty("EstimatedPeakExtent", "0.2");
216-
alg->setProperty("StartWorkspaceIndex", "1");
217-
alg->setProperty("EndWorkspaceIndex", "2");
218231
TS_ASSERT_THROWS_NOTHING(alg->execute());
219232
const Mantid::API::WorkspaceGroup_sptr resultWs = alg->getProperty("OutputWorkspace");
220233
Mantid::API::ITableWorkspace_sptr item =
221234
std::dynamic_pointer_cast<Mantid::API::ITableWorkspace>(resultWs->getItem("PeakCentre"));
222-
TS_ASSERT_EQUALS(item->rowCount(), 2);
235+
TS_ASSERT_EQUALS(item->rowCount(), 6);
236+
237+
std::cout << "End of: test_execNoRange" << std::endl; // TODO remove
223238
}
224239

225-
void test_execNoRange() {
240+
void test_execValidRange() {
241+
std::cout << "Start of: test_execValidRange" << std::endl; // TODO remove
242+
226243
auto alg = set_up_alg(INPUT_TEST_WS_NAME + "_focussed", OUTPUT_TEST_WS_NAME + "_focussed");
227244
alg->setProperty("EstimatedPeakExtent", "0.2");
245+
alg->setProperty("StartWorkspaceIndex", "1");
246+
alg->setProperty("EndWorkspaceIndex", "2");
228247
TS_ASSERT_THROWS_NOTHING(alg->execute());
229248
const Mantid::API::WorkspaceGroup_sptr resultWs = alg->getProperty("OutputWorkspace");
230249
Mantid::API::ITableWorkspace_sptr item =
231250
std::dynamic_pointer_cast<Mantid::API::ITableWorkspace>(resultWs->getItem("PeakCentre"));
232-
TS_ASSERT_EQUALS(item->rowCount(), 6);
251+
TS_ASSERT_EQUALS(item->rowCount(), 2);
252+
253+
std::cout << "End of: test_execValidRange" << std::endl; // TODO remove
233254
}
234255
};

0 commit comments

Comments
 (0)