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

Merge branch 'generate-patch-tests' into develop

Browse Source
This commit is contained in:
Max Bruckner 2017-04-28 02:00:40 +02:00
commit 18a7828940
2 changed files with 65 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cJSON_Utils.c
View File

@ -822,7 +822,7 @@ static void cJSONUtils_CompareToPatch(cJSON *patches, const unsigned char *path,
cJSONUtils_CompareToPatch(patches, newpath, from, to); cJSONUtils_CompareToPatch(patches, newpath, from, to);
} }
/* remove leftover elements from 'from' that are not in 'to' */ /* remove leftover elements from 'from' that are not in 'to' */
for (; from; (void)(from = from->next), c++) for (; from; (void)(from = from->next))
{ {
/* check if conversion to unsigned long is valid /* check if conversion to unsigned long is valid
* This should be eliminated at compile time by dead code elimination * This should be eliminated at compile time by dead code elimination

64
tests/json_patch_tests.c
View File

@ -119,6 +119,67 @@ static cJSON_bool test_apply_patch(const cJSON * const test)
return successful; return successful;
} }
static cJSON_bool test_generate_test(cJSON *test __attribute__((unused)))
{
cJSON *doc = NULL;
cJSON *patch = NULL;
cJSON *expected = NULL;
cJSON *disabled = NULL;
cJSON *object = NULL;
cJSON_bool successful = false;
char *printed_patch = NULL;
disabled = cJSON_GetObjectItem(test, "disabled");
if (cJSON_IsTrue(disabled))
{
printf("SKIPPED\n");
return true;
}
doc = cJSON_GetObjectItem(test, "doc");
TEST_ASSERT_NOT_NULL_MESSAGE(doc, "No \"doc\" in the test.");
/* Make a working copy of 'doc' */
object = cJSON_Duplicate(doc, true);
TEST_ASSERT_NOT_NULL(object);
expected = cJSON_GetObjectItem(test, "expected");
if (expected == NULL)
{
cJSON_Delete(object);
/* if there is no expected output, this test doesn't make sense */
return true;
}
patch = cJSONUtils_GeneratePatches(doc, expected);
TEST_ASSERT_NOT_NULL_MESSAGE(patch, "Failed to generate patches.");
printed_patch = cJSON_Print(patch);
printf("%s\n", printed_patch);
free(printed_patch);
/* apply the generated patch */
TEST_ASSERT_EQUAL_INT_MESSAGE(0, cJSONUtils_ApplyPatches(object, patch), "Failed to apply generated patch.");
successful = cJSON_Compare(object, expected, true);
cJSON_Delete(patch);
cJSON_Delete(object);
if (successful)
{
printf("generated patch: OK\n");
}
else
{
printf("generated patch: FAILED\n");
}
return successful;
}
static void cjson_utils_should_pass_json_patch_test_tests(void) static void cjson_utils_should_pass_json_patch_test_tests(void)
{ {
cJSON *tests = parse_test_file("json-patch-tests/tests.json"); cJSON *tests = parse_test_file("json-patch-tests/tests.json");
@ -128,6 +189,7 @@ static void cjson_utils_should_pass_json_patch_test_tests(void)
cJSON_ArrayForEach(test, tests) cJSON_ArrayForEach(test, tests)
{ {
failed |= !test_apply_patch(test); failed |= !test_apply_patch(test);
failed |= !test_generate_test(test);
} }
cJSON_Delete(tests); cJSON_Delete(tests);
@ -144,6 +206,7 @@ static void cjson_utils_should_pass_json_patch_test_spec_tests(void)
cJSON_ArrayForEach(test, tests) cJSON_ArrayForEach(test, tests)
{ {
failed |= !test_apply_patch(test); failed |= !test_apply_patch(test);
failed |= !test_generate_test(test);
} }
cJSON_Delete(tests); cJSON_Delete(tests);
@ -160,6 +223,7 @@ static void cjson_utils_should_pass_json_patch_test_cjson_utils_tests(void)
cJSON_ArrayForEach(test, tests) cJSON_ArrayForEach(test, tests)
{ {
failed |= !test_apply_patch(test); failed |= !test_apply_patch(test);
failed |= !test_generate_test(test);
} }
cJSON_Delete(tests); cJSON_Delete(tests);