generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-01-31 06:35:03 +01:00
Code Issues Projects Releases Wiki Activity

PatternFormatter fix, added test

Browse Source
This commit is contained in:
Guenter Obiltschnig 2015-08-20 20:23:13 +02:00
parent fafe691a04
commit ec71e76f0a
2 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Foundation/src/PatternFormatter.cpp
View File

@ -256,13 +256,18 @@ void PatternFormatter::parsePriorityNames()
{
_priorities[i] = priorities[i];
}
StringTokenizer st(_priorityNames, ",;", StringTokenizer::TOK_TRIM);
if (st.count() == 8)
if (!_priorityNames.empty())
{
for (int i = 1; i <= 8; i++)
_priorities[i] = st[i - 1];
StringTokenizer st(_priorityNames, ",;", StringTokenizer::TOK_TRIM);
if (st.count() == 8)
{
for (int i = 1; i <= 8; i++)
{
_priorities[i] = st[i - 1];
}
}
else throw Poco::SyntaxException("priorityNames property must specify a comma-separated list of 8 property names");
}
else throw Poco::SyntaxException("priorityNames property must specify a comma-separated list of 8 property names");
}

15
Foundation/testsuite/src/PatternFormatterTest.cpp
View File

@ -93,6 +93,21 @@ void PatternFormatterTest::testPatternFormatter()
fmt.setProperty("pattern", "start %v[8] end");
fmt.format(msg, result);
assert (result == "start stSource end");
result.clear();
fmt.setProperty("pattern", "%p");
fmt.setProperty("priorityNames", "FAT, CRI, ERR, WRN, NTC, INF, DBG, TRC");
fmt.format(msg, result);
assert (result == "ERR");
try
{
fmt.setProperty("priorityNames", "FAT, CRI,");
fail("invalid value, must throw");
}
catch (Poco::SyntaxException&)
{
}
}