From 5ce32f14ab411cf2dd585e99a196d0bf12bde537 Mon Sep 17 00:00:00 2001
From: nives-vukovic <110852104+nives-vukovic@users.noreply.github.com>
Date: Mon, 26 Sep 2022 07:33:30 +0200
Subject: [PATCH] EXSWHTEC-37 - Expand tests for hipStreamQuery (#2921)

- Add testing for null stream in Unit_hipStreamQuery_WithNoWork
- Add testing for null stream in Unit_hipStreamQuery_WithFinishedWork

[ROCm/hip-tests commit: 4795cc62659dd090b124b867cf1ac0896cf95fa7]
---
 .../catch/unit/stream/hipStreamQuery.cc       | 32 ++++++++++++++-----
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/projects/hip-tests/catch/unit/stream/hipStreamQuery.cc b/projects/hip-tests/catch/unit/stream/hipStreamQuery.cc
index ea2e9d0476..8b99dc712c 100644
--- a/projects/hip-tests/catch/unit/stream/hipStreamQuery.cc
+++ b/projects/hip-tests/catch/unit/stream/hipStreamQuery.cc
@@ -26,9 +26,16 @@ THE SOFTWARE.
  **/
 TEST_CASE("Unit_hipStreamQuery_WithNoWork") {
   hipStream_t stream{nullptr};
-  HIP_CHECK(hipStreamCreate(&stream));
-  HIP_CHECK(hipStreamQuery(stream));
-  HIP_CHECK(hipStreamDestroy(stream));
+
+  SECTION("Null Stream") {
+    HIP_CHECK(hipStreamQuery(stream));
+  }
+
+  SECTION ("Created Stream") {
+    HIP_CHECK(hipStreamCreate(&stream));
+    HIP_CHECK(hipStreamQuery(stream));
+    HIP_CHECK(hipStreamDestroy(stream));
+  }
 }
 
 /**
@@ -37,13 +44,22 @@ TEST_CASE("Unit_hipStreamQuery_WithNoWork") {
  **/
 TEST_CASE("Unit_hipStreamQuery_WithFinishedWork") {
   hipStream_t stream{nullptr};
-  HIP_CHECK(hipStreamCreate(&stream));
 
-  hip::stream::empty_kernel<<<dim3(1), dim3(1), 0, stream>>>();
-  HIP_CHECK(hipStreamSynchronize(stream));
+  SECTION("Null Stream") {
+    hip::stream::empty_kernel<<<dim3(1), dim3(1), 0, stream>>>();
+    HIP_CHECK(hipStreamSynchronize(stream));
 
-  HIP_CHECK(hipStreamQuery(stream));
-  HIP_CHECK(hipStreamDestroy(stream));
+    HIP_CHECK(hipStreamQuery(stream));
+  }
+
+  SECTION ("Created Stream") {
+    HIP_CHECK(hipStreamCreate(&stream));
+    hip::stream::empty_kernel<<<dim3(1), dim3(1), 0, stream>>>();
+    HIP_CHECK(hipStreamSynchronize(stream));
+
+    HIP_CHECK(hipStreamQuery(stream));
+    HIP_CHECK(hipStreamDestroy(stream));
+  }
 }
 
 #if !HT_NVIDIA