Skip to content

Commit da4ed04

Browse files
authored
Merge pull request #46042 from Dr15Jones/redundantThinningTest
Removed redundant tests in Thinning*TestAnalyzers
2 parents 52b77da + e0a351f commit da4ed04

File tree

2 files changed

+0
-32
lines changed

2 files changed

+0
-32
lines changed

FWCore/Integration/plugins/ThinningDSVTestAnalyzer.cc

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -415,19 +415,6 @@ namespace edmtest {
415415
throw cms::Exception("TestFailure") << "unexpected value (true) from refVector::isAvailable";
416416
}
417417
}
418-
k = 0;
419-
for (auto iExpectedValue : expectedValues_) {
420-
if (refToParentIsAvailable_ and iExpectedValue != -1) {
421-
const int expected = (iExpectedValue + eventOffset) * refSlimmedValueFactor_;
422-
if (track.refVector1[k]->a != expected) {
423-
throw cms::Exception("TestFailure")
424-
<< "unexpected values from refVector1, got " << track.refVector1[k]->a << " expected " << expected;
425-
}
426-
} else {
427-
allPresent = false;
428-
}
429-
++k;
430-
}
431418
}
432419
}
433420

FWCore/Integration/plugins/ThinningTestAnalyzer.cc

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -401,25 +401,6 @@ namespace edmtest {
401401
throw cms::Exception("TestFailure") << "unexpected value (true) from refToBaseVector::isAvailable";
402402
}
403403
}
404-
k = 0;
405-
for (auto iExpectedValue : expectedValues_) {
406-
if (refToParentIsAvailable_ and iExpectedValue != -1) {
407-
const int expected = (iExpectedValue + eventOffset) * refSlimmedValueFactor_;
408-
if (track.refVector1[k]->a != expected) {
409-
throw cms::Exception("TestFailure")
410-
<< "unexpected values from refVector1, got " << track.refVector1[k]->a << " expected " << expected;
411-
}
412-
if (track.ptrVector1[k]->a != expected) {
413-
throw cms::Exception("TestFailure") << "unexpected values from ptrVector1";
414-
}
415-
if (track.refToBaseVector1[k]->a != expected) {
416-
throw cms::Exception("TestFailure") << "unexpected values from refToBaseVector1";
417-
}
418-
} else {
419-
allPresent = false;
420-
}
421-
++k;
422-
}
423404
}
424405

425406
void ThinningTestAnalyzer::incrementExpectedValue(std::vector<int>::const_iterator& iter) const {

0 commit comments

Comments
 (0)