Skip to content

Commit

Permalink
Refs #2899 Created message for TSM_ASSERT_EQUALS in loop
Browse files Browse the repository at this point in the history
Changed from TS_ASSERT_EQUALS to TSM_ASSERT_EQUALS and involved the loop
variant in the failure message to identify which Histogram produced the error.
  • Loading branch information
MattKing06 committed Jul 16, 2015
1 parent 112796e commit fb2d06f
Showing 1 changed file with 13 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,19 @@ class ConvertToMatrixWorkspaceTest : public CxxTest::TestSuite {
for (size_t i = 0; i < out->getNumberHistograms(); i++) {
const Mantid::API::ISpectrum *inSpec = in->getSpectrum(i);
const Mantid::API::ISpectrum *outSpec = out->getSpectrum(i);
TS_ASSERT_EQUALS(inSpec->getSpectrumNo(), outSpec->getSpectrumNo());
TS_ASSERT_EQUALS(*inSpec->getDetectorIDs().begin(),
*outSpec->getDetectorIDs().begin());
TS_ASSERT_EQUALS(in->readX(i), out->readX(i));
TS_ASSERT_EQUALS(in->readY(i), out->readY(i));
TS_ASSERT_EQUALS(in->readE(i), out->readE(i));
TSM_ASSERT_EQUALS("Failed on comparing Spectrum Number for Histogram: " +
std::to_string(i),
inSpec->getSpectrumNo(), outSpec->getSpectrumNo());
TSM_ASSERT_EQUALS("Failed on comparing Detector ID for Histogram: " +
std::to_string(i),
*inSpec->getDetectorIDs().begin(),
*outSpec->getDetectorIDs().begin());
TSM_ASSERT_EQUALS("Failed on readX for Histogram: " + std::to_string(i),
in->readX(i), out->readX(i));
TSM_ASSERT_EQUALS("Failed on readY for Histogram: " + std::to_string(i),
in->readY(i), out->readY(i));
TSM_ASSERT_EQUALS("Failed on readE for Histogram: " + std::to_string(i),
in->readE(i), out->readE(i));
}
}
};
Expand Down

0 comments on commit fb2d06f

Please sign in to comment.