Fix shadowing in USM pool test fixture, correct assertion in PoolRetain test.

aarongreig · aarongreig · commit 95a5ab351940 · 2023-07-25T17:22:37.000+01:00
diff --git a/test/conformance/testing/include/uur/fixtures.h b/test/conformance/testing/include/uur/fixtures.h
@@ -635,7 +635,6 @@ struct urUSMPoolTest : urContextTest {
         UUR_RETURN_ON_FATAL_FAILURE(urContextTest::SetUp());
         ur_usm_pool_desc_t pool_desc{UR_STRUCTURE_TYPE_USM_POOL_DESC, nullptr,
                                      UR_USM_POOL_FLAG_ZERO_INITIALIZE_BLOCK};
-        ur_usm_pool_handle_t pool = nullptr;
         ASSERT_SUCCESS(urUSMPoolCreate(this->context, &pool_desc, &pool));
     }
 
diff --git a/test/conformance/usm/urUSMPoolRetain.cpp b/test/conformance/usm/urUSMPoolRetain.cpp
@@ -25,7 +25,7 @@ TEST_P(urUSMPoolRetainTest, Success) {
     uint32_t afterRefCount = 0;
     ASSERT_SUCCESS(uur::GetObjectReferenceCount(pool, afterRefCount));
 
-    ASSERT_LT(afterRefCount, prevRefCount);
+    ASSERT_LT(afterRefCount, refCount);
 }
 
 TEST_P(urUSMPoolRetainTest, InvalidNullHandlePool) {

Original file line number	Diff line number	Diff line change
`@@ -635,7 +635,6 @@ struct urUSMPoolTest : urContextTest {`
`635`	`635`	`UUR_RETURN_ON_FATAL_FAILURE(urContextTest::SetUp());`
`636`	`636`	`ur_usm_pool_desc_t pool_desc{UR_STRUCTURE_TYPE_USM_POOL_DESC, nullptr,`
`637`	`637`	`UR_USM_POOL_FLAG_ZERO_INITIALIZE_BLOCK};`
`638`		`- ur_usm_pool_handle_t pool = nullptr;`
`639`	`638`	`ASSERT_SUCCESS(urUSMPoolCreate(this->context, &pool_desc, &pool));`
`640`	`639`	`}`
`641`	`640`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ TEST_P(urUSMPoolRetainTest, Success) {`
`25`	`25`	`uint32_t afterRefCount = 0;`
`26`	`26`	`ASSERT_SUCCESS(uur::GetObjectReferenceCount(pool, afterRefCount));`
`27`	`27`
`28`		`- ASSERT_LT(afterRefCount, prevRefCount);`
	`28`	`+ ASSERT_LT(afterRefCount, refCount);`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`TEST_P(urUSMPoolRetainTest, InvalidNullHandlePool) {`