From 87f4293d32c6842a700a29a7e9275cba66b3aabb Mon Sep 17 00:00:00 2001 From: MiesSuomesta <32951624+MiesSuomesta@users.noreply.github.com> Date: Thu, 19 Dec 2019 08:47:06 +0200 Subject: [PATCH] Fixed tests to pass Fixed tests to pass (one testcase updated) --- json_object.c | 16 ++++++++-------- test_printbuf.expected | 43 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 8 deletions(-) create mode 100644 test_printbuf.expected diff --git a/json_object.c b/json_object.c index 109358c..f0bb1c0 100644 --- a/json_object.c +++ b/json_object.c @@ -1457,7 +1457,7 @@ static int json_object_deep_copy_recursive(struct json_object *src, struct json_ if (shallow_copy_rc < 1) { errno = EINVAL; - return -120; + return -1; } assert(*dst != NULL); @@ -1471,13 +1471,13 @@ static int json_object_deep_copy_recursive(struct json_object *src, struct json_ else if (json_object_deep_copy_recursive(iter.val, src, iter.key, -1, &jso, shallow_copy) < 0) { json_object_put(jso); - return -130; + return -1; } if (json_object_object_add(*dst, iter.key, jso) < 0) { json_object_put(jso); - return -140; + return -1; } } break; @@ -1493,13 +1493,13 @@ static int json_object_deep_copy_recursive(struct json_object *src, struct json_ else if (json_object_deep_copy_recursive(jso1, src, NULL, ii, &jso, shallow_copy) < 0) { json_object_put(jso); - return -150; + return -1; } if (json_object_array_add(*dst, jso) < 0) { json_object_put(jso); - return -160; + return -1; } } break; @@ -1522,15 +1522,15 @@ int json_object_deep_copy(struct json_object *src, struct json_object **dst, jso /* Check if arguments are sane ; *dst must not point to a non-NULL object */ if (!src) { errno = EINVAL; - return -101; + return -1; } if (!dst) { errno = EINVAL; - return -102; + return -1; } if (*dst) { errno = EINVAL; - return -103; + return -1; } if (shallow_copy == NULL) diff --git a/test_printbuf.expected b/test_printbuf.expected new file mode 100644 index 0000000..bab9ffe --- /dev/null +++ b/test_printbuf.expected @@ -0,0 +1,43 @@ +test_basic_printbuf_memset: starting test +Buffer contents:blue:1xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +test_basic_printbuf_memset: end test +======================================== +test_printbuf_memset_length: starting test +Buffer length: 0 +Buffer length: 12 +Buffer length: 18 +Buffer length: 76 +Buffer length: 76 +Buffer length: 77 +test_printbuf_memset_length: end test +======================================== +test_printbuf_memappend: starting test +Buffer length: 0 +Appended 256 bytes for resize: [xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx] +Partial append: 3, [blu] +With embedded \0 character: 4, [ab] +Append to just before resize: 255, [XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX] +Append to just after resize: 256, [XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX] +Buffer size after printbuf_strappend(): 16, [XXXXXXXXXXXXXXXX] +test_printbuf_memappend: end test +======================================== +test_sprintbuf: starting test +Buffer length: 0 +sprintbuf to just after resize(255+1): 256, [XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX], strlen(buf)=256 +5, [plain] +6, [plain] +16, [plain] +27, [plain] +29, [plain] +test_sprintbuf: end test +======================================== +test_sprintbuf2: starting test +Buffer length: 0 +sprintbuf to just after resize(255+1): 256, [XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX], strlen(buf)=256 +5, [plain] +6, [plain] +16, [plain] +27, [plain] +29, [plain] +test_sprintbuf2: end test +========================================