Skip to content

Use proper string comparisons in tests #579

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
merged 1 commit into from
Sep 18, 2025
Merged

Use proper string comparisons in tests #579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions source/tests/adt_trie_test/source/adt_trie_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ TEST_F(adt_trie_test, DefaultConstructor)

log_write("metacall", LOG_LEVEL_DEBUG, "%" PRIuS " -> %s", iterator, value_str);

EXPECT_EQ((int)0, (int)strcmp(values_str[keys_size - iterator - 1], value_str));
EXPECT_STREQ(values_str[keys_size - iterator - 1], value_str);

vector_pop_back(keys_copy);
}
Expand All @@ -144,7 +144,7 @@ TEST_F(adt_trie_test, DefaultConstructor)

log_write("metacall", LOG_LEVEL_DEBUG, "%s/", key_str);

EXPECT_EQ((int)0, (int)strcmp(keys_str[iterator], key_str));
EXPECT_STREQ(keys_str[iterator], key_str);
}

vector_pop_back(keys);
Expand Down
2 changes: 1 addition & 1 deletion source/tests/detour_test/source/detour_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ TEST_F(detour_test, DefaultConstructor)

ASSERT_NE((detour)NULL, (detour)d);

EXPECT_EQ((int)0, (int)strcmp(name, detour_name(d)));
EXPECT_STREQ(name, detour_name(d));

/* Load detour of detour library */
handle = detour_load_file(d, NULL);
Expand Down
6 changes: 3 additions & 3 deletions source/tests/dynlink_test/source/dynlink_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ TEST_F(dynlink_test, DefaultConstructor)

log_write("metacall", LOG_LEVEL_DEBUG, "Dynamic linked shared object file: %s", dynlink_get_path(handle));

EXPECT_EQ((int)0, (int)strcmp(library_name, dynlink_get_name(handle)));
EXPECT_STREQ(library_name, dynlink_get_name(handle));

if (handle != NULL)
{
Expand Down Expand Up @@ -146,8 +146,8 @@ TEST_F(dynlink_test, DefaultConstructor)
log_write("metacall", LOG_LEVEL_DEBUG, "Dynamic linked shared object file name: %s", dynlink_get_path(handle));
log_write("metacall", LOG_LEVEL_DEBUG, "Dynamic linked shared object file: %s", dynlink_get_name(handle));

EXPECT_EQ((int)0, (int)strcmp(absolute_path, dynlink_get_path(handle)));
EXPECT_EQ((int)0, (int)strcmp(library_name, dynlink_get_name(handle)));
EXPECT_STREQ(absolute_path, dynlink_get_path(handle));
EXPECT_STREQ(library_name, dynlink_get_name(handle));

if (handle != NULL)
{
Expand Down
12 changes: 6 additions & 6 deletions source/tests/environment_test/source/environment_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ TEST_F(environment_test, variable_text)

ASSERT_NE((const char *)NULL, (const char *)variable_text);

EXPECT_EQ((int)0, (int)strcmp(variable_text, "abcd"));
EXPECT_STREQ(variable_text, "abcd");

environment_variable_destroy(variable_text);
}
Expand All @@ -52,7 +52,7 @@ TEST_F(environment_test, variable_text_default)

ASSERT_NE((const char *)NULL, (const char *)variable_text);

EXPECT_EQ((int)0, (int)strcmp(variable_text, "default"));
EXPECT_STREQ(variable_text, "default");

environment_variable_destroy(variable_text);
}
Expand All @@ -63,7 +63,7 @@ TEST_F(environment_test, variable_static)

const char *variable_text_static = environment_variable_get(variable_text_name, "default");

EXPECT_EQ((int)0, (int)strcmp(variable_text_static, "abcd"));
EXPECT_STREQ(variable_text_static, "abcd");
}

TEST_F(environment_test, variable_path)
Expand All @@ -74,7 +74,7 @@ TEST_F(environment_test, variable_path)

ASSERT_NE((const char *)NULL, (const char *)variable_path);

EXPECT_EQ((int)0, (int)strcmp(variable_path, "abcd" ENVIRONMENT_VARIABLE_PATH_SEPARATOR_STR));
EXPECT_STREQ(variable_path, "abcd" ENVIRONMENT_VARIABLE_PATH_SEPARATOR_STR);

environment_variable_path_destroy(variable_path);
}
Expand All @@ -87,7 +87,7 @@ TEST_F(environment_test, variable_path_default)

ASSERT_NE((const char *)NULL, (const char *)variable_path);

EXPECT_EQ((int)0, (int)strcmp(variable_path, "default_path" ENVIRONMENT_VARIABLE_PATH_SEPARATOR_STR));
EXPECT_STREQ(variable_path, "default_path" ENVIRONMENT_VARIABLE_PATH_SEPARATOR_STR);

environment_variable_path_destroy(variable_path);
}
Expand All @@ -100,7 +100,7 @@ TEST_F(environment_test, variable_path_sanitized)

ASSERT_NE((const char *)NULL, (const char *)variable_path);

EXPECT_EQ((int)0, (int)strcmp(variable_path, "abcd" ENVIRONMENT_VARIABLE_PATH_SEPARATOR_STR));
EXPECT_STREQ(variable_path, "abcd" ENVIRONMENT_VARIABLE_PATH_SEPARATOR_STR);

environment_variable_path_destroy(variable_path);
}
2 changes: 1 addition & 1 deletion source/tests/log_test/source/log_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ TEST_F(log_test, DefaultConstructor)

unsigned int value = *((unsigned int *)value_ptr);

EXPECT_EQ((int)0, (int)strcmp(log_name_list[value].name, key));
EXPECT_STREQ(log_name_list[value].name, key);
}

EXPECT_EQ((int)log_map_destroy(map), (int)0);
Expand Down
2 changes: 1 addition & 1 deletion ...ts/metacall_configuration_exec_path_test/source/metacall_configuration_exec_path_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ TEST_F(metacall_configuration_exec_path_test, DefaultConstructor)

EXPECT_NE((void *)NULL, (void *)ret);

EXPECT_EQ((int)0, (int)strcmp(metacall_value_to_string(ret), "Python hello_world: test"));
EXPECT_STREQ(metacall_value_to_string(ret), "Python hello_world: test");

metacall_value_destroy(ret);
}
Expand Down
2 changes: 1 addition & 1 deletion ...uration_exec_relative_path_test/source/metacall_configuration_exec_relative_path_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ TEST_F(metacall_configuration_exec_relative_path_test, DefaultConstructor)

EXPECT_NE((void *)NULL, (void *)ret);

EXPECT_EQ((int)0, (int)strcmp(metacall_value_to_string(ret), "Python hello_world: test"));
EXPECT_STREQ(metacall_value_to_string(ret), "Python hello_world: test");

metacall_value_destroy(ret);
}
Expand Down
2 changes: 1 addition & 1 deletion source/tests/metacall_cs_test/source/metacall_cs_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ TEST_F(metacall_cs_test, Concat)

EXPECT_NE((void *)NULL, (void *)ret);

EXPECT_EQ((int)0, (int)strcmp((const char *)metacall_value_to_string(ret), "Hello World"));
EXPECT_STREQ((const char *)metacall_value_to_string(ret), "Hello World");

metacall_value_destroy(ret);
}
Expand Down
10 changes: 5 additions & 5 deletions source/tests/metacall_distributable_test/source/metacall_distributable_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ TEST_F(metacall_distributable_test, DefaultConstructor)

EXPECT_NE((void *)NULL, (void *)ret);

EXPECT_EQ((int)0, (int)strcmp(metacall_value_to_string(ret), "Hello Universe"));
EXPECT_STREQ(metacall_value_to_string(ret), "Hello Universe");

metacall_value_destroy(ret);
}
Expand Down Expand Up @@ -143,7 +143,7 @@ TEST_F(metacall_distributable_test, DefaultConstructor)

EXPECT_NE((void *)NULL, (void *)ret);

EXPECT_EQ((int)0, (int)strcmp(metacall_value_to_string(ret), "Hello meta-programmer!"));
EXPECT_STREQ(metacall_value_to_string(ret), "Hello meta-programmer!");

metacall_value_destroy(ret);

Expand Down Expand Up @@ -193,15 +193,15 @@ TEST_F(metacall_distributable_test, DefaultConstructor)

EXPECT_NE((void *)NULL, (void *)ret);

EXPECT_EQ((int)0, (int)strcmp(metacall_value_to_string(ret), "abcdef"));
EXPECT_STREQ(metacall_value_to_string(ret), "abcdef");

metacall_value_destroy(ret);

ret = metacall("third_value", "abc", "def", "efg");

EXPECT_NE((void *)NULL, (void *)ret);

EXPECT_EQ((int)0, (int)strcmp(metacall_value_to_string(ret), "efg"));
EXPECT_STREQ(metacall_value_to_string(ret), "efg");

metacall_value_destroy(ret);
}
Expand Down Expand Up @@ -246,7 +246,7 @@ TEST_F(metacall_distributable_test, DefaultConstructor)

EXPECT_NE((void *)NULL, (void *)ret);

EXPECT_EQ((int)0, (int)strcmp(metacall_value_to_string(ret), "Hello World"));
EXPECT_STREQ(metacall_value_to_string(ret), "Hello World");

metacall_value_destroy(ret);
}
Expand Down
8 changes: 4 additions & 4 deletions source/tests/metacall_ducktype_test/source/metacall_ducktype_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ TEST_F(metacall_ducktype_test, DefaultConstructor)

EXPECT_NE((void *)NULL, (void *)ret);

EXPECT_EQ((int)0, (int)strcmp(metacall_value_cast_string(&ret), "Hello Universe"));
EXPECT_STREQ(metacall_value_cast_string(&ret), "Hello Universe");

metacall_value_destroy(ret);

Expand Down Expand Up @@ -209,7 +209,7 @@ TEST_F(metacall_ducktype_test, DefaultConstructor)

EXPECT_NE((void *)NULL, (void *)ret);

EXPECT_EQ((int)0, (int)strcmp(metacall_value_cast_string(&ret), "PepicoWalas"));
EXPECT_STREQ(metacall_value_cast_string(&ret), "PepicoWalas");

metacall_value_destroy(ret);
metacall_value_destroy(args[0]);
Expand Down Expand Up @@ -260,7 +260,7 @@ TEST_F(metacall_ducktype_test, DefaultConstructor)

EXPECT_NE((void *)NULL, (void *)ret);

EXPECT_EQ((int)0, (int)strcmp(metacall_value_cast_string(&ret), "Hello meta-programmer!"));
EXPECT_STREQ(metacall_value_cast_string(&ret), "Hello meta-programmer!");

metacall_value_destroy(ret);

Expand Down Expand Up @@ -344,7 +344,7 @@ TEST_F(metacall_ducktype_test, DefaultConstructor)

EXPECT_NE((void *)NULL, (void *)ret);

EXPECT_EQ((int)0, (int)strcmp(metacall_value_cast_string(&ret), "abcdef"));
EXPECT_STREQ(metacall_value_cast_string(&ret), "abcdef");

metacall_value_destroy(ret);

Expand Down
2 changes: 1 addition & 1 deletion source/tests/metacall_function_test/source/metacall_function_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ TEST_F(metacall_function_test, DefaultConstructor)

EXPECT_EQ((enum metacall_value_id)METACALL_STRING, (enum metacall_value_id)metacall_value_id(ret));

EXPECT_EQ((int)0, (int)strcmp("hello world", metacall_value_to_string(ret)));
EXPECT_STREQ("hello world", metacall_value_to_string(ret));

metacall_value_destroy(ret);

Expand Down
4 changes: 2 additions & 2 deletions source/tests/metacall_handle_get_test/source/metacall_handle_get_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ TEST_F(metacall_handle_get_test, DefaultConstructor)

EXPECT_NE((void *)NULL, (void *)ret);

EXPECT_EQ((int)0, (int)strcmp(metacall_value_to_string(ret), "Hello from s1"));
EXPECT_STREQ(metacall_value_to_string(ret), "Hello from s1");

metacall_value_destroy(ret);

Expand All @@ -135,7 +135,7 @@ TEST_F(metacall_handle_get_test, DefaultConstructor)

EXPECT_NE((void *)NULL, (void *)ret);

EXPECT_EQ((int)0, (int)strcmp(metacall_value_to_string(ret), "Hello from s2"));
EXPECT_STREQ(metacall_value_to_string(ret), "Hello from s2");

metacall_value_destroy(ret);
}
Expand Down
4 changes: 2 additions & 2 deletions source/tests/metacall_java_test/source/metacall_java_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,8 @@ TEST_F(metacall_java_test, DefaultConstructor)
{ //GET ARRAYS
void *str_test = metacall_class_static_get(myclass, "STRING_TEST_Arr");
void **str_test_arr = metacall_value_to_array(str_test);
ASSERT_EQ((int)0, (int)strcmp(metacall_value_to_string(str_test_arr[0]), "Hello"));
ASSERT_EQ((int)0, (int)strcmp(metacall_value_to_string(str_test_arr[1]), "world"));
ASSERT_STREQ(metacall_value_to_string(str_test_arr[0]), "Hello");
ASSERT_STREQ(metacall_value_to_string(str_test_arr[1]), "world");
metacall_value_destroy(str_test);

void *class_test = metacall_class_static_get(myclass, "CLASS_TEST_Arr");
Expand Down
6 changes: 3 additions & 3 deletions source/tests/metacall_load_configuration_test/source/metacall_load_configuration_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ TEST_F(metacall_load_configuration_test, DefaultConstructor)

EXPECT_NE((void *)NULL, (void *)ret);

EXPECT_EQ((int)0, (int)strcmp(metacall_value_to_string(ret), "Hello Universe"));
EXPECT_STREQ(metacall_value_to_string(ret), "Hello Universe");

metacall_value_destroy(ret);

Expand Down Expand Up @@ -192,7 +192,7 @@ TEST_F(metacall_load_configuration_test, DefaultConstructor)

EXPECT_NE((void *)NULL, (void *)ret);

EXPECT_EQ((int)0, (int)strcmp(metacall_value_to_string(ret), "Hello Universe"));
EXPECT_STREQ(metacall_value_to_string(ret), "Hello Universe");

metacall_value_destroy(ret);
}
Expand Down Expand Up @@ -225,7 +225,7 @@ TEST_F(metacall_load_configuration_test, DefaultConstructor)

EXPECT_NE((void *)NULL, (void *)ret);

EXPECT_EQ((int)0, (int)strcmp(metacall_value_to_string(ret), "Hello meta-programmer!"));
EXPECT_STREQ(metacall_value_to_string(ret), "Hello meta-programmer!");

metacall_value_destroy(ret);
}
Expand Down
2 changes: 1 addition & 1 deletion source/tests/metacall_map_await_test/source/metacall_map_await_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ static void *hello_world_await_ok(void *result, void *data)

fflush(stdout);

EXPECT_EQ((int)0, (int)strcmp(metacall_value_to_string(result), "Hello World"));
EXPECT_STREQ(metacall_value_to_string(result), "Hello World");

++success_callbacks;

Expand Down
2 changes: 1 addition & 1 deletion source/tests/metacall_map_test/source/metacall_map_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ TEST_F(metacall_map_test, DefaultConstructor)

ASSERT_NE((void *)NULL, (void *)ret);

EXPECT_EQ((int)0, (int)strcmp(metacall_value_to_string(ret), "ACK: OK!"));
EXPECT_STREQ(metacall_value_to_string(ret), "ACK: OK!");

metacall_value_destroy(ret);
*/
Expand Down
4 changes: 2 additions & 2 deletions source/tests/metacall_node_exception_test/source/metacall_node_exception_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,15 @@ TEST_F(metacall_node_exception_test, DefaultConstructor)

EXPECT_EQ((int)0, (int)metacall_error_from_value(ret, &ex));

EXPECT_EQ((int)0, (int)strcmp("Yeet", ex.message));
EXPECT_STREQ("Yeet", ex.message);

metacall_value_destroy(ret);

ret = metacall("js_throw_error");

EXPECT_EQ((int)0, (int)metacall_error_from_value(ret, &ex));

EXPECT_EQ((int)0, (int)strcmp("YeetThrown", ex.message));
EXPECT_STREQ("YeetThrown", ex.message);

metacall_value_destroy(ret);

Expand Down
2 changes: 1 addition & 1 deletion source/tests/metacall_node_extension_test/source/metacall_node_extension_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ TEST_F(metacall_node_extension_test, DefaultConstructor)

EXPECT_NE((void *)NULL, (void *)ret);

EXPECT_EQ((int)0, (int)strcmp("world", metacall_value_to_string(ret)));
EXPECT_STREQ("world", metacall_value_to_string(ret));

metacall_value_destroy(ret);
}
Expand Down
2 changes: 1 addition & 1 deletion source/tests/metacall_node_port_test/source/metacall_node_port_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ TEST_F(metacall_node_port_test, DefaultConstructor)
struct await_data_type *await_data = static_cast<struct await_data_type *>(data);
std::unique_lock<std::mutex> lock(await_data->m);
const char *str = metacall_value_to_string(v);
EXPECT_EQ((int)0, (int)strcmp(str, "Tests passed without errors"));
EXPECT_STREQ(str, "Tests passed without errors");
await_data->c.notify_one();
return NULL;
};
Expand Down
6 changes: 3 additions & 3 deletions source/tests/metacall_python_dict_test/source/metacall_python_dict_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ TEST_F(metacall_python_dict_test, DefaultConstructor)
}
else if (strcmp(key, "hello") == 0)
{
EXPECT_EQ((int)0, (int)strcmp(metacall_value_to_string(array[1]), "world"));
EXPECT_STREQ(metacall_value_to_string(array[1]), "world");
}
else if (strcmp(key, "efg") == 0)
{
Expand Down Expand Up @@ -134,14 +134,14 @@ TEST_F(metacall_python_dict_test, DefaultConstructor)
char *ret_key0 = metacall_value_to_string(ret_pair0[0]);
long ret_value0 = metacall_value_to_long(ret_pair0[1]);

EXPECT_EQ((int)0, (int)strcmp(ret_key0, "new"));
EXPECT_STREQ(ret_key0, "new");
EXPECT_EQ((long)5, (long)ret_value0);

void **ret_pair1 = metacall_value_to_array(ret_map[1]);
char *ret_key1 = metacall_value_to_string(ret_pair1[0]);
long ret_value1 = metacall_value_to_long(ret_pair1[1]);

EXPECT_EQ((int)0, (int)strcmp(ret_key1, "whatever"));
EXPECT_STREQ(ret_key1, "whatever");
EXPECT_EQ((long)7, (long)ret_value1);

metacall_value_destroy(ret);
Expand Down
8 changes: 4 additions & 4 deletions source/tests/metacall_python_exception_test/source/metacall_python_exception_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,19 +54,19 @@ TEST_F(metacall_python_exception_test, DefaultConstructor)

EXPECT_EQ((int)0, (int)metacall_error_from_value(ret, &ex));

EXPECT_EQ((int)0, (int)strcmp("yeet", ex.message));
EXPECT_STREQ("yeet", ex.message);

EXPECT_EQ((int)0, (int)strcmp("TypeError", ex.label));
EXPECT_STREQ("TypeError", ex.label);

metacall_value_destroy(ret);

ret = metacall("py_return_error");

EXPECT_EQ((int)0, (int)metacall_error_from_value(ret, &ex));

EXPECT_EQ((int)0, (int)strcmp("asdf", ex.message));
EXPECT_STREQ("asdf", ex.message);

EXPECT_EQ((int)0, (int)strcmp("BaseException", ex.label));
EXPECT_STREQ("BaseException", ex.label);

metacall_value_destroy(ret);
}
Expand Down
Loading
Loading