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

#1666 Fix errors in CommandFile parsing for space between argname and "="

Browse Source
This commit is contained in:
Jacob Støren 2017-06-29 13:18:19 +02:00
parent ba84b9ec5a
commit 64bee4bb57
3 changed files with 52 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/CommandFileInterface/Core/RicfFieldCapability.cpp
View File

@ -41,8 +41,6 @@ void RicfFieldReader<QString>::readFieldData(QString& fieldValue, QTextStream& i
if ( currentChar == QChar('"') ) // End Quote
{
// Reached end of string
// Read and eat , or ) ?
break;
}
else

16
ApplicationCode/CommandFileInterface/Core/RicfObjectCapability.cpp
View File

@ -59,7 +59,21 @@ void RicfObjectCapability::readFields(QTextStream& inputStream, caf::PdmObjectFa
{
QChar currentChar;
inputStream >> currentChar;
if ( currentChar.isSpace() || currentChar == QChar('=') )
if ( currentChar.isSpace() )
{
// Must skip to, and read "="
inputStream.skipWhiteSpace();
inputStream >> currentChar;
if ( currentChar != QChar('=') )
{
// Error message: Missing "=" after argument name
}
break;
}
if ( currentChar == QChar('=') )
{
break;
}

48
ApplicationCode/UnitTests/RifcCommandCore-Test.cpp
View File

@ -27,37 +27,63 @@ public:
CAF_PDM_SOURCE_INIT(TestCommand1, "TestCommand1");
class TC2: public RicfCommandObject
{
CAF_PDM_HEADER_INIT;
public:
TC2()
{
RICF_InitField(&m_textArgument, "ta", QString(), "TextArgument", "", "", "");
RICF_InitField(&m_doubleArgument, "da", 0.0, "DoubleArgument", "", "", "");
RICF_InitField(&m_intArgument, "ia", 0,"IntArgument", "", "", "");
}
virtual void execute() override { std::cout << "TC2::execute(" << "\"" << m_textArgument().toStdString() << "\", "
<< m_doubleArgument() << ", "
<< m_intArgument << ");" << std::endl; }
caf::PdmField<QString> m_textArgument;
caf::PdmField<double> m_doubleArgument;
caf::PdmField<int> m_intArgument;
};
CAF_PDM_SOURCE_INIT(TC2, "TC2");
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
TEST(RicfCommands, Test1)
{
TestCommand1* tc = new TestCommand1;
tc->m_textArgument = "textValue";
tc->execute();
delete tc;
QString commandString("TestCommand1(IntArgument=3, TextArgument=\"Dette er en tekst, \\\"og\\\" jeg er: (happy)\", DoubleArgument=5.0e3) \n"
"TestCommand1 ( IntArgument = 4 , \n TextArgument = \"Dette er en tekst, \\\"og\\\" jeg er: (happy)\", \n DoubleArgument = 5.0e-3 ) \n"
" TestCommand1(TextArgument=\"Litt kortere tekst.\") \n");
std::cout << commandString.toStdString() << std::endl;
" TestCommand1(TextArgument=\"Litt kortere tekst.\") \n"
"TC2 ( ta = \"Hepp\", ia = 3, da= 0.123)");
//std::cout << commandString.toStdString() << std::endl;
QTextStream inputStream(&commandString);
auto objects = RicfCommandFileReader::readCommands(inputStream, caf::PdmDefaultObjectFactory::instance());
EXPECT_EQ(3, objects.size());
EXPECT_EQ(4, objects.size());
auto tc2 = dynamic_cast<TestCommand1*>(objects[0]);
EXPECT_EQ(39, tc2->m_textArgument().size());
EXPECT_EQ(5.0e3, tc2->m_doubleArgument());
tc2 = dynamic_cast<TestCommand1*>(objects[1]);
EXPECT_EQ(37, tc2->m_textArgument().size());
EXPECT_EQ(39, tc2->m_textArgument().size());
EXPECT_EQ(5e-3, tc2->m_doubleArgument());
tc2 = dynamic_cast<TestCommand1*>(objects[2]);
EXPECT_EQ(19, tc2->m_textArgument().size());
EXPECT_EQ(0.0, tc2->m_doubleArgument());
auto tc3 = dynamic_cast<TC2*>(objects[3]);
EXPECT_EQ(4, tc3->m_textArgument().size());
EXPECT_EQ(0.123, tc3->m_doubleArgument());
EXPECT_EQ(3, tc3->m_intArgument());
for (auto obj: objects)
{
obj->execute();