From 7be2b0b6c37165104b80b6248370af61d6b33386 Mon Sep 17 00:00:00 2001
From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
Date: Tue, 17 Aug 2021 11:49:51 -0700
Subject: [PATCH] Fix for a leaky test

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
---
 Code/Framework/AzCore/AzCore/Name/Name.h      |  6 ++++
 .../Framework/AzCore/Tests/Name/NameTests.cpp | 31 ++++++++++++++-----
 2 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/Code/Framework/AzCore/AzCore/Name/Name.h b/Code/Framework/AzCore/AzCore/Name/Name.h
index 46a9b5b7cc..16179c9cde 100644
--- a/Code/Framework/AzCore/AzCore/Name/Name.h
+++ b/Code/Framework/AzCore/AzCore/Name/Name.h
@@ -10,6 +10,11 @@
 
 #include <AzCore/Name/Internal/NameData.h>
 
+namespace UnitTest
+{
+    class NameTest;
+}
+
 namespace AZ
 {
     class NameDictionary;
@@ -29,6 +34,7 @@ namespace AZ
     class Name
     {
         friend NameDictionary;
+        friend UnitTest::NameTest;
     public:
         using Hash = Internal::NameData::Hash;
 
diff --git a/Code/Framework/AzCore/Tests/Name/NameTests.cpp b/Code/Framework/AzCore/Tests/Name/NameTests.cpp
index 3b6310b1de..a46c1724f6 100644
--- a/Code/Framework/AzCore/Tests/Name/NameTests.cpp
+++ b/Code/Framework/AzCore/Tests/Name/NameTests.cpp
@@ -171,7 +171,17 @@ namespace UnitTest
             azsnprintf(buffer, RandomStringBufferSize, "%d", m_random.GetRandom());
             return buffer;
         }
-        
+
+        AZ::Internal::NameData* GetNameData(AZ::Name& name)
+        {
+            return name.m_data.get();
+        }
+
+        void FreeMemoryFromNameData(AZ::Internal::NameData* nameData)
+        {
+            delete nameData;
+        }
+
         AZ::SimpleLcgRandom m_random;
     };
 
@@ -488,13 +498,20 @@ namespace UnitTest
 
     TEST_F(NameTest, ReportLeakedNames)
     {
-        AZ::Name leakedName{"hello"};
-        AZ_TEST_START_TRACE_SUPPRESSION;
-        AZ::NameDictionary::Destroy();
-        AZ_TEST_STOP_TRACE_SUPPRESSION(1);
+        AZ::Internal::NameData* leakedNameData = nullptr;
+        {
+            AZ::Name leakedName{ "hello" };
+            AZ_TEST_START_TRACE_SUPPRESSION;
+            AZ::NameDictionary::Destroy();
+            AZ_TEST_STOP_TRACE_SUPPRESSION(1);
 
-        // Create the dictionary again to avoid error in TearDown()
-        AZ::NameDictionary::Create();
+            leakedNameData = GetNameData(leakedName);
+
+            // Create the dictionary again to avoid crash when the intrusive_ptr in Name tries to access NameDictionary to free it
+            AZ::NameDictionary::Create();
+        } 
+        
+        FreeMemoryFromNameData(leakedNameData); // free it to avoid memory system reporting the leak
     }
 
     TEST_F(NameTest, NullTerminatedTest)