@@ -68,22 +68,35 @@ class FindPeaksConvolveTest : public CxxTest::TestSuite {
68
68
// This pair of boilerplate methods prevent the suite being created statically
69
69
// This means the constructor isn't called when running other tests
70
70
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
72
73
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
+ }
74
83
75
84
void setUp () override {
76
85
// Load data file into ADS once
77
86
TS_ASSERT_THROWS_NOTHING (loadNexusProcessed (" ENGINX_277208_focused_bank_2.nxs" , INPUT_TEST_WS_NAME));
78
87
TS_ASSERT_THROWS_NOTHING (loadNexusProcessed (" VesuvioCalibSpec177.nxs" , INPUT_TEST_WS_NAME + " _noisy" ));
79
88
TS_ASSERT_THROWS_NOTHING (loadNexusProcessed (" focussed.nxs" , INPUT_TEST_WS_NAME + " _focussed" ));
89
+
90
+ std::cout << " setup End" << std::endl; // TODO remove
80
91
}
81
92
82
93
void tearDown () override {
83
94
// Clean up workspaces to avoid interference between tests
84
95
Mantid::API::AnalysisDataService::Instance ().remove (INPUT_TEST_WS_NAME);
85
96
Mantid::API::AnalysisDataService::Instance ().remove (INPUT_TEST_WS_NAME + " _noisy" );
86
97
Mantid::API::AnalysisDataService::Instance ().remove (INPUT_TEST_WS_NAME + " _focussed" );
98
+
99
+ std::cout << " tearDown End" << std::endl; // TODO remove
87
100
}
88
101
89
102
void test_exec () {
@@ -210,25 +223,33 @@ class FindPeaksConvolveTest : public CxxTest::TestSuite {
210
223
TS_ASSERT_THROWS (alg->execute (), std::invalid_argument &);
211
224
}
212
225
213
- void test_execValidRange () {
226
+ void test_execNoRange () {
227
+ std::cout << " Start of: test_execNoRange" << std::endl; // TODO remove
228
+
214
229
auto alg = set_up_alg (INPUT_TEST_WS_NAME + " _focussed" , OUTPUT_TEST_WS_NAME + " _focussed" );
215
230
alg->setProperty (" EstimatedPeakExtent" , " 0.2" );
216
- alg->setProperty (" StartWorkspaceIndex" , " 1" );
217
- alg->setProperty (" EndWorkspaceIndex" , " 2" );
218
231
TS_ASSERT_THROWS_NOTHING (alg->execute ());
219
232
const Mantid::API::WorkspaceGroup_sptr resultWs = alg->getProperty (" OutputWorkspace" );
220
233
Mantid::API::ITableWorkspace_sptr item =
221
234
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
223
238
}
224
239
225
- void test_execNoRange () {
240
+ void test_execValidRange () {
241
+ std::cout << " Start of: test_execValidRange" << std::endl; // TODO remove
242
+
226
243
auto alg = set_up_alg (INPUT_TEST_WS_NAME + " _focussed" , OUTPUT_TEST_WS_NAME + " _focussed" );
227
244
alg->setProperty (" EstimatedPeakExtent" , " 0.2" );
245
+ alg->setProperty (" StartWorkspaceIndex" , " 1" );
246
+ alg->setProperty (" EndWorkspaceIndex" , " 2" );
228
247
TS_ASSERT_THROWS_NOTHING (alg->execute ());
229
248
const Mantid::API::WorkspaceGroup_sptr resultWs = alg->getProperty (" OutputWorkspace" );
230
249
Mantid::API::ITableWorkspace_sptr item =
231
250
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
233
254
}
234
255
};
0 commit comments