From 398decd06eff4fb718abb7e8da22bcd52d33e8a9 Mon Sep 17 00:00:00 2001
From: sphrose <82213493+sphrose@users.noreply.github.com>
Date: Thu, 11 Nov 2021 12:57:48 +0000
Subject: [PATCH] review changes

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>
---
 .../Terrain/Code/Tests/TerrainHeightGradientListTests.cpp | 8 --------
 .../Code/Tests/TerrainSurfaceGradientListTests.cpp        | 6 +-----
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/Gems/Terrain/Code/Tests/TerrainHeightGradientListTests.cpp b/Gems/Terrain/Code/Tests/TerrainHeightGradientListTests.cpp
index 535aacb8c8..89fc714c3c 100644
--- a/Gems/Terrain/Code/Tests/TerrainHeightGradientListTests.cpp
+++ b/Gems/Terrain/Code/Tests/TerrainHeightGradientListTests.cpp
@@ -82,8 +82,6 @@ TEST_F(TerrainHeightGradientListComponentTest, MissingRequiredComponentsActivate
 
     const AZ::Entity::DependencySortOutcome sortOutcome = entity->EvaluateDependenciesGetDetails();
     EXPECT_FALSE(sortOutcome.IsSuccess());
-
-    entity.reset();
 }
 
 TEST_F(TerrainHeightGradientListComponentTest, ActivateEntityActivateSuccess)
@@ -97,8 +95,6 @@ TEST_F(TerrainHeightGradientListComponentTest, ActivateEntityActivateSuccess)
 
     entity->Activate();
     EXPECT_EQ(entity->GetState(), AZ::Entity::State::Active);
-
-    entity.reset();
 }
 
 TEST_F(TerrainHeightGradientListComponentTest, TerrainHeightGradientRefreshesTerrainSystem)
@@ -123,8 +119,6 @@ TEST_F(TerrainHeightGradientListComponentTest, TerrainHeightGradientRefreshesTer
 
     // Stop the EXPECT_CALL check now, as OnCompositionChanged will get called twice again during the reset.
     Mock::VerifyAndClearExpectations(&terrainSystem);
-
-    entity.reset();
 }
 
 TEST_F(TerrainHeightGradientListComponentTest, TerrainHeightGradientListReturnsHeights)
@@ -169,7 +163,5 @@ TEST_F(TerrainHeightGradientListComponentTest, TerrainHeightGradientListReturnsH
     const float height = outPosition.GetZ();
 
     EXPECT_NEAR(height, mockGradientValue * max, 0.01f);
-
-    entity.reset();
 }
 
diff --git a/Gems/Terrain/Code/Tests/TerrainSurfaceGradientListTests.cpp b/Gems/Terrain/Code/Tests/TerrainSurfaceGradientListTests.cpp
index fb94d2320d..71f5d64fa8 100644
--- a/Gems/Terrain/Code/Tests/TerrainSurfaceGradientListTests.cpp
+++ b/Gems/Terrain/Code/Tests/TerrainSurfaceGradientListTests.cpp
@@ -63,8 +63,6 @@ namespace UnitTest
 
         const AZ::Entity::DependencySortOutcome sortOutcome = entity->EvaluateDependenciesGetDetails();
         EXPECT_FALSE(sortOutcome.IsSuccess());
-
-        entity.reset();
     }
 
     TEST_F(TerrainSurfaceGradientListTest, SurfaceGradientActivateSuccess)
@@ -78,9 +76,7 @@ namespace UnitTest
 
         entity->Activate();
 
-
-
-        entity.reset();
+        EXPECT_EQ(entity->GetState(), AZ::Entity::State::Active);
     }
 
     TEST_F(TerrainSurfaceGradientListTest, SurfaceGradientReturnsSurfaceWeights)