From 39f4d9afc4282b21bf9c6439517c63b0ddbfebd5 Mon Sep 17 00:00:00 2001
From: Adam Cetnerowski <adam.cetnerowski@intel.com>
Date: Wed, 14 Oct 2020 10:12:00 +0200
Subject: [PATCH] ULT renaming: Gen-specific Image tests

Related-To: NEO-2236

Change-Id: Icb16d4624fa0aaaca74370ac9498201f6a5325e9
Signed-off-by: Adam Cetnerowski <adam.cetnerowski@intel.com>
---
 opencl/test/unit_test/gen12lp/image_tests_gen12lp.inl | 8 ++++----
 opencl/test/unit_test/gen8/image_tests_gen8.cpp       | 2 +-
 opencl/test/unit_test/gen9/image_tests_gen9.cpp       | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/opencl/test/unit_test/gen12lp/image_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/image_tests_gen12lp.inl
index 3d69316285..95b511ae0e 100644
--- a/opencl/test/unit_test/gen12lp/image_tests_gen12lp.inl
+++ b/opencl/test/unit_test/gen12lp/image_tests_gen12lp.inl
@@ -26,7 +26,7 @@ using namespace NEO;
 
 typedef ::testing::Test gen12LpImageTests;
 
-GEN12LPTEST_F(gen12LpImageTests, appendSurfaceStateParamsDoesNothing) {
+GEN12LPTEST_F(gen12LpImageTests, WhenAppendingSurfaceStateParamsThenSurfaceStateDoesNotChange) {
     typedef typename FamilyType::RENDER_SURFACE_STATE RENDER_SURFACE_STATE;
     MockContext context;
     auto image = std::unique_ptr<Image>(ImageHelper<Image1dDefaults>::create(&context));
@@ -111,7 +111,7 @@ GEN12LPTEST_F(ImageClearColorFixture, givenMcsAllocationWhenSetArgIsCalledWithUn
     EXPECT_EQ(surfaceState.getAuxiliarySurfaceMode(), AUXILIARY_SURFACE_MODE::AUXILIARY_SURFACE_MODE_AUX_MCS_LCE);
 }
 
-GEN12LPTEST_F(gen12LpImageTests, givenRenderCompressionSurfaceStateParamsAreSetForRenderCompression) {
+GEN12LPTEST_F(gen12LpImageTests, givenRenderCompressionThenSurfaceStateParamsAreSetForRenderCompression) {
     MockContext context;
     using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE;
     cl_image_desc imgDesc = Image2dDefaults::imageDesc;
@@ -126,7 +126,7 @@ GEN12LPTEST_F(gen12LpImageTests, givenRenderCompressionSurfaceStateParamsAreSetF
     EXPECT_EQ(surfaceState.getAuxiliarySurfaceMode(), RENDER_SURFACE_STATE::AUXILIARY_SURFACE_MODE::AUXILIARY_SURFACE_MODE_AUX_CCS_E);
 }
 
-GEN12LPTEST_F(gen12LpImageTests, givenMediaCompressionSurfaceStateParamsAreSetForMediaCompression) {
+GEN12LPTEST_F(gen12LpImageTests, givenMediaCompressionThenSurfaceStateParamsAreSetForMediaCompression) {
     MockContext context;
     using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE;
     cl_image_desc imgDesc = Image2dDefaults::imageDesc;
@@ -144,7 +144,7 @@ GEN12LPTEST_F(gen12LpImageTests, givenMediaCompressionSurfaceStateParamsAreSetFo
 
 using Gen12lpRenderSurfaceStateDataTests = ::testing::Test;
 
-GEN12LPTEST_F(Gen12lpRenderSurfaceStateDataTests, WhenMemoryObjectControlStateIndexToMocsTablesIsSetThenValueIsShift) {
+GEN12LPTEST_F(Gen12lpRenderSurfaceStateDataTests, WhenMemoryObjectControlStateIndexToMocsTablesIsSetThenValueIsShifted) {
     using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE;
     auto surfaceState = FamilyType::cmdInitRenderSurfaceState;
 
diff --git a/opencl/test/unit_test/gen8/image_tests_gen8.cpp b/opencl/test/unit_test/gen8/image_tests_gen8.cpp
index 831011834d..599457d692 100644
--- a/opencl/test/unit_test/gen8/image_tests_gen8.cpp
+++ b/opencl/test/unit_test/gen8/image_tests_gen8.cpp
@@ -13,7 +13,7 @@ using namespace NEO;
 
 typedef ::testing::Test gen8ImageTests;
 
-GEN8TEST_F(gen8ImageTests, appendSurfaceStateParamsDoesNothing) {
+GEN8TEST_F(gen8ImageTests, WhenAppendingSurfaceStateParamsThenSurfaceStateDoesNotChange) {
     typedef typename FamilyType::RENDER_SURFACE_STATE RENDER_SURFACE_STATE;
     MockContext context;
     auto image = std::unique_ptr<Image>(ImageHelper<Image1dDefaults>::create(&context));
diff --git a/opencl/test/unit_test/gen9/image_tests_gen9.cpp b/opencl/test/unit_test/gen9/image_tests_gen9.cpp
index 9a6752a4bf..5ef7da2c17 100644
--- a/opencl/test/unit_test/gen9/image_tests_gen9.cpp
+++ b/opencl/test/unit_test/gen9/image_tests_gen9.cpp
@@ -13,7 +13,7 @@ using namespace NEO;
 
 typedef ::testing::Test gen9ImageTests;
 
-GEN9TEST_F(gen9ImageTests, appendSurfaceStateParamsDoesNothing) {
+GEN9TEST_F(gen9ImageTests, appendSurfaceSWhenAppendingSurfaceStateParamsThenSurfaceStateDoesNotChangetateParamsDoesNothing) {
     typedef typename FamilyType::RENDER_SURFACE_STATE RENDER_SURFACE_STATE;
     MockContext context;
     auto image = std::unique_ptr<Image>(ImageHelper<Image1dDefaults>::create(&context));
@@ -30,7 +30,7 @@ GEN9TEST_F(gen9ImageTests, appendSurfaceStateParamsDoesNothing) {
 
 using Gen9RenderSurfaceStateDataTests = ::testing::Test;
 
-GEN9TEST_F(Gen9RenderSurfaceStateDataTests, WhenMemoryObjectControlStateIndexToMocsTablesIsSetThenValueIsShift) {
+GEN9TEST_F(Gen9RenderSurfaceStateDataTests, WhenMemoryObjectControlStateIndexToMocsTablesIsSetThenValueIsShifted) {
     using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE;
     auto surfaceState = FamilyType::cmdInitRenderSurfaceState;