Skip to content

Commit c769cc8

Browse files
trgwiitrgwii
authored
Replace relevant EXPECT_EQ / ASSERT_EQ with EXPECT_STREQ / ASSERT_STREQ (#579)
1 parent 4d095b2 commit c769cc8

File tree

35 files changed

+80
-80
lines changed

35 files changed

+80
-80
lines changed

‎source/tests/adt_trie_test/source/adt_trie_test.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ TEST_F(adt_trie_test, DefaultConstructor)
123123

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

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

128128
vector_pop_back(keys_copy);
129129
}
@@ -144,7 +144,7 @@ TEST_F(adt_trie_test, DefaultConstructor)
144144

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

147-
EXPECT_EQ((int)0, (int)strcmp(keys_str[iterator], key_str));
147+
EXPECT_STREQ(keys_str[iterator], key_str);
148148
}
149149

150150
vector_pop_back(keys);

‎source/tests/detour_test/source/detour_test.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ TEST_F(detour_test, DefaultConstructor)
111111

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

114-
EXPECT_EQ((int)0, (int)strcmp(name, detour_name(d)));
114+
EXPECT_STREQ(name, detour_name(d));
115115

116116
/* Load detour of detour library */
117117
handle = detour_load_file(d, NULL);

‎source/tests/dynlink_test/source/dynlink_test.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ TEST_F(dynlink_test, DefaultConstructor)
101101

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

104-
EXPECT_EQ((int)0, (int)strcmp(library_name, dynlink_get_name(handle)));
104+
EXPECT_STREQ(library_name, dynlink_get_name(handle));
105105

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

149-
EXPECT_EQ((int)0, (int)strcmp(absolute_path, dynlink_get_path(handle)));
150-
EXPECT_EQ((int)0, (int)strcmp(library_name, dynlink_get_name(handle)));
149+
EXPECT_STREQ(absolute_path, dynlink_get_path(handle));
150+
EXPECT_STREQ(library_name, dynlink_get_name(handle));
151151

152152
if (handle != NULL)
153153
{

‎source/tests/environment_test/source/environment_test.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ TEST_F(environment_test, variable_text)
3939

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

42-
EXPECT_EQ((int)0, (int)strcmp(variable_text, "abcd"));
42+
EXPECT_STREQ(variable_text, "abcd");
4343

4444
environment_variable_destroy(variable_text);
4545
}
@@ -52,7 +52,7 @@ TEST_F(environment_test, variable_text_default)
5252

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

55-
EXPECT_EQ((int)0, (int)strcmp(variable_text, "default"));
55+
EXPECT_STREQ(variable_text, "default");
5656

5757
environment_variable_destroy(variable_text);
5858
}
@@ -63,7 +63,7 @@ TEST_F(environment_test, variable_static)
6363

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

66-
EXPECT_EQ((int)0, (int)strcmp(variable_text_static, "abcd"));
66+
EXPECT_STREQ(variable_text_static, "abcd");
6767
}
6868

6969
TEST_F(environment_test, variable_path)
@@ -74,7 +74,7 @@ TEST_F(environment_test, variable_path)
7474

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

77-
EXPECT_EQ((int)0, (int)strcmp(variable_path, "abcd" ENVIRONMENT_VARIABLE_PATH_SEPARATOR_STR));
77+
EXPECT_STREQ(variable_path, "abcd" ENVIRONMENT_VARIABLE_PATH_SEPARATOR_STR);
7878

7979
environment_variable_path_destroy(variable_path);
8080
}
@@ -87,7 +87,7 @@ TEST_F(environment_test, variable_path_default)
8787

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

90-
EXPECT_EQ((int)0, (int)strcmp(variable_path, "default_path" ENVIRONMENT_VARIABLE_PATH_SEPARATOR_STR));
90+
EXPECT_STREQ(variable_path, "default_path" ENVIRONMENT_VARIABLE_PATH_SEPARATOR_STR);
9191

9292
environment_variable_path_destroy(variable_path);
9393
}
@@ -100,7 +100,7 @@ TEST_F(environment_test, variable_path_sanitized)
100100

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

103-
EXPECT_EQ((int)0, (int)strcmp(variable_path, "abcd" ENVIRONMENT_VARIABLE_PATH_SEPARATOR_STR));
103+
EXPECT_STREQ(variable_path, "abcd" ENVIRONMENT_VARIABLE_PATH_SEPARATOR_STR);
104104

105105
environment_variable_path_destroy(variable_path);
106106
}

‎source/tests/log_test/source/log_test.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ TEST_F(log_test, DefaultConstructor)
8585

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

88-
EXPECT_EQ((int)0, (int)strcmp(log_name_list[value].name, key));
88+
EXPECT_STREQ(log_name_list[value].name, key);
8989
}
9090

9191
EXPECT_EQ((int)log_map_destroy(map), (int)0);

‎source/tests/metacall_configuration_exec_path_test/source/metacall_configuration_exec_path_test.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ TEST_F(metacall_configuration_exec_path_test, DefaultConstructor)
4949

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

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

5454
metacall_value_destroy(ret);
5555
}

‎source/tests/metacall_configuration_exec_relative_path_test/source/metacall_configuration_exec_relative_path_test.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ TEST_F(metacall_configuration_exec_relative_path_test, DefaultConstructor)
4949

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

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

5454
metacall_value_destroy(ret);
5555
}

‎source/tests/metacall_cs_test/source/metacall_cs_test.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ TEST_F(metacall_cs_test, Concat)
8181

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

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

8686
metacall_value_destroy(ret);
8787
}

‎source/tests/metacall_distributable_test/source/metacall_distributable_test.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ TEST_F(metacall_distributable_test, DefaultConstructor)
106106

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

109-
EXPECT_EQ((int)0, (int)strcmp(metacall_value_to_string(ret), "Hello Universe"));
109+
EXPECT_STREQ(metacall_value_to_string(ret), "Hello Universe");
110110

111111
metacall_value_destroy(ret);
112112
}
@@ -143,7 +143,7 @@ TEST_F(metacall_distributable_test, DefaultConstructor)
143143

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

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

148148
metacall_value_destroy(ret);
149149

@@ -193,15 +193,15 @@ TEST_F(metacall_distributable_test, DefaultConstructor)
193193

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

196-
EXPECT_EQ((int)0, (int)strcmp(metacall_value_to_string(ret), "abcdef"));
196+
EXPECT_STREQ(metacall_value_to_string(ret), "abcdef");
197197

198198
metacall_value_destroy(ret);
199199

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

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

204-
EXPECT_EQ((int)0, (int)strcmp(metacall_value_to_string(ret), "efg"));
204+
EXPECT_STREQ(metacall_value_to_string(ret), "efg");
205205

206206
metacall_value_destroy(ret);
207207
}
@@ -246,7 +246,7 @@ TEST_F(metacall_distributable_test, DefaultConstructor)
246246

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

249-
EXPECT_EQ((int)0, (int)strcmp(metacall_value_to_string(ret), "Hello World"));
249+
EXPECT_STREQ(metacall_value_to_string(ret), "Hello World");
250250

251251
metacall_value_destroy(ret);
252252
}

‎source/tests/metacall_ducktype_test/source/metacall_ducktype_test.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ TEST_F(metacall_ducktype_test, DefaultConstructor)
123123

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

126-
EXPECT_EQ((int)0, (int)strcmp(metacall_value_cast_string(&ret), "Hello Universe"));
126+
EXPECT_STREQ(metacall_value_cast_string(&ret), "Hello Universe");
127127

128128
metacall_value_destroy(ret);
129129

@@ -209,7 +209,7 @@ TEST_F(metacall_ducktype_test, DefaultConstructor)
209209

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

212-
EXPECT_EQ((int)0, (int)strcmp(metacall_value_cast_string(&ret), "PepicoWalas"));
212+
EXPECT_STREQ(metacall_value_cast_string(&ret), "PepicoWalas");
213213

214214
metacall_value_destroy(ret);
215215
metacall_value_destroy(args[0]);
@@ -260,7 +260,7 @@ TEST_F(metacall_ducktype_test, DefaultConstructor)
260260

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

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

265265
metacall_value_destroy(ret);
266266

@@ -344,7 +344,7 @@ TEST_F(metacall_ducktype_test, DefaultConstructor)
344344

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

347-
EXPECT_EQ((int)0, (int)strcmp(metacall_value_cast_string(&ret), "abcdef"));
347+
EXPECT_STREQ(metacall_value_cast_string(&ret), "abcdef");
348348

349349
metacall_value_destroy(ret);
350350

0 commit comments

Comments
 (0)