Skip to content

Commit ff28d1e

Browse files
Merge pull request #719 from ldorau/Refactor_providerCreateExt
Refactor providerCreateExt()
2 parents 5e8fca3 + e4c61f1 commit ff28d1e

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

test/provider_os_memory.cpp

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,28 +43,29 @@ static int compare_native_error_str(const char *message, int error) {
4343

4444
using providerCreateExtParams = std::tuple<umf_memory_provider_ops_t *, void *>;
4545

46-
umf::provider_unique_handle_t
47-
providerCreateExt(providerCreateExtParams params) {
46+
static void providerCreateExt(providerCreateExtParams params,
47+
umf::provider_unique_handle_t *handle) {
4848
umf_memory_provider_handle_t hProvider = nullptr;
4949
auto [provider_ops, provider_params] = params;
5050

5151
auto ret =
5252
umfMemoryProviderCreate(provider_ops, provider_params, &hProvider);
53-
EXPECT_EQ(ret, UMF_RESULT_SUCCESS);
54-
EXPECT_NE(hProvider, nullptr);
53+
ASSERT_EQ(ret, UMF_RESULT_SUCCESS);
54+
ASSERT_NE(hProvider, nullptr);
5555

56-
return umf::provider_unique_handle_t(hProvider, &umfMemoryProviderDestroy);
56+
*handle =
57+
umf::provider_unique_handle_t(hProvider, &umfMemoryProviderDestroy);
5758
}
5859

5960
struct umfProviderTest
6061
: umf_test::test,
6162
::testing::WithParamInterface<providerCreateExtParams> {
6263
void SetUp() override {
6364
test::SetUp();
64-
provider = providerCreateExt(this->GetParam());
65+
providerCreateExt(this->GetParam(), &provider);
6566
umf_result_t umf_result =
6667
umfMemoryProviderGetMinPageSize(provider.get(), NULL, &page_size);
67-
EXPECT_EQ(umf_result, UMF_RESULT_SUCCESS);
68+
ASSERT_EQ(umf_result, UMF_RESULT_SUCCESS);
6869

6970
page_plus_64 = page_size + 64;
7071
}

0 commit comments

Comments
 (0)