Rename AllocatorsTestFixture to LeakDetectionFixture

This more accurately describes the function of this fixture. Now that the
allocators are always available, there's no need to set them up.

Signed-off-by: Chris Burel <[email protected]>

Code/Editor/Core/Tests/test_PathUtil.cpp

@@ -10,7 +10,7 @@
 namespace UnitTest
 {
     class PathUtil
-        : public ScopedAllocatorSetupFixture
+        : public LeakDetectionFixture
     {
     };
 

Code/Editor/Lib/Tests/Camera/test_EditorCamera.cpp

@@ -21,7 +21,7 @@
 
 namespace UnitTest
 {
-    class EditorCameraFixture : public UnitTest::AllocatorsTestFixture
+    class EditorCameraFixture : public UnitTest::LeakDetectionFixture
     {
     public:
         AZ::ComponentApplication* m_application = nullptr;
@@ -276,7 +276,7 @@ namespace UnitTest
         EXPECT_THAT(nextInterpolationBegan, ::testing::IsTrue());
     }
 
-    using GotoPositionPitchConstraintsTest = UnitTest::AllocatorsTestFixture;
+    using GotoPositionPitchConstraintsTest = UnitTest::LeakDetectionFixture;
     TEST_F(GotoPositionPitchConstraintsTest, GoToPositionPitchIsSetToPlusOrMinusNinetyDegrees)
     {
         float minPitch = 0.0f;

Code/Editor/Lib/Tests/test_AzAssetBrowserRequestHandler.cpp

@@ -130,7 +130,7 @@ namespace UnitTest
         MOCK_METHOD1(GetComponentName, AZStd::string(const AZ::Component*));
     };
 
-    class AzAssetBrowserRequestHandlerFixture : public AllocatorsTestFixture
+    class AzAssetBrowserRequestHandlerFixture : public LeakDetectionFixture
     {
     public:
         using MockComponentApplicationBusHandler = UnitTest::MockComponentApplication;
@@ -140,7 +140,7 @@ namespace UnitTest
             using namespace AzToolsFramework::AssetBrowser;
             using namespace AzToolsFramework::AssetDatabase;
 
-            AllocatorsTestFixture::SetUp();
+            LeakDetectionFixture::SetUp();
 
             m_editorComponentDescriptor = MockEditorComponent::CreateDescriptor();
             m_assetTypeOfModel = AZ::Data::AssetType("{8ABC6797-2DB6-4AC1-975B-5B344ABD9105}");
@@ -370,7 +370,7 @@ namespace UnitTest
             m_editorRequestHandlerMock.reset();
             m_entityCompositionRequestBusMock.reset();
 
-            AllocatorsTestFixture::TearDown();
+            LeakDetectionFixture::TearDown();
         }
 
     protected:

Code/Editor/Lib/Tests/test_CryEditDocPythonBindings.cpp

@@ -23,7 +23,7 @@ namespace CryEditDocPythonBindingsUnitTests
 {
 
     class CryEditDocPythonBindingsFixture
-        : public ::UnitTest::ScopedAllocatorSetupFixture
+        : public ::UnitTest::LeakDetectionFixture
     {
     public:
         AzToolsFramework::ToolsApplication m_app;

Code/Editor/Lib/Tests/test_CryEditPythonBindings.cpp

@@ -25,7 +25,7 @@ namespace CryEditPythonBindingsUnitTests
 {
 
     class CryEditPythonBindingsFixture
-        : public ::UnitTest::ScopedAllocatorSetupFixture
+        : public ::UnitTest::LeakDetectionFixture
     {
     public:
         AzToolsFramework::ToolsApplication m_app;

Code/Editor/Lib/Tests/test_DisplaySettingsPythonBindings.cpp

@@ -24,7 +24,7 @@ namespace DisplaySettingsPythonBindingsUnitTests
 {
 
     class DisplaySettingsPythonBindingsFixture
-        : public ::UnitTest::ScopedAllocatorSetupFixture
+        : public ::UnitTest::LeakDetectionFixture
     {
     public:
         AzToolsFramework::ToolsApplication m_app;
@@ -58,7 +58,7 @@ namespace DisplaySettingsPythonBindingsUnitTests
     }
 
     class DisplaySettingsComponentFixture
-        : public ::UnitTest::ScopedAllocatorSetupFixture
+        : public ::UnitTest::LeakDetectionFixture
     {
     public:
         AzToolsFramework::ToolsApplication m_app;

Code/Editor/Lib/Tests/test_EditorPythonBindings.cpp

@@ -79,7 +79,7 @@ namespace EditorPythonBindingsUnitTests
     };
 
     class EditorPythonBindingsFixture
-        : public ::UnitTest::ScopedAllocatorSetupFixture
+        : public ::UnitTest::LeakDetectionFixture
     {
     public:
         AzToolsFramework::ToolsApplication m_app;

Code/Editor/Lib/Tests/test_EditorUtils.cpp

@@ -40,7 +40,7 @@ namespace EditorUtilsTest
 
 
     class TestWarningAbsorber
-        : public ::UnitTest::ScopedAllocatorSetupFixture
+        : public ::UnitTest::LeakDetectionFixture
     {
     };
 

Code/Editor/Lib/Tests/test_MainWindowPythonBindings.cpp

@@ -23,7 +23,7 @@ namespace MainWindowPythonBindingsUnitTests
 {
 
     class MainWindowPythonBindingsFixture
-        : public ::UnitTest::ScopedAllocatorSetupFixture
+        : public ::UnitTest::LeakDetectionFixture
     {
     public:
         AzToolsFramework::ToolsApplication m_app;

Code/Editor/Lib/Tests/test_ModularViewportCameraController.cpp

@@ -88,14 +88,14 @@ namespace UnitTest
         return m_mousePosition;
     }
 
-    class ModularViewportCameraControllerFixture : public AllocatorsTestFixture
+    class ModularViewportCameraControllerFixture : public LeakDetectionFixture
     {
     public:
         static inline constexpr AzFramework::ViewportId TestViewportId = 1234;
 
         void SetUp() override
         {
-            AllocatorsTestFixture::SetUp();
+            LeakDetectionFixture::SetUp();
 
             m_rootWidget = AZStd::make_unique<QWidget>();
             // set root widget to the the active window to ensure focus in/out events are fired
@@ -130,7 +130,7 @@ namespace UnitTest
             m_otherWidget.reset();
             m_rootWidget.reset();
 
-            AllocatorsTestFixture::TearDown();
+            LeakDetectionFixture::TearDown();
         }
 
         void PrepareCollaborators()

Code/Editor/Lib/Tests/test_ObjectManagerPythonBindings.cpp

@@ -23,7 +23,7 @@ namespace ObjectManagerPythonBindingsUnitTests
 {
 
     class ObjectManagerPythonBindingsFixture
-        : public ::UnitTest::ScopedAllocatorSetupFixture
+        : public ::UnitTest::LeakDetectionFixture
     {
     public:
         AzToolsFramework::ToolsApplication m_app;

Code/Editor/Lib/Tests/test_TerrainHoleToolPythonBindings.cpp

@@ -23,7 +23,7 @@ namespace TerrainFuncsUnitTests
 {
 
     class TerrainHoleToolPythonBindingsFixture
-        : public UnitTest::ScopedAllocatorSetupFixture
+        : public UnitTest::LeakDetectionFixture
     {
     public:
         AzToolsFramework::ToolsApplication m_app;

Code/Editor/Lib/Tests/test_TerrainLayerPythonBindings.cpp

@@ -23,7 +23,7 @@ namespace TerrainFuncsUnitTests
 {
 
     class TerrainLayerPythonBindingsFixture
-        : public UnitTest::ScopedAllocatorSetupFixture
+        : public UnitTest::LeakDetectionFixture
     {
     public:
         AzToolsFramework::ToolsApplication m_app;

Code/Editor/Lib/Tests/test_TerrainModifyPythonBindings.cpp

@@ -22,7 +22,7 @@ namespace TerrainModifyPythonBindingsUnitTests
 {
 
     class TerrainModifyPythonBindingsFixture
-        : public UnitTest::ScopedAllocatorSetupFixture
+        : public UnitTest::LeakDetectionFixture
     {
     public:
         AzToolsFramework::ToolsApplication m_app;

Code/Editor/Lib/Tests/test_TerrainPainterPythonBindings.cpp

@@ -23,7 +23,7 @@ namespace TerrainFuncsUnitTests
 {
 
     class TerrainPainterPythonBindingsFixture
-        : public UnitTest::ScopedAllocatorSetupFixture
+        : public UnitTest::LeakDetectionFixture
     {
     public:
         AzToolsFramework::ToolsApplication m_app;

Code/Editor/Lib/Tests/test_TerrainPythonBindings.cpp

@@ -23,7 +23,7 @@ namespace TerrainFuncsUnitTests
 {
 
     class TerrainPythonBindingsFixture
-        : public UnitTest::ScopedAllocatorSetupFixture
+        : public UnitTest::LeakDetectionFixture
     {
     public:
         AzToolsFramework::ToolsApplication m_app;

Code/Editor/Lib/Tests/test_TerrainTexturePythonBindings.cpp

@@ -23,7 +23,7 @@ namespace TerrainFuncsUnitTests
 {
 
     class TerrainTexturePythonBindingsFixture
-        : public UnitTest::ScopedAllocatorSetupFixture
+        : public UnitTest::LeakDetectionFixture
     {
     public:
         AzToolsFramework::ToolsApplication m_app;

Code/Editor/Lib/Tests/test_TrackViewPythonBindings.cpp

@@ -23,7 +23,7 @@ namespace TrackViewPythonBindingsUnitTests
 {
 
     class TrackViewPythonBindingsFixture
-        : public UnitTest::ScopedAllocatorSetupFixture
+        : public UnitTest::LeakDetectionFixture
     {
     public:
         AzToolsFramework::ToolsApplication m_app;
@@ -82,7 +82,7 @@ namespace TrackViewPythonBindingsUnitTests
     }
 
     class TrackViewComponentFixture
-        : public UnitTest::ScopedAllocatorSetupFixture
+        : public UnitTest::LeakDetectionFixture
     {
     public:
         AzToolsFramework::ToolsApplication m_app;

Code/Editor/Lib/Tests/test_ViewPanePythonBindings.cpp

@@ -23,7 +23,7 @@ namespace ViewPaneFuncsUnitTests
 {
 
     class ViewPanePythonBindingsFixture
-        : public ::UnitTest::ScopedAllocatorSetupFixture
+        : public ::UnitTest::LeakDetectionFixture
     {
     public:
         AzToolsFramework::ToolsApplication m_app;

Code/Editor/Lib/Tests/test_ViewportManipulatorController.cpp

@@ -77,7 +77,7 @@ namespace UnitTest
         return false;
     }
 
-    class ViewportManipulatorControllerFixture : public AllocatorsTestFixture
+    class ViewportManipulatorControllerFixture : public LeakDetectionFixture
     {
     public:
         static inline constexpr AzFramework::ViewportId TestViewportId = 1234;
@@ -85,7 +85,7 @@ namespace UnitTest
 
         void SetUp() override
         {
-            AllocatorsTestFixture::SetUp();
+            LeakDetectionFixture::SetUp();
 
             m_rootWidget = AZStd::make_unique<QWidget>();
             m_rootWidget->setFixedSize(WidgetSize);
@@ -113,7 +113,7 @@ namespace UnitTest
 
             QApplication::setActiveWindow(nullptr);
 
-            AllocatorsTestFixture::TearDown();
+            LeakDetectionFixture::TearDown();
         }
 
         AZStd::unique_ptr<QWidget> m_rootWidget;

Code/Editor/Lib/Tests/test_ViewportTitleDlgPythonBindings.cpp

@@ -23,7 +23,7 @@ namespace ViewportTitleDlgFuncsUnitTests
 {
 
     class ViewportTitleDlgPythonBindingsFixture
-        : public UnitTest::ScopedAllocatorSetupFixture
+        : public UnitTest::LeakDetectionFixture
     {
     public:
         AzToolsFramework::ToolsApplication m_app;

Code/Framework/AtomCore/Tests/ConcurrencyCheckerTests.cpp

@@ -15,16 +15,16 @@ using namespace AZStd;
 namespace UnitTest
 {
     class ConcurrencyCheckerTestFixture
-        : public AllocatorsTestFixture
+        : public LeakDetectionFixture
     {
 
         void SetUp() override
         {
-            AllocatorsFixture::SetUp();
+            LeakDetectionFixture::SetUp();
         }
     };
 
-    TEST_F(AllocatorsTestFixture, SoftLock_NoContention_NoAsserts)
+    TEST_F(LeakDetectionFixture, SoftLock_NoContention_NoAsserts)
     {
         concurrency_checker concurrencyChecker;
         concurrencyChecker.soft_lock();
@@ -33,7 +33,7 @@ namespace UnitTest
         concurrencyChecker.soft_unlock();
     }
 
-    TEST_F(AllocatorsTestFixture, SoftLock_AlreadyLocked_Assert)
+    TEST_F(LeakDetectionFixture, SoftLock_AlreadyLocked_Assert)
     {
         concurrency_checker concurrencyChecker;
         concurrencyChecker.soft_lock();
@@ -42,7 +42,7 @@ namespace UnitTest
         AZ_TEST_STOP_TRACE_SUPPRESSION(1);
     }
 
-    TEST_F(AllocatorsTestFixture, SoftUnlock_NotAlreadyLocked_Assert)
+    TEST_F(LeakDetectionFixture, SoftUnlock_NotAlreadyLocked_Assert)
     {
         concurrency_checker concurrencyChecker;
         concurrencyChecker.soft_lock();
@@ -52,7 +52,7 @@ namespace UnitTest
         AZ_TEST_STOP_TRACE_SUPPRESSION(1);
     }
 
-    TEST_F(AllocatorsTestFixture, SoftLockShared_NoContention_NoAsserts)
+    TEST_F(LeakDetectionFixture, SoftLockShared_NoContention_NoAsserts)
     {
         concurrency_checker concurrencyChecker;
         // Multiple shared locks can be made at once,
@@ -74,7 +74,7 @@ namespace UnitTest
         concurrencyChecker.soft_unlock();
     }
 
-    TEST_F(AllocatorsTestFixture, SoftLockShared_SharedLockAfterSoftLock_Assert)
+    TEST_F(LeakDetectionFixture, SoftLockShared_SharedLockAfterSoftLock_Assert)
     {
         concurrency_checker concurrencyChecker;
 
@@ -84,7 +84,7 @@ namespace UnitTest
         AZ_TEST_STOP_TRACE_SUPPRESSION(1);
     }
 
-    TEST_F(AllocatorsTestFixture, SoftUnlockShared_NotAlreadyLocked_Assert)
+    TEST_F(LeakDetectionFixture, SoftUnlockShared_NotAlreadyLocked_Assert)
     {
         concurrency_checker concurrencyChecker;
         concurrencyChecker.soft_lock_shared();

Code/Framework/AtomCore/Tests/InstanceDatabase.cpp

@@ -114,7 +114,7 @@ namespace UnitTest
         }
     };
 
-    class InstanceDatabaseTest : public AllocatorsFixture
+    class InstanceDatabaseTest : public LeakDetectionFixture
     {
     protected:
         MyAssetHandler<TestAssetType>* m_assetHandler;
@@ -122,7 +122,7 @@ namespace UnitTest
     public:
         void SetUp() override
         {
-            AllocatorsFixture::SetUp();
+            LeakDetectionFixture::SetUp();
             AllocatorInstance<PoolAllocator>::Create();
             AllocatorInstance<ThreadPoolAllocator>::Create();
 
@@ -157,7 +157,7 @@ namespace UnitTest
 
             AllocatorInstance<ThreadPoolAllocator>::Destroy();
             AllocatorInstance<PoolAllocator>::Destroy();
-            AllocatorsFixture::TearDown();
+            LeakDetectionFixture::TearDown();
         }
     };
 

Code/Framework/AtomCore/Tests/lru_cache.cpp

@@ -16,7 +16,7 @@ using namespace AZStd;
 
 namespace UnitTest
 {
-    using HashedContainers = AllocatorsFixture;
+    using HashedContainers = LeakDetectionFixture;
 
     TEST_F(HashedContainers, LRUCacheBasic)
     {

Code/Framework/AtomCore/Tests/vector_set.cpp

@@ -16,22 +16,22 @@ using namespace AZStd;
 namespace UnitTest
 {
     class VectorSets
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
 
         void SetUp() override
         {
-            AllocatorsFixture::SetUp();
+            LeakDetectionFixture::SetUp();
         }
     };
 
     class FixedVectorSets
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
 
         void SetUp() override
         {
-            AllocatorsFixture::SetUp();
+            LeakDetectionFixture::SetUp();
         }
     };
 

Code/Framework/AzCore/AzCore/UnitTest/TestTypes.h

@@ -99,75 +99,26 @@ namespace UnitTest
     /**
     * Base class to share common allocator code between fixture types.
     */
-    class AllocatorsBase
+    class LeakDetectionFixture
         : public LeakDetectionBase
+        , public ::testing::Test
     {
 
     public:
 
-        AllocatorsBase()
+        LeakDetectionFixture()
         {
             AZ::AllocatorManager::Instance().SetDefaultTrackingMode(AZ::Debug::AllocationRecords::RECORD_FULL);
             m_allocatedSizes = GetAllocatedSizes();
         }
 
-        ~AllocatorsBase() override
+        ~LeakDetectionFixture() override
         {
             CheckAllocatorsForLeaks();
             AZ::AllocatorManager::Instance().SetDefaultTrackingMode(AZ::Debug::AllocationRecords::RECORD_NO_RECORDS);
         }
-
-        void SetupAllocator()
-        {
-        }
-    };
-
-    /**
-     * RAII wrapper of AllocatorBase.
-     * The benefit of using this wrapper instead of AllocatorsTestFixture is that SetUp/TearDown of the allocator is managed
-     * on construction/destruction, allowing member variables of derived classes to exist as value (and do heap allocation).
-     */
-    class ScopedAllocatorFixture : AllocatorsBase
-    {
-    public:
-        ScopedAllocatorFixture()
-        {
-            SetupAllocator();
-        }
-    };
-
-    // Like ScopedAllocatorFixture, but includes the Test base class
-    class ScopedAllocatorSetupFixture
-        : public ::testing::Test
-        , public ScopedAllocatorFixture
-    {
-    public:
-        ScopedAllocatorSetupFixture() = default;
     };
 
-    /**
-    * Helper class to handle the boiler plate of setting up a test fixture that uses the system allocators
-    * If you wish to do additional setup and tear down be sure to call the base class SetUp first and TearDown
-    * last.
-    * By default memory tracking is enabled.
-    */
-
-    class AllocatorsTestFixture
-        : public ::testing::Test
-        , public AllocatorsBase
-    {
-    public:
-        //GTest interface
-        void SetUp() override
-        {
-            SetupAllocator();
-        }
-    };
-
-    //Legacy alias to avoid needing to modify tons of files
-    //-- Do not use for new tests.
-    using AllocatorsFixture = AllocatorsTestFixture;
-
 #if defined(HAVE_BENCHMARK)
 
     /**

Code/Framework/AzCore/Tests/AZStd/Algorithms.cpp

@@ -24,7 +24,7 @@ namespace UnitTest
 {
 #if !AZ_UNIT_TEST_SKIP_STD_ALGORITHMS_TESTS
     class Algorithms
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
     };
 
@@ -32,7 +32,7 @@ namespace UnitTest
      *
      */
     class AlgorithmsFindTest
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
     public:
         static bool SearchCompare(int i1, int i2) { return (i1 == i2); }

Code/Framework/AzCore/Tests/AZStd/Allocators.cpp

@@ -27,7 +27,7 @@ namespace UnitTest
 
     /// Default allocator.
     class AllocatorDefaultTest
-        : public AllocatorsTestFixture
+        : public LeakDetectionFixture
     {
     public:
         void run()

Code/Framework/AzCore/Tests/AZStd/Any.cpp

@@ -61,18 +61,18 @@ namespace UnitTest
 
     // Fixture for non-typed tests
     class AnyTest
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     { };
 
     // Fixture for tests with 1 type
     template<typename TestStruct>
     class AnySizedTest
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
     protected:
         void SetUp() override
         {
-            AllocatorsFixture::SetUp();
+            LeakDetectionFixture::SetUp();
 
             TestStruct::Reset();
         }
@@ -83,7 +83,7 @@ namespace UnitTest
     // Fixture for tests with 2 types (for converting between types)
     template <typename StructPair>
     class AnyConversionTest
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
     public:
         using LHS = typename StructPair::first_type;
@@ -91,7 +91,7 @@ namespace UnitTest
 
         void SetUp() override
         {
-            AllocatorsFixture::SetUp();
+            LeakDetectionFixture::SetUp();
 
             LHS::Reset();
             RHS::Reset();

Code/Framework/AzCore/Tests/AZStd/Atomics.cpp

@@ -21,7 +21,7 @@
 namespace UnitTest
 {
     class Atomics
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
     };
 

Code/Framework/AzCore/Tests/AZStd/Bitset.cpp

@@ -18,7 +18,7 @@ namespace UnitTest
     // Or the bitset can be tested without respect to the unsigned long, but benefit from having multiple test cases exercised through the parameterized test
     class BitsetUnsignedLongTests
         : public ::testing::WithParamInterface <unsigned long>
-        , public UnitTest::ScopedAllocatorSetupFixture
+        , public UnitTest::LeakDetectionFixture
     {
 
     protected:
@@ -107,7 +107,7 @@ namespace UnitTest
     // Bitwise operations can be performed between the bitsets, then compared to the same bitwise operations preformed between the unsigned longs
     class BitsetUnsignedLongPairTests
         : public ::testing::WithParamInterface < AZStd::pair<unsigned long, unsigned long> >
-        , public UnitTest::ScopedAllocatorSetupFixture
+        , public UnitTest::LeakDetectionFixture
     {
 
     protected:
@@ -221,7 +221,7 @@ namespace UnitTest
     // such as shifting bits beyond the length of the bitset
     class BitsetStdComparisonTests
         : public ::testing::WithParamInterface <unsigned long>
-        , public UnitTest::ScopedAllocatorSetupFixture
+        , public UnitTest::LeakDetectionFixture
     {
 
     protected:
@@ -343,7 +343,7 @@ namespace UnitTest
     INSTANTIATE_TEST_CASE_P(Bitset, BitsetStdComparisonTests, ::testing::ValuesIn(GenerateBitsetUnsignedLongTestCases()), GenerateBitsetUnsignedLongTestCaseName);
 
     class BitsetTests
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
     };
 

Code/Framework/AzCore/Tests/AZStd/Charconv.cpp

@@ -15,7 +15,7 @@
 namespace UnitTest
 {
     class CharconvTestFixture
-        : public UnitTest::ScopedAllocatorSetupFixture
+        : public UnitTest::LeakDetectionFixture
     {};
 
     TEST_F(CharconvTestFixture, ToChars_CanConvertIntegralValue_Success)

Code/Framework/AzCore/Tests/AZStd/ChronoTests.cpp

@@ -21,7 +21,7 @@ namespace UnitTest
 
     // Fixture for non-typed tests
     class DurationTest
-        : public ScopedAllocatorSetupFixture
+        : public LeakDetectionFixture
     {
     };
 
@@ -42,17 +42,17 @@ namespace UnitTest
 
     // Fixture for typed tests
     template<typename ExpectedResultTraits>
-    class DurationTypedTest : public AllocatorsFixture
+    class DurationTypedTest : public LeakDetectionFixture
     {
     protected:
         void SetUp() override
         {
-            AllocatorsFixture::SetUp();
+            LeakDetectionFixture::SetUp();
         }
 
         void TearDown() override
         {
-            AllocatorsFixture::TearDown();
+            LeakDetectionFixture::TearDown();
         }
     };
     using ChronoTestTypes = ::testing::Types<

Code/Framework/AzCore/Tests/AZStd/ConceptsTests.cpp

@@ -13,7 +13,7 @@
 namespace UnitTest
 {
     class ConceptsTestFixture
-        : public ScopedAllocatorSetupFixture
+        : public LeakDetectionFixture
     {};
 
     TEST_F(ConceptsTestFixture, GeneralConcepts)
@@ -21,20 +21,22 @@ namespace UnitTest
 
         // concept same_as
         static_assert(AZStd::same_as<ConceptsTestFixture, ConceptsTestFixture>);
-        static_assert(!AZStd::same_as<ConceptsTestFixture, ScopedAllocatorSetupFixture>);
+        static_assert(!AZStd::same_as<ConceptsTestFixture, LeakDetectionFixture>);
 
         // concept derived_from
-        static_assert(AZStd::derived_from<ConceptsTestFixture, ScopedAllocatorSetupFixture>);
-        static_assert(!AZStd::derived_from<ScopedAllocatorSetupFixture, ConceptsTestFixture>);
+        static_assert(AZStd::derived_from<ConceptsTestFixture, LeakDetectionFixture>);
+        static_assert(!AZStd::derived_from<LeakDetectionFixture, ConceptsTestFixture>);
 
         // concept convertible_to
-        static_assert(AZStd::convertible_to<ConceptsTestFixture&, ScopedAllocatorSetupFixture&>);
-        static_assert(!AZStd::convertible_to<ScopedAllocatorSetupFixture&, ConceptsTestFixture&>);
+        static_assert(AZStd::convertible_to<ConceptsTestFixture&, LeakDetectionFixture&>);
+        static_assert(!AZStd::convertible_to<LeakDetectionFixture&, ConceptsTestFixture&>);
 
 
         // Test structs to validate common_reference_with and common_with concepts
         struct Base {};
         struct TestBase : Base {};
+        struct TestDerived : TestBase {};
+        struct TestDerived2 : TestBase {};
         struct NoMove
         {
             NoMove(NoMove&&) = delete;
@@ -67,11 +69,11 @@ namespace UnitTest
         // concept common_reference_with
         static_assert(AZStd::common_reference_with<TestBase&, Base&>);
         static_assert(AZStd::same_as<AZStd::common_reference_t<const TestBase&, Base&>, const Base&>);
-        static_assert(!AZStd::common_reference_with<AllocatorsTestFixture, ScopedAllocatorSetupFixture>);
+        static_assert(!AZStd::common_reference_with<TestDerived2, TestDerived>);
 
         // concept common_with
         static_assert(AZStd::common_with<TestBase, Base>);
-        static_assert(!AZStd::common_with<AllocatorsTestFixture, AllocatorsBenchmarkFixture>);
+        static_assert(!AZStd::common_with<LeakDetectionFixture, AllocatorsBenchmarkFixture>);
 
         // arithmetic concepts
         // concept integral

Code/Framework/AzCore/Tests/AZStd/ConcurrentAllocators.cpp

@@ -23,7 +23,7 @@ namespace UnitTest
 
     template <typename AllocatorType>
     class ConcurrentAllocatorTestFixture
-        : public AllocatorsTestFixture
+        : public LeakDetectionFixture
     {
     protected:
         using this_type = ConcurrentAllocatorTestFixture<AllocatorType>;
@@ -143,7 +143,7 @@ namespace UnitTest
         EXPECT_EQ(0, myalloc.get_allocated_size());
     }
 
-    using StaticPoolConcurrentAllocatorTestFixture = AllocatorsTestFixture;
+    using StaticPoolConcurrentAllocatorTestFixture = LeakDetectionFixture;
 
     TEST(StaticPoolConcurrentAllocatorTestFixture, Aligment)
     {

Code/Framework/AzCore/Tests/AZStd/ConcurrentContainers.cpp

@@ -24,7 +24,7 @@ namespace UnitTest
 
     template<typename Set>
     class ConcurrentUnorderedSetTestBase
-        : public ScopedAllocatorSetupFixture
+        : public LeakDetectionFixture
     {
     public:
         void run()
@@ -165,7 +165,7 @@ namespace UnitTest
 
     template<typename Set>
     class ConcurrentUnorderedMultiSetTestBase
-        : public ScopedAllocatorSetupFixture
+        : public LeakDetectionFixture
     {
     public:
         void run()
@@ -312,7 +312,7 @@ namespace UnitTest
 
     template<typename Map>
     class ConcurrentUnorderedMapTestBase
-        : public ScopedAllocatorSetupFixture
+        : public LeakDetectionFixture
     {
     public:
         void run()
@@ -461,7 +461,7 @@ namespace UnitTest
 
     template<typename Map>
     class ConcurrentUnorderedMultiMapTestBase
-        : public ScopedAllocatorSetupFixture
+        : public LeakDetectionFixture
     {
     public:
         void run()
@@ -616,7 +616,7 @@ namespace UnitTest
     }
 
     class ConcurrentVectorTest
-        : public ScopedAllocatorSetupFixture
+        : public LeakDetectionFixture
     {
     public:
         void run()

Code/Framework/AzCore/Tests/AZStd/DequeAndSimilar.cpp

@@ -33,7 +33,7 @@
 namespace UnitTest
 {
     class Containers
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
     };
     
@@ -675,7 +675,7 @@ namespace UnitTest
         }
     }
 
-    using StackContainerTestFixture = ScopedAllocatorSetupFixture;
+    using StackContainerTestFixture = LeakDetectionFixture;
 
     TEST_F(StackContainerTestFixture, StackEmplaceOperator_SupportsZeroOrMoreArguments)
     {
@@ -691,7 +691,7 @@ namespace UnitTest
     }
 
 
-    using DequeTestFixture = ScopedAllocatorSetupFixture;
+    using DequeTestFixture = LeakDetectionFixture;
 
     TEST_F(DequeTestFixture, RangeConstructors_Succeeds)
     {

Code/Framework/AzCore/Tests/AZStd/Examples.cpp

@@ -94,7 +94,7 @@ namespace UnitTest
     }
 
     class ContainersExamples
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
     public:
         void Array()

Code/Framework/AzCore/Tests/AZStd/ExpectedTests.cpp

@@ -13,7 +13,7 @@
 namespace UnitTest
 {
     class ExpectedTest
-        : public ScopedAllocatorSetupFixture
+        : public LeakDetectionFixture
     {
     };
 

Code/Framework/AzCore/Tests/AZStd/FunctionalBasic.cpp

@@ -15,7 +15,7 @@
 namespace UnitTest
 {
     class FunctionalBasicTest
-        : public ScopedAllocatorSetupFixture
+        : public LeakDetectionFixture
     {
     };
 

Code/Framework/AzCore/Tests/AZStd/FunctorsBind.cpp

@@ -253,7 +253,7 @@ namespace UnitTest
      * We use tuned version of the boost::function (which is in TR1), so we use the boost::function tests too
      */
     class Function
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
     public:
         void test_zero_args()
@@ -1005,12 +1005,12 @@ namespace UnitTest
     // Fixture for Type Parameter test to test AZStd::function move operations
     template <typename FunctorType>
     class FunctionFunctorTestFixture
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
     protected:
         void SetUp() override
         {
-            AllocatorsFixture::SetUp();
+            LeakDetectionFixture::SetUp();
             FunctionTestInternal::s_functorCopyAssignmentCount = 0;
             FunctionTestInternal::s_functorCopyConstructorCount = 0;
             FunctionTestInternal::s_functorMoveAssignmentCount = 0;
@@ -1019,7 +1019,7 @@ namespace UnitTest
 
         void TearDown() override
         {
-            AllocatorsFixture::TearDown();
+            LeakDetectionFixture::TearDown();
         }
 
     };
@@ -1083,7 +1083,7 @@ namespace UnitTest
     * We use tuned version of the boost::bind (which is in TR1), so we use the boost::bind tests too
     */
     class Bind
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
     public:
         void function_test()

Code/Framework/AzCore/Tests/AZStd/Hashed.cpp

@@ -33,7 +33,7 @@ namespace UnitTest
      * Hash functions test.
      */
     class HashedContainers
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
     public:
         template <class H, bool hasValidate>
@@ -1163,7 +1163,7 @@ namespace UnitTest
 
     template<typename ContainerType>
     class HashedSetContainers
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
     };
 
@@ -1397,7 +1397,7 @@ namespace UnitTest
 
     template <typename ContainerType>
     class HashedSetDifferentAllocatorFixture
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
     };
 
@@ -1445,7 +1445,7 @@ namespace UnitTest
 
     template<typename ContainerType>
     class HashedMapContainers
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
     };
 
@@ -1893,7 +1893,7 @@ namespace UnitTest
 
     template <typename ContainerType>
     class HashedMapDifferentAllocatorFixture
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
     };
 
@@ -2013,7 +2013,7 @@ namespace UnitTest
     };
     template <typename ContainerType>
     class HashedContainerTransparentFixture
-        : public ScopedAllocatorSetupFixture
+        : public LeakDetectionFixture
     {
     protected:
         void SetUp() override

Code/Framework/AzCore/Tests/AZStd/Invoke.cpp

@@ -79,17 +79,17 @@ namespace UnitTest
 
     // Fixture for non-typed tests
     class InvocableTest
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
     protected:
         void SetUp() override
         {
-            AllocatorsFixture::SetUp();
+            LeakDetectionFixture::SetUp();
         }
 
         void TearDown() override
         {
-            AllocatorsFixture::TearDown();
+            LeakDetectionFixture::TearDown();
         }
     };
 
@@ -291,17 +291,17 @@ namespace UnitTest
     }
 
     class InvokeTest
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
     protected:
         void SetUp() override
         {
-            AllocatorsFixture::SetUp();
+            LeakDetectionFixture::SetUp();
         }
 
         void TearDown() override
         {
-            AllocatorsFixture::TearDown();
+            LeakDetectionFixture::TearDown();
         }
 
         static int RawIntFunc(int num)

Code/Framework/AzCore/Tests/AZStd/Iterators.cpp

@@ -23,7 +23,7 @@
 namespace UnitTest
 {
     class Iterators
-        : public ScopedAllocatorSetupFixture
+        : public LeakDetectionFixture
     {
     };
 

Code/Framework/AzCore/Tests/AZStd/Lists.cpp

@@ -55,7 +55,7 @@ namespace UnitTest
      * Tests AZSTD::list container.
      */
     class ListContainers
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
     public:
         // ListContainerTest-Begin

Code/Framework/AzCore/Tests/AZStd/ListsFixed.cpp

@@ -48,7 +48,7 @@ namespace UnitTest
     };
 
     class FixedListContainers
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
     public:
         struct RemoveLessThan401

Code/Framework/AzCore/Tests/AZStd/ListsIntrusive.cpp

@@ -54,7 +54,7 @@ namespace UnitTest
     AZ_FORCE_INLINE bool operator>(const MyListClass& a, const MyListClass& b)  { return a.m_data > b.m_data; }
 
     class IntrusiveListContainers
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
     public:
         template <class T>

Code/Framework/AzCore/Tests/AZStd/LockFreeQueues.cpp

@@ -21,10 +21,10 @@ namespace UnitTest
     using namespace UnitTestInternal;
 
     class LockFreeQueue
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
     public:
-        LockFreeQueue() : AllocatorsFixture() {}
+        LockFreeQueue() : LeakDetectionFixture() {}
 
     protected:
 #ifdef _DEBUG

Code/Framework/AzCore/Tests/AZStd/LockFreeStacks.cpp

@@ -21,7 +21,7 @@ namespace UnitTest
     using namespace UnitTestInternal;
 
     class LockFreeStack
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
     public:
         
@@ -160,7 +160,7 @@ namespace UnitTest
 
     
     class LockFreeIntrusiveStack
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
     public:
 #ifdef _DEBUG

Code/Framework/AzCore/Tests/AZStd/LockTests.cpp

@@ -14,17 +14,17 @@ namespace UnitTest
 {
     // Fixture for non-typed tests
     class LockTest
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
     protected:
         void SetUp() override
         {
-            AllocatorsFixture::SetUp();
+            LeakDetectionFixture::SetUp();
         }
 
         void TearDown() override
         {
-            AllocatorsFixture::TearDown();
+            LeakDetectionFixture::TearDown();
         }
     };
 

Code/Framework/AzCore/Tests/AZStd/Numeric.cpp

@@ -12,7 +12,7 @@
 
 namespace UnitTest
 {
-    class AccumulateFixture : public AllocatorsTestFixture
+    class AccumulateFixture : public LeakDetectionFixture
     {
     };
 
@@ -45,7 +45,7 @@ namespace UnitTest
         EXPECT_THAT(evenNumbers, ElementsAre(2, 4, 6, 8, 10));
     }
 
-    class InnerProductFixture : public AllocatorsTestFixture
+    class InnerProductFixture : public LeakDetectionFixture
     {
     };
 

Code/Framework/AzCore/Tests/AZStd/Optional.cpp

@@ -59,7 +59,7 @@ namespace UnitTest
     using namespace OptionalTestClasses;
 
     class OptionalFixture
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
     };
 

Code/Framework/AzCore/Tests/AZStd/Ordered.cpp

@@ -49,7 +49,7 @@ namespace UnitTest
     };
 
     class Tree_RedBlack
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
     };
     
@@ -169,7 +169,7 @@ namespace UnitTest
     }
 
     class Tree_IntrusiveMultiSet
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
     public:
         struct Node
@@ -280,7 +280,7 @@ namespace UnitTest
 
     // SetContainerTest-Begin
     class Tree_Set
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
     };
 
@@ -409,7 +409,7 @@ namespace UnitTest
     }
 
     class Tree_MultiSet
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
     };
 
@@ -531,7 +531,7 @@ namespace UnitTest
     }
 
     class Tree_Map
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
     };
 
@@ -689,7 +689,7 @@ namespace UnitTest
     }
 
     class Tree_MultiMap
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
     };
 
@@ -834,17 +834,17 @@ namespace UnitTest
 
     template<typename ContainerType>
     class TreeSetContainers
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
     protected:
         void SetUp() override
         {
-            AllocatorsFixture::SetUp();
+            LeakDetectionFixture::SetUp();
         }
 
         void TearDown() override
         {
-            AllocatorsFixture::TearDown();
+            LeakDetectionFixture::TearDown();
         }
     };
 
@@ -1136,7 +1136,7 @@ namespace UnitTest
 
     template <typename ContainerType>
     class TreeSetDifferentAllocatorFixture
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
     };
 
@@ -1204,17 +1204,17 @@ namespace UnitTest
 
     template<typename ContainerType>
     class TreeMapContainers
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
     protected:
         void SetUp() override
         {
-            AllocatorsFixture::SetUp();
+            LeakDetectionFixture::SetUp();
         }
 
         void TearDown() override
         {
-            AllocatorsFixture::TearDown();
+            LeakDetectionFixture::TearDown();
         }
     };
 
@@ -1607,7 +1607,7 @@ namespace UnitTest
 
     template <typename ContainerType>
     class TreeMapDifferentAllocatorFixture
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
     };
 
@@ -1731,7 +1731,7 @@ namespace UnitTest
 
     template <typename ContainerType>
     class TreeContainerTransparentFixture
-        : public ScopedAllocatorSetupFixture
+        : public LeakDetectionFixture
     {
     protected:
         void SetUp() override

Code/Framework/AzCore/Tests/AZStd/Pair.cpp

@@ -17,17 +17,17 @@ namespace UnitTest
     // Fixture for non-typed tests
     template<typename TestConfig>
     class CompressedPairTest
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
     protected:
         void SetUp() override
         {
-            AllocatorsFixture::SetUp();
+            LeakDetectionFixture::SetUp();
         }
 
         void TearDown() override
         {
-            AllocatorsFixture::TearDown();
+            LeakDetectionFixture::TearDown();
         }
     };
 
@@ -122,7 +122,7 @@ namespace UnitTest
     }
 
     class PairTestFixture
-        : public ScopedAllocatorSetupFixture
+        : public LeakDetectionFixture
     {};
 
     TEST_F(PairTestFixture, StructuredBinding_ToConstAutoVar_CompilesSuccessfully)

Code/Framework/AzCore/Tests/AZStd/Parallel.cpp

@@ -153,7 +153,7 @@ namespace UnitTest
      * Thread test
      */
     class Parallel_Thread
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
         int m_data;
         int m_dataMax;
@@ -164,12 +164,12 @@ namespace UnitTest
     public:
         void SetUp() override
         {
-            AllocatorsFixture::SetUp();
+            LeakDetectionFixture::SetUp();
         }
 
         void TearDown() override
         {
-            AllocatorsFixture::TearDown();
+            LeakDetectionFixture::TearDown();
         }
 
         void increment_data()
@@ -686,7 +686,7 @@ namespace UnitTest
     }
 
     class Parallel_Combinable
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
     public:
         void run()
@@ -847,7 +847,7 @@ namespace UnitTest
     }
 
     class Parallel_SharedMutex
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
     public:
         static const int s_numOfReaders = 4;
@@ -980,7 +980,7 @@ namespace UnitTest
     }
 
     class ConditionVariable
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {};
     
     TEST_F(ConditionVariable, NotifyOneSingleWait)
@@ -1396,17 +1396,17 @@ namespace UnitTest
     // Fixture for thread-event-bus related calls
     // exists only to categorize the tests.
     class ThreadEventsBus :
-        public AllocatorsFixture
+        public LeakDetectionFixture
     {
         public:
         void SetUp() override
         {
-            AllocatorsFixture::SetUp();
+            LeakDetectionFixture::SetUp();
         }
 
         void TearDown() override
         {
-            AllocatorsFixture::TearDown();
+            LeakDetectionFixture::TearDown();
         }
     };
 
@@ -1468,17 +1468,17 @@ namespace UnitTest
     // OnThreadExit() because it cannot lock the mutex.
 
     class ThreadEventsDeathTest :
-        public AllocatorsFixture
+        public LeakDetectionFixture
     {
         public:
         void SetUp() override
         {
-            AllocatorsFixture::SetUp();
+            LeakDetectionFixture::SetUp();
         }
 
         void TearDown() override
         {
-            AllocatorsFixture::TearDown();
+            LeakDetectionFixture::TearDown();
         }
     };
 

Code/Framework/AzCore/Tests/AZStd/RangesAlgorithmTests.cpp

@@ -14,7 +14,7 @@
 namespace UnitTest
 {
     class RangesAlgorithmTestFixture
-        : public ScopedAllocatorSetupFixture
+        : public LeakDetectionFixture
     {};
 
     // range algorithm min and max

Code/Framework/AzCore/Tests/AZStd/RangesTests.cpp

@@ -13,7 +13,7 @@
 namespace UnitTest
 {
     class RangesTestFixture
-        : public ScopedAllocatorSetupFixture
+        : public LeakDetectionFixture
     {};
 
     struct RangeLikeCustomizationPoint {};

Code/Framework/AzCore/Tests/AZStd/RangesUtilityTests.cpp

@@ -17,7 +17,7 @@
 namespace UnitTest
 {
     class RangesUtilityTestFixture
-        : public ScopedAllocatorSetupFixture
+        : public LeakDetectionFixture
     {};
 
 

Code/Framework/AzCore/Tests/AZStd/RangesViewTests.cpp

@@ -34,7 +34,7 @@
 namespace UnitTest
 {
     class RangesViewTestFixture
-        : public ScopedAllocatorSetupFixture
+        : public LeakDetectionFixture
     {};
 
     TEST_F(RangesViewTestFixture, AllRangeAdaptor_Succeeds)

Code/Framework/AzCore/Tests/AZStd/ScopedLockTests.cpp

@@ -15,17 +15,17 @@ namespace UnitTest
 {
     // Fixture for AZStd::scoped_lock unit tests
     class ScopedLockTest
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
     protected:
         void SetUp() override
         {
-            AllocatorsFixture::SetUp();
+            LeakDetectionFixture::SetUp();
         }
 
         void TearDown() override
         {
-            AllocatorsFixture::TearDown();
+            LeakDetectionFixture::TearDown();
         }
     };
 

Code/Framework/AzCore/Tests/AZStd/SetsIntrusive.cpp

@@ -49,7 +49,7 @@ namespace UnitTest
     AZ_FORCE_INLINE bool operator>(const MySetClass& a, const MySetClass& b) { return a.m_data > b.m_data; }
 
     class IntrusiveSetContainers
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
     public:
         template <class T>

Code/Framework/AzCore/Tests/AZStd/SmartPtr.cpp

@@ -33,7 +33,7 @@ namespace UnitTest
     using namespace UnitTestInternal;
 
     class SmartPtr
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
     public:
         void SetUp() override;
@@ -307,14 +307,14 @@ namespace UnitTest
 
     void SmartPtr::SetUp()
     {
-        AllocatorsFixture::SetUp();
+        LeakDetectionFixture::SetUp();
         m_sharedPtr = new SharedPtr;
     }
 
     void SmartPtr::TearDown()
     {
         delete m_sharedPtr;
-        AllocatorsFixture::TearDown();
+        LeakDetectionFixture::TearDown();
     }
 
     TEST_F(SmartPtr, SharedPtrCtorInt)

Code/Framework/AzCore/Tests/AZStd/SpanTests.cpp

@@ -12,7 +12,7 @@
 namespace UnitTest
 {
     class SpanTestFixture
-        : public ScopedAllocatorSetupFixture
+        : public LeakDetectionFixture
     {};
 
     // range access

Code/Framework/AzCore/Tests/AZStd/String.cpp

@@ -159,7 +159,7 @@ namespace UnitTest
     }
 
     class String
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
     };
 
@@ -1008,7 +1008,7 @@ namespace UnitTest
     }
 
     class Regex
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
     };
 
@@ -1547,7 +1547,7 @@ namespace UnitTest
 
     template<typename T>
     class BasicStringViewConstexprFixture
-        : public ScopedAllocatorSetupFixture
+        : public LeakDetectionFixture
     {};
 
     using StringViewElementTypes = ::testing::Types<char, wchar_t>;
@@ -2507,7 +2507,7 @@ namespace UnitTest
 
     template <typename StringType>
     class ImmutableStringFunctionsFixture
-        : public ScopedAllocatorSetupFixture
+        : public LeakDetectionFixture
     {};
     using StringTypesToTest = ::testing::Types<AZStd::string_view, AZStd::string, AZStd::fixed_string<1024>>;
     TYPED_TEST_CASE(ImmutableStringFunctionsFixture, StringTypesToTest);
@@ -2540,7 +2540,7 @@ namespace UnitTest
 
     template<typename T>
     class StringFormatFixture
-        : public UnitTest::AllocatorsTestFixture
+        : public UnitTest::LeakDetectionFixture
     {
     };
 
@@ -2556,7 +2556,7 @@ namespace UnitTest
 
     template<typename T>
     class StringTypeFixture
-        : public ScopedAllocatorSetupFixture
+        : public LeakDetectionFixture
     {};
 
     using StringTypeWithRangeFunctions = ::testing::Types<AZStd::string, AZStd::fixed_string<32>>;

Code/Framework/AzCore/Tests/AZStd/Tuple.cpp

@@ -34,17 +34,17 @@ namespace UnitTest
 
     // Fixture for non-typed tests
     class TupleTest
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
     protected:
         void SetUp() override
         {
-            AllocatorsFixture::SetUp();
+            LeakDetectionFixture::SetUp();
         }
 
         void TearDown() override
         {
-            AllocatorsFixture::TearDown();
+            LeakDetectionFixture::TearDown();
         }
 
         struct MoveOnlyType
@@ -65,17 +65,17 @@ namespace UnitTest
     // Fixture for typed tests
     template<typename Tuple>
     class TupleTypedTest
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
     protected:
         void SetUp() override
         {
-            AllocatorsFixture::SetUp();
+            LeakDetectionFixture::SetUp();
         }
 
         void TearDown() override
         {
-            AllocatorsFixture::TearDown();
+            LeakDetectionFixture::TearDown();
         }
     };
     using TupleTestTypes = ::testing::Types<
@@ -1112,17 +1112,17 @@ namespace UnitTest
     namespace ExtendedApplyTest
     {
         class ExtendedTupleTest
-            : public AllocatorsFixture
+            : public LeakDetectionFixture
         {
         protected:
             void SetUp() override
             {
-                AllocatorsFixture::SetUp();
+                LeakDetectionFixture::SetUp();
             }
 
             void TearDown() override
             {
-                AllocatorsFixture::TearDown();
+                LeakDetectionFixture::TearDown();
             }
 
             static void SetUpTestCase()

Code/Framework/AzCore/Tests/AZStd/Variant.cpp

@@ -16,33 +16,33 @@ namespace UnitTest
 
     // Fixture for non-typed tests
     class VariantTest
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
     protected:
         void SetUp() override
         {
-            AllocatorsFixture::SetUp();
+            LeakDetectionFixture::SetUp();
         }
 
         void TearDown() override
         {
-            AllocatorsFixture::TearDown();
+            LeakDetectionFixture::TearDown();
         }
     };
 
     template<typename TestConfig>
     class VariantSizeTest
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
     protected:
         void SetUp() override
         {
-            AllocatorsFixture::SetUp();
+            LeakDetectionFixture::SetUp();
         }
 
         void TearDown() override
         {
-            AllocatorsFixture::TearDown();
+            LeakDetectionFixture::TearDown();
         }
     };
 
@@ -61,17 +61,17 @@ namespace UnitTest
 
     template<typename TestConfig>
     class VariantAlternativeTest
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
     protected:
         void SetUp() override
         {
-            AllocatorsFixture::SetUp();
+            LeakDetectionFixture::SetUp();
         }
 
         void TearDown() override
         {
-            AllocatorsFixture::TearDown();
+            LeakDetectionFixture::TearDown();
         }
     };
 

Code/Framework/AzCore/Tests/AZStd/VariantSerialization.cpp

@@ -17,13 +17,13 @@
 namespace UnitTest
 {
     class VariantSerializationTest
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
     public:
         // We must expose the class for serialization first.
         void SetUp() override
         {
-            AllocatorsFixture::SetUp();
+            LeakDetectionFixture::SetUp();
 
             AZ::AllocatorInstance<AZ::PoolAllocator>::Create();
             AZ::AllocatorInstance<AZ::ThreadPoolAllocator>::Create();
@@ -44,7 +44,7 @@ namespace UnitTest
             AZ::AllocatorInstance<AZ::ThreadPoolAllocator>::Destroy();
             AZ::AllocatorInstance<AZ::PoolAllocator>::Destroy();
 
-            AllocatorsFixture::TearDown();
+            LeakDetectionFixture::TearDown();
         }
 
     protected:

Code/Framework/AzCore/Tests/AZStd/VectorAndArray.cpp

@@ -93,12 +93,12 @@ namespace UnitTest
     };
 
     class Arrays
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
 
         void SetUp() override
         {
-            AllocatorsFixture::SetUp();
+            LeakDetectionFixture::SetUp();
             MyCtorClass::s_numConstructedObjects = 0;
         }
     };

Code/Framework/AzCore/Tests/Asset/AssetCommon.cpp

@@ -14,7 +14,7 @@ namespace UnitTest
     using namespace AZ;
     using namespace AZ::Data;
 
-    using AssetIdTest = AllocatorsFixture;
+    using AssetIdTest = LeakDetectionFixture;
 
     TEST_F(AssetIdTest, AssetId_PrintDecimalSubId_SubIdIsDecimal)
     {
@@ -89,7 +89,7 @@ namespace UnitTest
         EXPECT_EQ(dynamic, fixed);
     }
 
-    using AssetTest = AllocatorsFixture;
+    using AssetTest = LeakDetectionFixture;
 
     TEST_F(AssetTest, AssetPreserveHintTest_Const_Copy)
     {
@@ -156,7 +156,7 @@ namespace UnitTest
     }
 
 
-    TEST_F(AllocatorsFixture, AssetReleaseRetainsAssetState_Id_Type_Hint)
+    TEST_F(LeakDetectionFixture, AssetReleaseRetainsAssetState_Id_Type_Hint)
     {
         const AssetId id("{52C79B55-B5AA-4841-AFC8-683D77716287}", 1);
         const AssetType type("{A99E8722-1F1D-4CA9-B89B-921EB3D907A9}");
@@ -171,7 +171,7 @@ namespace UnitTest
         EXPECT_EQ(assetWithHint.GetHint(), hint);
     }
 
-    TEST_F(AllocatorsFixture, AssetResetDefaultsAssetState_Id_Type_Hint)
+    TEST_F(LeakDetectionFixture, AssetResetDefaultsAssetState_Id_Type_Hint)
     {
         const AssetId id("{52C79B55-B5AA-4841-AFC8-683D77716287}", 1);
         const AssetType type("{A99E8722-1F1D-4CA9-B89B-921EB3D907A9}");
@@ -186,7 +186,7 @@ namespace UnitTest
         EXPECT_EQ(assetWithHint.GetHint(), AZStd::string{});
     }
 
-    using WeakAssetTest = AllocatorsFixture;
+    using WeakAssetTest = LeakDetectionFixture;
 
     // Expose the internal weak use count of AssetData for verification in unit tests.
     class TestAssetData : public AssetData

Code/Framework/AzCore/Tests/Asset/AssetDataStreamTests.cpp

@@ -12,7 +12,7 @@
 #include <Tests/Streamer/IStreamerMock.h>
 
 class AssetDataStreamTest
-    : public UnitTest::ScopedAllocatorSetupFixture
+    : public UnitTest::LeakDetectionFixture
 {
 public:
     void SetUp() override
@@ -21,7 +21,7 @@ public:
         using ::testing::NiceMock;
         using ::testing::Return;
 
-        UnitTest::ScopedAllocatorSetupFixture::SetUp();
+        UnitTest::LeakDetectionFixture::SetUp();
         AZ::Interface<AZ::IO::IStreamer>::Register(&m_mockStreamer);
 
         // Reroute enough mock streamer calls to this class to let us validate the input parameters and mock
@@ -91,7 +91,7 @@ public:
     void TearDown() override
     {
         AZ::Interface<AZ::IO::IStreamer>::Unregister(&m_mockStreamer);
-        UnitTest::ScopedAllocatorSetupFixture::TearDown();
+        UnitTest::LeakDetectionFixture::TearDown();
     }
 
 

Code/Framework/AzCore/Tests/AssetSerializerTests.cpp

@@ -12,12 +12,12 @@
 
 
 class AssetSerializerTest
-    : public UnitTest::ScopedAllocatorSetupFixture
+    : public UnitTest::LeakDetectionFixture
 {
     public:
         void SetUp() override
         {
-            UnitTest::ScopedAllocatorSetupFixture::SetUp();
+            UnitTest::LeakDetectionFixture::SetUp();
 
             // Fill in v0 and v1 of the test data with subsets of our v2 test asset.
             memcpy(m_testSerializedAssetVersion0, m_testSerializedAssetVersion2, AZ_ARRAY_SIZE(m_testSerializedAssetVersion0));
@@ -29,7 +29,7 @@ class AssetSerializerTest
 
         void TearDown() override
         {
-            UnitTest::ScopedAllocatorSetupFixture::TearDown();
+            UnitTest::LeakDetectionFixture::TearDown();
         }
 
     protected:

Code/Framework/AzCore/Tests/BehaviorContext.cpp

@@ -35,7 +35,7 @@ namespace UnitTest
     };
 
     class BehaviorClassTest
-        : public ScopedAllocatorSetupFixture
+        : public LeakDetectionFixture
     {
     public:
         void SetUp() override
@@ -59,7 +59,7 @@ namespace UnitTest
     };
 
     class BehaviorContextTestFixture
-        : public ScopedAllocatorSetupFixture
+        : public LeakDetectionFixture
     {
     public:
         AZ::BehaviorContext m_behaviorContext;
@@ -173,7 +173,7 @@ namespace UnitTest
         }
     };
 
-    using BehaviorContextConstTest = AllocatorsFixture;
+    using BehaviorContextConstTest = LeakDetectionFixture;
     TEST_F(BehaviorContextConstTest, BehaviorContext_BindConstMethods_Compiles)
     {
         AZ::BehaviorContext bc;

Code/Framework/AzCore/Tests/BehaviorContextFixture.h

@@ -16,13 +16,13 @@ namespace UnitTest
 {
     // Basic fixture for managing a BehaviorContext
     class BehaviorContextFixture
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
         , public AZ::ComponentApplicationBus::Handler
     {
     public:
         void SetUp() override
         {
-            AllocatorsFixture::SetUp();
+            LeakDetectionFixture::SetUp();
 
             m_behaviorContext = aznew AZ::BehaviorContext();
 
@@ -39,7 +39,7 @@ namespace UnitTest
             delete m_behaviorContext;
             m_behaviorContext = nullptr;
 
-            AllocatorsFixture::TearDown();
+            LeakDetectionFixture::TearDown();
         }
 
         // ComponentApplicationBus

Code/Framework/AzCore/Tests/Components.cpp

@@ -40,11 +40,11 @@ using namespace AZ::Debug;
 namespace UnitTest
 {
     class Components
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
     public:
         Components()
-            : AllocatorsFixture()
+            : LeakDetectionFixture()
         {
         }
     };
@@ -605,7 +605,7 @@ namespace UnitTest
     protected:
         void SetUp() override
         {
-            AllocatorsFixture::SetUp();
+            LeakDetectionFixture::SetUp();
 
             // component descriptors are cleaned up when application shuts down
             m_descriptorComponentA = aznew ComponentADescriptor;
@@ -645,7 +645,7 @@ namespace UnitTest
             delete m_entity;
             delete m_componentApp;
 
-            AllocatorsFixture::TearDown();
+            LeakDetectionFixture::TearDown();
         }
 
         void CreateComponents_ABCDE()
@@ -1102,7 +1102,7 @@ namespace UnitTest
         int m_intOption1;
     };
 
-    using UserSettingsTestFixture = UnitTest::AllocatorsTestFixture;
+    using UserSettingsTestFixture = UnitTest::LeakDetectionFixture;
     TEST_F(UserSettingsTestFixture, Test)
     {
         UserSettingsTestApp app;

Code/Framework/AzCore/Tests/Console/ConsoleTests.cpp

@@ -51,12 +51,11 @@ namespace AZ
         ", Option3/6 sets the CVar to the Option3 value");
 
     class ConsoleTests
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
     public:
         void SetUp() override
         {
-            SetupAllocator();
             m_console = AZStd::make_unique<AZ::Console>();
             m_console->LinkDeferredFunctors(AZ::ConsoleFunctorBase::GetDeferredHead());
             AZ::Interface<AZ::IConsole>::Register(m_console.get());
@@ -409,7 +408,7 @@ namespace ConsoleSettingsRegistryTests
         AZStd::string_view m_testConfigContents;
     };
     class ConsoleSettingsRegistryFixture
-        : public UnitTest::ScopedAllocatorSetupFixture
+        : public UnitTest::LeakDetectionFixture
         , public ::testing::WithParamInterface<ConfigFileParams>
     {
     public:

Code/Framework/AzCore/Tests/Console/LoggerSystemComponentTests.cpp

@@ -12,7 +12,7 @@
 namespace UnitTest
 {
     class LoggerSystemComponentTests
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
     public:
         LoggerSystemComponentTests()
@@ -29,7 +29,7 @@ namespace UnitTest
 
         void SetUp() override
         {
-            AllocatorsFixture::SetUp();
+            LeakDetectionFixture::SetUp();
             m_loggerComponent = aznew AZ::LoggerSystemComponent;
             AZ::Interface<AZ::ILogger>::Get()->BindLogHandler(m_logHandler);
             AZ::Interface<AZ::ILogger>::Get()->SetLogLevel(AZ::LogLevel::Trace); // Set to trace by default
@@ -39,7 +39,7 @@ namespace UnitTest
         {
             m_logHandler.Disconnect();
             delete m_loggerComponent;
-            AllocatorsFixture::TearDown();
+            LeakDetectionFixture::TearDown();
         }
 
         void LogEventHandler(AZ::LogLevel logLevel, const char* message, const char*, const char*, int32_t)

Code/Framework/AzCore/Tests/DLL.cpp

@@ -21,12 +21,12 @@ namespace UnitTest
 #if !AZ_UNIT_TEST_SKIP_DLL_TEST
 
     class DLL
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
     public:
         void SetUp() override
         {
-            AllocatorsFixture::SetUp();
+            LeakDetectionFixture::SetUp();
 
             AZ::NameDictionary::Create();
         }
@@ -35,7 +35,7 @@ namespace UnitTest
         {
             AZ::NameDictionary::Destroy();
 
-            AllocatorsFixture::TearDown();
+            LeakDetectionFixture::TearDown();
         }
 
         void LoadModule()

Code/Framework/AzCore/Tests/DOM/DomFixtures.cpp

@@ -177,13 +177,13 @@ namespace AZ::Dom::Tests
 
     void DomTestFixture::SetUp()
     {
-        UnitTest::AllocatorsFixture::SetUp();
+        UnitTest::LeakDetectionFixture::SetUp();
         SetUpHarness();
     }
 
     void DomTestFixture::TearDown()
     {
         TearDownHarness();
-        UnitTest::AllocatorsFixture::TearDown();
+        UnitTest::LeakDetectionFixture::TearDown();
     }
 } // namespace AZ::Dom::Tests

Code/Framework/AzCore/Tests/DOM/DomFixtures.h

@@ -57,7 +57,7 @@ namespace AZ::Dom::Tests
 
     class DomTestFixture
         : public DomTestHarness
-        , public UnitTest::AllocatorsFixture
+        , public UnitTest::LeakDetectionFixture
     {
     public:
         void SetUp() override;

Code/Framework/AzCore/Tests/Date/DateFormatTests.cpp

@@ -15,7 +15,7 @@ namespace UnitTest
     // Fixtures
 
     // Fixture for non-typed tests
-    class DateFormatTest : public ScopedAllocatorSetupFixture
+    class DateFormatTest : public LeakDetectionFixture
     {
     };
 

Code/Framework/AzCore/Tests/Debug/PerformanceCollectorTests.cpp

@@ -16,7 +16,7 @@
 namespace UnitTest
 {
     class PerformanceCollectorTest
-        : public ScopedAllocatorSetupFixture
+        : public LeakDetectionFixture
     {
     }; //class PerformanceCollectorTest
 

Code/Framework/AzCore/Tests/Debug/Trace.cpp

@@ -15,7 +15,7 @@
 namespace UnitTest
 {
     struct TraceTests
-        : ScopedAllocatorSetupFixture
+        : LeakDetectionFixture
         , AZ::Debug::TraceMessageBus::Handler
     {
         bool OnPreAssert(const char*, int, const char*, const char*) override

Code/Framework/AzCore/Tests/EBus.cpp

@@ -370,7 +370,7 @@ namespace UnitTest
 
     template <typename Bus>
     class EBusTestAll
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
     public:
         using BusHandler = Handler<Bus>;
@@ -385,7 +385,7 @@ namespace UnitTest
         void TearDown() override
         {
             DestroyHandlers();
-            AllocatorsFixture::TearDown();
+            LeakDetectionFixture::TearDown();
         }
 
         //////////////////////////////////////////////////////////////////////////
@@ -1538,7 +1538,7 @@ namespace UnitTest
     }
 
     class EBus
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {};
 
     TEST_F(EBus, DISABLED_CopyConstructorOfEBusHandlerDoesNotAssertInInternalDestructorOfHandler)
@@ -1823,7 +1823,7 @@ namespace UnitTest
     }
 
     class QueueEbusTest
-        : public ScopedAllocatorSetupFixture
+        : public LeakDetectionFixture
     {
 
     };
@@ -4121,7 +4121,7 @@ namespace UnitTest
 
     template <typename ParamType>
     class EBusParamFixture
-        : public ScopedAllocatorSetupFixture
+        : public LeakDetectionFixture
         , public ::testing::WithParamInterface<ParamType>
     {};
 

Code/Framework/AzCore/Tests/EBus/EBusSharedDispatchMutexTests.cpp

@@ -113,7 +113,7 @@ namespace UnitTest
     };
 
     class EBusSharedDispatchMutexTestFixture
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
     public:
 

Code/Framework/AzCore/Tests/EBus/ScheduledEventTests.cpp

@@ -18,12 +18,11 @@
 namespace UnitTest
 {
     class ScheduledEventTests
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
     public:
         void SetUp() override
         {
-            SetupAllocator();
             AZ::NameDictionary::Create();
 
             m_loggerComponent = AZStd::make_unique<AZ::LoggerSystemComponent>();

Code/Framework/AzCore/Tests/EntityIdTests.cpp

@@ -9,7 +9,7 @@
 #include <AzCore/UnitTest/TestTypes.h>
 
 class EntityIdTests
-    : public UnitTest::AllocatorsFixture
+    : public UnitTest::LeakDetectionFixture
 {
 };
 

Code/Framework/AzCore/Tests/EnumTests.cpp

@@ -49,7 +49,7 @@ namespace UnitTest
                                        Z
     );
 
-    class EnumTests : public AllocatorsTestFixture
+    class EnumTests : public LeakDetectionFixture
     {
     };
 

Code/Framework/AzCore/Tests/EventTests.cpp

@@ -12,7 +12,7 @@
 namespace UnitTest
 {
     class EventTests
-        : public ScopedAllocatorSetupFixture
+        : public LeakDetectionFixture
     {
     };
 

Code/Framework/AzCore/Tests/GenericStreamTests.cpp

@@ -10,7 +10,7 @@
 #include <AZTestShared/Utils/Utils.h>
 
 class GenericStreamTest
-    : public UnitTest::ScopedAllocatorSetupFixture
+    : public UnitTest::LeakDetectionFixture
 {
 public:
     void SetUp() override
@@ -19,7 +19,7 @@ public:
         using ::testing::NiceMock;
         using ::testing::Return;
 
-        UnitTest::ScopedAllocatorSetupFixture::SetUp();
+        UnitTest::LeakDetectionFixture::SetUp();
 
         // Route our mocked WriteFromStream back to the base class implementation for test validation
         ON_CALL(m_mockGenericStream, WriteFromStream(_, _))
@@ -31,7 +31,7 @@ public:
 
     void TearDown() override
     {
-        UnitTest::ScopedAllocatorSetupFixture::TearDown();
+        UnitTest::LeakDetectionFixture::TearDown();
     }
 
     void CreateTestData(AZStd::vector<AZ::u8>& inBuffer, size_t numBytes)

Code/Framework/AzCore/Tests/Geometry2DUtils.cpp

@@ -14,7 +14,7 @@
 namespace UnitTest
 {
     using namespace AZ;
-    using Geometry2DUtilsFixture = ::UnitTest::AllocatorsFixture;
+    using Geometry2DUtilsFixture = ::UnitTest::LeakDetectionFixture;
 
     struct Signed2DTriangleAreaTestData
     {

Code/Framework/AzCore/Tests/IO/FileReaderTests.cpp

@@ -13,7 +13,7 @@ namespace UnitTest
 {
     template <typename FileIOType>
     class FileReaderTestFixture
-        : public ScopedAllocatorSetupFixture
+        : public LeakDetectionFixture
     {
     public:
         void SetUp() override

Code/Framework/AzCore/Tests/IO/Path/PathTests.cpp

@@ -16,7 +16,7 @@ namespace UnitTest
 #if !AZ_UNIT_TEST_SKIP_PATH_TESTS
 
     class PathFixture
-        : public ScopedAllocatorSetupFixture
+        : public LeakDetectionFixture
     {};
 
     TEST_F(PathFixture, AppendWithFixedPath_IsConstexpr_Compiles)
@@ -142,7 +142,7 @@ namespace UnitTest
     }
 
     class PathParamFixture
-        : public ScopedAllocatorSetupFixture
+        : public LeakDetectionFixture
         , public ::testing::WithParamInterface<AZStd::tuple<AZStd::string_view, AZStd::string_view>>
     {};
 
@@ -279,7 +279,7 @@ namespace UnitTest
     };
 
     class PathHashCompareFixture
-        : public ScopedAllocatorSetupFixture
+        : public LeakDetectionFixture
         , public ::testing::WithParamInterface<PathHashCompareParams>
     {};
 
@@ -347,7 +347,7 @@ AZ_POP_DISABLE_WARNING
         ));
 
     class PathSingleParamFixture
-        : public ScopedAllocatorSetupFixture
+        : public LeakDetectionFixture
         , public ::testing::WithParamInterface<AZStd::tuple<AZStd::string_view>>
     {};
 
@@ -466,7 +466,7 @@ AZ_POP_DISABLE_WARNING
         bool expectedResult;
     };
     class PathCustomParamFixture
-        : public ScopedAllocatorSetupFixture
+        : public LeakDetectionFixture
         , public ::testing::WithParamInterface<TestParams>
     {};
 
@@ -587,7 +587,7 @@ AZ_POP_DISABLE_WARNING
         AZStd::fixed_vector<AZStd::string_view, 20> m_expectedValues;
     };
     class PathIteratorFixture
-        : public ScopedAllocatorSetupFixture
+        : public LeakDetectionFixture
         , public ::testing::WithParamInterface<PathIteratorParams>
     {};
 
@@ -677,7 +677,7 @@ AZ_POP_DISABLE_WARNING
     };
     template <typename ParamType>
     class PathLexicallyFixture
-        : public ScopedAllocatorSetupFixture
+        : public LeakDetectionFixture
         , public ::testing::WithParamInterface<ParamType>
     {};
 

Code/Framework/AzCore/Tests/IPC.cpp

@@ -22,7 +22,7 @@ namespace UnitTest
      * Test InterProcessCommunication utils.
      */
     class IPC
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
     };
 

Code/Framework/AzCore/Tests/Interface.cpp

@@ -78,7 +78,7 @@ namespace UnitTest
     };
 
     class InterfaceTest
-        : public AllocatorsTestFixture
+        : public LeakDetectionFixture
     {
     };
 

Code/Framework/AzCore/Tests/JSON.cpp

@@ -20,7 +20,7 @@ namespace UnitTest
      * Rapid XML parser
      */
     class RapidJSON
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
     public:
         RapidJSON() {}

Code/Framework/AzCore/Tests/Jobs.cpp

@@ -61,7 +61,7 @@ namespace UnitTest
     static AZStd::sys_time_t s_totalJobsTime = 0;
 
     class DefaultJobManagerSetupFixture
-        : public AllocatorsTestFixture
+        : public LeakDetectionFixture
 
     {
     protected:
@@ -76,7 +76,7 @@ namespace UnitTest
 
         void SetUp() override
         {
-            AllocatorsTestFixture::SetUp();
+            LeakDetectionFixture::SetUp();
 
             AllocatorInstance<PoolAllocator>::Create();
             AllocatorInstance<ThreadPoolAllocator>::Create();
@@ -116,7 +116,7 @@ namespace UnitTest
             AllocatorInstance<ThreadPoolAllocator>::Destroy();
             AllocatorInstance<PoolAllocator>::Destroy();
 
-            AllocatorsTestFixture::TearDown();
+            LeakDetectionFixture::TearDown();
         }
     };
 

Code/Framework/AzCore/Tests/Math/CrcTests.cpp

@@ -68,7 +68,7 @@ namespace Benchmark
 namespace UnitTest
 {
     class Crc32Fixture
-        : public UnitTest::ScopedAllocatorSetupFixture
+        : public UnitTest::LeakDetectionFixture
     {
 
     };

Code/Framework/AzCore/Tests/Math/FrustumTests.cpp

@@ -368,13 +368,13 @@ namespace UnitTest
 
     class Tests
         : public ::testing::WithParamInterface <FrustumTestCase>
-        , public UnitTest::AllocatorsTestFixture
+        , public UnitTest::LeakDetectionFixture
     {
 
     protected:
         void SetUp() override
         {
-            UnitTest::AllocatorsTestFixture::SetUp();
+            UnitTest::LeakDetectionFixture::SetUp();
 
             // Build a frustum from 8 points
             // This allows us to generate test cases in each of the 9 regions in the 3x3 grid divided by the 6 planes,

Code/Framework/AzCore/Tests/Math/Geometry3DUtilsTests.cpp

@@ -12,7 +12,7 @@
 namespace UnitTest
 {
     class Geometry3DUtilsFixture :
-        public UnitTest::AllocatorsFixture,
+        public UnitTest::LeakDetectionFixture,
         public ::testing::WithParamInterface<uint8_t>
     {
     };

Code/Framework/AzCore/Tests/Math/IntersectionTests.cpp

@@ -264,7 +264,7 @@ namespace UnitTest
         }
     }
 
-    class MATH_IntersectSegmentTriangleTest : public AllocatorsFixture
+    class MATH_IntersectSegmentTriangleTest : public LeakDetectionFixture
     {
         public:
 
@@ -596,7 +596,7 @@ namespace UnitTest
     }
 
     class MATH_IntersectRayCappedCylinderTest
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
     protected:
 
@@ -780,7 +780,7 @@ namespace UnitTest
     }
 
     class MATH_IntersectRayConeTest
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
     protected:
 
@@ -962,7 +962,7 @@ namespace UnitTest
     }
 
     class MATH_IntersectRayQuadTest
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
     protected:
 
@@ -1107,7 +1107,7 @@ namespace UnitTest
     }
 
     class MATH_IntersectRayBoxTest
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
     protected:
 
@@ -1185,7 +1185,7 @@ namespace UnitTest
     }
 
     class MATH_IntersectRayPolyhedronTest
-        : public AllocatorsFixture
+        : public LeakDetectionFixture
     {
     protected:
         void SetUp() override
@@ -1299,7 +1299,7 @@ namespace UnitTest
         EXPECT_EQ(intersections, 0);
     }
 
-    class MATH_ClipRayWithAabbTest : public AllocatorsFixture
+    class MATH_ClipRayWithAabbTest : public LeakDetectionFixture
     {
     };