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

#3910 Unit test for reg exp validator

Browse Source
This commit is contained in:
Gaute Lindkvist 2018-12-19 13:57:37 +01:00
parent 10da90350f
commit 975cd15c32
4 changed files with 62 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ApplicationCode/ProjectDataModel/Completions/RimWellPathCompletions.cpp
View File

@ -237,6 +237,15 @@ void RimWellPathCompletions::setUnitSystemSpecificDefaults()
m_perforationCollection->setUnitSystemSpecificDefaults();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QRegExp RimWellPathCompletions::wellNameForExportRegExp()
{
QRegExp rx("[\\w\\-\\_]{1,8}");
return rx;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@ -295,9 +304,8 @@ void RimWellPathCompletions::defineEditorAttribute(const caf::PdmFieldHandle* fi
caf::PdmUiLineEditorAttribute* lineEditorAttr = dynamic_cast<caf::PdmUiLineEditorAttribute*>(attribute);
if (field == &m_wellNameForExport && lineEditorAttr)
{
QRegExp rx("[\\w\\-\\_]{1,8}");
QRegExpValidator* validator = new QRegExpValidator(nullptr);
validator->setRegExp(rx);
validator->setRegExp(wellNameForExportRegExp());
lineEditorAttr->validator = validator;
}
}

2
ApplicationCode/ProjectDataModel/Completions/RimWellPathCompletions.h
View File

@ -57,7 +57,7 @@ public:
bool hasCompletions() const;
void setUnitSystemSpecificDefaults();
static QRegExp wellNameForExportRegExp();
protected:
void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName) override;
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;

1
ApplicationCode/UnitTests/CMakeLists_files.cmake
View File

@ -53,6 +53,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RiaWeightedHarmonicMeanCalculator-Test.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaCellDividingTools-Test.cpp
${CMAKE_CURRENT_LIST_DIR}/Intersect-Test.cpp
${CMAKE_CURRENT_LIST_DIR}/RifPerforationIntervalReader-Test.cpp
${CMAKE_CURRENT_LIST_DIR}/RimWellPathCompletions-Test.cpp
)
list(APPEND CODE_HEADER_FILES

50
ApplicationCode/UnitTests/RimWellPathCompletions-Test.cpp Normal file
View File

@ -0,0 +1,50 @@
#include "gtest/gtest.h"
#include "RimWellPathCompletions.h"
#include <QRegExpValidator>
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
TEST(RimWellPathCompletions, WellNameRegExp)
{
std::vector<QString> validNames = { "RASASD", "gf0sdf", "sd-ASD12", "1-AA_b" };
std::vector<QString> invalidNames = { ".AdSD", "+gf0sdf", "sd ASD12", "ABCDEFGHIJKL" };
QRegExp rx = RimWellPathCompletions::wellNameForExportRegExp();
EXPECT_TRUE(rx.isValid());
for (QString validName : validNames)
{
EXPECT_TRUE(rx.exactMatch(validName));
}
for (QString invalidName : invalidNames)
{
EXPECT_FALSE(rx.exactMatch(invalidName));
}
}
TEST(RimWellPathCompletions, WellNameRegExpValidator)
{
std::vector<QString> validNames = {"RASASD", "gf0sdf", "sd-ASD12", "1-AA_b"};
std::vector<QString> invalidNames = {".AdSD", "+gf0sdf", "sd ASD12", "ABCDEFGHIJKL"};
QString emptyString = "";
QRegExp rx = RimWellPathCompletions::wellNameForExportRegExp();
QRegExpValidator validator;
validator.setRegExp(rx);
for (QString validName : validNames)
{
int dummyPos;
EXPECT_EQ(QValidator::Acceptable, validator.validate(validName, dummyPos));
}
for (QString invalidName : invalidNames)
{
int dummyPos;
EXPECT_EQ(QValidator::Invalid, validator.validate(invalidName, dummyPos));
}
int dummyPos;
EXPECT_EQ(QValidator::Intermediate, validator.validate(emptyString, dummyPos));
}