mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
Import of AICD valve definition from text file
* Add readKeywordContentFromFile * Add import of AICD values from Completor and Eclipse
This commit is contained in:
@@ -192,13 +192,13 @@ TEST( RifEclipseInputFileToolsTest, EquilData )
|
||||
|
||||
RifEclipseInputFileTools::readKeywordAndParseIncludeStatementsRecursively( keyword,
|
||||
keywordToStopParsing,
|
||||
pathAliasDefinitions,
|
||||
includeStatementAbsolutePathPrefix,
|
||||
data,
|
||||
startPositionInFile,
|
||||
pathAliasDefinitions,
|
||||
&keywordContent,
|
||||
&fileNamesContainingKeyword,
|
||||
&isStopParsingKeywordDetected,
|
||||
includeStatementAbsolutePathPrefix );
|
||||
keywordContent,
|
||||
fileNamesContainingKeyword,
|
||||
isStopParsingKeywordDetected );
|
||||
EXPECT_EQ( (int)10, keywordContent.size() );
|
||||
}
|
||||
}
|
||||
@@ -232,13 +232,13 @@ TEST( RifEclipseInputFileToolsTest, FaultData )
|
||||
|
||||
RifEclipseInputFileTools::readKeywordAndParseIncludeStatementsRecursively( keyword,
|
||||
keywordToStopParsing,
|
||||
pathAliasDefinitions,
|
||||
includeStatementAbsolutePathPrefix,
|
||||
data,
|
||||
startPositionInFile,
|
||||
pathAliasDefinitions,
|
||||
&keywordContent,
|
||||
&fileNamesContainingKeyword,
|
||||
&isStopParsingKeywordDetected,
|
||||
includeStatementAbsolutePathPrefix );
|
||||
keywordContent,
|
||||
fileNamesContainingKeyword,
|
||||
isStopParsingKeywordDetected );
|
||||
|
||||
EXPECT_EQ( (int)977, keywordContent.size() );
|
||||
|
||||
@@ -277,13 +277,13 @@ TEST( RifEclipseInputFileToolsTest, StopAtKeyword )
|
||||
|
||||
RifEclipseInputFileTools::readKeywordAndParseIncludeStatementsRecursively( keyword,
|
||||
keywordToStopParsing,
|
||||
pathAliasDefinitions,
|
||||
includeStatementAbsolutePathPrefix,
|
||||
data,
|
||||
startPositionInFile,
|
||||
pathAliasDefinitions,
|
||||
&keywordContent,
|
||||
&fileNamesContainingKeyword,
|
||||
&isStopParsingKeywordDetected,
|
||||
includeStatementAbsolutePathPrefix );
|
||||
keywordContent,
|
||||
fileNamesContainingKeyword,
|
||||
isStopParsingKeywordDetected );
|
||||
|
||||
EXPECT_TRUE( isStopParsingKeywordDetected );
|
||||
EXPECT_TRUE( keywordContent.isEmpty() );
|
||||
@@ -301,13 +301,13 @@ TEST( RifEclipseInputFileToolsTest, StopAtKeyword )
|
||||
|
||||
RifEclipseInputFileTools::readKeywordAndParseIncludeStatementsRecursively( keyword,
|
||||
keywordToStopParsing,
|
||||
pathAliasDefinitions,
|
||||
includeStatementAbsolutePathPrefix,
|
||||
data,
|
||||
startPositionInFile,
|
||||
pathAliasDefinitions,
|
||||
&keywordContent,
|
||||
&fileNamesContainingKeyword,
|
||||
&isStopParsingKeywordDetected,
|
||||
includeStatementAbsolutePathPrefix );
|
||||
keywordContent,
|
||||
fileNamesContainingKeyword,
|
||||
isStopParsingKeywordDetected );
|
||||
EXPECT_TRUE( isStopParsingKeywordDetected );
|
||||
EXPECT_TRUE( keywordContent.isEmpty() );
|
||||
}
|
||||
@@ -338,13 +338,13 @@ TEST( RifEclipseInputFileToolsTest, DISABLED_FindFilesWithVfp )
|
||||
|
||||
RifEclipseInputFileTools::readKeywordAndParseIncludeStatementsRecursively( keyword,
|
||||
keywordToStopParsing,
|
||||
pathAliasDefinitions,
|
||||
includeStatementAbsolutePathPrefix,
|
||||
data,
|
||||
startPositionInFile,
|
||||
pathAliasDefinitions,
|
||||
&keywordContent,
|
||||
&fileNamesContainingKeyword,
|
||||
&isStopParsingKeywordDetected,
|
||||
includeStatementAbsolutePathPrefix );
|
||||
keywordContent,
|
||||
fileNamesContainingKeyword,
|
||||
isStopParsingKeywordDetected );
|
||||
|
||||
// EXPECT_TRUE( isStopParsingKeywordDetected );
|
||||
// EXPECT_TRUE( keywordContent.isEmpty() );
|
||||
@@ -368,13 +368,13 @@ TEST( RifEclipseInputFileToolsTest, DISABLED_FindFilesWithVfp )
|
||||
|
||||
RifEclipseInputFileTools::readKeywordAndParseIncludeStatementsRecursively( keyword,
|
||||
keywordToStopParsing,
|
||||
pathAliasDefinitions,
|
||||
includeStatementAbsolutePathPrefix,
|
||||
data,
|
||||
startPositionInFile,
|
||||
pathAliasDefinitions,
|
||||
&keywordContent,
|
||||
&fileNamesContainingKeyword,
|
||||
&isStopParsingKeywordDetected,
|
||||
includeStatementAbsolutePathPrefix );
|
||||
keywordContent,
|
||||
fileNamesContainingKeyword,
|
||||
isStopParsingKeywordDetected );
|
||||
|
||||
// EXPECT_TRUE( isStopParsingKeywordDetected );
|
||||
// EXPECT_TRUE( keywordContent.isEmpty() );
|
||||
|
||||
Reference in New Issue
Block a user