generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-02-21 22:56:19 +01:00
Code Issues Projects Releases Wiki Activity

fix(DynamicStruct): toString not wrapping empty strings #3835

Browse Source
This commit is contained in:
Alex Fabijanic 2022-10-13 15:25:35 +02:00
parent a2c09c29d8
commit 9c8a92da3d
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Foundation/src/VarHolder.cpp
View File

@ -72,6 +72,10 @@ void appendJSONValue(std::string& val, const Var& any, bool wrap)
{ {
val.append("null"); val.append("null");
} }
else if (any.isString() && any.extract<std::string>().empty())
{
val.append("\"\"");
}
else else
{ {
bool isStr = wrap && isJSONString(any); bool isStr = wrap && isJSONString(any);

10
Foundation/testsuite/src/VarTest.cpp
View File

@ -2286,6 +2286,15 @@ void VarTest::testOrderedDynamicStructBasics()
} }
void VarTest::testDynamicStructEmptyString()
{
DynamicStruct aStruct;
aStruct["Empty"] = "";
aStruct["Space"] = " ";
assertEqual(aStruct.toString(false), "{ \"Empty\": \"\", \"Space\": \" \" }");
}
void VarTest::testDynamicStructNoEscapeString() void VarTest::testDynamicStructNoEscapeString()
{ {
DynamicStruct aStruct; DynamicStruct aStruct;
@ -3139,6 +3148,7 @@ CppUnit::Test* VarTest::suite()
CppUnit_addTest(pSuite, VarTest, testDynamicPair); CppUnit_addTest(pSuite, VarTest, testDynamicPair);
CppUnit_addTest(pSuite, VarTest, testDynamicStructBasics); CppUnit_addTest(pSuite, VarTest, testDynamicStructBasics);
CppUnit_addTest(pSuite, VarTest, testOrderedDynamicStructBasics); CppUnit_addTest(pSuite, VarTest, testOrderedDynamicStructBasics);
CppUnit_addTest(pSuite, VarTest, testDynamicStructEmptyString);
CppUnit_addTest(pSuite, VarTest, testDynamicStructNoEscapeString); CppUnit_addTest(pSuite, VarTest, testDynamicStructNoEscapeString);
CppUnit_addTest(pSuite, VarTest, testDynamicStructString); CppUnit_addTest(pSuite, VarTest, testDynamicStructString);
CppUnit_addTest(pSuite, VarTest, testOrderedDynamicStructString); CppUnit_addTest(pSuite, VarTest, testOrderedDynamicStructString);

1
Foundation/testsuite/src/VarTest.h
View File

@ -57,6 +57,7 @@ public:
void testDynamicStructBasics(); void testDynamicStructBasics();
void testOrderedDynamicStructBasics(); void testOrderedDynamicStructBasics();
void testDynamicStructString(); void testDynamicStructString();
void testDynamicStructEmptyString();
void testDynamicStructNoEscapeString(); void testDynamicStructNoEscapeString();
void testOrderedDynamicStructString(); void testOrderedDynamicStructString();
void testDynamicStructInt(); void testDynamicStructInt();