kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tests: ck_assert_ptr_null -> ck_assert_ptr_ne

This commit is contained in:
Mike Blumenkrantz 2018-04-05 13:43:15 -04:00
parent 621f34d322
commit 681cfc9177
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/tests/eina/eina_test_binshare.c
View File

@ -123,7 +123,7 @@ EFL_START_TEST(eina_binshare_putstuff)
eina_convert_xtoa(i, build + 7); eina_convert_xtoa(i, build + 7);
len = strlen(build); len = strlen(build);
tmp = eina_binshare_add_length(build, len); tmp = eina_binshare_add_length(build, len);
ck_assert_ptr_nonnull(tmp); ck_assert_ptr_ne(tmp, NULL);
ck_assert_ptr_eq(tmp, eina_binshare_add_length(build, len)); ck_assert_ptr_eq(tmp, eina_binshare_add_length(build, len));
ck_assert_int_eq(len, eina_binshare_length(tmp)); ck_assert_int_eq(len, eina_binshare_length(tmp));
eina_binshare_del(tmp); eina_binshare_del(tmp);
@ -147,12 +147,12 @@ EFL_START_TEST(eina_binshare_collision)
eina_convert_itoa(60000 - i, buffer); eina_convert_itoa(60000 - i, buffer);
len = strlen(buffer); len = strlen(buffer);
r = eina_binshare_add_length(buffer, len); r = eina_binshare_add_length(buffer, len);
ck_assert_ptr_nonnull(r); ck_assert_ptr_ne(r, NULL);
eina_array_push(ea, r); eina_array_push(ea, r);
r = eina_binshare_add_length(buffer, len); r = eina_binshare_add_length(buffer, len);
ck_assert_ptr_nonnull(r); ck_assert_ptr_ne(r, NULL);
r = eina_binshare_add_length(buffer, len); r = eina_binshare_add_length(buffer, len);
ck_assert_ptr_nonnull(r); ck_assert_ptr_ne(r, NULL);
} }
while (eina_array_count(ea)) while (eina_array_count(ea))

4
src/tests/eina/eina_test_hash.c
View File

@ -191,7 +191,7 @@ EFL_START_TEST(eina_test_hash_extended)
fail_if(eina_hash_direct_add(hash, "42", "42") != EINA_TRUE); fail_if(eina_hash_direct_add(hash, "42", "42") != EINA_TRUE);
array = malloc(num_loops * 10); array = malloc(num_loops * 10);
ck_assert_ptr_nonnull(array); ck_assert_ptr_ne(array, NULL);
for (i = 0; i < num_loops; ++i) for (i = 0; i < num_loops; ++i)
{ {
@ -357,7 +357,7 @@ EFL_START_TEST(eina_test_hash_string_fuzze)
hash = eina_hash_string_superfast_new(NULL); hash = eina_hash_string_superfast_new(NULL);
array = malloc(num_loops * 10); array = malloc(num_loops * 10);
ck_assert_ptr_nonnull(array); ck_assert_ptr_ne(array, NULL);
for (i = 0; i < num_loops; ++i) for (i = 0; i < num_loops; ++i)
{ {

2
src/tests/eina/eina_test_list.c
View File

@ -417,7 +417,7 @@ EFL_START_TEST(eina_test_list_shuffle)
if (eina_list_data_get(cl) != p) break; if (eina_list_data_get(cl) != p) break;
cl = eina_list_next(cl); cl = eina_list_next(cl);
} }
ck_assert_ptr_nonnull(item); ck_assert_ptr_ne(item, NULL);
} }
} }
EFL_END_TEST EFL_END_TEST

10
src/tests/eina/eina_test_safepointer.c
View File

@ -38,7 +38,7 @@ EFL_START_TEST(eina_test_safepointer_reusable)
for (i = 0; i < EINA_C_ARRAY_LENGTH(test_array); i++) for (i = 0; i < EINA_C_ARRAY_LENGTH(test_array); i++)
{ {
const void *ptr = pointers[i] = eina_safepointer_register(&test_array[i]); const void *ptr = pointers[i] = eina_safepointer_register(&test_array[i]);
ck_assert_ptr_nonnull(ptr); ck_assert_ptr_ne(ptr, NULL);
ck_assert_ptr_ne(ptr, &test_array[i]); ck_assert_ptr_ne(ptr, &test_array[i]);
ck_assert_ptr_eq(&test_array[i], eina_safepointer_get(pointers[i])); ck_assert_ptr_eq(&test_array[i], eina_safepointer_get(pointers[i]));
} }
@ -46,7 +46,7 @@ EFL_START_TEST(eina_test_safepointer_reusable)
for (i = 0; i < EINA_C_ARRAY_LENGTH(test_array2); i++) for (i = 0; i < EINA_C_ARRAY_LENGTH(test_array2); i++)
{ {
const void *ptr = pointers[i + EINA_C_ARRAY_LENGTH(test_array)] = eina_safepointer_register(&test_array2[i]); const void *ptr = pointers[i + EINA_C_ARRAY_LENGTH(test_array)] = eina_safepointer_register(&test_array2[i]);
ck_assert_ptr_nonnull(ptr); ck_assert_ptr_ne(ptr, NULL);
ck_assert_ptr_ne(ptr, &test_array2[i]); ck_assert_ptr_ne(ptr, &test_array2[i]);
ck_assert_ptr_eq(&test_array2[i], eina_safepointer_get(ptr)); ck_assert_ptr_eq(&test_array2[i], eina_safepointer_get(ptr));
eina_safepointer_unregister(ptr); eina_safepointer_unregister(ptr);
@ -82,7 +82,7 @@ _thread1(void *data EINA_UNUSED, Eina_Thread t EINA_UNUSED)
for (i = 0; i < EINA_C_ARRAY_LENGTH(test_array); i++) for (i = 0; i < EINA_C_ARRAY_LENGTH(test_array); i++)
{ {
const void *ptr = pointers[i] = eina_safepointer_register(&test_array[i]); const void *ptr = pointers[i] = eina_safepointer_register(&test_array[i]);
ck_assert_ptr_nonnull(ptr); ck_assert_ptr_ne(ptr, NULL);
ck_assert_ptr_ne(ptr, &test_array[i]); ck_assert_ptr_ne(ptr, &test_array[i]);
ck_assert_ptr_eq(&test_array[i], eina_safepointer_get(ptr)); ck_assert_ptr_eq(&test_array[i], eina_safepointer_get(ptr));
} }
@ -100,7 +100,7 @@ _thread2(void *data EINA_UNUSED, Eina_Thread t EINA_UNUSED)
for (i = 0; i < EINA_C_ARRAY_LENGTH(test_array2); i++) for (i = 0; i < EINA_C_ARRAY_LENGTH(test_array2); i++)
{ {
const void *ptr = pointers[i + (EINA_C_ARRAY_LENGTH(test_array))] = eina_safepointer_register(&test_array2[i]); const void *ptr = pointers[i + (EINA_C_ARRAY_LENGTH(test_array))] = eina_safepointer_register(&test_array2[i]);
ck_assert_ptr_nonnull(ptr); ck_assert_ptr_ne(ptr, NULL);
ck_assert_ptr_ne(ptr, &test_array2[i]); ck_assert_ptr_ne(ptr, &test_array2[i]);
ck_assert_ptr_eq(&test_array2[i], eina_safepointer_get(ptr)); ck_assert_ptr_eq(&test_array2[i], eina_safepointer_get(ptr));
eina_safepointer_unregister(ptr); eina_safepointer_unregister(ptr);
@ -155,7 +155,7 @@ EFL_START_TEST(eina_test_safepointer_lowestbit)
for (i = 0; i < EINA_C_ARRAY_LENGTH(test_array); i++) for (i = 0; i < EINA_C_ARRAY_LENGTH(test_array); i++)
{ {
const void *ptr = eina_safepointer_register(&test_array[i]); const void *ptr = eina_safepointer_register(&test_array[i]);
ck_assert_ptr_nonnull(ptr); ck_assert_ptr_ne(ptr, NULL);
ck_assert_ptr_ne(ptr, &test_array[i]); ck_assert_ptr_ne(ptr, &test_array[i]);
ck_assert_ptr_eq(&test_array[i], eina_safepointer_get(ptr)); ck_assert_ptr_eq(&test_array[i], eina_safepointer_get(ptr));

4
src/tests/eina/eina_test_strbuf.c
View File

@ -392,7 +392,7 @@ EFL_START_TEST(eina_test_strbuf_append_realloc)
ck_assert_int_eq(eina_strbuf_length_get(buf), runs * target_pattern_size); ck_assert_int_eq(eina_strbuf_length_get(buf), runs * target_pattern_size);
str = eina_strbuf_string_get(buf); str = eina_strbuf_string_get(buf);
ck_assert_ptr_nonnull(str); ck_assert_ptr_ne(str, NULL);
for (i = 0; i < runs; i++, str += target_pattern_size) for (i = 0; i < runs; i++, str += target_pattern_size)
ck_assert_int_eq(memcmp(str, target_pattern, target_pattern_size), 0); ck_assert_int_eq(memcmp(str, target_pattern, target_pattern_size), 0);
@ -423,7 +423,7 @@ EFL_START_TEST(eina_test_strbuf_prepend_realloc)
ck_assert_int_eq(eina_strbuf_length_get(buf), runs * target_pattern_size); ck_assert_int_eq(eina_strbuf_length_get(buf), runs * target_pattern_size);
str = eina_strbuf_string_get(buf); str = eina_strbuf_string_get(buf);
ck_assert_ptr_nonnull(str); ck_assert_ptr_ne(str, NULL);
for (i = 0; i < runs; i++, str += target_pattern_size) for (i = 0; i < runs; i++, str += target_pattern_size)
ck_assert_int_eq(memcmp(str, target_pattern, target_pattern_size), 0); ck_assert_int_eq(memcmp(str, target_pattern, target_pattern_size), 0);