From afd97abdcfc08b463e248ba4a035fc2d4c3ad470 Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Fri, 9 Jul 2021 08:07:47 -0700 Subject: [PATCH] Move files to AzFramework/Test and AzToolsFramework/Test accordingly Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> --- Code/Framework/{ => AzFramework}/Tests/Application.cpp | 0 .../Framework/{ => AzFramework}/Tests/ArchiveCompressionTests.cpp | 0 Code/Framework/{ => AzFramework}/Tests/ArchiveTests.cpp | 0 Code/Framework/{ => AzFramework}/Tests/AssetCatalog.cpp | 0 .../{ => AzFramework}/Tests/AssetProcessorConnection.cpp | 0 Code/Framework/{ => AzFramework}/Tests/BehaviorEntityTests.cpp | 0 Code/Framework/{ => AzFramework}/Tests/BinToTextEncode.cpp | 0 Code/Framework/{ => AzFramework}/Tests/CMakeLists.txt | 0 Code/Framework/{ => AzFramework}/Tests/CameraInputTests.cpp | 0 Code/Framework/{ => AzFramework}/Tests/CameraState.cpp | 0 Code/Framework/{ => AzFramework}/Tests/ClickDetectorTests.cpp | 0 Code/Framework/{ => AzFramework}/Tests/CursorStateTests.cpp | 0 Code/Framework/{ => AzFramework}/Tests/EntityContext.cpp | 0 Code/Framework/{ => AzFramework}/Tests/FileIO.cpp | 0 Code/Framework/{ => AzFramework}/Tests/FileTagTests.cpp | 0 .../{ => AzFramework}/Tests/FrameworkApplicationFixture.h | 0 Code/Framework/{ => AzFramework}/Tests/GenAppDescriptors.cpp | 0 Code/Framework/{ => AzFramework}/Tests/InputTests.cpp | 0 .../Tests/Mocks/MockSpawnableEntitiesInterface.h | 0 Code/Framework/{ => AzFramework}/Tests/NativeWindow.cpp | 0 Code/Framework/{ => AzFramework}/Tests/OctreePerformanceTests.cpp | 0 Code/Framework/{ => AzFramework}/Tests/OctreeTests.cpp | 0 .../Tests/Platform/Android/AzFrameworkTests_Traits_Android.h | 0 .../Tests/Platform/Android/AzFrameworkTests_Traits_Platform.h | 0 .../Tests/Platform/Android/platform_android_files.cmake | 0 .../Tests/Platform/Linux/AzFrameworkTests_Traits_Linux.h | 0 .../Tests/Platform/Linux/AzFrameworkTests_Traits_Platform.h | 0 .../Tests/Platform/Linux/platform_linux_files.cmake | 0 .../Tests/Platform/Mac/AzFrameworkTests_Traits_Mac.h | 0 .../Tests/Platform/Mac/AzFrameworkTests_Traits_Platform.h | 0 .../{ => AzFramework}/Tests/Platform/Mac/platform_mac_files.cmake | 0 .../Tests/Platform/Windows/AzFrameworkTests_Traits_Platform.h | 0 .../Tests/Platform/Windows/AzFrameworkTests_Traits_Windows.h | 0 .../Tests/Platform/Windows/platform_windows_files.cmake | 0 .../Tests/Platform/iOS/AzFrameworkTests_Traits_Platform.h | 0 .../Tests/Platform/iOS/AzFrameworkTests_Traits_iOS.h | 0 .../{ => AzFramework}/Tests/Platform/iOS/platform_ios_files.cmake | 0 Code/Framework/{ => AzFramework}/Tests/PlatformHelper.cpp | 0 Code/Framework/{ => AzFramework}/Tests/ProcessLaunchMain.cpp | 0 .../Framework/{ => AzFramework}/Tests/ProcessLaunchParseTests.cpp | 0 Code/Framework/{ => AzFramework}/Tests/Scene.cpp | 0 .../Tests/Spawnable/SpawnableEntitiesManagerTests.cpp | 0 Code/Framework/{ => AzFramework}/Tests/Utils/Utils.cpp | 0 Code/Framework/{ => AzFramework}/Tests/Utils/Utils.h | 0 .../{ => AzFramework}/Tests/framework_shared_tests_files.cmake | 0 Code/Framework/{ => AzFramework}/Tests/frameworktests_files.cmake | 0 .../{ => AzFramework}/Tests/process_launch_test_files.cmake | 0 .../{ => AzToolsFramework}/Tests/ComponentAdapterTests.cpp | 0 .../Framework/{ => AzToolsFramework}/Tests/ComponentAddRemove.cpp | 0 .../EntityOwnershipService/EntityOwnershipServiceTestFixture.cpp | 0 .../EntityOwnershipService/EntityOwnershipServiceTestFixture.h | 0 .../EntityOwnershipService/SliceEditorEntityOwnershipTests.cpp | 0 .../Tests/EntityOwnershipService/SliceEntityOwnershipTests.cpp | 0 Code/Framework/{ => AzToolsFramework}/Tests/EntityTestbed.h | 0 Code/Framework/{ => AzToolsFramework}/Tests/FileFunc.cpp | 0 .../{ => AzToolsFramework}/Tests/GenericComponentWrapperTest.cpp | 0 .../{ => AzToolsFramework}/Tests/InstanceDataHierarchy.cpp | 0 .../{ => AzToolsFramework}/Tests/SQLiteConnectionTests.cpp | 0 .../{ => AzToolsFramework}/Tests/Script/ScriptComponentTests.cpp | 0 .../{ => AzToolsFramework}/Tests/Script/ScriptEntityTests.cpp | 0 Code/Framework/{ => AzToolsFramework}/Tests/Slices.cpp | 0 .../Framework/{ => AzToolsFramework}/Tests/TransformComponent.cpp | 0 62 files changed, 0 insertions(+), 0 deletions(-) rename Code/Framework/{ => AzFramework}/Tests/Application.cpp (100%) rename Code/Framework/{ => AzFramework}/Tests/ArchiveCompressionTests.cpp (100%) rename Code/Framework/{ => AzFramework}/Tests/ArchiveTests.cpp (100%) rename Code/Framework/{ => AzFramework}/Tests/AssetCatalog.cpp (100%) rename Code/Framework/{ => AzFramework}/Tests/AssetProcessorConnection.cpp (100%) rename Code/Framework/{ => AzFramework}/Tests/BehaviorEntityTests.cpp (100%) rename Code/Framework/{ => AzFramework}/Tests/BinToTextEncode.cpp (100%) rename Code/Framework/{ => AzFramework}/Tests/CMakeLists.txt (100%) rename Code/Framework/{ => AzFramework}/Tests/CameraInputTests.cpp (100%) rename Code/Framework/{ => AzFramework}/Tests/CameraState.cpp (100%) rename Code/Framework/{ => AzFramework}/Tests/ClickDetectorTests.cpp (100%) rename Code/Framework/{ => AzFramework}/Tests/CursorStateTests.cpp (100%) rename Code/Framework/{ => AzFramework}/Tests/EntityContext.cpp (100%) rename Code/Framework/{ => AzFramework}/Tests/FileIO.cpp (100%) rename Code/Framework/{ => AzFramework}/Tests/FileTagTests.cpp (100%) rename Code/Framework/{ => AzFramework}/Tests/FrameworkApplicationFixture.h (100%) rename Code/Framework/{ => AzFramework}/Tests/GenAppDescriptors.cpp (100%) rename Code/Framework/{ => AzFramework}/Tests/InputTests.cpp (100%) rename Code/Framework/{ => AzFramework}/Tests/Mocks/MockSpawnableEntitiesInterface.h (100%) rename Code/Framework/{ => AzFramework}/Tests/NativeWindow.cpp (100%) rename Code/Framework/{ => AzFramework}/Tests/OctreePerformanceTests.cpp (100%) rename Code/Framework/{ => AzFramework}/Tests/OctreeTests.cpp (100%) rename Code/Framework/{ => AzFramework}/Tests/Platform/Android/AzFrameworkTests_Traits_Android.h (100%) rename Code/Framework/{ => AzFramework}/Tests/Platform/Android/AzFrameworkTests_Traits_Platform.h (100%) rename Code/Framework/{ => AzFramework}/Tests/Platform/Android/platform_android_files.cmake (100%) rename Code/Framework/{ => AzFramework}/Tests/Platform/Linux/AzFrameworkTests_Traits_Linux.h (100%) rename Code/Framework/{ => AzFramework}/Tests/Platform/Linux/AzFrameworkTests_Traits_Platform.h (100%) rename Code/Framework/{ => AzFramework}/Tests/Platform/Linux/platform_linux_files.cmake (100%) rename Code/Framework/{ => AzFramework}/Tests/Platform/Mac/AzFrameworkTests_Traits_Mac.h (100%) rename Code/Framework/{ => AzFramework}/Tests/Platform/Mac/AzFrameworkTests_Traits_Platform.h (100%) rename Code/Framework/{ => AzFramework}/Tests/Platform/Mac/platform_mac_files.cmake (100%) rename Code/Framework/{ => AzFramework}/Tests/Platform/Windows/AzFrameworkTests_Traits_Platform.h (100%) rename Code/Framework/{ => AzFramework}/Tests/Platform/Windows/AzFrameworkTests_Traits_Windows.h (100%) rename Code/Framework/{ => AzFramework}/Tests/Platform/Windows/platform_windows_files.cmake (100%) rename Code/Framework/{ => AzFramework}/Tests/Platform/iOS/AzFrameworkTests_Traits_Platform.h (100%) rename Code/Framework/{ => AzFramework}/Tests/Platform/iOS/AzFrameworkTests_Traits_iOS.h (100%) rename Code/Framework/{ => AzFramework}/Tests/Platform/iOS/platform_ios_files.cmake (100%) rename Code/Framework/{ => AzFramework}/Tests/PlatformHelper.cpp (100%) rename Code/Framework/{ => AzFramework}/Tests/ProcessLaunchMain.cpp (100%) rename Code/Framework/{ => AzFramework}/Tests/ProcessLaunchParseTests.cpp (100%) rename Code/Framework/{ => AzFramework}/Tests/Scene.cpp (100%) rename Code/Framework/{ => AzFramework}/Tests/Spawnable/SpawnableEntitiesManagerTests.cpp (100%) rename Code/Framework/{ => AzFramework}/Tests/Utils/Utils.cpp (100%) rename Code/Framework/{ => AzFramework}/Tests/Utils/Utils.h (100%) rename Code/Framework/{ => AzFramework}/Tests/framework_shared_tests_files.cmake (100%) rename Code/Framework/{ => AzFramework}/Tests/frameworktests_files.cmake (100%) rename Code/Framework/{ => AzFramework}/Tests/process_launch_test_files.cmake (100%) rename Code/Framework/{ => AzToolsFramework}/Tests/ComponentAdapterTests.cpp (100%) rename Code/Framework/{ => AzToolsFramework}/Tests/ComponentAddRemove.cpp (100%) rename Code/Framework/{ => AzToolsFramework}/Tests/EntityOwnershipService/EntityOwnershipServiceTestFixture.cpp (100%) rename Code/Framework/{ => AzToolsFramework}/Tests/EntityOwnershipService/EntityOwnershipServiceTestFixture.h (100%) rename Code/Framework/{ => AzToolsFramework}/Tests/EntityOwnershipService/SliceEditorEntityOwnershipTests.cpp (100%) rename Code/Framework/{ => AzToolsFramework}/Tests/EntityOwnershipService/SliceEntityOwnershipTests.cpp (100%) rename Code/Framework/{ => AzToolsFramework}/Tests/EntityTestbed.h (100%) rename Code/Framework/{ => AzToolsFramework}/Tests/FileFunc.cpp (100%) rename Code/Framework/{ => AzToolsFramework}/Tests/GenericComponentWrapperTest.cpp (100%) rename Code/Framework/{ => AzToolsFramework}/Tests/InstanceDataHierarchy.cpp (100%) rename Code/Framework/{ => AzToolsFramework}/Tests/SQLiteConnectionTests.cpp (100%) rename Code/Framework/{ => AzToolsFramework}/Tests/Script/ScriptComponentTests.cpp (100%) rename Code/Framework/{ => AzToolsFramework}/Tests/Script/ScriptEntityTests.cpp (100%) rename Code/Framework/{ => AzToolsFramework}/Tests/Slices.cpp (100%) rename Code/Framework/{ => AzToolsFramework}/Tests/TransformComponent.cpp (100%) diff --git a/Code/Framework/Tests/Application.cpp b/Code/Framework/AzFramework/Tests/Application.cpp similarity index 100% rename from Code/Framework/Tests/Application.cpp rename to Code/Framework/AzFramework/Tests/Application.cpp diff --git a/Code/Framework/Tests/ArchiveCompressionTests.cpp b/Code/Framework/AzFramework/Tests/ArchiveCompressionTests.cpp similarity index 100% rename from Code/Framework/Tests/ArchiveCompressionTests.cpp rename to Code/Framework/AzFramework/Tests/ArchiveCompressionTests.cpp diff --git a/Code/Framework/Tests/ArchiveTests.cpp b/Code/Framework/AzFramework/Tests/ArchiveTests.cpp similarity index 100% rename from Code/Framework/Tests/ArchiveTests.cpp rename to Code/Framework/AzFramework/Tests/ArchiveTests.cpp diff --git a/Code/Framework/Tests/AssetCatalog.cpp b/Code/Framework/AzFramework/Tests/AssetCatalog.cpp similarity index 100% rename from Code/Framework/Tests/AssetCatalog.cpp rename to Code/Framework/AzFramework/Tests/AssetCatalog.cpp diff --git a/Code/Framework/Tests/AssetProcessorConnection.cpp b/Code/Framework/AzFramework/Tests/AssetProcessorConnection.cpp similarity index 100% rename from Code/Framework/Tests/AssetProcessorConnection.cpp rename to Code/Framework/AzFramework/Tests/AssetProcessorConnection.cpp diff --git a/Code/Framework/Tests/BehaviorEntityTests.cpp b/Code/Framework/AzFramework/Tests/BehaviorEntityTests.cpp similarity index 100% rename from Code/Framework/Tests/BehaviorEntityTests.cpp rename to Code/Framework/AzFramework/Tests/BehaviorEntityTests.cpp diff --git a/Code/Framework/Tests/BinToTextEncode.cpp b/Code/Framework/AzFramework/Tests/BinToTextEncode.cpp similarity index 100% rename from Code/Framework/Tests/BinToTextEncode.cpp rename to Code/Framework/AzFramework/Tests/BinToTextEncode.cpp diff --git a/Code/Framework/Tests/CMakeLists.txt b/Code/Framework/AzFramework/Tests/CMakeLists.txt similarity index 100% rename from Code/Framework/Tests/CMakeLists.txt rename to Code/Framework/AzFramework/Tests/CMakeLists.txt diff --git a/Code/Framework/Tests/CameraInputTests.cpp b/Code/Framework/AzFramework/Tests/CameraInputTests.cpp similarity index 100% rename from Code/Framework/Tests/CameraInputTests.cpp rename to Code/Framework/AzFramework/Tests/CameraInputTests.cpp diff --git a/Code/Framework/Tests/CameraState.cpp b/Code/Framework/AzFramework/Tests/CameraState.cpp similarity index 100% rename from Code/Framework/Tests/CameraState.cpp rename to Code/Framework/AzFramework/Tests/CameraState.cpp diff --git a/Code/Framework/Tests/ClickDetectorTests.cpp b/Code/Framework/AzFramework/Tests/ClickDetectorTests.cpp similarity index 100% rename from Code/Framework/Tests/ClickDetectorTests.cpp rename to Code/Framework/AzFramework/Tests/ClickDetectorTests.cpp diff --git a/Code/Framework/Tests/CursorStateTests.cpp b/Code/Framework/AzFramework/Tests/CursorStateTests.cpp similarity index 100% rename from Code/Framework/Tests/CursorStateTests.cpp rename to Code/Framework/AzFramework/Tests/CursorStateTests.cpp diff --git a/Code/Framework/Tests/EntityContext.cpp b/Code/Framework/AzFramework/Tests/EntityContext.cpp similarity index 100% rename from Code/Framework/Tests/EntityContext.cpp rename to Code/Framework/AzFramework/Tests/EntityContext.cpp diff --git a/Code/Framework/Tests/FileIO.cpp b/Code/Framework/AzFramework/Tests/FileIO.cpp similarity index 100% rename from Code/Framework/Tests/FileIO.cpp rename to Code/Framework/AzFramework/Tests/FileIO.cpp diff --git a/Code/Framework/Tests/FileTagTests.cpp b/Code/Framework/AzFramework/Tests/FileTagTests.cpp similarity index 100% rename from Code/Framework/Tests/FileTagTests.cpp rename to Code/Framework/AzFramework/Tests/FileTagTests.cpp diff --git a/Code/Framework/Tests/FrameworkApplicationFixture.h b/Code/Framework/AzFramework/Tests/FrameworkApplicationFixture.h similarity index 100% rename from Code/Framework/Tests/FrameworkApplicationFixture.h rename to Code/Framework/AzFramework/Tests/FrameworkApplicationFixture.h diff --git a/Code/Framework/Tests/GenAppDescriptors.cpp b/Code/Framework/AzFramework/Tests/GenAppDescriptors.cpp similarity index 100% rename from Code/Framework/Tests/GenAppDescriptors.cpp rename to Code/Framework/AzFramework/Tests/GenAppDescriptors.cpp diff --git a/Code/Framework/Tests/InputTests.cpp b/Code/Framework/AzFramework/Tests/InputTests.cpp similarity index 100% rename from Code/Framework/Tests/InputTests.cpp rename to Code/Framework/AzFramework/Tests/InputTests.cpp diff --git a/Code/Framework/Tests/Mocks/MockSpawnableEntitiesInterface.h b/Code/Framework/AzFramework/Tests/Mocks/MockSpawnableEntitiesInterface.h similarity index 100% rename from Code/Framework/Tests/Mocks/MockSpawnableEntitiesInterface.h rename to Code/Framework/AzFramework/Tests/Mocks/MockSpawnableEntitiesInterface.h diff --git a/Code/Framework/Tests/NativeWindow.cpp b/Code/Framework/AzFramework/Tests/NativeWindow.cpp similarity index 100% rename from Code/Framework/Tests/NativeWindow.cpp rename to Code/Framework/AzFramework/Tests/NativeWindow.cpp diff --git a/Code/Framework/Tests/OctreePerformanceTests.cpp b/Code/Framework/AzFramework/Tests/OctreePerformanceTests.cpp similarity index 100% rename from Code/Framework/Tests/OctreePerformanceTests.cpp rename to Code/Framework/AzFramework/Tests/OctreePerformanceTests.cpp diff --git a/Code/Framework/Tests/OctreeTests.cpp b/Code/Framework/AzFramework/Tests/OctreeTests.cpp similarity index 100% rename from Code/Framework/Tests/OctreeTests.cpp rename to Code/Framework/AzFramework/Tests/OctreeTests.cpp diff --git a/Code/Framework/Tests/Platform/Android/AzFrameworkTests_Traits_Android.h b/Code/Framework/AzFramework/Tests/Platform/Android/AzFrameworkTests_Traits_Android.h similarity index 100% rename from Code/Framework/Tests/Platform/Android/AzFrameworkTests_Traits_Android.h rename to Code/Framework/AzFramework/Tests/Platform/Android/AzFrameworkTests_Traits_Android.h diff --git a/Code/Framework/Tests/Platform/Android/AzFrameworkTests_Traits_Platform.h b/Code/Framework/AzFramework/Tests/Platform/Android/AzFrameworkTests_Traits_Platform.h similarity index 100% rename from Code/Framework/Tests/Platform/Android/AzFrameworkTests_Traits_Platform.h rename to Code/Framework/AzFramework/Tests/Platform/Android/AzFrameworkTests_Traits_Platform.h diff --git a/Code/Framework/Tests/Platform/Android/platform_android_files.cmake b/Code/Framework/AzFramework/Tests/Platform/Android/platform_android_files.cmake similarity index 100% rename from Code/Framework/Tests/Platform/Android/platform_android_files.cmake rename to Code/Framework/AzFramework/Tests/Platform/Android/platform_android_files.cmake diff --git a/Code/Framework/Tests/Platform/Linux/AzFrameworkTests_Traits_Linux.h b/Code/Framework/AzFramework/Tests/Platform/Linux/AzFrameworkTests_Traits_Linux.h similarity index 100% rename from Code/Framework/Tests/Platform/Linux/AzFrameworkTests_Traits_Linux.h rename to Code/Framework/AzFramework/Tests/Platform/Linux/AzFrameworkTests_Traits_Linux.h diff --git a/Code/Framework/Tests/Platform/Linux/AzFrameworkTests_Traits_Platform.h b/Code/Framework/AzFramework/Tests/Platform/Linux/AzFrameworkTests_Traits_Platform.h similarity index 100% rename from Code/Framework/Tests/Platform/Linux/AzFrameworkTests_Traits_Platform.h rename to Code/Framework/AzFramework/Tests/Platform/Linux/AzFrameworkTests_Traits_Platform.h diff --git a/Code/Framework/Tests/Platform/Linux/platform_linux_files.cmake b/Code/Framework/AzFramework/Tests/Platform/Linux/platform_linux_files.cmake similarity index 100% rename from Code/Framework/Tests/Platform/Linux/platform_linux_files.cmake rename to Code/Framework/AzFramework/Tests/Platform/Linux/platform_linux_files.cmake diff --git a/Code/Framework/Tests/Platform/Mac/AzFrameworkTests_Traits_Mac.h b/Code/Framework/AzFramework/Tests/Platform/Mac/AzFrameworkTests_Traits_Mac.h similarity index 100% rename from Code/Framework/Tests/Platform/Mac/AzFrameworkTests_Traits_Mac.h rename to Code/Framework/AzFramework/Tests/Platform/Mac/AzFrameworkTests_Traits_Mac.h diff --git a/Code/Framework/Tests/Platform/Mac/AzFrameworkTests_Traits_Platform.h b/Code/Framework/AzFramework/Tests/Platform/Mac/AzFrameworkTests_Traits_Platform.h similarity index 100% rename from Code/Framework/Tests/Platform/Mac/AzFrameworkTests_Traits_Platform.h rename to Code/Framework/AzFramework/Tests/Platform/Mac/AzFrameworkTests_Traits_Platform.h diff --git a/Code/Framework/Tests/Platform/Mac/platform_mac_files.cmake b/Code/Framework/AzFramework/Tests/Platform/Mac/platform_mac_files.cmake similarity index 100% rename from Code/Framework/Tests/Platform/Mac/platform_mac_files.cmake rename to Code/Framework/AzFramework/Tests/Platform/Mac/platform_mac_files.cmake diff --git a/Code/Framework/Tests/Platform/Windows/AzFrameworkTests_Traits_Platform.h b/Code/Framework/AzFramework/Tests/Platform/Windows/AzFrameworkTests_Traits_Platform.h similarity index 100% rename from Code/Framework/Tests/Platform/Windows/AzFrameworkTests_Traits_Platform.h rename to Code/Framework/AzFramework/Tests/Platform/Windows/AzFrameworkTests_Traits_Platform.h diff --git a/Code/Framework/Tests/Platform/Windows/AzFrameworkTests_Traits_Windows.h b/Code/Framework/AzFramework/Tests/Platform/Windows/AzFrameworkTests_Traits_Windows.h similarity index 100% rename from Code/Framework/Tests/Platform/Windows/AzFrameworkTests_Traits_Windows.h rename to Code/Framework/AzFramework/Tests/Platform/Windows/AzFrameworkTests_Traits_Windows.h diff --git a/Code/Framework/Tests/Platform/Windows/platform_windows_files.cmake b/Code/Framework/AzFramework/Tests/Platform/Windows/platform_windows_files.cmake similarity index 100% rename from Code/Framework/Tests/Platform/Windows/platform_windows_files.cmake rename to Code/Framework/AzFramework/Tests/Platform/Windows/platform_windows_files.cmake diff --git a/Code/Framework/Tests/Platform/iOS/AzFrameworkTests_Traits_Platform.h b/Code/Framework/AzFramework/Tests/Platform/iOS/AzFrameworkTests_Traits_Platform.h similarity index 100% rename from Code/Framework/Tests/Platform/iOS/AzFrameworkTests_Traits_Platform.h rename to Code/Framework/AzFramework/Tests/Platform/iOS/AzFrameworkTests_Traits_Platform.h diff --git a/Code/Framework/Tests/Platform/iOS/AzFrameworkTests_Traits_iOS.h b/Code/Framework/AzFramework/Tests/Platform/iOS/AzFrameworkTests_Traits_iOS.h similarity index 100% rename from Code/Framework/Tests/Platform/iOS/AzFrameworkTests_Traits_iOS.h rename to Code/Framework/AzFramework/Tests/Platform/iOS/AzFrameworkTests_Traits_iOS.h diff --git a/Code/Framework/Tests/Platform/iOS/platform_ios_files.cmake b/Code/Framework/AzFramework/Tests/Platform/iOS/platform_ios_files.cmake similarity index 100% rename from Code/Framework/Tests/Platform/iOS/platform_ios_files.cmake rename to Code/Framework/AzFramework/Tests/Platform/iOS/platform_ios_files.cmake diff --git a/Code/Framework/Tests/PlatformHelper.cpp b/Code/Framework/AzFramework/Tests/PlatformHelper.cpp similarity index 100% rename from Code/Framework/Tests/PlatformHelper.cpp rename to Code/Framework/AzFramework/Tests/PlatformHelper.cpp diff --git a/Code/Framework/Tests/ProcessLaunchMain.cpp b/Code/Framework/AzFramework/Tests/ProcessLaunchMain.cpp similarity index 100% rename from Code/Framework/Tests/ProcessLaunchMain.cpp rename to Code/Framework/AzFramework/Tests/ProcessLaunchMain.cpp diff --git a/Code/Framework/Tests/ProcessLaunchParseTests.cpp b/Code/Framework/AzFramework/Tests/ProcessLaunchParseTests.cpp similarity index 100% rename from Code/Framework/Tests/ProcessLaunchParseTests.cpp rename to Code/Framework/AzFramework/Tests/ProcessLaunchParseTests.cpp diff --git a/Code/Framework/Tests/Scene.cpp b/Code/Framework/AzFramework/Tests/Scene.cpp similarity index 100% rename from Code/Framework/Tests/Scene.cpp rename to Code/Framework/AzFramework/Tests/Scene.cpp diff --git a/Code/Framework/Tests/Spawnable/SpawnableEntitiesManagerTests.cpp b/Code/Framework/AzFramework/Tests/Spawnable/SpawnableEntitiesManagerTests.cpp similarity index 100% rename from Code/Framework/Tests/Spawnable/SpawnableEntitiesManagerTests.cpp rename to Code/Framework/AzFramework/Tests/Spawnable/SpawnableEntitiesManagerTests.cpp diff --git a/Code/Framework/Tests/Utils/Utils.cpp b/Code/Framework/AzFramework/Tests/Utils/Utils.cpp similarity index 100% rename from Code/Framework/Tests/Utils/Utils.cpp rename to Code/Framework/AzFramework/Tests/Utils/Utils.cpp diff --git a/Code/Framework/Tests/Utils/Utils.h b/Code/Framework/AzFramework/Tests/Utils/Utils.h similarity index 100% rename from Code/Framework/Tests/Utils/Utils.h rename to Code/Framework/AzFramework/Tests/Utils/Utils.h diff --git a/Code/Framework/Tests/framework_shared_tests_files.cmake b/Code/Framework/AzFramework/Tests/framework_shared_tests_files.cmake similarity index 100% rename from Code/Framework/Tests/framework_shared_tests_files.cmake rename to Code/Framework/AzFramework/Tests/framework_shared_tests_files.cmake diff --git a/Code/Framework/Tests/frameworktests_files.cmake b/Code/Framework/AzFramework/Tests/frameworktests_files.cmake similarity index 100% rename from Code/Framework/Tests/frameworktests_files.cmake rename to Code/Framework/AzFramework/Tests/frameworktests_files.cmake diff --git a/Code/Framework/Tests/process_launch_test_files.cmake b/Code/Framework/AzFramework/Tests/process_launch_test_files.cmake similarity index 100% rename from Code/Framework/Tests/process_launch_test_files.cmake rename to Code/Framework/AzFramework/Tests/process_launch_test_files.cmake diff --git a/Code/Framework/Tests/ComponentAdapterTests.cpp b/Code/Framework/AzToolsFramework/Tests/ComponentAdapterTests.cpp similarity index 100% rename from Code/Framework/Tests/ComponentAdapterTests.cpp rename to Code/Framework/AzToolsFramework/Tests/ComponentAdapterTests.cpp diff --git a/Code/Framework/Tests/ComponentAddRemove.cpp b/Code/Framework/AzToolsFramework/Tests/ComponentAddRemove.cpp similarity index 100% rename from Code/Framework/Tests/ComponentAddRemove.cpp rename to Code/Framework/AzToolsFramework/Tests/ComponentAddRemove.cpp diff --git a/Code/Framework/Tests/EntityOwnershipService/EntityOwnershipServiceTestFixture.cpp b/Code/Framework/AzToolsFramework/Tests/EntityOwnershipService/EntityOwnershipServiceTestFixture.cpp similarity index 100% rename from Code/Framework/Tests/EntityOwnershipService/EntityOwnershipServiceTestFixture.cpp rename to Code/Framework/AzToolsFramework/Tests/EntityOwnershipService/EntityOwnershipServiceTestFixture.cpp diff --git a/Code/Framework/Tests/EntityOwnershipService/EntityOwnershipServiceTestFixture.h b/Code/Framework/AzToolsFramework/Tests/EntityOwnershipService/EntityOwnershipServiceTestFixture.h similarity index 100% rename from Code/Framework/Tests/EntityOwnershipService/EntityOwnershipServiceTestFixture.h rename to Code/Framework/AzToolsFramework/Tests/EntityOwnershipService/EntityOwnershipServiceTestFixture.h diff --git a/Code/Framework/Tests/EntityOwnershipService/SliceEditorEntityOwnershipTests.cpp b/Code/Framework/AzToolsFramework/Tests/EntityOwnershipService/SliceEditorEntityOwnershipTests.cpp similarity index 100% rename from Code/Framework/Tests/EntityOwnershipService/SliceEditorEntityOwnershipTests.cpp rename to Code/Framework/AzToolsFramework/Tests/EntityOwnershipService/SliceEditorEntityOwnershipTests.cpp diff --git a/Code/Framework/Tests/EntityOwnershipService/SliceEntityOwnershipTests.cpp b/Code/Framework/AzToolsFramework/Tests/EntityOwnershipService/SliceEntityOwnershipTests.cpp similarity index 100% rename from Code/Framework/Tests/EntityOwnershipService/SliceEntityOwnershipTests.cpp rename to Code/Framework/AzToolsFramework/Tests/EntityOwnershipService/SliceEntityOwnershipTests.cpp diff --git a/Code/Framework/Tests/EntityTestbed.h b/Code/Framework/AzToolsFramework/Tests/EntityTestbed.h similarity index 100% rename from Code/Framework/Tests/EntityTestbed.h rename to Code/Framework/AzToolsFramework/Tests/EntityTestbed.h diff --git a/Code/Framework/Tests/FileFunc.cpp b/Code/Framework/AzToolsFramework/Tests/FileFunc.cpp similarity index 100% rename from Code/Framework/Tests/FileFunc.cpp rename to Code/Framework/AzToolsFramework/Tests/FileFunc.cpp diff --git a/Code/Framework/Tests/GenericComponentWrapperTest.cpp b/Code/Framework/AzToolsFramework/Tests/GenericComponentWrapperTest.cpp similarity index 100% rename from Code/Framework/Tests/GenericComponentWrapperTest.cpp rename to Code/Framework/AzToolsFramework/Tests/GenericComponentWrapperTest.cpp diff --git a/Code/Framework/Tests/InstanceDataHierarchy.cpp b/Code/Framework/AzToolsFramework/Tests/InstanceDataHierarchy.cpp similarity index 100% rename from Code/Framework/Tests/InstanceDataHierarchy.cpp rename to Code/Framework/AzToolsFramework/Tests/InstanceDataHierarchy.cpp diff --git a/Code/Framework/Tests/SQLiteConnectionTests.cpp b/Code/Framework/AzToolsFramework/Tests/SQLiteConnectionTests.cpp similarity index 100% rename from Code/Framework/Tests/SQLiteConnectionTests.cpp rename to Code/Framework/AzToolsFramework/Tests/SQLiteConnectionTests.cpp diff --git a/Code/Framework/Tests/Script/ScriptComponentTests.cpp b/Code/Framework/AzToolsFramework/Tests/Script/ScriptComponentTests.cpp similarity index 100% rename from Code/Framework/Tests/Script/ScriptComponentTests.cpp rename to Code/Framework/AzToolsFramework/Tests/Script/ScriptComponentTests.cpp diff --git a/Code/Framework/Tests/Script/ScriptEntityTests.cpp b/Code/Framework/AzToolsFramework/Tests/Script/ScriptEntityTests.cpp similarity index 100% rename from Code/Framework/Tests/Script/ScriptEntityTests.cpp rename to Code/Framework/AzToolsFramework/Tests/Script/ScriptEntityTests.cpp diff --git a/Code/Framework/Tests/Slices.cpp b/Code/Framework/AzToolsFramework/Tests/Slices.cpp similarity index 100% rename from Code/Framework/Tests/Slices.cpp rename to Code/Framework/AzToolsFramework/Tests/Slices.cpp diff --git a/Code/Framework/Tests/TransformComponent.cpp b/Code/Framework/AzToolsFramework/Tests/TransformComponent.cpp similarity index 100% rename from Code/Framework/Tests/TransformComponent.cpp rename to Code/Framework/AzToolsFramework/Tests/TransformComponent.cpp