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

fix JSON object formatting and tests

Browse Source
This commit is contained in:
Günter Obiltschnig
2020-07-29 11:40:40 +02:00
parent 328d6a1a46
commit 9e36cea203
5 changed files with 115 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Foundation/testsuite/src/StringTest.cpp
View File

@@ -1378,7 +1378,6 @@ void StringTest::testJSONString()
{ {
assertTrue (toJSON("\\", false) == "\\\\"); assertTrue (toJSON("\\", false) == "\\\\");
assertTrue (toJSON("\"", false) == "\\\""); assertTrue (toJSON("\"", false) == "\\\"");
assertTrue (toJSON("/", false) == "\\/");
assertTrue (toJSON("\a", false) == "\\u0007"); assertTrue (toJSON("\a", false) == "\\u0007");
assertTrue (toJSON("\b", false) == "\\b"); assertTrue (toJSON("\b", false) == "\\b");
assertTrue (toJSON("\f", false) == "\\f"); assertTrue (toJSON("\f", false) == "\\f");
@@ -1395,7 +1394,7 @@ void StringTest::testJSONString()
std::string str = "\"foo\\\\\""; std::string str = "\"foo\\\\\"";
assertTrue (toJSON("foo\\") == str); assertTrue (toJSON("foo\\") == str);
assertTrue (toJSON("bar/") == "\"bar\\/\""); assertTrue (toJSON("bar/") == "\"bar/\"");
assertTrue (toJSON("baz") == "\"baz\""); assertTrue (toJSON("baz") == "\"baz\"");
assertTrue (toJSON("q\"uote\"d") == "\"q\\\"uote\\\"d\""); assertTrue (toJSON("q\"uote\"d") == "\"q\\\"uote\\\"d\"");
assertTrue (toJSON("bs\b") == "\"bs\\b\""); assertTrue (toJSON("bs\b") == "\"bs\\b\"");
@@ -1412,7 +1411,7 @@ void StringTest::testJSONString()
ostr.str(""); ostr.str("");
toJSON("foo\\", ostr); toJSON("foo\\", ostr);
assertTrue (toJSON("bar/") == "\"bar\\/\""); assertTrue (toJSON("bar/") == "\"bar/\"");
ostr.str(""); ostr.str("");
toJSON("baz", ostr); toJSON("baz", ostr);
assertTrue (ostr.str() == "\"baz\""); assertTrue (ostr.str() == "\"baz\"");

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

@@ -2625,7 +2625,7 @@ void VarTest::testJSONDeserializeString()
tst = "{ \"message\": \"escape\\b\\f\\n\\r\\t\", \"path\": \"\\/dev\\/null\" }"; tst = "{ \"message\": \"escape\\b\\f\\n\\r\\t\", \"path\": \"\\/dev\\/null\" }";
a = Var::parse(tst); a = Var::parse(tst);
assertTrue(a.toString() == "{ \"message\" : \"escape\\b\\f\\n\\r\\t\", \"path\" : \"\\/dev\\/null\" }"); assertTrue(a.toString() == "{ \"message\": \"escape\\b\\f\\n\\r\\t\", \"path\": \"/dev/null\" }");
} }

3
JSON/testsuite/src/JSONTest.cpp
View File

@@ -1382,7 +1382,6 @@ void JSONTest::testStringify()
Poco::JSON::Stringifier::stringify(obj1, oss1); Poco::JSON::Stringifier::stringify(obj1, oss1);
Poco::JSON::Stringifier::stringify(obj2, oss2); Poco::JSON::Stringifier::stringify(obj2, oss2);
assertTrue (oss1.str() == "{\"payload\":\"\\r\"}"); assertTrue (oss1.str() == "{\"payload\":\"\\r\"}");
std::cout << "\"" << oss1.str() << "\"" << std::endl;
assertTrue (oss2.str() == "{\"payload\":\"\\n\"}"); assertTrue (oss2.str() == "{\"payload\":\"\\n\"}");
Object jObj(false); Object jObj(false);
@@ -1397,7 +1396,7 @@ void JSONTest::testStringify()
std::stringstream ss; std::stringstream ss;
jObj.stringify(ss); jObj.stringify(ss);
assertTrue (ss.str() == "{\"backspace\":\"bs\\b\",\"bar\\/\":0,\"baz\":0,\"foo\\\\\":0," assertTrue (ss.str() == "{\"backspace\":\"bs\\b\",\"bar/\":0,\"baz\":0,\"foo\\\\\":0,"
"\"newline\":\"nl\\n\",\"q\\\"uote\\\"d\":0,\"tab\":\"tb\\t\"}"); "\"newline\":\"nl\\n\",\"q\\\"uote\\\"d\":0,\"tab\":\"tb\\t\"}");
std::string json = "{ \"Simpsons\" : { \"husband\" : { \"name\" : \"Homer\" , \"age\" : 38 }, \"wife\" : { \"name\" : \"Marge\", \"age\" : 36 }, " std::string json = "{ \"Simpsons\" : { \"husband\" : { \"name\" : \"Homer\" , \"age\" : 38 }, \"wife\" : { \"name\" : \"Marge\", \"age\" : 36 }, "