From c6484646d8336e3be7d0fb98dd6142b862535d9c Mon Sep 17 00:00:00 2001
From: Oleksandr Pavlyk <oleksandr.pavlyk@intel.com>
Date: Wed, 23 Jun 2021 16:14:00 -0500
Subject: [PATCH 1/2] Extend parameterized test in test_sycl_queue_interface

Test with queues that use different properties,
default/non-default error handler to improve coverage.
---
 .../tests/test_sycl_queue_interface.cpp       | 37 ++++++++++++++-----
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/dpctl-capi/tests/test_sycl_queue_interface.cpp b/dpctl-capi/tests/test_sycl_queue_interface.cpp
index 8c2c7b4127..5aa25bc18b 100644
--- a/dpctl-capi/tests/test_sycl_queue_interface.cpp
+++ b/dpctl-capi/tests/test_sycl_queue_interface.cpp
@@ -41,20 +41,30 @@ namespace
 {
 DEFINE_SIMPLE_CONVERSION_FUNCTIONS(queue, DPCTLSyclQueueRef);
 
+void error_handler_fn(int /*err*/)
+{
+    return;
+}
+
 struct TestDPCTLQueueMemberFunctions
-    : public ::testing::TestWithParam<const char *>
+    : public ::testing::TestWithParam<
+          std::tuple<const char *, DPCTLQueuePropertyType, bool>>
 {
 protected:
     DPCTLSyclQueueRef QRef = nullptr;
 
     TestDPCTLQueueMemberFunctions()
     {
-        auto DS = DPCTLFilterSelector_Create(GetParam());
+        auto param_tuple = GetParam();
+        auto DS = DPCTLFilterSelector_Create(std::get<0>(param_tuple));
         DPCTLSyclDeviceRef DRef = nullptr;
         if (DS) {
             EXPECT_NO_FATAL_FAILURE(DRef = DPCTLDevice_CreateFromSelector(DS));
-            EXPECT_NO_FATAL_FAILURE(QRef = DPCTLQueue_CreateForDevice(
-                                        DRef, nullptr, DPCTL_DEFAULT_PROPERTY));
+            EXPECT_NO_FATAL_FAILURE(
+                QRef = DPCTLQueue_CreateForDevice(
+                    DRef,
+                    (std::get<2>(param_tuple)) ? &error_handler_fn : nullptr,
+                    std::get<1>(param_tuple)));
         }
         DPCTLDevice_Delete(DRef);
         DPCTLDeviceSelector_Delete(DS);
@@ -63,8 +73,9 @@ struct TestDPCTLQueueMemberFunctions
     void SetUp()
     {
         if (!QRef) {
+            auto param_tuple = GetParam();
             auto message = "Skipping as no device of type " +
-                           std::string(GetParam()) + ".";
+                           std::string(std::get<0>(param_tuple)) + ".";
             GTEST_SKIP_(message.c_str());
         }
     }
@@ -284,8 +295,14 @@ TEST_P(TestDPCTLQueueMemberFunctions, CheckGetDevice)
     EXPECT_NO_FATAL_FAILURE(DPCTLDevice_Delete(D));
 }
 
-INSTANTIATE_TEST_SUITE_P(DPCTLQueueMemberFuncTests,
-                         TestDPCTLQueueMemberFunctions,
-                         ::testing::Values("opencl:gpu:0",
-                                           "opencl:cpu:0",
-                                           "level_zero:gpu:0"));
+INSTANTIATE_TEST_SUITE_P(
+    DPCTLQueueMemberFuncTests,
+    TestDPCTLQueueMemberFunctions,
+    ::testing::Combine(
+        ::testing::Values("opencl:gpu", "opencl:cpu", "level_zero:gpu"),
+        ::testing::Values(DPCTL_DEFAULT_PROPERTY,
+                          DPCTL_ENABLE_PROFILING,
+                          DPCTL_IN_ORDER,
+                          static_cast<DPCTLQueuePropertyType>(
+                              DPCTL_ENABLE_PROFILING | DPCTL_IN_ORDER)),
+        ::testing::Bool()));

From 2f385512651931d66b2625d84941215475c868f2 Mon Sep 17 00:00:00 2001
From: Oleksandr Pavlyk <oleksandr.pavlyk@intel.com>
Date: Wed, 23 Jun 2021 17:04:51 -0500
Subject: [PATCH 2/2] Use Memcpy, memadvise in tests

---
 dpctl-capi/tests/test_sycl_usm_interface.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/dpctl-capi/tests/test_sycl_usm_interface.cpp b/dpctl-capi/tests/test_sycl_usm_interface.cpp
index 8105631f94..c646a6b7cc 100644
--- a/dpctl-capi/tests/test_sycl_usm_interface.cpp
+++ b/dpctl-capi/tests/test_sycl_usm_interface.cpp
@@ -57,6 +57,15 @@ void common_test_body(size_t nbytes,
     EXPECT_TRUE(DPCTLDevice_AreEq(Dev, QueueDev));
 
     EXPECT_NO_FATAL_FAILURE(DPCTLQueue_Prefetch(Q, Ptr, nbytes));
+    EXPECT_NO_FATAL_FAILURE(DPCTLQueue_MemAdvise(Q, Ptr, nbytes, 0));
+
+    try {
+        unsigned short *host_ptr = new unsigned short[nbytes];
+        EXPECT_NO_FATAL_FAILURE(DPCTLQueue_Memcpy(Q, host_ptr, Ptr, nbytes));
+        delete[] host_ptr;
+    } catch (std::bad_alloc const &ba) {
+        // pass
+    }
 
     DPCTLDevice_Delete(QueueDev);
     DPCTLDevice_Delete(Dev);