Skip to content

Commit edd2fdf

Browse files
committed
Move urVirtualMemGetInfo success test from a switch to individual tests.
1 parent 9c652ff commit edd2fdf

File tree

1 file changed

+11
-29
lines changed

1 file changed

+11
-29
lines changed

test/conformance/virtual_memory/urVirtualMemGetInfo.cpp

Lines changed: 11 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -4,42 +4,24 @@
44
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
55
#include <uur/fixtures.h>
66

7-
using urVirtualMemGetInfoTestWithParam =
8-
uur::urVirtualMemMappedTestWithParam<ur_virtual_mem_info_t>;
9-
UUR_TEST_SUITE_P(urVirtualMemGetInfoTestWithParam,
10-
::testing::Values(UR_VIRTUAL_MEM_INFO_ACCESS_MODE),
11-
uur::deviceTestWithParamPrinter<ur_virtual_mem_info_t>);
7+
using urVirtualMemGetInfoTest = uur::urVirtualMemMappedTest;
8+
UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(urVirtualMemGetInfoTest);
129

13-
TEST_P(urVirtualMemGetInfoTestWithParam, Success) {
10+
TEST_P(urVirtualMemGetInfoTest, SuccessAccessMode) {
1411
size_t info_size = 0;
15-
ur_virtual_mem_info_t info = getParam();
16-
ASSERT_SUCCESS_OR_OPTIONAL_QUERY(urVirtualMemGetInfo(context, virtual_ptr,
17-
size, info, 0, nullptr,
18-
&info_size),
19-
info);
12+
auto info_type = UR_VIRTUAL_MEM_INFO_ACCESS_MODE;
13+
ASSERT_SUCCESS(urVirtualMemGetInfo(context, virtual_ptr, size, info_type, 0,
14+
nullptr, &info_size));
2015
ASSERT_NE(info_size, 0);
2116

22-
std::vector<uint8_t> data(info_size);
23-
ASSERT_SUCCESS(urVirtualMemGetInfo(context, virtual_ptr, size, info,
24-
data.size(), data.data(), nullptr));
25-
26-
switch (info) {
27-
case UR_VIRTUAL_MEM_INFO_ACCESS_MODE: {
28-
ASSERT_EQ(sizeof(ur_virtual_mem_access_flags_t), data.size());
29-
ur_virtual_mem_access_flags_t flags =
30-
*reinterpret_cast<ur_virtual_mem_access_flags_t *>(data.data());
31-
ASSERT_TRUE(flags & UR_VIRTUAL_MEM_ACCESS_FLAG_READ_WRITE);
32-
} break;
17+
ur_virtual_mem_access_flags_t returned_flags =
18+
UR_VIRTUAL_MEM_ACCESS_FLAG_FORCE_UINT32;
19+
ASSERT_SUCCESS(urVirtualMemGetInfo(context, virtual_ptr, size, info_type,
20+
info_size, &returned_flags, nullptr));
3321

34-
default:
35-
FAIL() << "Unhandled ur_virtual_mem_info_t enumeration: " << info;
36-
break;
37-
}
22+
ASSERT_TRUE(returned_flags & UR_VIRTUAL_MEM_ACCESS_FLAG_READ_WRITE);
3823
}
3924

40-
using urVirtualMemGetInfoTest = uur::urVirtualMemMappedTest;
41-
UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(urVirtualMemGetInfoTest);
42-
4325
TEST_P(urVirtualMemGetInfoTest, InvalidNullHandleContext) {
4426
ur_virtual_mem_access_flags_t flags = 0;
4527
ASSERT_EQ_RESULT(urVirtualMemGetInfo(nullptr, virtual_ptr, size,

0 commit comments

Comments
 (0)