Skip to content

fix: substitute UT_ASSERTs with asserts from GTEST part 1 #676

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.

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
Aug 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion test/test_base_alloc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ TEST_F(test, baseAllocMultiThreadedAllocMemset) {

for (int i = 0; i < ITERATIONS; i++) {
for (int k = 0; k < ALLOCATION_SIZE; k++) {
UT_ASSERTeq(*(ptrs[i].get() + k), ((i + TID) & 0xFF));
ASSERT_EQ(*(ptrs[i].get() + k), ((i + TID) & 0xFF));
}
}
};
Expand Down
17 changes: 8 additions & 9 deletions test/test_base_alloc_linear.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ TEST_F(test, baseAllocLinearAllocMoreThanPoolSize) {

size_t new_size = 20 * 1024 * 1024; // = 20 MB
void *ptr = umf_ba_linear_alloc(pool.get(), new_size);
UT_ASSERTne(ptr, NULL);
ASSERT_NE(ptr, nullptr);
memset(ptr, 0, new_size);

umf_ba_linear_free(pool.get(), ptr);
Expand All @@ -37,15 +37,14 @@ TEST_F(test, baseAllocLinearPoolContainsPointer) {

size_t size = 16;
void *ptr = umf_ba_linear_alloc(pool.get(), size);
UT_ASSERTne(ptr, NULL);
ASSERT_NE(ptr, nullptr);
memset(ptr, 0, size);

// assert pool contains pointer ptr
UT_ASSERTne(umf_ba_linear_pool_contains_pointer(pool.get(), ptr), 0);
ASSERT_NE(umf_ba_linear_pool_contains_pointer(pool.get(), ptr), 0);

// assert pool does NOT contain pointer 0x0123
UT_ASSERTeq(umf_ba_linear_pool_contains_pointer(pool.get(), (void *)0x0123),
0);
ASSERT_EQ(umf_ba_linear_pool_contains_pointer(pool.get(), (void *)0x0123),
0);

umf_ba_linear_free(pool.get(), ptr);
}
Expand Down Expand Up @@ -78,14 +77,14 @@ TEST_F(test, baseAllocLinearMultiThreadedAllocMemset) {
(rand() / (double)RAND_MAX));
buffer[i].size = size;
buffer[i].ptr = (unsigned char *)umf_ba_linear_alloc(pool, size);
UT_ASSERTne(buffer[i].ptr, NULL);
ASSERT_NE(buffer[i].ptr, nullptr);
memset(buffer[i].ptr, (i + TID) & 0xFF, buffer[i].size);
}

for (int i = 0; i < ITERATIONS; i++) {
UT_ASSERTne(buffer[i].ptr, NULL);
ASSERT_NE(buffer[i].ptr, nullptr);
for (size_t k = 0; k < buffer[i].size; k++) {
UT_ASSERTeq(*(buffer[i].ptr + k), (i + TID) & 0xFF);
ASSERT_EQ(*(buffer[i].ptr + k), (i + TID) & 0xFF);
}
}

Expand Down
2 changes: 1 addition & 1 deletion test/test_proxy_lib.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@ TEST_F(test, proxyLibBasic) {
#else
size_t size = ::malloc_usable_size(ptr);
#endif
UT_ASSERTeq(size, 0xDEADBEEF);
ASSERT_EQ(size, 0xDEADBEEF);
}
Loading