mirror/cJSON
1
0
Fork 0
mirror of https://github.com/DaveGamble/cJSON.git synced 2023-08-10 21:13:26 +03:00
Code Issues Projects Releases Wiki Activity

Use space after object keys in pretty-print output; update unit tests

Browse Source
This commit is contained in:
Ondřej Hruška 2020-07-14 14:44:37 +02:00
parent cf97c6f066
commit 6b15bb73e7
11 changed files with 217 additions and 217 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cJSON.c
View File

@ -92,9 +92,9 @@ CJSON_PUBLIC(const char *) cJSON_GetErrorPtr(void)
return (const char*) (global_error.json + global_error.position); return (const char*) (global_error.json + global_error.position);
} }
CJSON_PUBLIC(char *) cJSON_GetStringValue(const cJSON * const item) CJSON_PUBLIC(char *) cJSON_GetStringValue(const cJSON * const item)
{ {
if (!cJSON_IsString(item)) if (!cJSON_IsString(item))
{ {
return NULL; return NULL;
} }
@ -102,9 +102,9 @@ CJSON_PUBLIC(char *) cJSON_GetStringValue(const cJSON * const item)
return item->valuestring; return item->valuestring;
} }
CJSON_PUBLIC(double) cJSON_GetNumberValue(const cJSON * const item) CJSON_PUBLIC(double) cJSON_GetNumberValue(const cJSON * const item)
{ {
if (!cJSON_IsNumber(item)) if (!cJSON_IsNumber(item))
{ {
return NAN; return NAN;
} }
@ -1101,7 +1101,7 @@ CJSON_PUBLIC(cJSON *) cJSON_ParseWithLengthOpts(const char *value, size_t buffer
} }
buffer.content = (const unsigned char*)value; buffer.content = (const unsigned char*)value;
buffer.length = buffer_length; buffer.length = buffer_length;
buffer.offset = 0; buffer.offset = 0;
buffer.hooks = global_hooks; buffer.hooks = global_hooks;
@ -1765,7 +1765,7 @@ static cJSON_bool print_object(const cJSON * const item, printbuffer * const out
*output_pointer++ = ':'; *output_pointer++ = ':';
if (output_buffer->format) if (output_buffer->format)
{ {
*output_pointer++ = '\t'; *output_pointer++ = ' ';
} }
output_buffer->offset += length; output_buffer->offset += length;

30
tests/inputs/test1.expected
View File

@ -1,20 +1,20 @@
{ {
"glossary": { "glossary": {
"title": "example glossary", "title": "example glossary",
"GlossDiv": { "GlossDiv": {
"title": "S", "title": "S",
"GlossList": { "GlossList": {
"GlossEntry": { "GlossEntry": {
"ID": "SGML", "ID": "SGML",
"SortAs": "SGML", "SortAs": "SGML",
"GlossTerm": "Standard Generalized Markup Language", "GlossTerm": "Standard Generalized Markup Language",
"Acronym": "SGML", "Acronym": "SGML",
"Abbrev": "ISO 8879:1986", "Abbrev": "ISO 8879:1986",
"GlossDef": { "GlossDef": {
"para": "A meta-markup language, used to create markup languages such as DocBook.", "para": "A meta-markup language, used to create markup languages such as DocBook.",
"GlossSeeAlso": ["GML", "XML"] "GlossSeeAlso": ["GML", "XML"]
}, },
"GlossSee": "markup" "GlossSee": "markup"
} }
} }
} }

14
tests/inputs/test11.expected
View File

@ -1,10 +1,10 @@
{ {
"name": "Jack (\"Bee\") Nimble", "name": "Jack (\"Bee\") Nimble",
"format": { "format": {
"type": "rect", "type": "rect",
"width": 1920, "width": 1920,
"height": 1080, "height": 1080,
"interlace": false, "interlace": false,
"frame rate": 24 "frame rate": 24
} }
} }

22
tests/inputs/test2.expected
View File

@ -1,17 +1,17 @@
{ {
"menu": { "menu": {
"id": "file", "id": "file",
"value": "File", "value": "File",
"popup": { "popup": {
"menuitem": [{ "menuitem": [{
"value": "New", "value": "New",
"onclick": "CreateNewDoc()" "onclick": "CreateNewDoc()"
}, { }, {
"value": "Open", "value": "Open",
"onclick": "OpenDoc()" "onclick": "OpenDoc()"
}, { }, {
"value": "Close", "value": "Close",
"onclick": "CloseDoc()" "onclick": "CloseDoc()"
}] }]
} }
} }

44
tests/inputs/test3.expected
View File

@ -1,28 +1,28 @@
{ {
"widget": { "widget": {
"debug": "on", "debug": "on",
"window": { "window": {
"title": "Sample Konfabulator Widget", "title": "Sample Konfabulator Widget",
"name": "main_window", "name": "main_window",
"width": 500, "width": 500,
"height": 500 "height": 500
}, },
"image": { "image": {
"src": "Images/Sun.png", "src": "Images/Sun.png",
"name": "sun1", "name": "sun1",
"hOffset": 250, "hOffset": 250,
"vOffset": 250, "vOffset": 250,
"alignment": "center" "alignment": "center"
}, },
"text": { "text": {
"data": "Click Here", "data": "Click Here",
"size": 36, "size": 36,
"style": "bold", "style": "bold",
"name": "text1", "name": "text1",
"hOffset": 250, "hOffset": 250,
"vOffset": 100, "vOffset": 100,
"alignment": "center", "alignment": "center",
"onMouseUp": "sun1.opacity = (sun1.opacity / 100) * 90;" "onMouseUp": "sun1.opacity = (sun1.opacity / 100) * 90;"
} }
} }
} }

162
tests/inputs/test4.expected
View File

@ -1,94 +1,94 @@
{ {
"web-app": { "web-app": {
"servlet": [{ "servlet": [{
"servlet-name": "cofaxCDS", "servlet-name": "cofaxCDS",
"servlet-class": "org.cofax.cds.CDSServlet", "servlet-class": "org.cofax.cds.CDSServlet",
"init-param": { "init-param": {
"configGlossary:installationAt": "Philadelphia, PA", "configGlossary:installationAt": "Philadelphia, PA",
"configGlossary:adminEmail": "ksm@pobox.com", "configGlossary:adminEmail": "ksm@pobox.com",
"configGlossary:poweredBy": "Cofax", "configGlossary:poweredBy": "Cofax",
"configGlossary:poweredByIcon": "/images/cofax.gif", "configGlossary:poweredByIcon": "/images/cofax.gif",
"configGlossary:staticPath": "/content/static", "configGlossary:staticPath": "/content/static",
"templateProcessorClass": "org.cofax.WysiwygTemplate", "templateProcessorClass": "org.cofax.WysiwygTemplate",
"templateLoaderClass": "org.cofax.FilesTemplateLoader", "templateLoaderClass": "org.cofax.FilesTemplateLoader",
"templatePath": "templates", "templatePath": "templates",
"templateOverridePath": "", "templateOverridePath": "",
"defaultListTemplate": "listTemplate.htm", "defaultListTemplate": "listTemplate.htm",
"defaultFileTemplate": "articleTemplate.htm", "defaultFileTemplate": "articleTemplate.htm",
"useJSP": false, "useJSP": false,
"jspListTemplate": "listTemplate.jsp", "jspListTemplate": "listTemplate.jsp",
"jspFileTemplate": "articleTemplate.jsp", "jspFileTemplate": "articleTemplate.jsp",
"cachePackageTagsTrack": 200, "cachePackageTagsTrack": 200,
"cachePackageTagsStore": 200, "cachePackageTagsStore": 200,
"cachePackageTagsRefresh": 60, "cachePackageTagsRefresh": 60,
"cacheTemplatesTrack": 100, "cacheTemplatesTrack": 100,
"cacheTemplatesStore": 50, "cacheTemplatesStore": 50,
"cacheTemplatesRefresh": 15, "cacheTemplatesRefresh": 15,
"cachePagesTrack": 200, "cachePagesTrack": 200,
"cachePagesStore": 100, "cachePagesStore": 100,
"cachePagesRefresh": 10, "cachePagesRefresh": 10,
"cachePagesDirtyRead": 10, "cachePagesDirtyRead": 10,
"searchEngineListTemplate": "forSearchEnginesList.htm", "searchEngineListTemplate": "forSearchEnginesList.htm",
"searchEngineFileTemplate": "forSearchEngines.htm", "searchEngineFileTemplate": "forSearchEngines.htm",
"searchEngineRobotsDb": "WEB-INF/robots.db", "searchEngineRobotsDb": "WEB-INF/robots.db",
"useDataStore": true, "useDataStore": true,
"dataStoreClass": "org.cofax.SqlDataStore", "dataStoreClass": "org.cofax.SqlDataStore",
"redirectionClass": "org.cofax.SqlRedirection", "redirectionClass": "org.cofax.SqlRedirection",
"dataStoreName": "cofax", "dataStoreName": "cofax",
"dataStoreDriver": "com.microsoft.jdbc.sqlserver.SQLServerDriver", "dataStoreDriver": "com.microsoft.jdbc.sqlserver.SQLServerDriver",
"dataStoreUrl": "jdbc:microsoft:sqlserver://LOCALHOST:1433;DatabaseName=goon", "dataStoreUrl": "jdbc:microsoft:sqlserver://LOCALHOST:1433;DatabaseName=goon",
"dataStoreUser": "sa", "dataStoreUser": "sa",
"dataStorePassword": "dataStoreTestQuery", "dataStorePassword": "dataStoreTestQuery",
"dataStoreTestQuery": "SET NOCOUNT ON;select test='test';", "dataStoreTestQuery": "SET NOCOUNT ON;select test='test';",
"dataStoreLogFile": "/usr/local/tomcat/logs/datastore.log", "dataStoreLogFile": "/usr/local/tomcat/logs/datastore.log",
"dataStoreInitConns": 10, "dataStoreInitConns": 10,
"dataStoreMaxConns": 100, "dataStoreMaxConns": 100,
"dataStoreConnUsageLimit": 100, "dataStoreConnUsageLimit": 100,
"dataStoreLogLevel": "debug", "dataStoreLogLevel": "debug",
"maxUrlLength": 500 "maxUrlLength": 500
} }
}, { }, {
"servlet-name": "cofaxEmail", "servlet-name": "cofaxEmail",
"servlet-class": "org.cofax.cds.EmailServlet", "servlet-class": "org.cofax.cds.EmailServlet",
"init-param": { "init-param": {
"mailHost": "mail1", "mailHost": "mail1",
"mailHostOverride": "mail2" "mailHostOverride": "mail2"
} }
}, { }, {
"servlet-name": "cofaxAdmin", "servlet-name": "cofaxAdmin",
"servlet-class": "org.cofax.cds.AdminServlet" "servlet-class": "org.cofax.cds.AdminServlet"
}, { }, {
"servlet-name": "fileServlet", "servlet-name": "fileServlet",
"servlet-class": "org.cofax.cds.FileServlet" "servlet-class": "org.cofax.cds.FileServlet"
}, { }, {
"servlet-name": "cofaxTools", "servlet-name": "cofaxTools",
"servlet-class": "org.cofax.cms.CofaxToolsServlet", "servlet-class": "org.cofax.cms.CofaxToolsServlet",
"init-param": { "init-param": {
"templatePath": "toolstemplates/", "templatePath": "toolstemplates/",
"log": 1, "log": 1,
"logLocation": "/usr/local/tomcat/logs/CofaxTools.log", "logLocation": "/usr/local/tomcat/logs/CofaxTools.log",
"logMaxSize": "", "logMaxSize": "",
"dataLog": 1, "dataLog": 1,
"dataLogLocation": "/usr/local/tomcat/logs/dataLog.log", "dataLogLocation": "/usr/local/tomcat/logs/dataLog.log",
"dataLogMaxSize": "", "dataLogMaxSize": "",
"removePageCache": "/content/admin/remove?cache=pages&id=", "removePageCache": "/content/admin/remove?cache=pages&id=",
"removeTemplateCache": "/content/admin/remove?cache=templates&id=", "removeTemplateCache": "/content/admin/remove?cache=templates&id=",
"fileTransferFolder": "/usr/local/tomcat/webapps/content/fileTransferFolder", "fileTransferFolder": "/usr/local/tomcat/webapps/content/fileTransferFolder",
"lookInContext": 1, "lookInContext": 1,
"adminGroupID": 4, "adminGroupID": 4,
"betaServer": true "betaServer": true
} }
}], }],
"servlet-mapping": { "servlet-mapping": {
"cofaxCDS": "/", "cofaxCDS": "/",
"cofaxEmail": "/cofaxutil/aemail/*", "cofaxEmail": "/cofaxutil/aemail/*",
"cofaxAdmin": "/admin/*", "cofaxAdmin": "/admin/*",
"fileServlet": "/static/*", "fileServlet": "/static/*",
"cofaxTools": "/tools/*" "cofaxTools": "/tools/*"
}, },
"taglib": { "taglib": {
"taglib-uri": "cofax.tld", "taglib-uri": "cofax.tld",
"taglib-location": "/WEB-INF/tlds/cofax.tld" "taglib-location": "/WEB-INF/tlds/cofax.tld"
} }
} }
} }

66
tests/inputs/test5.expected
View File

@ -1,54 +1,54 @@
{ {
"menu": { "menu": {
"header": "SVG Viewer", "header": "SVG Viewer",
"items": [{ "items": [{
"id": "Open" "id": "Open"
}, { }, {
"id": "OpenNew", "id": "OpenNew",
"label": "Open New" "label": "Open New"
}, null, { }, null, {
"id": "ZoomIn", "id": "ZoomIn",
"label": "Zoom In" "label": "Zoom In"
}, { }, {
"id": "ZoomOut", "id": "ZoomOut",
"label": "Zoom Out" "label": "Zoom Out"
}, { }, {
"id": "OriginalView", "id": "OriginalView",
"label": "Original View" "label": "Original View"
}, null, { }, null, {
"id": "Quality" "id": "Quality"
}, { }, {
"id": "Pause" "id": "Pause"
}, { }, {
"id": "Mute" "id": "Mute"
}, null, { }, null, {
"id": "Find", "id": "Find",
"label": "Find..." "label": "Find..."
}, { }, {
"id": "FindAgain", "id": "FindAgain",
"label": "Find Again" "label": "Find Again"
}, { }, {
"id": "Copy" "id": "Copy"
}, { }, {
"id": "CopyAgain", "id": "CopyAgain",
"label": "Copy Again" "label": "Copy Again"
}, { }, {
"id": "CopySVG", "id": "CopySVG",
"label": "Copy SVG" "label": "Copy SVG"
}, { }, {
"id": "ViewSVG", "id": "ViewSVG",
"label": "View SVG" "label": "View SVG"
}, { }, {
"id": "ViewSource", "id": "ViewSource",
"label": "View Source" "label": "View Source"
}, { }, {
"id": "SaveAs", "id": "SaveAs",
"label": "Save As" "label": "Save As"
}, null, { }, null, {
"id": "Help" "id": "Help"
}, { }, {
"id": "About", "id": "About",
"label": "About Adobe CVG Viewer..." "label": "About Adobe CVG Viewer..."
}] }]
} }
} }

32
tests/inputs/test7.expected
View File

@ -1,19 +1,19 @@
[{ [{
"precision": "zip", "precision": "zip",
"Latitude": 37.7668, "Latitude": 37.7668,
"Longitude": -122.3959, "Longitude": -122.3959,
"Address": "", "Address": "",
"City": "SAN FRANCISCO", "City": "SAN FRANCISCO",
"State": "CA", "State": "CA",
"Zip": "94107", "Zip": "94107",
"Country": "US" "Country": "US"
}, { }, {
"precision": "zip", "precision": "zip",
"Latitude": 37.371991, "Latitude": 37.371991,
"Longitude": -122.02602, "Longitude": -122.02602,
"Address": "", "Address": "",
"City": "SUNNYVALE", "City": "SUNNYVALE",
"State": "CA", "State": "CA",
"Zip": "94085", "Zip": "94085",
"Country": "US" "Country": "US"
}] }]

18
tests/inputs/test8.expected
View File

@ -1,13 +1,13 @@
{ {
"Image": { "Image": {
"Width": 800, "Width": 800,
"Height": 600, "Height": 600,
"Title": "View from 15th Floor", "Title": "View from 15th Floor",
"Thumbnail": { "Thumbnail": {
"Url": "http:/*www.example.com/image/481989943", "Url": "http:/*www.example.com/image/481989943",
"Height": 125, "Height": 125,
"Width": "100" "Width": "100"
}, },
"IDs": [116, 943, 234, 38793] "IDs": [116, 943, 234, 38793]
} }
} }

12
tests/print_object.c
View File

@ -76,16 +76,16 @@ static void print_object_should_print_empty_objects(void)
static void print_object_should_print_objects_with_one_element(void) static void print_object_should_print_objects_with_one_element(void)
{ {
assert_print_object("{\n\t\"one\":\t1\n}", "{\"one\":1}"); assert_print_object("{\n\t\"one\": 1\n}", "{\"one\":1}");
assert_print_object("{\n\t\"hello\":\t\"world!\"\n}", "{\"hello\":\"world!\"}"); assert_print_object("{\n\t\"hello\": \"world!\"\n}", "{\"hello\":\"world!\"}");
assert_print_object("{\n\t\"array\":\t[]\n}", "{\"array\":[]}"); assert_print_object("{\n\t\"array\": []\n}", "{\"array\":[]}");
assert_print_object("{\n\t\"null\":\tnull\n}", "{\"null\":null}"); assert_print_object("{\n\t\"null\": null\n}", "{\"null\":null}");
} }
static void print_object_should_print_objects_with_multiple_elements(void) static void print_object_should_print_objects_with_multiple_elements(void)
{ {
assert_print_object("{\n\t\"one\":\t1,\n\t\"two\":\t2,\n\t\"three\":\t3\n}", "{\"one\":1,\"two\":2,\"three\":3}"); assert_print_object("{\n\t\"one\": 1,\n\t\"two\": 2,\n\t\"three\": 3\n}", "{\"one\":1,\"two\":2,\"three\":3}");
assert_print_object("{\n\t\"one\":\t1,\n\t\"NULL\":\tnull,\n\t\"TRUE\":\ttrue,\n\t\"FALSE\":\tfalse,\n\t\"array\":\t[],\n\t\"world\":\t\"hello\",\n\t\"object\":\t{\n\t}\n}", "{\"one\":1,\"NULL\":null,\"TRUE\":true,\"FALSE\":false,\"array\":[],\"world\":\"hello\",\"object\":{}}"); assert_print_object("{\n\t\"one\": 1,\n\t\"NULL\": null,\n\t\"TRUE\": true,\n\t\"FALSE\": false,\n\t\"array\": [],\n\t\"world\": \"hello\",\n\t\"object\": {\n\t}\n}", "{\"one\":1,\"NULL\":null,\"TRUE\":true,\"FALSE\":false,\"array\":[],\"world\":\"hello\",\"object\":{}}");
} }
int CJSON_CDECL main(void) int CJSON_CDECL main(void)

22
tests/readme_examples.c
View File

@ -29,16 +29,16 @@
#include "common.h" #include "common.h"
static const char *json = "{\n\ static const char *json = "{\n\
\t\"name\":\t\"Awesome 4K\",\n\ \t\"name\": \"Awesome 4K\",\n\
\t\"resolutions\":\t[{\n\ \t\"resolutions\": [{\n\
\t\t\t\"width\":\t1280,\n\ \t\t\t\"width\": 1280,\n\
\t\t\t\"height\":\t720\n\ \t\t\t\"height\": 720\n\
\t\t}, {\n\ \t\t}, {\n\
\t\t\t\"width\":\t1920,\n\ \t\t\t\"width\": 1920,\n\
\t\t\t\"height\":\t1080\n\ \t\t\t\"height\": 1080\n\
\t\t}, {\n\ \t\t}, {\n\
\t\t\t\"width\":\t3840,\n\ \t\t\t\"width\": 3840,\n\
\t\t\t\"height\":\t2160\n\ \t\t\t\"height\": 2160\n\
\t\t}]\n\ \t\t}]\n\
}"; }";
@ -236,9 +236,9 @@ static void supports_full_hd_should_check_for_full_hd_support(void)
{ {
static const char *monitor_without_hd = "{\n\ static const char *monitor_without_hd = "{\n\
\t\t\"name\": \"lame monitor\",\n\ \t\t\"name\": \"lame monitor\",\n\
\t\t\"resolutions\":\t[{\n\ \t\t\"resolutions\": [{\n\
\t\t\t\"width\":\t640,\n\ \t\t\t\"width\": 640,\n\
\t\t\t\"height\":\t480\n\ \t\t\t\"height\": 480\n\
\t\t}]\n\ \t\t}]\n\
}"; }";