From b69f9ed58de6b248a615ff6c77789ef08f63a945 Mon Sep 17 00:00:00 2001
From: piotr-wozniak-mobica <piotr.wozniak@mobica.com>
Date: Tue, 22 Aug 2023 08:47:56 +0200
Subject: [PATCH 1/2] UT for enqueueAcquireGLObjects

---
 tests/test_openclhpp.cpp | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/tests/test_openclhpp.cpp b/tests/test_openclhpp.cpp
index 7748e664..4852816c 100644
--- a/tests/test_openclhpp.cpp
+++ b/tests/test_openclhpp.cpp
@@ -4517,4 +4517,38 @@ void testgetObjectInfo() {
     TEST_ASSERT_EQUAL(type, CL_GL_OBJECT_BUFFER);
     TEST_ASSERT_EQUAL(bufobj, 0);
 }
+static cl_int clEnqueueAcquireGLObjects_testenqueueAcquireGLObjects(
+    cl_command_queue command_queue, cl_uint num_objects,
+    const cl_mem *mem_objects, cl_uint num_events_in_wait_list,
+    const cl_event *event_wait_list, cl_event *event, int num_calls) {
+    (void)command_queue;
+    TEST_ASSERT_EQUAL(1, num_objects);
+    TEST_ASSERT_NOT_NULL(mem_objects);
+    TEST_ASSERT_EQUAL(1, num_events_in_wait_list);
+    TEST_ASSERT_NOT_NULL(event_wait_list);
+    TEST_ASSERT_EQUAL(0, num_calls);
+    if (event != nullptr) {
+            *event = make_event(1);
+    }
+    return CL_SUCCESS;
+}
+
+void testenqueueAcquireGLObjects() {
+    cl::Memory obj;
+    cl::vector<cl::Memory> mem_objects = {obj};
+    cl::Event event;
+    cl::vector<cl::Event> events = {event};
+    cl_int ret = CL_INVALID_COMMAND_QUEUE;
+
+    clEnqueueAcquireGLObjects_StubWithCallback(
+        clEnqueueAcquireGLObjects_testenqueueAcquireGLObjects);
+    ret = commandQueuePool[0].enqueueAcquireGLObjects(&mem_objects, &events,
+                                                      &event);
+    TEST_ASSERT_EQUAL(CL_SUCCESS, ret);
+    TEST_ASSERT_EQUAL_PTR(make_event(1), event());
+
+    event() = nullptr;
+    events[0]() = nullptr;
+    mem_objects[0]() = nullptr;
+}
 } // extern "C"

From 72dcef691ff73a55ec600171483bba2014639978 Mon Sep 17 00:00:00 2001
From: Kamil Goras <kamil.goras@mobica.com>
Date: Thu, 16 Nov 2023 13:53:35 +0100
Subject: [PATCH 2/2] Review corrections

---
 tests/test_openclhpp.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/tests/test_openclhpp.cpp b/tests/test_openclhpp.cpp
index 4852816c..b6b53eaf 100644
--- a/tests/test_openclhpp.cpp
+++ b/tests/test_openclhpp.cpp
@@ -4524,8 +4524,10 @@ static cl_int clEnqueueAcquireGLObjects_testenqueueAcquireGLObjects(
     (void)command_queue;
     TEST_ASSERT_EQUAL(1, num_objects);
     TEST_ASSERT_NOT_NULL(mem_objects);
+    TEST_ASSERT_EQUAL(make_mem(0), *mem_objects);
     TEST_ASSERT_EQUAL(1, num_events_in_wait_list);
     TEST_ASSERT_NOT_NULL(event_wait_list);
+    TEST_ASSERT_EQUAL(make_event(0), event_wait_list[0]);
     TEST_ASSERT_EQUAL(0, num_calls);
     if (event != nullptr) {
             *event = make_event(1);
@@ -4534,10 +4536,11 @@ static cl_int clEnqueueAcquireGLObjects_testenqueueAcquireGLObjects(
 }
 
 void testenqueueAcquireGLObjects() {
-    cl::Memory obj;
-    cl::vector<cl::Memory> mem_objects = {obj};
+    cl::vector<cl::Memory> mem_objects;
+    mem_objects.emplace_back(make_mem(0), false);
     cl::Event event;
-    cl::vector<cl::Event> events = {event};
+    cl::vector<cl::Event> events;
+    events.emplace_back(cl::Event(make_event(0)));
     cl_int ret = CL_INVALID_COMMAND_QUEUE;
 
     clEnqueueAcquireGLObjects_StubWithCallback(