Merge pull request #2541 from martygrant/martin/virtualmem-info-unswitch

Move urVirtualMemGetInfo success test from a switch to individual tests

Author: martygrant

test/conformance/virtual_memory/urVirtualMemGetInfo.cpp

@@ -4,42 +4,28 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 #include <uur/fixtures.h>
 
-using urVirtualMemGetInfoTestWithParam =
-    uur::urVirtualMemMappedTestWithParam<ur_virtual_mem_info_t>;
-UUR_DEVICE_TEST_SUITE_P(urVirtualMemGetInfoTestWithParam,
-                        ::testing::Values(UR_VIRTUAL_MEM_INFO_ACCESS_MODE),
-                        uur::deviceTestWithParamPrinter<ur_virtual_mem_info_t>);
+using urVirtualMemGetInfoTest = uur::urVirtualMemMappedTest;
+UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(urVirtualMemGetInfoTest);
 
-TEST_P(urVirtualMemGetInfoTestWithParam, Success) {
-    size_t info_size = 0;
-    ur_virtual_mem_info_t info = getParam();
-    ASSERT_SUCCESS_OR_OPTIONAL_QUERY(urVirtualMemGetInfo(context, virtual_ptr,
-                                                         size, info, 0, nullptr,
-                                                         &info_size),
-                                     info);
-    ASSERT_NE(info_size, 0);
+TEST_P(urVirtualMemGetInfoTest, SuccessAccessMode) {
+    size_t property_size = 0;
+    ur_virtual_mem_info_t property_name = UR_VIRTUAL_MEM_INFO_ACCESS_MODE;
 
-    std::vector<uint8_t> data(info_size);
-    ASSERT_SUCCESS(urVirtualMemGetInfo(context, virtual_ptr, size, info,
-                                       data.size(), data.data(), nullptr));
+    ASSERT_SUCCESS_OR_OPTIONAL_QUERY(
+        urVirtualMemGetInfo(context, virtual_ptr, size, property_name, 0,
+                            nullptr, &property_size),
+        property_name);
+    ASSERT_NE(property_size, 0);
 
-    switch (info) {
-    case UR_VIRTUAL_MEM_INFO_ACCESS_MODE: {
-        ASSERT_EQ(sizeof(ur_virtual_mem_access_flags_t), data.size());
-        ur_virtual_mem_access_flags_t flags =
-            *reinterpret_cast<ur_virtual_mem_access_flags_t *>(data.data());
-        ASSERT_TRUE(flags & UR_VIRTUAL_MEM_ACCESS_FLAG_READ_WRITE);
-    } break;
+    ur_virtual_mem_access_flags_t returned_flags =
+        UR_VIRTUAL_MEM_ACCESS_FLAG_FORCE_UINT32;
+    ASSERT_SUCCESS(urVirtualMemGetInfo(context, virtual_ptr, size,
+                                       property_name, property_size,
+                                       &returned_flags, nullptr));
 
-    default:
-        FAIL() << "Unhandled ur_virtual_mem_info_t enumeration: " << info;
-        break;
-    }
+    ASSERT_TRUE(returned_flags & UR_VIRTUAL_MEM_ACCESS_FLAG_READ_WRITE);
 }
 
-using urVirtualMemGetInfoTest = uur::urVirtualMemMappedTest;
-UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(urVirtualMemGetInfoTest);
-
 TEST_P(urVirtualMemGetInfoTest, InvalidNullHandleContext) {
     ur_virtual_mem_access_flags_t flags = 0;
     ASSERT_EQ_RESULT(urVirtualMemGetInfo(nullptr, virtual_ptr, size,
@@ -57,9 +43,9 @@ TEST_P(urVirtualMemGetInfoTest, InvalidNullPointerStart) {
 }
 
 TEST_P(urVirtualMemGetInfoTest, InvalidEnumerationInfo) {
-    size_t info_size = 0;
+    size_t property_size = 0;
     ASSERT_EQ_RESULT(urVirtualMemGetInfo(context, virtual_ptr, size,
                                          UR_VIRTUAL_MEM_INFO_FORCE_UINT32, 0,
-                                         nullptr, &info_size),
+                                         nullptr, &property_size),
                      UR_RESULT_ERROR_INVALID_ENUMERATION);
 }