OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-01-09 07:33:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

#3659 Regression Test : Use range based for

Browse Source
This commit is contained in:
Magne Sjaastad 2018-11-11 12:57:51 +01:00
parent 937e1f16d4
commit 99f182e74d
1 changed files with 29 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
ApplicationCode/Application/Tools/RiaRegressionTestRunner.cpp
View File

@ -130,9 +130,9 @@ void RiaRegressionTestRunner::runRegressionTest()
// delete diff and generated images // delete diff and generated images
for (int i = 0; i < folderList.size(); ++i) for (const QFileInfo& fi : folderList)
{ {
QDir testCaseFolder(folderList[i].filePath()); QDir testCaseFolder(fi.filePath());
{ {
QDir genDir(testCaseFolder.filePath(generatedFolderName)); QDir genDir(testCaseFolder.filePath(generatedFolderName));
@ -198,6 +198,15 @@ void RiaRegressionTestRunner::runRegressionTest()
RicSnapshotAllPlotsToFileFeature::exportSnapshotOfAllPlotsIntoFolder(fullPathGeneratedFolder); RicSnapshotAllPlotsToFileFeature::exportSnapshotOfAllPlotsIntoFolder(fullPathGeneratedFolder);
app->closeProject();
}
else
{
RiaLogging::error("Could not find a regression test file named : " + testCaseFolder.absolutePath() + "/" +
regTestProjectName + ".rsp");
}
}
QDir baseDir(testCaseFolder.filePath(baseFolderName)); QDir baseDir(testCaseFolder.filePath(baseFolderName));
QDir genDir(testCaseFolder.filePath(generatedFolderName)); QDir genDir(testCaseFolder.filePath(generatedFolderName));
QDir diffDir(testCaseFolder.filePath(diffFolderName)); QDir diffDir(testCaseFolder.filePath(diffFolderName));
@ -209,23 +218,14 @@ void RiaRegressionTestRunner::runRegressionTest()
{ {
QString fileName = baseImageFileNames[fIdx]; QString fileName = baseImageFileNames[fIdx];
RiaImageFileCompare imgComparator(RegTestNames::imageCompareExeName); RiaImageFileCompare imgComparator(RegTestNames::imageCompareExeName);
bool ok = imgComparator.runComparison( bool ok =
genDir.filePath(fileName), baseDir.filePath(fileName), diffDir.filePath(fileName)); imgComparator.runComparison(genDir.filePath(fileName), baseDir.filePath(fileName), diffDir.filePath(fileName));
if (!ok) if (!ok)
{ {
qDebug() << "Error comparing :" << imgComparator.errorMessage() << "\n" << imgComparator.errorDetails(); qDebug() << "Error comparing :" << imgComparator.errorMessage() << "\n" << imgComparator.errorDetails();
} }
} }
app->closeProject();
}
else
{
RiaLogging::error("Could not find a regression test file named : " + testCaseFolder.absolutePath() + "/" +
regTestProjectName + ".rsp");
}
}
logInfoTextWithTimeInSeconds(timeStamp, "Completed test :" + testCaseFolder.absolutePath()); logInfoTextWithTimeInSeconds(timeStamp, "Completed test :" + testCaseFolder.absolutePath());
} }
@ -419,9 +419,9 @@ QString RiaRegressionTestRunner::generateHtmlReport(const QFileInfoList& folderL
} }
} }
for (int dirIdx = 0; dirIdx < folderList.size(); ++dirIdx) for (const QFileInfo& fi : folderList)
{ {
QDir testCaseFolder(folderList[dirIdx].filePath()); QDir testCaseFolder(fi.filePath());
QString testFolderName = testCaseFolder.dirName(); QString testFolderName = testCaseFolder.dirName();
QString reportBaseFolderName = testCaseFolder.filePath(baseFolderName); QString reportBaseFolderName = testCaseFolder.filePath(baseFolderName);
@ -464,17 +464,14 @@ void RiaRegressionTestRunner::regressionTestConfigureProject()
std::vector<RimCase*> projectCases; std::vector<RimCase*> projectCases;
proj->allCases(projectCases); proj->allCases(projectCases);
for (size_t i = 0; i < projectCases.size(); i++) for (RimCase* cas : projectCases)
{ {
RimCase* cas = projectCases[i];
if (!cas) continue; if (!cas) continue;
std::vector<Rim3dView*> views = cas->views(); std::vector<Rim3dView*> views = cas->views();
for (size_t j = 0; j < views.size(); j++) for (Rim3dView* riv : views)
{ {
Rim3dView* riv = views[j];
if (riv && riv->viewer()) if (riv && riv->viewer())
{ {
// Make sure all views are maximized for snapshotting // Make sure all views are maximized for snapshotting
@ -588,12 +585,12 @@ QFileInfoList RiaRegressionTestRunner::subDirectoriesForTestExecution(const QDir
QFileInfoList foldersMatchingTestFilter; QFileInfoList foldersMatchingTestFilter;
QFileInfoList folderList = directory.entryInfoList(); QFileInfoList folderList = directory.entryInfoList();
for (auto fi : folderList) for (const auto& fi : folderList)
{ {
QString path = fi.path(); QString path = fi.path();
QString baseName = fi.baseName(); QString baseName = fi.baseName();
for (auto s : m_testFilter) for (const auto& s : m_testFilter)
{ {
QString trimmed = s.trimmed(); QString trimmed = s.trimmed();
if (baseName.contains(trimmed, Qt::CaseInsensitive)) if (baseName.contains(trimmed, Qt::CaseInsensitive))
@ -664,9 +661,9 @@ void RiaRegressionTestRunner::updateRegressionTest(const QString& testRootPath)
QFileInfoList folderList = testDir.entryInfoList(); QFileInfoList folderList = testDir.entryInfoList();
for (int i = 0; i < folderList.size(); ++i) for (const auto& fi : folderList)
{ {
QDir testCaseFolder(folderList[i].filePath()); QDir testCaseFolder(fi.filePath());
QDir baseDir(testCaseFolder.filePath(RegTestNames::baseFolderName)); QDir baseDir(testCaseFolder.filePath(RegTestNames::baseFolderName));
removeDirectoryWithContent(baseDir); removeDirectoryWithContent(baseDir);