json_patch_tests.c: Use case sensitive functions

This commit is contained in:
Max Bruckner 2017-05-02 01:54:49 +02:00
parent 1d277eb99d
commit e1f6470dae

View File

@ -59,7 +59,7 @@ static cJSON_bool test_apply_patch(const cJSON * const test)
cJSON_bool successful = false; cJSON_bool successful = false;
/* extract all the data out of the test */ /* extract all the data out of the test */
comment = cJSON_GetObjectItem(test, "comment"); comment = cJSON_GetObjectItemCaseSensitive(test, "comment");
if (cJSON_IsString(comment)) if (cJSON_IsString(comment))
{ {
printf("Testing \"%s\"\n", comment->valuestring); printf("Testing \"%s\"\n", comment->valuestring);
@ -69,34 +69,34 @@ static cJSON_bool test_apply_patch(const cJSON * const test)
printf("Testing unkown\n"); printf("Testing unkown\n");
} }
disabled = cJSON_GetObjectItem(test, "disabled"); disabled = cJSON_GetObjectItemCaseSensitive(test, "disabled");
if (cJSON_IsTrue(disabled)) if (cJSON_IsTrue(disabled))
{ {
printf("SKIPPED\n"); printf("SKIPPED\n");
return true; return true;
} }
doc = cJSON_GetObjectItem(test, "doc"); doc = cJSON_GetObjectItemCaseSensitive(test, "doc");
TEST_ASSERT_NOT_NULL_MESSAGE(doc, "No \"doc\" in the test."); TEST_ASSERT_NOT_NULL_MESSAGE(doc, "No \"doc\" in the test.");
patch = cJSON_GetObjectItem(test, "patch"); patch = cJSON_GetObjectItemCaseSensitive(test, "patch");
TEST_ASSERT_NOT_NULL_MESSAGE(patch, "No \"patch\"in the test."); TEST_ASSERT_NOT_NULL_MESSAGE(patch, "No \"patch\"in the test.");
/* Make a working copy of 'doc' */ /* Make a working copy of 'doc' */
object = cJSON_Duplicate(doc, true); object = cJSON_Duplicate(doc, true);
TEST_ASSERT_NOT_NULL(object); TEST_ASSERT_NOT_NULL(object);
expected = cJSON_GetObjectItem(test, "expected"); expected = cJSON_GetObjectItemCaseSensitive(test, "expected");
error_element = cJSON_GetObjectItem(test, "error"); error_element = cJSON_GetObjectItemCaseSensitive(test, "error");
if (error_element != NULL) if (error_element != NULL)
{ {
/* excepting an error */ /* excepting an error */
TEST_ASSERT_TRUE_MESSAGE(0 != cJSONUtils_ApplyPatches(object, patch), "Test didn't fail as it's supposed to."); TEST_ASSERT_TRUE_MESSAGE(0 != cJSONUtils_ApplyPatchesCaseSensitive(object, patch), "Test didn't fail as it's supposed to.");
successful = true; successful = true;
} }
else else
{ {
/* apply the patch */ /* apply the patch */
TEST_ASSERT_EQUAL_INT_MESSAGE(0, cJSONUtils_ApplyPatches(object, patch), "Failed to apply patches."); TEST_ASSERT_EQUAL_INT_MESSAGE(0, cJSONUtils_ApplyPatchesCaseSensitive(object, patch), "Failed to apply patches.");
successful = true; successful = true;
if (expected != NULL) if (expected != NULL)
@ -131,21 +131,21 @@ static cJSON_bool test_generate_test(cJSON *test __attribute__((unused)))
char *printed_patch = NULL; char *printed_patch = NULL;
disabled = cJSON_GetObjectItem(test, "disabled"); disabled = cJSON_GetObjectItemCaseSensitive(test, "disabled");
if (cJSON_IsTrue(disabled)) if (cJSON_IsTrue(disabled))
{ {
printf("SKIPPED\n"); printf("SKIPPED\n");
return true; return true;
} }
doc = cJSON_GetObjectItem(test, "doc"); doc = cJSON_GetObjectItemCaseSensitive(test, "doc");
TEST_ASSERT_NOT_NULL_MESSAGE(doc, "No \"doc\" in the test."); TEST_ASSERT_NOT_NULL_MESSAGE(doc, "No \"doc\" in the test.");
/* Make a working copy of 'doc' */ /* Make a working copy of 'doc' */
object = cJSON_Duplicate(doc, true); object = cJSON_Duplicate(doc, true);
TEST_ASSERT_NOT_NULL(object); TEST_ASSERT_NOT_NULL(object);
expected = cJSON_GetObjectItem(test, "expected"); expected = cJSON_GetObjectItemCaseSensitive(test, "expected");
if (expected == NULL) if (expected == NULL)
{ {
cJSON_Delete(object); cJSON_Delete(object);
@ -153,7 +153,7 @@ static cJSON_bool test_generate_test(cJSON *test __attribute__((unused)))
return true; return true;
} }
patch = cJSONUtils_GeneratePatches(doc, expected); patch = cJSONUtils_GeneratePatchesCaseSensitive(doc, expected);
TEST_ASSERT_NOT_NULL_MESSAGE(patch, "Failed to generate patches."); TEST_ASSERT_NOT_NULL_MESSAGE(patch, "Failed to generate patches.");
printed_patch = cJSON_Print(patch); printed_patch = cJSON_Print(patch);
@ -161,7 +161,7 @@ static cJSON_bool test_generate_test(cJSON *test __attribute__((unused)))
free(printed_patch); free(printed_patch);
/* apply the generated patch */ /* apply the generated patch */
TEST_ASSERT_EQUAL_INT_MESSAGE(0, cJSONUtils_ApplyPatches(object, patch), "Failed to apply generated patch."); TEST_ASSERT_EQUAL_INT_MESSAGE(0, cJSONUtils_ApplyPatchesCaseSensitive(object, patch), "Failed to apply generated patch.");
successful = cJSON_Compare(object, expected, true); successful = cJSON_Compare(object, expected, true);