zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ENH: add dimensionSet provisioning for a dimensioned clip() method

Browse Source 
- use file-local function to reduce some code clutter
This commit is contained in:
Mark Olesen
2019-01-09 23:44:17 +01:00
parent d0bb3670a7
commit 7720b59066
5 changed files with 228 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
applications/test/primitives/Test-primitives.C
View File

@ -47,14 +47,49 @@ inline scalar readNasScalar(const std::string& str)
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
template<class TYPE>
template<class T>
bool hadParsingError
(
const std::pair<bool, std::string>& input,
const std::pair<bool, T>& result,
std::string errMsg
)
{
if (result.first)
{
if (input.first)
{
Info<< "(pass) parsed "
<< input.second << " = " << result.second << nl;
}
else
{
Info<< "(fail) unexpected success for " << input.second << nl;
}
}
else
{
if (input.first)
{
Info<< "(fail) unexpected";
}
else
{
Info<< "(pass) expected";
}
Info<< " failure " << input.second << " >> " << errMsg.c_str() << nl;
}
return (input.first != result.first);
}
template<class T>
unsigned testParsing
(
TYPE (*function)(const std::string&),
std::initializer_list
<
Tuple2<bool, std::string>
> tests
T (*function)(const std::string&),
std::initializer_list<std::pair<bool, std::string>> tests
)
{
unsigned nFail = 0;
@ -63,51 +98,26 @@ unsigned testParsing
// Expect some failures
const bool prev = FatalIOError.throwExceptions();
for (const Tuple2<bool, std::string>& test : tests)
for (const std::pair<bool, std::string>& test : tests)
{
const bool expected = test.first();
const std::string& str = test.second();
std::pair<bool, T> result(false, T());
bool parsed = true;
TYPE val;
try
{
val = function (str);
result.second = function (test.second);
result.first = true;
}
catch (Foam::error& err)
{
parsed = false;
errMsg = err.message();
}
if (parsed)
if (test.first != result.first)
{
if (expected)
{
Info<< "(pass) parsed " << str << " = " << val << nl;
}
else
{
++nFail;
Info<< "(fail) unexpected success for " << str << nl;
}
++nFail;
}
else
{
if (expected)
{
++nFail;
Info<< "(fail) unexpected";
}
else
{
Info<< "(pass) expected";
}
Info<< " failure " << str
<< " >> " << errMsg.c_str() << nl;
}
hadParsingError(test, result, errMsg);
}
FatalIOError.throwExceptions(prev);