Address feedback: remove some redundant checks including those in Queue and Event.

Author: martygrant

test/conformance/context/urContextGetInfo.cpp

@@ -12,7 +12,6 @@ TEST_P(urContextGetInfoTest, SuccessNumDevices) {
     size_t size = 0;
 
     ASSERT_SUCCESS(urContextGetInfo(context, info_type, 0, nullptr, &size));
-    ASSERT_NE(size, 0);
     ASSERT_EQ(size, sizeof(uint32_t));
 
     uint32_t nDevices = 0;
@@ -29,23 +28,19 @@ TEST_P(urContextGetInfoTest, SuccessDevices) {
     ASSERT_SUCCESS(urContextGetInfo(context, info_type, 0, nullptr, &size));
     ASSERT_NE(size, 0);
 
-    if (size > 0) {
-        ur_device_handle_t devices = 0;
-        ASSERT_SUCCESS(
-            urContextGetInfo(context, info_type, size, &devices, nullptr));
-
-        size_t devices_count = size / sizeof(ur_device_handle_t);
-        ASSERT_GT(devices_count, 0);
-
-        for (uint32_t i = 0; i < devices_count; i++) {
-            auto &devices = uur::DevicesEnvironment::instance->devices;
-            auto queried_device =
-                std::find(devices.begin(), devices.end(), devices[i]);
-            EXPECT_TRUE(queried_device != devices.end())
-                << "device associated with the context is not valid";
-        }
-    } else {
-        ASSERT_EQ(size, 0);
+    ur_device_handle_t devices = 0;
+    ASSERT_SUCCESS(
+        urContextGetInfo(context, info_type, size, &devices, nullptr));
+
+    size_t devices_count = size / sizeof(ur_device_handle_t);
+    ASSERT_GT(devices_count, 0);
+
+    for (uint32_t i = 0; i < devices_count; i++) {
+        auto &devices = uur::DevicesEnvironment::instance->devices;
+        auto queried_device =
+            std::find(devices.begin(), devices.end(), devices[i]);
+        EXPECT_TRUE(queried_device != devices.end())
+            << "device associated with the context is not valid";
     }
 }
 
@@ -54,7 +49,6 @@ TEST_P(urContextGetInfoTest, SuccessUSMMemCpy2DSupport) {
     size_t size = 0;
 
     ASSERT_SUCCESS(urContextGetInfo(context, info_type, 0, nullptr, &size));
-    ASSERT_NE(size, 0);
     ASSERT_EQ(size, sizeof(ur_bool_t));
 }
 
@@ -63,7 +57,6 @@ TEST_P(urContextGetInfoTest, SuccessUSMFill2DSupport) {
     size_t size = 0;
 
     ASSERT_SUCCESS(urContextGetInfo(context, info_type, 0, nullptr, &size));
-    ASSERT_NE(size, 0);
     ASSERT_EQ(size, sizeof(ur_bool_t));
 }
 
@@ -72,7 +65,6 @@ TEST_P(urContextGetInfoTest, SuccessReferenceCount) {
     size_t size = 0;
 
     ASSERT_SUCCESS(urContextGetInfo(context, info_type, 0, nullptr, &size));
-    ASSERT_NE(size, 0);
     ASSERT_EQ(size, sizeof(uint32_t));
 
     uint32_t reference_count = 0;
@@ -88,7 +80,6 @@ TEST_P(urContextGetInfoTest, SuccessAtomicMemoryOrderCapabilities) {
 
     ASSERT_SUCCESS_OR_OPTIONAL_QUERY(
         urContextGetInfo(context, info_type, 0, nullptr, &size), info_type);
-    ASSERT_NE(size, 0);
     ASSERT_EQ(size, sizeof(ur_memory_order_capability_flags_t));
 
     ur_memory_order_capability_flags_t flags = 0;
@@ -104,7 +95,6 @@ TEST_P(urContextGetInfoTest, SuccessAtomicMemoryScopeCapabilities) {
 
     ASSERT_SUCCESS_OR_OPTIONAL_QUERY(
         urContextGetInfo(context, info_type, 0, nullptr, &size), info_type);
-    ASSERT_NE(size, 0);
     ASSERT_EQ(size, sizeof(ur_memory_scope_capability_flags_t));
 
     ur_memory_scope_capability_flags_t flags = 0;
@@ -120,7 +110,6 @@ TEST_P(urContextGetInfoTest, SuccessAtomicFenceOrderCapabilities) {
 
     ASSERT_SUCCESS_OR_OPTIONAL_QUERY(
         urContextGetInfo(context, info_type, 0, nullptr, &size), info_type);
-    ASSERT_NE(size, 0);
     ASSERT_EQ(size, sizeof(ur_memory_order_capability_flags_t));
 
     ur_memory_order_capability_flags_t flags = 0;
@@ -136,7 +125,6 @@ TEST_P(urContextGetInfoTest, SuccessAtomicFenceScopeCapabilities) {
 
     ASSERT_SUCCESS_OR_OPTIONAL_QUERY(
         urContextGetInfo(context, info_type, 0, nullptr, &size), info_type);
-    ASSERT_NE(size, 0);
     ASSERT_EQ(size, sizeof(ur_memory_scope_capability_flags_t));
 
     ur_memory_scope_capability_flags_t flags = 0;

test/conformance/event/urEventGetInfo.cpp

@@ -12,7 +12,6 @@ TEST_P(urEventGetInfoTest, SuccessCommandQueue) {
     size_t size = 0;
 
     ASSERT_SUCCESS(urEventGetInfo(event, info_type, 0, nullptr, &size));
-    ASSERT_NE(size, 0);
     ASSERT_EQ(size, sizeof(ur_queue_handle_t));
 
     ur_queue_handle_t returned_queue;
@@ -27,7 +26,6 @@ TEST_P(urEventGetInfoTest, SuccessContext) {
     size_t size = 0;
 
     ASSERT_SUCCESS(urEventGetInfo(event, info_type, 0, nullptr, &size));
-    ASSERT_NE(size, 0);
     ASSERT_EQ(size, sizeof(ur_context_handle_t));
 
     ur_context_handle_t returned_context;
@@ -42,7 +40,6 @@ TEST_P(urEventGetInfoTest, SuccessCommandType) {
     size_t size = 0;
 
     ASSERT_SUCCESS(urEventGetInfo(event, info_type, 0, nullptr, &size));
-    ASSERT_NE(size, 0);
     ASSERT_EQ(size, sizeof(ur_command_t));
 
     ur_command_t returned_command_type;
@@ -57,7 +54,6 @@ TEST_P(urEventGetInfoTest, SuccessCommandExecutionStatus) {
     size_t size = 0;
 
     ASSERT_SUCCESS(urEventGetInfo(event, info_type, 0, nullptr, &size));
-    ASSERT_NE(size, 0);
     ASSERT_EQ(size, sizeof(ur_event_status_t));
 
     ur_event_status_t returned_status;
@@ -72,7 +68,6 @@ TEST_P(urEventGetInfoTest, SuccessReferenceCount) {
     size_t size = 0;
 
     ASSERT_SUCCESS(urEventGetInfo(event, info_type, 0, nullptr, &size));
-    ASSERT_NE(size, 0);
     ASSERT_EQ(size, sizeof(uint32_t));
 
     uint32_t returned_reference_count;

test/conformance/queue/urQueueGetInfo.cpp

@@ -12,7 +12,6 @@ TEST_P(urQueueGetInfoTest, Context) {
     auto infoType = UR_QUEUE_INFO_CONTEXT;
     ASSERT_SUCCESS_OR_OPTIONAL_QUERY(
         urQueueGetInfo(queue, infoType, 0, nullptr, &size), infoType);
-    ASSERT_NE(size, 0);
     ASSERT_EQ(sizeof(ur_context_handle_t), size);
 
     std::vector<uint8_t> data(size);
@@ -28,7 +27,6 @@ TEST_P(urQueueGetInfoTest, Device) {
     auto infoType = UR_QUEUE_INFO_DEVICE;
     ASSERT_SUCCESS_OR_OPTIONAL_QUERY(
         urQueueGetInfo(queue, infoType, 0, nullptr, &size), infoType);
-    ASSERT_NE(size, 0);
     ASSERT_EQ(sizeof(ur_device_handle_t), size);
 
     std::vector<uint8_t> data(size);
@@ -43,7 +41,6 @@ TEST_P(urQueueGetInfoTest, Flags) {
     auto infoType = UR_QUEUE_INFO_FLAGS;
     ASSERT_SUCCESS_OR_OPTIONAL_QUERY(
         urQueueGetInfo(queue, infoType, 0, nullptr, &size), infoType);
-    ASSERT_NE(size, 0);
     ASSERT_EQ(sizeof(ur_queue_flags_t), size);
 
     std::vector<uint8_t> data(size);
@@ -58,7 +55,6 @@ TEST_P(urQueueGetInfoTest, ReferenceCount) {
     auto infoType = UR_QUEUE_INFO_REFERENCE_COUNT;
     ASSERT_SUCCESS_OR_OPTIONAL_QUERY(
         urQueueGetInfo(queue, infoType, 0, nullptr, &size), infoType);
-    ASSERT_NE(size, 0);
     ASSERT_EQ(sizeof(uint32_t), size);
 
     std::vector<uint8_t> data(size);
@@ -73,7 +69,6 @@ TEST_P(urQueueGetInfoTest, EmptyQueue) {
     auto infoType = UR_QUEUE_INFO_EMPTY;
     ASSERT_SUCCESS_OR_OPTIONAL_QUERY(
         urQueueGetInfo(queue, infoType, 0, nullptr, &size), infoType);
-    ASSERT_NE(size, 0);
     ASSERT_EQ(sizeof(ur_bool_t), size);
 
     std::vector<uint8_t> data(size);