OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#6771 Regression Test: Rename

Browse Source
This commit is contained in:
Magne Sjaastad
2020-10-13 11:40:06 +02:00
parent 73e775a6cf
commit b4a879c637
5 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ApplicationCode/Application/Tools/RiaProjectModifier.cpp
View File

@@ -35,7 +35,7 @@
///
//--------------------------------------------------------------------------------------------------
RiaProjectModifier::RiaProjectModifier()
: m_invalidateExternalPaths( false )
: m_invalidateExternalFilePaths( false )
{
}
@@ -99,15 +99,15 @@ void RiaProjectModifier::setReplacePropertiesFolder( int caseIdToReplace, QStrin
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiaProjectModifier::setInvalidateExternalPaths()
void RiaProjectModifier::setInvalidateExternalFilePaths()
{
m_invalidateExternalPaths = true;
m_invalidateExternalFilePaths = true;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiaProjectModifier::invalidateExternalPaths( RimProject* project )
void RiaProjectModifier::invalidateExternalFilePaths( RimProject* project )
{
std::vector<caf::FilePath*> filePaths = project->allFilePaths();
@@ -138,9 +138,9 @@ bool RiaProjectModifier::applyModificationsToProject( RimProject* project )
replacePropertiesFolder( project );
}
if ( m_invalidateExternalPaths )
if ( m_invalidateExternalFilePaths )
{
invalidateExternalPaths( project );
invalidateExternalFilePaths( project );
}
return true;

6
ApplicationCode/Application/Tools/RiaProjectModifier.h
View File

@@ -49,7 +49,7 @@ public:
// Used by the regression test system to invalidate all paths to test if the tests run as expected if external files
// are missing/invalid
void setInvalidateExternalPaths();
void setInvalidateExternalFilePaths();
bool applyModificationsToProject( RimProject* project );
@@ -57,7 +57,7 @@ private:
void replaceSourceCases( RimProject* project );
void replaceCase( RimProject* project );
void replacePropertiesFolder( RimProject* project );
void invalidateExternalPaths( RimProject* project );
void invalidateExternalFilePaths( RimProject* project );
static QString makeFilePathAbsolute( const QString& relOrAbsolutePath );
static QString caseNameFromGridFileName( const QString& fullGridFilePathName );
@@ -72,5 +72,5 @@ private:
std::map<int, QString> m_caseIdToGridFileNameMap;
std::map<int, std::vector<QString>> m_groupIdToGridFileNamesMap;
std::map<int, QString> m_caseIdToPropertiesFolderMap;
bool m_invalidateExternalPaths;
bool m_invalidateExternalFilePaths;
};

6
ApplicationCode/Application/Tools/RiaRegressionTest.cpp
View File

@@ -84,10 +84,10 @@ RiaRegressionTest::RiaRegressionTest( void )
"",
"" );
CAF_PDM_InitField( &makeExternalIncludePathsInvalid,
"makeExternalIncludePathsInvalid",
CAF_PDM_InitField( &invalidateExternalFilePaths,
"invalidateExternalFilePaths",
false,
"Invalidate all External Paths",
"Invalidate External File Paths",
"",
"",
"" );

2
ApplicationCode/Application/Tools/RiaRegressionTest.h
View File

@@ -43,7 +43,7 @@ public:
caf::PdmField<bool> useOpenMPForGeometryCreation;
caf::PdmField<bool> openReportInBrowser;
caf::PdmField<bool> appendTestsAfterTestFilter;
caf::PdmField<bool> makeExternalIncludePathsInvalid;
caf::PdmField<bool> invalidateExternalFilePaths;
protected:
void defineEditorAttribute( const caf::PdmFieldHandle* field,

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

@@ -196,10 +196,10 @@ void RiaRegressionTestRunner::runRegressionTest()
if ( !projectFileName.isEmpty() )
{
cvf::ref<RiaProjectModifier> projectModifier;
if ( regressionTestConfig.makeExternalIncludePathsInvalid )
if ( regressionTestConfig.invalidateExternalFilePaths )
{
projectModifier = new RiaProjectModifier;
projectModifier->setInvalidateExternalPaths();
projectModifier->setInvalidateExternalFilePaths();
}
logInfoTextWithTimeInSeconds( timeStamp, "Initializing test :" + testCaseFolder.absolutePath() );