Skip to content

Added function JsonGetTypeAsString() #254

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
larsewi merged 2 commits into from
Aug 18, 2025
Merged

Added function JsonGetTypeAsString() #254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf478fe
Added missing primitive null to JsonPrimitiveTypeToString
larsewi Aug 14, 2025
1d26c08
Added function JsonGetTypeAsString()
larsewi Aug 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions libutils/json.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,20 @@ struct JsonElement_
// JsonElement Functions
// *******************************************************************************************

const char *JsonGetTypeAsString(const JsonElement *element)
{
switch (JsonGetElementType(element))
{
case JSON_ELEMENT_TYPE_CONTAINER:
return JsonContainerTypeToString(JsonGetContainerType(element));
case JSON_ELEMENT_TYPE_PRIMITIVE:
return JsonPrimitiveTypeToString(JsonGetPrimitiveType(element));
default:
UnexpectedError("Unknown JSON container type: %d", JsonGetType(element));
return "(null)";
}
}

const char *JsonContainerTypeToString(const JsonContainerType type)
{
switch (type)
Expand All @@ -101,6 +115,8 @@ const char *JsonPrimitiveTypeToString(const JsonPrimitiveType type)
return "number";
case JSON_PRIMITIVE_TYPE_BOOL:
return "boolean";
case JSON_PRIMITIVE_TYPE_NULL:
return "null";
default:
UnexpectedError("Unknown JSON primitive type: %d", type);
return "(null)";
Expand Down
2 changes: 2 additions & 0 deletions libutils/json.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,8 @@ const char *JsonGetPropertyAsString(const JsonElement *element);
#define NULL_JSON(json) ((json == NULL) || (JsonGetType(json) == JSON_TYPE_NULL))
#define JSON_NOT_NULL(json) ((json != NULL) && (JsonGetType(json) != JSON_TYPE_NULL))

const char *JsonGetTypeAsString(const JsonElement *element);

//////////////////////////////////////////////////////////////////////////////
// JSON Primitives
//////////////////////////////////////////////////////////////////////////////
Expand Down
59 changes: 59 additions & 0 deletions tests/unit/json_test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2363,6 +2363,64 @@ static void test_json_object_merge_deep()
));
}

static void test_json_get_type_as_string()
{
{
JsonElement *element = JsonStringCreate("foo");
const char *expected = "string";
const char *actual = JsonGetTypeAsString(element);
assert_string_equal(expected, actual);
JsonDestroy(element);
}

{
JsonElement *element = JsonIntegerCreate(42);
const char *expected = "number";
const char *actual = JsonGetTypeAsString(element);
assert_string_equal(expected, actual);
JsonDestroy(element);
}

{
JsonElement *element = JsonRealCreate(3.14);
const char *expected = "number";
const char *actual = JsonGetTypeAsString(element);
assert_string_equal(expected, actual);
JsonDestroy(element);
}

{
JsonElement *element = JsonBoolCreate(true);
const char *expected = "boolean";
const char *actual = JsonGetTypeAsString(element);
assert_string_equal(expected, actual);
JsonDestroy(element);
}

{
JsonElement *element = JsonNullCreate(true);
const char *expected = "null";
const char *actual = JsonGetTypeAsString(element);
assert_string_equal(expected, actual);
JsonDestroy(element);
}

{
JsonElement *element = JsonObjectCreate(0);
const char *expected = "object";
const char *actual = JsonGetTypeAsString(element);
assert_string_equal(expected, actual);
JsonDestroy(element);
}

{
JsonElement *element = JsonArrayCreate(0);
const char *expected = "array";
const char *actual = JsonGetTypeAsString(element);
assert_string_equal(expected, actual);
JsonDestroy(element);
}
}

int main()
{
Expand Down Expand Up @@ -2435,6 +2493,7 @@ int main()
unit_test(test_json_null_not_null),
unit_test(test_json_object_merge_deep),
unit_test(test_compare_container_type_mismatch),
unit_test(test_json_get_type_as_string),
};

return run_tests(tests);
Expand Down
Loading