Merge branch 'development' into issues/3202

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

.github/ISSUE_TEMPLATE/nightly_build_failure_bug_template.md

@@ -0,0 +1,36 @@
+---
+name: Nightly Build Error bug report
+about: Create a report when the nightly build process fails
+title: 'Nightly Build Failure'
+labels: 'needs-triage,needs-sig,kind/bug,kind/nightlybuildfailure'
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**Failure type**
+Build | Asset Processing | Test Tools | Infrastructure | Test
+
+**To Reproduce Test Failures**
+ - Paste the command line that reproduces the test failure
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Logs**
+Attach the Jenkins logs that are relevant to the failure
+
+**Desktop/Device (please complete the following information):**
+ - Device: [e.g. PC, Mac, iPhone, Samsung] 
+ - OS: [e.g. Windows, macOS, iOS, Android]
+ - Version [e.g. 10, Bug Sur, Oreo]
+ - CPU [e.g. Intel I9-9900k , Ryzen 5900x, ]
+ - GPU [AMD 6800 XT, NVidia RTX 3090]
+ - Memory [e.g. 16GB]
+
+**Additional context**
+Add any other context about the problem here.

AutomatedTesting/Gem/Code/CMakeLists.txt

@@ -35,37 +35,11 @@ ly_create_alias(NAME AutomatedTesting.Servers  NAMESPACE Gem TARGETS Gem::Automa
 # Gem dependencies
 ################################################################################
 
-# The GameLauncher uses "Clients" gem variants:
+# Enable the enabled_gems for the Project:
-ly_enable_gems(PROJECT_NAME AutomatedTesting GEM_FILE enabled_gems.cmake
+ly_enable_gems(PROJECT_NAME AutomatedTesting GEM_FILE enabled_gems.cmake)
-    TARGETS AutomatedTesting.GameLauncher
-    VARIANTS Clients)
 
-# If we build a server, then apply the gems to the server
+# Add project to the list server projects to create the AutomatedTesting.ServerLauncher
 if(PAL_TRAIT_BUILD_SERVER_SUPPORTED)
-    # if we're making a server, then add the "Server" gem variants to it:
-    ly_enable_gems(PROJECT_NAME AutomatedTesting GEM_FILE enabled_gems.cmake
-        TARGETS AutomatedTesting.ServerLauncher
-        VARIANTS Servers)
-    
     set_property(GLOBAL APPEND PROPERTY LY_LAUNCHER_SERVER_PROJECTS AutomatedTesting)
 endif()
 
-if (PAL_TRAIT_BUILD_HOST_TOOLS)
-    # The Editor uses "Tools" gem variants:
-    ly_enable_gems(
-        PROJECT_NAME AutomatedTesting GEM_FILE enabled_gems.cmake
-        TARGETS Editor
-        VARIANTS Tools)
-
-    # The Material Editor needs the Lyshine "Tools" gem variant for the custom LyShine pass
-    ly_enable_gems(
-        PROJECT_NAME AutomatedTesting GEMS LyShine
-        TARGETS MaterialEditor
-        VARIANTS Tools)
-
-    # The pipeline tools use "Builders" gem variants:
-    ly_enable_gems(
-        PROJECT_NAME AutomatedTesting GEM_FILE enabled_gems.cmake
-        TARGETS AssetBuilder AssetProcessor AssetProcessorBatch
-        VARIANTS Builders)
-endif()

AutomatedTesting/Gem/PythonCoverage/Code/Source/PythonCoverageEditorSystemComponent.cpp

@@ -17,7 +17,7 @@
 
 namespace PythonCoverage
 {
-    static constexpr char* const LogCallSite = "PythonCoverageEditorSystemComponent";
+    static constexpr const char* const LogCallSite = "PythonCoverageEditorSystemComponent";
 
     void PythonCoverageEditorSystemComponent::Reflect(AZ::ReflectContext* context)
     {

AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/asset_utils.py

@@ -0,0 +1,47 @@
+"""
+Copyright (c) Contributors to the Open 3D Engine Project.
+For complete copyright and license terms please see the LICENSE at the root of this distribution.
+
+SPDX-License-Identifier: Apache-2.0 OR MIT
+"""
+
+# Built-in Imports
+from __future__ import annotations
+
+# Open 3D Engine Imports
+import azlmbr.bus as bus
+import azlmbr.asset as azasset
+import azlmbr.math as math
+
+
+class Asset:
+    """
+    Used to find Asset Id by its path and path of asset by its Id
+    If a component has any asset property, then this class object can be called as:
+        asset_id = editor_python_test_tools.editor_entity_utils.EditorComponent.get_component_property_value(<arguments>)
+        asset = asset_utils.Asset(asset_id)
+    """
+    def __init__(self, id: azasset.AssetId):
+        self.id: azasset.AssetId = id
+
+    # Creation functions
+    @classmethod
+    def find_asset_by_path(cls, path: str, RegisterType: bool = False) -> Asset:
+        """
+        :param path: Absolute file path of the asset
+        :param RegisterType: Whether to register the asset if it's not in the database,
+                             default to false for the general case
+        :return: Asset object associated with file path
+        """
+        asset_id = azasset.AssetCatalogRequestBus(bus.Broadcast, "GetAssetIdByPath", path, math.Uuid(), RegisterType)
+        assert asset_id.is_valid(), f"Couldn't find Asset with path: {path}"
+        asset = cls(asset_id)
+        return asset
+
+    # Methods
+    def get_path(self) -> str:
+        """
+        :return: Absolute file path of Asset
+        """
+        assert self.id.is_valid(), "Invalid Asset Id"
+        return azasset.AssetCatalogRequestBus(bus.Broadcast, "GetAssetPathById", self.id)

AutomatedTesting/Gem/PythonTests/atom_renderer/atom_hydra_scripts/hydra_AtomMaterialEditor_BasicTests.py

@@ -33,6 +33,7 @@ MATERIAL_TYPE_PATH = os.path.join(
     azlmbr.paths.devroot, "Gems", "Atom", "Feature", "Common", "Assets",
     "Materials", "Types", "StandardPBR.materialtype",
 )
+CACHE_FILE_EXTENSION = ".azmaterial"
 
 
 def run():
@@ -67,6 +68,7 @@ def run():
     material_editor.save_document_as_child(document_id, target_path)
     material_editor.wait_for_condition(lambda: os.path.exists(target_path), 2.0)
     print(f"New asset created: {os.path.exists(target_path)}")
+    time.sleep(2.0)
 
     # Verify if the newly created document is open
     new_document_id = material_editor.open_material(target_path)
@@ -101,22 +103,29 @@ def run():
     expected_color = math.Color(0.25, 0.25, 0.25, 1.0)
     material_editor.set_property(document_id, property_name, expected_color)
     material_editor.save_document(document_id)
+    time.sleep(2.0)
 
     # 7) Test Case: Saving as a New Material
     # Assign new color to the material file and save the document as copy
     expected_color_1 = math.Color(0.5, 0.5, 0.5, 1.0)
     material_editor.set_property(document_id, property_name, expected_color_1)
     target_path_1 = os.path.join(azlmbr.paths.devroot, "AutomatedTesting", "Materials", NEW_MATERIAL_1)
+    cache_file_name_1 = os.path.splitext(NEW_MATERIAL_1)  # Example output: ('test_material_1', '.material')
+    cache_file_1 = f"{cache_file_name_1[0]}{CACHE_FILE_EXTENSION}"
+    target_path_1_cache = os.path.join(azlmbr.paths.devassets, "Cache", "pc", "materials", cache_file_1)
     material_editor.save_document_as_copy(document_id, target_path_1)
-    time.sleep(2.0)
+    material_editor.wait_for_condition(lambda: os.path.exists(target_path_1_cache), 4.0)
 
     # 8) Test Case: Saving as a Child Material
     # Assign new color to the material file save the document as child
     expected_color_2 = math.Color(0.75, 0.75, 0.75, 1.0)
     material_editor.set_property(document_id, property_name, expected_color_2)
     target_path_2 = os.path.join(azlmbr.paths.devroot, "AutomatedTesting", "Materials", NEW_MATERIAL_2)
+    cache_file_name_2 = os.path.splitext(NEW_MATERIAL_1)  # Example output: ('test_material_2', '.material')
+    cache_file_2 = f"{cache_file_name_2[0]}{CACHE_FILE_EXTENSION}"
+    target_path_2_cache = os.path.join(azlmbr.paths.devassets, "Cache", "pc", "materials", cache_file_2)
     material_editor.save_document_as_child(document_id, target_path_2)
-    time.sleep(2.0)
+    material_editor.wait_for_condition(lambda: os.path.exists(target_path_2_cache), 4.0)
 
     # Close/Reopen documents
     material_editor.close_all_documents()

AutomatedTesting/Gem/PythonTests/atom_renderer/test_Atom_MainSuite.py

@@ -16,7 +16,6 @@ import editor_python_test_tools.hydra_test_utils as hydra
 from atom_renderer.atom_utils.atom_constants import LIGHT_TYPES
 
 logger = logging.getLogger(__name__)
-EDITOR_TIMEOUT = 120
 TEST_DIRECTORY = os.path.join(os.path.dirname(__file__), "atom_hydra_scripts")
 
 
@@ -175,7 +174,7 @@ class TestAtomEditorComponentsMain(object):
             TEST_DIRECTORY,
             editor,
             "hydra_AtomEditorComponents_AddedToEntity.py",
-            timeout=EDITOR_TIMEOUT,
+            timeout=120,
             expected_lines=expected_lines,
             unexpected_lines=unexpected_lines,
             halt_on_unexpected=True,
@@ -236,7 +235,7 @@ class TestAtomEditorComponentsMain(object):
             TEST_DIRECTORY,
             editor,
             "hydra_AtomEditorComponents_LightComponent.py",
-            timeout=EDITOR_TIMEOUT,
+            timeout=120,
             expected_lines=expected_lines,
             unexpected_lines=unexpected_lines,
             halt_on_unexpected=True,
@@ -299,7 +298,7 @@ class TestMaterialEditorBasicTests(object):
             generic_launcher,
             "hydra_AtomMaterialEditor_BasicTests.py",
             run_python="--runpython",
-            timeout=80,
+            timeout=120,
             expected_lines=expected_lines,
             unexpected_lines=unexpected_lines,
             halt_on_unexpected=True,

AutomatedTesting/Gem/PythonTests/physics/ImportPathHelper.py

@@ -1,11 +0,0 @@
-"""
-Copyright (c) Contributors to the Open 3D Engine Project.
-For complete copyright and license terms please see the LICENSE at the root of this distribution.
-
-SPDX-License-Identifier: Apache-2.0 OR MIT
-"""
-
-def init():
-    import os
-    import sys
-    sys.path.append(os.path.dirname(os.path.abspath(__file__)) + '/../automatedtesting_shared')

AutomatedTesting/Gem/PythonTests/physics/TestSuite_InDevelopment.py

@@ -13,25 +13,25 @@ import pytest
 import os
 import sys
 
-from .FileManagement import FileManagement as fm
+from .utils.FileManagement import FileManagement as fm
 
 sys.path.append(os.path.dirname(os.path.abspath(__file__)) + '/../automatedtesting_shared')
 
-@pytest.mark.parametrize("spec", ["all"])
+from base import TestAutomationBase
+
 @pytest.mark.parametrize("project", ["AutomatedTesting"])
-@pytest.mark.system
 class TestAutomation(TestAutomationBase):
     @fm.file_revert("ragdollbones.physmaterial",
                     r"AutomatedTesting\Levels\Physics\C4925582_Material_AddModifyDeleteOnRagdollBones")
     def test_C4925582_Material_AddModifyDeleteOnRagdollBones(self, request, workspace, editor):
-        from . import C4925582_Material_AddModifyDeleteOnRagdollBones as test_module
+        from .material import C4925582_Material_AddModifyDeleteOnRagdollBones as test_module
 
         expected_lines = []
         unexpected_lines = ["Assert"]
         self._run_test(request, workspace, editor, test_module, expected_lines, unexpected_lines)
 
     def test_C4925580_Material_RagdollBonesMaterial(self, request, workspace, editor):
-        from . import C4925580_Material_RagdollBonesMaterial as test_module
+        from .material import C4925580_Material_RagdollBonesMaterial as test_module
 
         expected_lines = []
         unexpected_lines = ["Assert"]
@@ -40,7 +40,7 @@ class TestAutomation(TestAutomationBase):
     @fm.file_revert("c15308221_material_componentsinsyncwithlibrary.physmaterial",
                     r"AutomatedTesting\Levels\Physics\C15308221_Material_ComponentsInSyncWithLibrary")
     def test_C15308221_Material_ComponentsInSyncWithLibrary(self, request, workspace, editor):
-        from . import C15308221_Material_ComponentsInSyncWithLibrary as test_module
+        from .material import C15308221_Material_ComponentsInSyncWithLibrary as test_module
 
         expected_lines = []
         unexpected_lines = ["Assert"]
@@ -48,7 +48,7 @@ class TestAutomation(TestAutomationBase):
 
     # BUG: LY-107723")
     def test_C14976308_ScriptCanvas_SetKinematicTargetTransform(self, request, workspace, editor):
-        from . import C14976308_ScriptCanvas_SetKinematicTargetTransform as test_module
+        from .script_canvas import C14976308_ScriptCanvas_SetKinematicTargetTransform as test_module
 
         expected_lines = []
         unexpected_lines = ["Assert"]
@@ -58,7 +58,7 @@ class TestAutomation(TestAutomationBase):
     @fm.file_revert("c4925579_material_addmodifydeleteonterrain.physmaterial",
                     r"AutomatedTesting\Levels\Physics\C4925579_Material_AddModifyDeleteOnTerrain")
     def test_C4925579_Material_AddModifyDeleteOnTerrain(self, request, workspace, editor):
-        from . import C4925579_Material_AddModifyDeleteOnTerrain as test_module
+        from .material import C4925579_Material_AddModifyDeleteOnTerrain as test_module
 
         expected_lines = []
         unexpected_lines = ["Assert"]
@@ -66,7 +66,7 @@ class TestAutomation(TestAutomationBase):
 
     # Failing, PhysXTerrain
     def test_C13508019_Terrain_TerrainTexturePainterWorks(self, request, workspace, editor):
-        from . import C13508019_Terrain_TerrainTexturePainterWorks as test_module
+        from .terrain import C13508019_Terrain_TerrainTexturePainterWorks as test_module
 
         expected_lines = []
         unexpected_lines = ["Assert"]
@@ -74,7 +74,7 @@ class TestAutomation(TestAutomationBase):
 
     # Failing, PhysXTerrain
     def test_C4925577_Materials_MaterialAssignedToTerrain(self, request, workspace, editor):
-        from . import C4925577_Materials_MaterialAssignedToTerrain as test_module
+        from .material import C4925577_Materials_MaterialAssignedToTerrain as test_module
 
         expected_lines = []
         unexpected_lines = ["Assert"]
@@ -82,7 +82,7 @@ class TestAutomation(TestAutomationBase):
 
     # Failing, PhysXTerrain
     def test_C15096735_Materials_DefaultLibraryConsistency(self, request, workspace, editor):
-        from . import C15096735_Materials_DefaultLibraryConsistency as test_module
+        from .material import C15096735_Materials_DefaultLibraryConsistency as test_module
 
         expected_lines = []
         unexpected_lines = ["Assert"]
@@ -92,13 +92,13 @@ class TestAutomation(TestAutomationBase):
     @fm.file_revert("all_ones_1.physmaterial", r"AutomatedTesting\Levels\Physics\C15096737_Materials_DefaultMaterialLibraryChanges")
     @fm.file_override("default.physxconfiguration", "C15096737_Materials_DefaultMaterialLibraryChanges.physxconfiguration", "AutomatedTesting")
     def test_C15096737_Materials_DefaultMaterialLibraryChanges(self, request, workspace, editor):
-        from . import C15096737_Materials_DefaultMaterialLibraryChanges as test_module
+        from .material import C15096737_Materials_DefaultMaterialLibraryChanges as test_module
         expected_lines = []
         unexpected_lines = ["Assert"]
         self._run_test(request, workspace, editor, test_module, expected_lines, unexpected_lines)
 
     def test_C4976242_Collision_SameCollisionlayerSameCollisiongroup(self, request, workspace, editor):
-        from . import C4976242_Collision_SameCollisionlayerSameCollisiongroup as test_module
+        from .collider import C4976242_Collision_SameCollisionlayerSameCollisiongroup as test_module
 
         expected_lines = []
         unexpected_lines = ["Assert"]
@@ -109,7 +109,7 @@ class TestAutomation(TestAutomationBase):
                           "Material_DefaultLibraryUpdatedAcrossLevels_before.physxconfiguration", "AutomatedTesting",
                           search_subdirs=True)
         def test_levels_before(self, request, workspace, editor):
-            from . import C15096732_Material_DefaultLibraryUpdatedAcrossLevels_before as test_module_0
+            from .material import C15096732_Material_DefaultLibraryUpdatedAcrossLevels_before as test_module_0
             expected_lines = []
             unexpected_lines = ["Assert"]
             self._run_test(request, workspace, editor, test_module_0, expected_lines, unexpected_lines)
@@ -119,7 +119,7 @@ class TestAutomation(TestAutomationBase):
                           "Material_DefaultLibraryUpdatedAcrossLevels_after.physxconfiguration", "AutomatedTesting",
                           search_subdirs=True)
         def test_levels_after(self, request, workspace, editor):
-            from . import C15096732_Material_DefaultLibraryUpdatedAcrossLevels_after as test_module_1
+            from .material import C15096732_Material_DefaultLibraryUpdatedAcrossLevels_after as test_module_1
             expected_lines = []
             unexpected_lines = ["Assert"]
             self._run_test(request, workspace, editor, test_module_1, expected_lines, unexpected_lines)
@@ -128,7 +128,7 @@ class TestAutomation(TestAutomationBase):
         test_levels_after(self, request, workspace, editor)
 
     def test_C14654882_Ragdoll_ragdollAPTest(self, request, workspace, editor):
-        from . import C14654882_Ragdoll_ragdollAPTest as test_module
+        from .ragdoll import C14654882_Ragdoll_ragdollAPTest as test_module
 
         expected_lines = []
         unexpected_lines = test_module.UnexpectedLines.lines
@@ -136,14 +136,14 @@ class TestAutomation(TestAutomationBase):
 
     @fm.file_override("default.physxconfiguration", "C12712454_ScriptCanvas_OverlapNodeVerification.physxconfiguration")
     def test_C12712454_ScriptCanvas_OverlapNodeVerification(self, request, workspace, editor):
-        from . import C12712454_ScriptCanvas_OverlapNodeVerification as test_module
+        from .script_canvas import C12712454_ScriptCanvas_OverlapNodeVerification as test_module
 
         expected_lines = []
         unexpected_lines = ["Assert"]
         self._run_test(request, workspace, editor, test_module, expected_lines, unexpected_lines)
 
     def test_C4044460_Material_StaticFriction(self, request, workspace, editor):
-        from . import C4044460_Material_StaticFriction as test_module
+        from .material import C4044460_Material_StaticFriction as test_module
 
         expected_lines = []
         unexpected_lines = ["Assert"]
@@ -154,7 +154,7 @@ class TestAutomation(TestAutomationBase):
     @fm.file_revert("c4888315_material_addmodifydeleteoncollider.physmaterial",
                     r"AutomatedTesting\Levels\Physics\C4888315_Material_AddModifyDeleteOnCollider")
     def test_C4888315_Material_AddModifyDeleteOnCollider(self, request, workspace, editor):
-        from . import C4888315_Material_AddModifyDeleteOnCollider as test_module
+        from .material import C4888315_Material_AddModifyDeleteOnCollider as test_module
 
         expected_lines = []
         unexpected_lines = ["Assert"]
@@ -164,7 +164,7 @@ class TestAutomation(TestAutomationBase):
     @fm.file_revert("c15563573_material_addmodifydeleteoncharactercontroller.physmaterial",
                     r"AutomatedTesting\Levels\Physics\C15563573_Material_AddModifyDeleteOnCharacterController")
     def test_C15563573_Material_AddModifyDeleteOnCharacterController(self, request, workspace, editor):
-        from . import C15563573_Material_AddModifyDeleteOnCharacterController as test_module
+        from .material import C15563573_Material_AddModifyDeleteOnCharacterController as test_module
 
         expected_lines = []
         unexpected_lines = ["Assert"]
@@ -173,7 +173,7 @@ class TestAutomation(TestAutomationBase):
     @fm.file_revert("c4888315_material_addmodifydeleteoncollider.physmaterial",
                     r"AutomatedTesting\Levels\Physics\C4888315_Material_AddModifyDeleteOnCollider")
     def test_C4888315_Material_AddModifyDeleteOnCollider(self, request, workspace, editor):
-        from . import C4888315_Material_AddModifyDeleteOnCollider as test_module
+        from .material import C4888315_Material_AddModifyDeleteOnCollider as test_module
 
         expected_lines = []
         unexpected_lines = ["Assert"]
@@ -185,7 +185,7 @@ class TestAutomation(TestAutomationBase):
     @fm.file_revert("c15563573_material_addmodifydeleteoncharactercontroller.physmaterial",
                     r"AutomatedTesting\Levels\Physics\C15563573_Material_AddModifyDeleteOnCharacterController")
     def test_C15563573_Material_AddModifyDeleteOnCharacterController(self, request, workspace, editor):
-        from . import C15563573_Material_AddModifyDeleteOnCharacterController as test_module
+        from .material import C15563573_Material_AddModifyDeleteOnCharacterController as test_module
 
         expected_lines = []
         unexpected_lines = ["Assert"]
@@ -194,7 +194,7 @@ class TestAutomation(TestAutomationBase):
     @fm.file_revert("c4044455_material_librarychangesinstantly.physmaterial",
                     r"AutomatedTesting\Levels\Physics\C4044455_Material_LibraryChangesInstantly")
     def test_C4044455_Material_libraryChangesInstantly(self, request, workspace, editor):
-        from . import C4044455_Material_libraryChangesInstantly as test_module
+        from .material import C4044455_Material_libraryChangesInstantly as test_module
 
         expected_lines = []
         unexpected_lines = ["Assert"]
@@ -204,103 +204,103 @@ class TestAutomation(TestAutomationBase):
     @fm.file_revert("C15425935_Material_LibraryUpdatedAcrossLevels.physmaterial",
                     r"AutomatedTesting\Levels\Physics\C15425935_Material_LibraryUpdatedAcrossLevels")
     def test_C15425935_Material_LibraryUpdatedAcrossLevels(self, request, workspace, editor):
-        from . import C15425935_Material_LibraryUpdatedAcrossLevels as test_module
+        from .material import C15425935_Material_LibraryUpdatedAcrossLevels as test_module
 
         expected_lines = []
         unexpected_lines = ["Assert"]
         self._run_test(request, workspace, editor, test_module, expected_lines, unexpected_lines)
     
     def test_C4976199_RigidBodies_LinearDampingObjectMotion(self, request, workspace, editor):
-        from . import C4976199_RigidBodies_LinearDampingObjectMotion as test_module
+        from .rigid_body import C4976199_RigidBodies_LinearDampingObjectMotion as test_module
 
         expected_lines = []
         unexpected_lines = ["Assert"]
         self._run_test(request, workspace, editor, test_module, expected_lines, unexpected_lines)
 
     def test_C5689518_PhysXTerrain_CollidesWithPhysXTerrain(self, request, workspace, editor):
-        from . import C5689518_PhysXTerrain_CollidesWithPhysXTerrain as test_module
+        from .terrain import C5689518_PhysXTerrain_CollidesWithPhysXTerrain as test_module
 
         expected_lines = []
         unexpected_lines = ["Assert"]
         self._run_test(request, workspace, editor, test_module, expected_lines, unexpected_lines)
 
     def test_C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain(self, request, workspace, editor):
-        from . import C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain as test_module
+        from .collider import C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain as test_module
 
         expected_lines = []
         unexpected_lines = ["Assert"]
         self._run_test(request, workspace, editor, test_module, expected_lines, unexpected_lines)
 
     def test_C29032500_EditorComponents_WorldBodyBusWorks(self, request, workspace, editor):
-        from . import C29032500_EditorComponents_WorldBodyBusWorks as test_module
+        from .general import C29032500_EditorComponents_WorldBodyBusWorks as test_module
 
         expected_lines = []
         unexpected_lines = ["Assert"]
         self._run_test(request, workspace, editor, test_module, expected_lines, unexpected_lines)
 
     def test_C14861498_ConfirmError_NoPxMesh(self, request, workspace, editor, launcher_platform):
-        from . import C14861498_ConfirmError_NoPxMesh as test_module
+        from .collider import C14861498_ConfirmError_NoPxMesh as test_module
 
         expected_lines = []
         unexpected_lines = ["Assert"]
         self._run_test(request, workspace, editor, test_module, expected_lines, unexpected_lines)
 
     def test_C5959763_ForceRegion_ForceRegionImpulsesCube(self, request, workspace, editor, launcher_platform):
-        from . import C5959763_ForceRegion_ForceRegionImpulsesCube as test_module
+        from .force_region import C5959763_ForceRegion_ForceRegionImpulsesCube as test_module
 
         expected_lines = []
         unexpected_lines = ["Assert"]
         self._run_test(request, workspace, editor, test_module, expected_lines, unexpected_lines)
 
     def test_C5689531_Warning_TerrainSliceTerrainComponent(self, request, workspace, editor, launcher_platform):
-        from . import C5689531_Warning_TerrainSliceTerrainComponent as test_module
+        from .terrain import C5689531_Warning_TerrainSliceTerrainComponent as test_module
         expected_lines = []
         unexpected_lines = ["Assert"]
         self._run_test(request, workspace, editor, test_module, expected_lines, unexpected_lines)
 
     def test_C5689522_Physxterrain_AddPhysxterrainNoEditorCrash(self, request, workspace, editor, launcher_platform):
-        from . import C5689522_Physxterrain_AddPhysxterrainNoEditorCrash as test_module
+        from .terrain import C5689522_Physxterrain_AddPhysxterrainNoEditorCrash as test_module
 
         expected_lines = []
         unexpected_lines = ["Assert"]
         self._run_test(request, workspace, editor, test_module, expected_lines, unexpected_lines)
 
     def test_C5689524_MultipleTerrains_CheckWarningInConsole(self, request, workspace, editor, launcher_platform):
-        from . import C5689524_MultipleTerrains_CheckWarningInConsole as test_module
+        from .terrain import C5689524_MultipleTerrains_CheckWarningInConsole as test_module
 
         expected_lines = []
         unexpected_lines = ["Assert"]
         self._run_test(request, workspace, editor, test_module, expected_lines, unexpected_lines)
 
     def test_C5689528_Terrain_MultipleTerrainComponents(self, request, workspace, editor, launcher_platform):
-        from . import C5689528_Terrain_MultipleTerrainComponents as test_module
+        from .terrain import C5689528_Terrain_MultipleTerrainComponents as test_module
         expected_lines = []
         unexpected_lines = ["Assert"]
         self._run_test(request, workspace, editor, test_module, expected_lines, unexpected_lines)
 
     def test_C5689528_Terrain_MultipleTerrainComponents(self, request, workspace, editor, launcher_platform):
-        from . import C5689528_Terrain_MultipleTerrainComponents as test_module
+        from .terrain import C5689528_Terrain_MultipleTerrainComponents as test_module
 
         expected_lines = []
         unexpected_lines = ["Assert"]
         self._run_test(request, workspace, editor, test_module, expected_lines, unexpected_lines)
 
     def test_C6321601_Force_HighValuesDirectionAxes(self, request, workspace, editor, launcher_platform):
-        from . import C6321601_Force_HighValuesDirectionAxes as test_module
+        from .force_region import C6321601_Force_HighValuesDirectionAxes as test_module
 
         expected_lines = []
         unexpected_lines = ["Assert"]
         self._run_test(request, workspace, editor, test_module, expected_lines, unexpected_lines)
 
     def test_C6032082_Terrain_MultipleResolutionsValid(self, request, workspace, editor, launcher_platform):
-        from . import C6032082_Terrain_MultipleResolutionsValid as test_module
+        from .terrain import C6032082_Terrain_MultipleResolutionsValid as test_module
 
         expected_lines = []
         unexpected_lines = ["Assert"]
         self._run_test(request, workspace, editor, test_module, expected_lines, unexpected_lines)
 
     def test_C12905527_ForceRegion_MagnitudeDeviation(self, request, workspace, editor, launcher_platform):
-        from . import C12905527_ForceRegion_MagnitudeDeviation as test_module
+        from .force_region import C12905527_ForceRegion_MagnitudeDeviation as test_module
 
         expected_lines = []
         unexpected_lines = ["Assert"]
@@ -308,7 +308,7 @@ class TestAutomation(TestAutomationBase):
 
     # Removed from active suite to meet 60 minutes limit in AR job
     def test_C18243580_Joints_Fixed2BodiesConstrained(self, request, workspace, editor, launcher_platform):
-        from . import C18243580_Joints_Fixed2BodiesConstrained as test_module
+        from .joints import C18243580_Joints_Fixed2BodiesConstrained as test_module
 
         expected_lines = []
         unexpected_lines = ["Assert"]
@@ -316,7 +316,7 @@ class TestAutomation(TestAutomationBase):
 
     # Removed from active suite to meet 60 minutes limit in AR job
     def test_C18243583_Joints_Hinge2BodiesConstrained(self, request, workspace, editor, launcher_platform):
-        from . import C18243583_Joints_Hinge2BodiesConstrained as test_module
+        from .joints import C18243583_Joints_Hinge2BodiesConstrained as test_module
 
         expected_lines = []
         unexpected_lines = ["Assert"]
@@ -324,7 +324,7 @@ class TestAutomation(TestAutomationBase):
 
     # Removed from active suite to meet 60 minutes limit in AR job
     def test_C18243588_Joints_Ball2BodiesConstrained(self, request, workspace, editor, launcher_platform):
-        from . import C18243588_Joints_Ball2BodiesConstrained as test_module
+        from .joints import C18243588_Joints_Ball2BodiesConstrained as test_module
 
         expected_lines = []
         unexpected_lines = ["Assert"]
@@ -332,7 +332,7 @@ class TestAutomation(TestAutomationBase):
 
     # Removed from active suite to meet 60 minutes limit in AR job
     def test_C18243581_Joints_FixedBreakable(self, request, workspace, editor, launcher_platform):
-        from . import C18243581_Joints_FixedBreakable as test_module
+        from .joints import C18243581_Joints_FixedBreakable as test_module
 
         expected_lines = []
         unexpected_lines = ["Assert"]
@@ -340,7 +340,7 @@ class TestAutomation(TestAutomationBase):
 
     # Removed from active suite to meet 60 minutes limit in AR job
     def test_C18243587_Joints_HingeBreakable(self, request, workspace, editor, launcher_platform):
-        from . import C18243587_Joints_HingeBreakable as test_module
+        from .joints import C18243587_Joints_HingeBreakable as test_module
 
         expected_lines = []
         unexpected_lines = ["Assert"]
@@ -348,7 +348,7 @@ class TestAutomation(TestAutomationBase):
 
     # Removed from active suite to meet 60 minutes limit in AR job
     def test_C18243592_Joints_BallBreakable(self, request, workspace, editor, launcher_platform):
-        from . import C18243592_Joints_BallBreakable as test_module
+        from .joints import C18243592_Joints_BallBreakable as test_module
 
         expected_lines = []
         unexpected_lines = ["Assert"]
@@ -356,7 +356,7 @@ class TestAutomation(TestAutomationBase):
 
     # Removed from active suite to meet 60 minutes limit in AR job
     def test_C18243585_Joints_HingeNoLimitsConstrained(self, request, workspace, editor, launcher_platform):
-        from . import C18243585_Joints_HingeNoLimitsConstrained as test_module
+        from .joints import C18243585_Joints_HingeNoLimitsConstrained as test_module
 
         expected_lines = []
         unexpected_lines = ["Assert"]
@@ -364,7 +364,7 @@ class TestAutomation(TestAutomationBase):
 
     # Removed from active suite to meet 60 minutes limit in AR job
     def test_C18243590_Joints_BallNoLimitsConstrained(self, request, workspace, editor, launcher_platform):
-        from . import C18243590_Joints_BallNoLimitsConstrained as test_module
+        from .joints import C18243590_Joints_BallNoLimitsConstrained as test_module
 
         expected_lines = []
         unexpected_lines = ["Assert"]
@@ -372,7 +372,7 @@ class TestAutomation(TestAutomationBase):
 
     # Removed from active suite to meet 60 minutes limit in AR job
     def test_C18243582_Joints_FixedLeadFollowerCollide(self, request, workspace, editor, launcher_platform):
-        from . import C18243582_Joints_FixedLeadFollowerCollide as test_module
+        from .joints import C18243582_Joints_FixedLeadFollowerCollide as test_module
 
         expected_lines = []
         unexpected_lines = ["Assert"]
@@ -380,7 +380,7 @@ class TestAutomation(TestAutomationBase):
 
     # Removed from active suite to meet 60 minutes limit in AR job
     def test_C18243593_Joints_GlobalFrameConstrained(self, request, workspace, editor, launcher_platform):
-        from . import C18243593_Joints_GlobalFrameConstrained as test_module
+        from .joints import C18243593_Joints_GlobalFrameConstrained as test_module
 
         expected_lines = []
         unexpected_lines = ["Assert"]

AutomatedTesting/Gem/PythonTests/physics/TestSuite_Main.py

@@ -12,7 +12,7 @@ import pytest
 import os
 import sys
 
-from .FileManagement import FileManagement as fm
+from .utils.FileManagement import FileManagement as fm
 from ly_test_tools import LAUNCHERS
 
 sys.path.append(os.path.dirname(os.path.abspath(__file__)) + '/../automatedtesting_shared')
@@ -29,58 +29,58 @@ revert_physics_config = fm.file_revert_list(['physxdebugconfiguration.setreg', '
 class TestAutomation(TestAutomationBase):
 
     def test_C111111_RigidBody_EnablingGravityWorksUsingNotificationsPoC(self, request, workspace, editor, launcher_platform):
-        from . import C111111_RigidBody_EnablingGravityWorksUsingNotificationsPoC as test_module
+        from .collider import C111111_RigidBody_EnablingGravityWorksUsingNotificationsPoC as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     def test_C5932041_PhysXForceRegion_LocalSpaceForceOnRigidBodies(self, request, workspace, editor, launcher_platform):
-        from . import C5932041_PhysXForceRegion_LocalSpaceForceOnRigidBodies as test_module
+        from .force_region import C5932041_PhysXForceRegion_LocalSpaceForceOnRigidBodies as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     @fm.file_override('physxsystemconfiguration.setreg','C4044459_Material_DynamicFriction.setreg_override', 'AutomatedTesting/Registry')
     def test_C4044459_Material_DynamicFriction(self, request, workspace, editor, launcher_platform):
-        from . import C4044459_Material_DynamicFriction as test_module
+        from .material import C4044459_Material_DynamicFriction as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     def test_C4976243_Collision_SameCollisionGroupDiffCollisionLayers(self, request, workspace, editor,
                                                                       launcher_platform):
-        from . import C4976243_Collision_SameCollisionGroupDiffCollisionLayers as test_module
+        from .collider import C4976243_Collision_SameCollisionGroupDiffCollisionLayers as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     def test_C14654881_CharacterController_SwitchLevels(self, request, workspace, editor, launcher_platform):
-        from . import C14654881_CharacterController_SwitchLevels as test_module
+        from .character_controller import C14654881_CharacterController_SwitchLevels as test_module
         self._run_test(request, workspace, editor, test_module)
 
     def test_C17411467_AddPhysxRagdollComponent(self, request, workspace, editor, launcher_platform):
-        from . import C17411467_AddPhysxRagdollComponent as test_module
+        from .ragdoll import C17411467_AddPhysxRagdollComponent as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     def test_C12712453_ScriptCanvas_MultipleRaycastNode(self, request, workspace, editor, launcher_platform):
-        from . import C12712453_ScriptCanvas_MultipleRaycastNode as test_module
+        from .script_canvas import C12712453_ScriptCanvas_MultipleRaycastNode as test_module
         # Fixme: unexpected_lines = ["Assert"] + test_module.Lines.unexpected
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     @fm.file_override('physxsystemconfiguration.setreg','C4982593_PhysXCollider_CollisionLayer.setreg_override', 'AutomatedTesting/Registry')
     def test_C4982593_PhysXCollider_CollisionLayerTest(self, request, workspace, editor, launcher_platform):
-        from . import C4982593_PhysXCollider_CollisionLayerTest as test_module
+        from .collider import C4982593_PhysXCollider_CollisionLayerTest as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     def test_C18243586_Joints_HingeLeadFollowerCollide(self, request, workspace, editor, launcher_platform):
-        from . import C18243586_Joints_HingeLeadFollowerCollide as test_module
+        from .joints import C18243586_Joints_HingeLeadFollowerCollide as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     def test_C4982803_Enable_PxMesh_Option(self, request, workspace, editor, launcher_platform):
-        from . import C4982803_Enable_PxMesh_Option as test_module
+        from .collider import C4982803_Enable_PxMesh_Option as test_module
         self._run_test(request, workspace, editor, test_module)
     
     @revert_physics_config    
     def test_C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain(self, request, workspace, editor, launcher_platform):
-        from . import C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain as test_module
+        from .collider import C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain as test_module
-        self._run_test(request, workspace, editor, test_module)
+        self._run_test(request, workspace, editor, test_module)

AutomatedTesting/Gem/PythonTests/physics/TestSuite_Main_Optimized.py

@@ -12,7 +12,7 @@ import inspect
 
 from ly_test_tools import LAUNCHERS
 from ly_test_tools.o3de.editor_test import EditorSingleTest, EditorSharedTest, EditorParallelTest, EditorTestSuite
-from .FileManagement import FileManagement as fm
+from .utils.FileManagement import FileManagement as fm
 
 # Custom test spec, it provides functionality to override files
 class EditorSingleTest_WithFileOverrides(EditorSingleTest):
@@ -54,7 +54,6 @@ class EditorSingleTest_WithFileOverrides(EditorSingleTest):
             fm._restore_file(f, file_list[f])
 
 
-@pytest.mark.xfail(reason="Optimized tests are experimental, we will enable xfail and monitor them temporarly.")
 @pytest.mark.SUITE_main
 @pytest.mark.parametrize("launcher_platform", ['windows_editor'])
 @pytest.mark.parametrize("project", ["AutomatedTesting"])
@@ -67,14 +66,14 @@ class TestAutomation(EditorTestSuite):
     #########################################
     # Non-atomic tests: These need to be run in a single editor because they have custom setup and teardown
     class C4044459_Material_DynamicFriction(EditorSingleTest_WithFileOverrides):
-        from . import C4044459_Material_DynamicFriction as test_module        
+        from .material import C4044459_Material_DynamicFriction as test_module        
         files_to_override = [
             ('physxsystemconfiguration.setreg', 'C4044459_Material_DynamicFriction.setreg_override')
         ]
         base_dir = "AutomatedTesting/Registry"
 
     class C4982593_PhysXCollider_CollisionLayerTest(EditorSingleTest_WithFileOverrides):
-        from . import C4982593_PhysXCollider_CollisionLayerTest as test_module
+        from .collider import C4982593_PhysXCollider_CollisionLayerTest as test_module
         files_to_override = [
             ('physxsystemconfiguration.setreg', 'C4982593_PhysXCollider_CollisionLayer.setreg_override')
         ]
@@ -82,268 +81,268 @@ class TestAutomation(EditorTestSuite):
     #########################################
 
     class C111111_RigidBody_EnablingGravityWorksUsingNotificationsPoC(EditorSharedTest):
-        from . import C111111_RigidBody_EnablingGravityWorksUsingNotificationsPoC as test_module
+        from .collider import C111111_RigidBody_EnablingGravityWorksUsingNotificationsPoC as test_module
 
     class C5932041_PhysXForceRegion_LocalSpaceForceOnRigidBodies(EditorSharedTest):
-        from . import C5932041_PhysXForceRegion_LocalSpaceForceOnRigidBodies as test_module
+        from .force_region import C5932041_PhysXForceRegion_LocalSpaceForceOnRigidBodies as test_module
 
     class C15425929_Undo_Redo(EditorSharedTest):
-        from . import C15425929_Undo_Redo as test_module
+        from .general import C15425929_Undo_Redo as test_module
         
     class C4976243_Collision_SameCollisionGroupDiffCollisionLayers(EditorSharedTest):
-        from . import C4976243_Collision_SameCollisionGroupDiffCollisionLayers as test_module
+        from .collider import C4976243_Collision_SameCollisionGroupDiffCollisionLayers as test_module
 
     class C14654881_CharacterController_SwitchLevels(EditorSharedTest):
-        from . import C14654881_CharacterController_SwitchLevels as test_module
+        from .character_controller import C14654881_CharacterController_SwitchLevels as test_module
  
     class C17411467_AddPhysxRagdollComponent(EditorSharedTest):
-        from . import C17411467_AddPhysxRagdollComponent as test_module
+        from .ragdoll import C17411467_AddPhysxRagdollComponent as test_module
  
     class C12712453_ScriptCanvas_MultipleRaycastNode(EditorSharedTest):
-        from . import C12712453_ScriptCanvas_MultipleRaycastNode as test_module
+        from .script_canvas import C12712453_ScriptCanvas_MultipleRaycastNode as test_module
 
     class C18243586_Joints_HingeLeadFollowerCollide(EditorSharedTest):
-        from . import C18243586_Joints_HingeLeadFollowerCollide as test_module
+        from .joints import C18243586_Joints_HingeLeadFollowerCollide as test_module
 
     class C4982803_Enable_PxMesh_Option(EditorSharedTest):
-        from . import C4982803_Enable_PxMesh_Option as test_module
+        from .collider import C4982803_Enable_PxMesh_Option as test_module
     
     class C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain(EditorSharedTest):
-        from . import C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain as test_module
+        from .collider import C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain as test_module
 
     class C3510642_Terrain_NotCollideWithTerrain(EditorSharedTest):
-        from . import C3510642_Terrain_NotCollideWithTerrain as test_module
+        from .terrain import C3510642_Terrain_NotCollideWithTerrain as test_module
 
     class C4976195_RigidBodies_InitialLinearVelocity(EditorSharedTest):
-        from . import C4976195_RigidBodies_InitialLinearVelocity as test_module
+        from .rigid_body import C4976195_RigidBodies_InitialLinearVelocity as test_module
 
     class C4976206_RigidBodies_GravityEnabledActive(EditorSharedTest):
-        from . import C4976206_RigidBodies_GravityEnabledActive as test_module
+        from .rigid_body import C4976206_RigidBodies_GravityEnabledActive as test_module
 
     class C4976207_PhysXRigidBodies_KinematicBehavior(EditorSharedTest):
-        from . import C4976207_PhysXRigidBodies_KinematicBehavior as test_module
+        from .rigid_body import C4976207_PhysXRigidBodies_KinematicBehavior as test_module
 
     class C5932042_PhysXForceRegion_LinearDamping(EditorSharedTest):
-        from . import C5932042_PhysXForceRegion_LinearDamping as test_module
+        from .force_region import C5932042_PhysXForceRegion_LinearDamping as test_module
 
     class C5932043_ForceRegion_SimpleDragOnRigidBodies(EditorSharedTest):
-        from . import C5932043_ForceRegion_SimpleDragOnRigidBodies as test_module
+        from .force_region import C5932043_ForceRegion_SimpleDragOnRigidBodies as test_module
 
     class C5959760_PhysXForceRegion_PointForceExertion(EditorSharedTest):
-        from . import C5959760_PhysXForceRegion_PointForceExertion as test_module
+        from .force_region import C5959760_PhysXForceRegion_PointForceExertion as test_module
 
     class C5959764_ForceRegion_ForceRegionImpulsesCapsule(EditorSharedTest):
-        from . import C5959764_ForceRegion_ForceRegionImpulsesCapsule as test_module
+        from .force_region import C5959764_ForceRegion_ForceRegionImpulsesCapsule as test_module
 
     class C5340400_RigidBody_ManualMomentOfInertia(EditorSharedTest):
-        from . import C5340400_RigidBody_ManualMomentOfInertia as test_module
+        from .rigid_body import C5340400_RigidBody_ManualMomentOfInertia as test_module
 
     class C4976210_COM_ManualSetting(EditorSharedTest):
-        from . import C4976210_COM_ManualSetting as test_module
+        from .rigid_body import C4976210_COM_ManualSetting as test_module
 
     class C4976194_RigidBody_PhysXComponentIsValid(EditorSharedTest):
-        from . import C4976194_RigidBody_PhysXComponentIsValid as test_module
+        from .rigid_body import C4976194_RigidBody_PhysXComponentIsValid as test_module
 
     class C5932045_ForceRegion_Spline(EditorSharedTest):
-        from . import C5932045_ForceRegion_Spline as test_module
+        from .force_region import C5932045_ForceRegion_Spline as test_module
 
     class C4982797_Collider_ColliderOffset(EditorSharedTest):
-        from . import C4982797_Collider_ColliderOffset as test_module
+        from .collider import C4982797_Collider_ColliderOffset as test_module
 
     class C4976200_RigidBody_AngularDampingObjectRotation(EditorSharedTest):
-        from . import C4976200_RigidBody_AngularDampingObjectRotation as test_module
+        from .rigid_body import C4976200_RigidBody_AngularDampingObjectRotation as test_module
 
     class C5689529_Verify_Terrain_RigidBody_Collider_Mesh(EditorSharedTest):
-        from . import C5689529_Verify_Terrain_RigidBody_Collider_Mesh as test_module
+        from .general import C5689529_Verify_Terrain_RigidBody_Collider_Mesh as test_module
 
     class C5959810_ForceRegion_ForceRegionCombinesForces(EditorSharedTest):
-        from . import C5959810_ForceRegion_ForceRegionCombinesForces as test_module
+        from .force_region import C5959810_ForceRegion_ForceRegionCombinesForces as test_module
 
     class C5959765_ForceRegion_AssetGetsImpulsed(EditorSharedTest):
-        from . import C5959765_ForceRegion_AssetGetsImpulsed as test_module
+        from .force_region import C5959765_ForceRegion_AssetGetsImpulsed as test_module
 
     class C6274125_ScriptCanvas_TriggerEvents(EditorSharedTest):
-        from . import C6274125_ScriptCanvas_TriggerEvents as test_module
+        from .script_canvas import C6274125_ScriptCanvas_TriggerEvents as test_module
         # needs to be updated to log for unexpected lines
         # expected_lines = test_module.LogLines.expected_lines
 
     class C6090554_ForceRegion_PointForceNegative(EditorSharedTest):
-        from . import C6090554_ForceRegion_PointForceNegative as test_module
+        from .force_region import C6090554_ForceRegion_PointForceNegative as test_module
 
     class C6090550_ForceRegion_WorldSpaceForceNegative(EditorSharedTest):
-        from . import C6090550_ForceRegion_WorldSpaceForceNegative as test_module
+        from .force_region import C6090550_ForceRegion_WorldSpaceForceNegative as test_module
 
     class C6090552_ForceRegion_LinearDampingNegative(EditorSharedTest):
-        from . import C6090552_ForceRegion_LinearDampingNegative as test_module
+        from .force_region import C6090552_ForceRegion_LinearDampingNegative as test_module
 
     class C5968760_ForceRegion_CheckNetForceChange(EditorSharedTest):
-        from . import C5968760_ForceRegion_CheckNetForceChange as test_module
+        from .force_region import C5968760_ForceRegion_CheckNetForceChange as test_module
 
     class C12712452_ScriptCanvas_CollisionEvents(EditorSharedTest):
-        from . import C12712452_ScriptCanvas_CollisionEvents as test_module
+        from .script_canvas import C12712452_ScriptCanvas_CollisionEvents as test_module
 
     class C12868578_ForceRegion_DirectionHasNoAffectOnMagnitude(EditorSharedTest):
-        from . import C12868578_ForceRegion_DirectionHasNoAffectOnMagnitude as test_module
+        from .force_region import C12868578_ForceRegion_DirectionHasNoAffectOnMagnitude as test_module
 
     class C4976204_Verify_Start_Asleep_Condition(EditorSharedTest):
-        from . import C4976204_Verify_Start_Asleep_Condition as test_module
+        from .rigid_body import C4976204_Verify_Start_Asleep_Condition as test_module
 
     class C6090546_ForceRegion_SliceFileInstantiates(EditorSharedTest):
-        from . import C6090546_ForceRegion_SliceFileInstantiates as test_module
+        from .force_region import C6090546_ForceRegion_SliceFileInstantiates as test_module
 
     class C6090551_ForceRegion_LocalSpaceForceNegative(EditorSharedTest):
-        from . import C6090551_ForceRegion_LocalSpaceForceNegative as test_module
+        from .force_region import C6090551_ForceRegion_LocalSpaceForceNegative as test_module
 
     class C6090553_ForceRegion_SimpleDragForceOnRigidBodies(EditorSharedTest):
-        from . import C6090553_ForceRegion_SimpleDragForceOnRigidBodies as test_module
+        from .force_region import C6090553_ForceRegion_SimpleDragForceOnRigidBodies as test_module
 
     class C4976209_RigidBody_ComputesCOM(EditorSharedTest):
-        from . import C4976209_RigidBody_ComputesCOM as test_module
+        from .rigid_body import C4976209_RigidBody_ComputesCOM as test_module
 
     class C4976201_RigidBody_MassIsAssigned(EditorSharedTest):
-        from . import C4976201_RigidBody_MassIsAssigned as test_module
+        from .rigid_body import C4976201_RigidBody_MassIsAssigned as test_module
 
     class C12868580_ForceRegion_SplineModifiedTransform(EditorSharedTest):
-        from . import C12868580_ForceRegion_SplineModifiedTransform as test_module
+        from .force_region import C12868580_ForceRegion_SplineModifiedTransform as test_module
 
     class C12712455_ScriptCanvas_ShapeCastVerification(EditorSharedTest):
-        from . import C12712455_ScriptCanvas_ShapeCastVerification as test_module
+        from .script_canvas import C12712455_ScriptCanvas_ShapeCastVerification as test_module
 
     class C4976197_RigidBodies_InitialAngularVelocity(EditorSharedTest):
-        from . import C4976197_RigidBodies_InitialAngularVelocity as test_module
+        from .rigid_body import C4976197_RigidBodies_InitialAngularVelocity as test_module
 
     class C6090555_ForceRegion_SplineFollowOnRigidBodies(EditorSharedTest):
-        from . import C6090555_ForceRegion_SplineFollowOnRigidBodies as test_module
+        from .force_region import C6090555_ForceRegion_SplineFollowOnRigidBodies as test_module
 
     class C6131473_StaticSlice_OnDynamicSliceSpawn(EditorSharedTest):
-        from . import C6131473_StaticSlice_OnDynamicSliceSpawn as test_module
+        from .general import C6131473_StaticSlice_OnDynamicSliceSpawn as test_module
 
     class C5959808_ForceRegion_PositionOffset(EditorSharedTest):
-        from . import C5959808_ForceRegion_PositionOffset as test_module
+        from .force_region import C5959808_ForceRegion_PositionOffset as test_module
 
     @pytest.mark.xfail(reason="Something with the CryRenderer disabling is causing this test to fail now.")
     class C13895144_Ragdoll_ChangeLevel(EditorSharedTest):
-        from . import C13895144_Ragdoll_ChangeLevel as test_module
+        from .ragdoll import C13895144_Ragdoll_ChangeLevel as test_module
     
     class C5968759_ForceRegion_ExertsSeveralForcesOnRigidBody(EditorSharedTest):
-        from . import C5968759_ForceRegion_ExertsSeveralForcesOnRigidBody as test_module
+        from .force_region import C5968759_ForceRegion_ExertsSeveralForcesOnRigidBody as test_module
 
     @pytest.mark.xfail(reason="This test will sometimes fail as the ball will continue to roll before the timeout is reached.")
     class C4976202_RigidBody_StopsWhenBelowKineticThreshold(EditorSharedTest):
-        from . import C4976202_RigidBody_StopsWhenBelowKineticThreshold as test_module
+        from .rigid_body import C4976202_RigidBody_StopsWhenBelowKineticThreshold as test_module
 
     class C13351703_COM_NotIncludeTriggerShapes(EditorSharedTest):
-        from . import C13351703_COM_NotIncludeTriggerShapes as test_module
+        from .rigid_body import C13351703_COM_NotIncludeTriggerShapes as test_module
 
     class C5296614_PhysXMaterial_ColliderShape(EditorSharedTest):
-        from . import C5296614_PhysXMaterial_ColliderShape as test_module
+        from .material import C5296614_PhysXMaterial_ColliderShape as test_module
 
     class C4982595_Collider_TriggerDisablesCollision(EditorSharedTest):
-        from . import C4982595_Collider_TriggerDisablesCollision as test_module
+        from .collider import C4982595_Collider_TriggerDisablesCollision as test_module
 
     class C14976307_Gravity_SetGravityWorks(EditorSharedTest):
-        from . import C14976307_Gravity_SetGravityWorks as test_module
+        from .general import C14976307_Gravity_SetGravityWorks as test_module
 
     class C4044694_Material_EmptyLibraryUsesDefault(EditorSharedTest):
-        from . import C4044694_Material_EmptyLibraryUsesDefault as test_module
+        from .material import C4044694_Material_EmptyLibraryUsesDefault as test_module
 
     class C15845879_ForceRegion_HighLinearDampingForce(EditorSharedTest):
-        from . import C15845879_ForceRegion_HighLinearDampingForce as test_module
+        from .force_region import C15845879_ForceRegion_HighLinearDampingForce as test_module
 
     class C4976218_RigidBodies_InertiaObjectsNotComputed(EditorSharedTest):
-        from . import C4976218_RigidBodies_InertiaObjectsNotComputed as test_module
+        from .rigid_body import C4976218_RigidBodies_InertiaObjectsNotComputed as test_module
 
     class C14902098_ScriptCanvas_PostPhysicsUpdate(EditorSharedTest):
-        from . import C14902098_ScriptCanvas_PostPhysicsUpdate as test_module
+        from .script_canvas import C14902098_ScriptCanvas_PostPhysicsUpdate as test_module
         # Note: Test needs to be updated to log for unexpected lines
         # unexpected_lines = ["Assert"] + test_module.Lines.unexpected
 
     class C5959761_ForceRegion_PhysAssetExertsPointForce(EditorSharedTest):
-        from . import C5959761_ForceRegion_PhysAssetExertsPointForce as test_module
+        from .force_region import C5959761_ForceRegion_PhysAssetExertsPointForce as test_module
         
     # Marking the Test as expected to fail using the xfail decorator due to sporadic failure on Automated Review: SPEC-3146
     # The test still runs, but a failure of the test doesn't result in the test run failing
     @pytest.mark.xfail(reason="Test Sporadically fails with message [ NOT FOUND ] Success: Bar1 : Expected angular velocity")
     class C13352089_RigidBodies_MaxAngularVelocity(EditorSharedTest):
-        from . import C13352089_RigidBodies_MaxAngularVelocity as test_module
+        from .rigid_body import C13352089_RigidBodies_MaxAngularVelocity as test_module
 
     class C18243584_Joints_HingeSoftLimitsConstrained(EditorSharedTest):
-        from . import C18243584_Joints_HingeSoftLimitsConstrained as test_module
+        from .joints import C18243584_Joints_HingeSoftLimitsConstrained as test_module
 
     class C18243589_Joints_BallSoftLimitsConstrained(EditorSharedTest):
-        from . import C18243589_Joints_BallSoftLimitsConstrained as test_module
+        from .joints import C18243589_Joints_BallSoftLimitsConstrained as test_module
 
     class C18243591_Joints_BallLeadFollowerCollide(EditorSharedTest):
-        from . import C18243591_Joints_BallLeadFollowerCollide as test_module
+        from .joints import C18243591_Joints_BallLeadFollowerCollide as test_module
 
     class C19578018_ShapeColliderWithNoShapeComponent(EditorSharedTest):
-        from . import C19578018_ShapeColliderWithNoShapeComponent as test_module
+        from .collider import C19578018_ShapeColliderWithNoShapeComponent as test_module
 
     class C14861500_DefaultSetting_ColliderShape(EditorSharedTest):
-        from . import C14861500_DefaultSetting_ColliderShape as test_module
+        from .collider import C14861500_DefaultSetting_ColliderShape as test_module
 
     class C19723164_ShapeCollider_WontCrashEditor(EditorSharedTest):
-        from . import C19723164_ShapeColliders_WontCrashEditor as test_module
+        from .collider import C19723164_ShapeColliders_WontCrashEditor as test_module
 
     class C4982800_PhysXColliderShape_CanBeSelected(EditorSharedTest):
-        from . import C4982800_PhysXColliderShape_CanBeSelected as test_module
+        from .collider import C4982800_PhysXColliderShape_CanBeSelected as test_module
 
     class C4982801_PhysXColliderShape_CanBeSelected(EditorSharedTest):
-        from . import C4982801_PhysXColliderShape_CanBeSelected as test_module
+        from .collider import C4982801_PhysXColliderShape_CanBeSelected as test_module
 
     class C4982802_PhysXColliderShape_CanBeSelected(EditorSharedTest):
-        from . import C4982802_PhysXColliderShape_CanBeSelected as test_module
+        from .collider import C4982802_PhysXColliderShape_CanBeSelected as test_module
        
     class C12905528_ForceRegion_WithNonTriggerCollider(EditorSharedTest):
-        from . import C12905528_ForceRegion_WithNonTriggerCollider as test_module
+        from .force_region import C12905528_ForceRegion_WithNonTriggerCollider as test_module
         # Fixme: expected_lines = ["[Warning] (PhysX Force Region) - Please ensure collider component marked as trigger exists in entity"]
         
     class C5932040_ForceRegion_CubeExertsWorldForce(EditorSharedTest):
-        from . import C5932040_ForceRegion_CubeExertsWorldForce as test_module
+        from .force_region import C5932040_ForceRegion_CubeExertsWorldForce as test_module
         
     class C5932044_ForceRegion_PointForceOnRigidBody(EditorSharedTest):
-        from . import C5932044_ForceRegion_PointForceOnRigidBody as test_module
+        from .force_region import C5932044_ForceRegion_PointForceOnRigidBody as test_module
         
     class C5959759_RigidBody_ForceRegionSpherePointForce(EditorSharedTest):
-        from . import C5959759_RigidBody_ForceRegionSpherePointForce as test_module
+        from .force_region import C5959759_RigidBody_ForceRegionSpherePointForce as test_module
         
     class C5959809_ForceRegion_RotationalOffset(EditorSharedTest):
-        from . import C5959809_ForceRegion_RotationalOffset as test_module
+        from .force_region import C5959809_ForceRegion_RotationalOffset as test_module
        
     class C15096740_Material_LibraryUpdatedCorrectly(EditorSharedTest):
-        from . import C15096740_Material_LibraryUpdatedCorrectly as test_module
+        from .material import C15096740_Material_LibraryUpdatedCorrectly as test_module
         
     class C4976236_AddPhysxColliderComponent(EditorSharedTest):
-        from . import C4976236_AddPhysxColliderComponent as test_module
+        from .collider import C4976236_AddPhysxColliderComponent as test_module
         
 
     @pytest.mark.xfail(reason="This will fail due to this issue ATOM-15487.")
     class C14861502_PhysXCollider_AssetAutoAssigned(EditorSharedTest):
-        from . import C14861502_PhysXCollider_AssetAutoAssigned as test_module
+        from .collider import C14861502_PhysXCollider_AssetAutoAssigned as test_module
         
     class C14861501_PhysXCollider_RenderMeshAutoAssigned(EditorSharedTest):
-        from . import C14861501_PhysXCollider_RenderMeshAutoAssigned as test_module
+        from .collider import C14861501_PhysXCollider_RenderMeshAutoAssigned as test_module
         
     class C4044695_PhysXCollider_AddMultipleSurfaceFbx(EditorSharedTest):
-        from . import C4044695_PhysXCollider_AddMultipleSurfaceFbx as test_module
+        from .collider import C4044695_PhysXCollider_AddMultipleSurfaceFbx as test_module
         
     class C14861504_RenderMeshAsset_WithNoPxAsset(EditorSharedTest):
-        from . import C14861504_RenderMeshAsset_WithNoPxAsset as test_module
+        from .collider import C14861504_RenderMeshAsset_WithNoPxAsset as test_module
         
     class C100000_RigidBody_EnablingGravityWorksPoC(EditorSharedTest):
-        from . import C100000_RigidBody_EnablingGravityWorksPoC as test_module
+        from .collider import C100000_RigidBody_EnablingGravityWorksPoC as test_module
 
     class C4982798_Collider_ColliderRotationOffset(EditorSharedTest):
-        from . import C4982798_Collider_ColliderRotationOffset as test_module
+        from .collider import C4982798_Collider_ColliderRotationOffset as test_module
 
     class C15308217_NoCrash_LevelSwitch(EditorSharedTest):
-        from . import C15308217_NoCrash_LevelSwitch as test_module
+        from .terrain import C15308217_NoCrash_LevelSwitch as test_module
 
     class C6090547_ForceRegion_ParentChildForceRegions(EditorSharedTest):
-        from . import C6090547_ForceRegion_ParentChildForceRegions as test_module
+        from .force_region import C6090547_ForceRegion_ParentChildForceRegions as test_module
 
     class C19578021_ShapeCollider_CanBeAdded(EditorSharedTest):
-        from . import C19578021_ShapeCollider_CanBeAdded as test_module
+        from .collider import C19578021_ShapeCollider_CanBeAdded as test_module
 
     class C15425929_Undo_Redo(EditorSharedTest):
-        from . import C15425929_Undo_Redo as test_module
+        from .general import C15425929_Undo_Redo as test_module

AutomatedTesting/Gem/PythonTests/physics/TestSuite_Periodic.py

@@ -12,7 +12,7 @@ import pytest
 import os
 import sys
 
-from .FileManagement import FileManagement as fm
+from .utils.FileManagement import FileManagement as fm
 from ly_test_tools import LAUNCHERS
 
 sys.path.append(os.path.dirname(os.path.abspath(__file__)) + '/../automatedtesting_shared')
@@ -30,219 +30,219 @@ class TestAutomation(TestAutomationBase):
 
     @revert_physics_config
     def test_C3510642_Terrain_NotCollideWithTerrain(self, request, workspace, editor, launcher_platform):
-        from . import C3510642_Terrain_NotCollideWithTerrain as test_module
+        from .terrain import C3510642_Terrain_NotCollideWithTerrain as test_module
         self._run_test(request, workspace, editor, test_module)
         
     @revert_physics_config
     def test_C4976195_RigidBodies_InitialLinearVelocity(self, request, workspace, editor, launcher_platform):
-        from . import C4976195_RigidBodies_InitialLinearVelocity as test_module
+        from .rigid_body import C4976195_RigidBodies_InitialLinearVelocity as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     def test_C4976206_RigidBodies_GravityEnabledActive(self, request, workspace, editor, launcher_platform):
-        from . import C4976206_RigidBodies_GravityEnabledActive as test_module
+        from .rigid_body import C4976206_RigidBodies_GravityEnabledActive as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     def test_C4976207_PhysXRigidBodies_KinematicBehavior(self, request, workspace, editor, launcher_platform):
-        from . import C4976207_PhysXRigidBodies_KinematicBehavior as test_module
+        from .rigid_body import C4976207_PhysXRigidBodies_KinematicBehavior as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     def test_C5932042_PhysXForceRegion_LinearDamping(self, request, workspace, editor, launcher_platform):
-        from . import C5932042_PhysXForceRegion_LinearDamping as test_module
+        from .force_region import C5932042_PhysXForceRegion_LinearDamping as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     def test_C5932043_ForceRegion_SimpleDragOnRigidBodies(self, request, workspace, editor, launcher_platform):
-        from . import C5932043_ForceRegion_SimpleDragOnRigidBodies as test_module
+        from .force_region import C5932043_ForceRegion_SimpleDragOnRigidBodies as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     def test_C5959760_PhysXForceRegion_PointForceExertion(self, request, workspace, editor, launcher_platform):
-        from . import C5959760_PhysXForceRegion_PointForceExertion as test_module
+        from .force_region import C5959760_PhysXForceRegion_PointForceExertion as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     def test_C5959764_ForceRegion_ForceRegionImpulsesCapsule(self, request, workspace, editor, launcher_platform):
-        from . import C5959764_ForceRegion_ForceRegionImpulsesCapsule as test_module
+        from .force_region import C5959764_ForceRegion_ForceRegionImpulsesCapsule as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     def test_C5340400_RigidBody_ManualMomentOfInertia(self, request, workspace, editor, launcher_platform):
-        from . import C5340400_RigidBody_ManualMomentOfInertia as test_module
+        from .rigid_body import C5340400_RigidBody_ManualMomentOfInertia as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     def test_C4976210_COM_ManualSetting(self, request, workspace, editor, launcher_platform):
-        from . import C4976210_COM_ManualSetting as test_module
+        from .rigid_body import C4976210_COM_ManualSetting as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     def test_C4976194_RigidBody_PhysXComponentIsValid(self, request, workspace, editor, launcher_platform):
-        from . import C4976194_RigidBody_PhysXComponentIsValid as test_module
+        from .rigid_body import C4976194_RigidBody_PhysXComponentIsValid as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     def test_C5932045_ForceRegion_Spline(self, request, workspace, editor, launcher_platform):
-        from . import C5932045_ForceRegion_Spline as test_module
+        from .force_region import C5932045_ForceRegion_Spline as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     @fm.file_override('physxsystemconfiguration.setreg','C4044457_Material_RestitutionCombine.setreg_override', 'AutomatedTesting/Registry')
     def test_C4044457_Material_RestitutionCombine(self, request, workspace, editor, launcher_platform):
-        from . import C4044457_Material_RestitutionCombine as test_module
+        from .material import C4044457_Material_RestitutionCombine as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     @fm.file_override('physxsystemconfiguration.setreg','C4044456_Material_FrictionCombine.setreg_override', 'AutomatedTesting/Registry')
     def test_C4044456_Material_FrictionCombine(self, request, workspace, editor, launcher_platform):
-        from . import C4044456_Material_FrictionCombine as test_module
+        from .material import C4044456_Material_FrictionCombine as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     def test_C4982797_Collider_ColliderOffset(self, request, workspace, editor, launcher_platform):
-        from . import C4982797_Collider_ColliderOffset as test_module
+        from .collider import C4982797_Collider_ColliderOffset as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     def test_C4976200_RigidBody_AngularDampingObjectRotation(self, request, workspace, editor, launcher_platform):
-        from . import C4976200_RigidBody_AngularDampingObjectRotation as test_module
+        from .rigid_body import C4976200_RigidBody_AngularDampingObjectRotation as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     def test_C5689529_Verify_Terrain_RigidBody_Collider_Mesh(self, request, workspace, editor, launcher_platform):
-        from . import C5689529_Verify_Terrain_RigidBody_Collider_Mesh as test_module
+        from .general import C5689529_Verify_Terrain_RigidBody_Collider_Mesh as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     def test_C5959810_ForceRegion_ForceRegionCombinesForces(self, request, workspace, editor, launcher_platform):
-        from . import C5959810_ForceRegion_ForceRegionCombinesForces as test_module
+        from .force_region import C5959810_ForceRegion_ForceRegionCombinesForces as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     def test_C5959765_ForceRegion_AssetGetsImpulsed(self, request, workspace, editor, launcher_platform):
-        from . import C5959765_ForceRegion_AssetGetsImpulsed as test_module
+        from .force_region import C5959765_ForceRegion_AssetGetsImpulsed as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     def test_C6274125_ScriptCanvas_TriggerEvents(self, request, workspace, editor, launcher_platform):
-        from . import C6274125_ScriptCanvas_TriggerEvents as test_module
+        from .script_canvas import C6274125_ScriptCanvas_TriggerEvents as test_module
         # FIXME: expected_lines = test_module.LogLines.expected_lines
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     def test_C6090554_ForceRegion_PointForceNegative(self, request, workspace, editor, launcher_platform):
-        from . import C6090554_ForceRegion_PointForceNegative as test_module
+        from .force_region import C6090554_ForceRegion_PointForceNegative as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     def test_C6090550_ForceRegion_WorldSpaceForceNegative(self, request, workspace, editor, launcher_platform):
-        from . import C6090550_ForceRegion_WorldSpaceForceNegative as test_module
+        from .force_region import C6090550_ForceRegion_WorldSpaceForceNegative as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     def test_C6090552_ForceRegion_LinearDampingNegative(self, request, workspace, editor, launcher_platform):
-        from . import C6090552_ForceRegion_LinearDampingNegative as test_module
+        from .force_region import C6090552_ForceRegion_LinearDampingNegative as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     def test_C5968760_ForceRegion_CheckNetForceChange(self, request, workspace, editor, launcher_platform):
-        from . import C5968760_ForceRegion_CheckNetForceChange as test_module
+        from .force_region import C5968760_ForceRegion_CheckNetForceChange as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     def test_C12712452_ScriptCanvas_CollisionEvents(self, request, workspace, editor, launcher_platform):
-        from . import C12712452_ScriptCanvas_CollisionEvents as test_module
+        from .script_canvas import C12712452_ScriptCanvas_CollisionEvents as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     def test_C12868578_ForceRegion_DirectionHasNoAffectOnMagnitude(self, request, workspace, editor, launcher_platform):
-        from . import C12868578_ForceRegion_DirectionHasNoAffectOnMagnitude as test_module
+        from .force_region import C12868578_ForceRegion_DirectionHasNoAffectOnMagnitude as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     def test_C4976204_Verify_Start_Asleep_Condition(self, request, workspace, editor, launcher_platform):
-        from . import C4976204_Verify_Start_Asleep_Condition as test_module
+        from .rigid_body import C4976204_Verify_Start_Asleep_Condition as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     def test_C6090546_ForceRegion_SliceFileInstantiates(self, request, workspace, editor, launcher_platform):
-        from . import C6090546_ForceRegion_SliceFileInstantiates as test_module
+        from .force_region import C6090546_ForceRegion_SliceFileInstantiates as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     def test_C6090551_ForceRegion_LocalSpaceForceNegative(self, request, workspace, editor, launcher_platform):
-        from . import C6090551_ForceRegion_LocalSpaceForceNegative as test_module
+        from .force_region import C6090551_ForceRegion_LocalSpaceForceNegative as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     def test_C6090553_ForceRegion_SimpleDragForceOnRigidBodies(self, request, workspace, editor, launcher_platform):
-        from . import C6090553_ForceRegion_SimpleDragForceOnRigidBodies as test_module
+        from .force_region import C6090553_ForceRegion_SimpleDragForceOnRigidBodies as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     def test_C4976209_RigidBody_ComputesCOM(self, request, workspace, editor, launcher_platform):
-        from . import C4976209_RigidBody_ComputesCOM as test_module
+        from .rigid_body import C4976209_RigidBody_ComputesCOM as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     def test_C4976201_RigidBody_MassIsAssigned(self, request, workspace, editor, launcher_platform):
-        from . import C4976201_RigidBody_MassIsAssigned as test_module
+        from .rigid_body import C4976201_RigidBody_MassIsAssigned as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     @fm.file_override('physxsystemconfiguration.setreg','C18981526_Material_RestitutionCombinePriority.setreg_override', 'AutomatedTesting/Registry')
     def test_C18981526_Material_RestitutionCombinePriority(self, request, workspace, editor, launcher_platform):
-        from . import C18981526_Material_RestitutionCombinePriority as test_module
+        from .material import C18981526_Material_RestitutionCombinePriority as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     def test_C12868580_ForceRegion_SplineModifiedTransform(self, request, workspace, editor, launcher_platform):
-        from . import C12868580_ForceRegion_SplineModifiedTransform as test_module
+        from .force_region import C12868580_ForceRegion_SplineModifiedTransform as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     def test_C12712455_ScriptCanvas_ShapeCastVerification(self, request, workspace, editor, launcher_platform):
-        from . import C12712455_ScriptCanvas_ShapeCastVerification as test_module
+        from .script_canvas import C12712455_ScriptCanvas_ShapeCastVerification as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     def test_C4976197_RigidBodies_InitialAngularVelocity(self, request, workspace, editor, launcher_platform):
-        from . import C4976197_RigidBodies_InitialAngularVelocity as test_module
+        from .rigid_body import C4976197_RigidBodies_InitialAngularVelocity as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     def test_C6090555_ForceRegion_SplineFollowOnRigidBodies(self, request, workspace, editor, launcher_platform):
-        from . import C6090555_ForceRegion_SplineFollowOnRigidBodies as test_module
+        from .force_region import C6090555_ForceRegion_SplineFollowOnRigidBodies as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     def test_C6131473_StaticSlice_OnDynamicSliceSpawn(self, request, workspace, editor, launcher_platform):
-        from . import C6131473_StaticSlice_OnDynamicSliceSpawn as test_module
+        from .general import C6131473_StaticSlice_OnDynamicSliceSpawn as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     def test_C5959808_ForceRegion_PositionOffset(self, request, workspace, editor, launcher_platform):
-        from . import C5959808_ForceRegion_PositionOffset as test_module
+        from .force_region import C5959808_ForceRegion_PositionOffset as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     @fm.file_override('physxsystemconfiguration.setreg','C18977601_Material_FrictionCombinePriority.setreg_override', 'AutomatedTesting/Registry')
     def test_C18977601_Material_FrictionCombinePriority(self, request, workspace, editor, launcher_platform):
-        from . import C18977601_Material_FrictionCombinePriority as test_module
+        from .material import C18977601_Material_FrictionCombinePriority as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @pytest.mark.xfail(
         reason="Something with the CryRenderer disabling is causing this test to fail now.")
     @revert_physics_config
     def test_C13895144_Ragdoll_ChangeLevel(self, request, workspace, editor, launcher_platform):
-        from . import C13895144_Ragdoll_ChangeLevel as test_module
+        from .ragdoll import C13895144_Ragdoll_ChangeLevel as test_module
         self._run_test(request, workspace, editor, test_module)
     
     @revert_physics_config
     def test_C5968759_ForceRegion_ExertsSeveralForcesOnRigidBody(self, request, workspace, editor, launcher_platform):
-        from . import C5968759_ForceRegion_ExertsSeveralForcesOnRigidBody as test_module
+        from .force_region import C5968759_ForceRegion_ExertsSeveralForcesOnRigidBody as test_module
         self._run_test(request, workspace, editor, test_module)
 
     # Marking the test as an expected failure due to sporadic failure on Automated Review: LYN-2580
@@ -252,96 +252,96 @@ class TestAutomation(TestAutomationBase):
     @revert_physics_config
     @fm.file_override('physxsystemconfiguration.setreg','C4044697_Material_PerfaceMaterialValidation.setreg_override', 'AutomatedTesting/Registry')
     def test_C4044697_Material_PerfaceMaterialValidation(self, request, workspace, editor, launcher_platform):
-        from . import C4044697_Material_PerfaceMaterialValidation as test_module
+        from .material import C4044697_Material_PerfaceMaterialValidation as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @pytest.mark.xfail(
         reason="This test will sometimes fail as the ball will continue to roll before the timeout is reached.")
     @revert_physics_config
     def test_C4976202_RigidBody_StopsWhenBelowKineticThreshold(self, request, workspace, editor, launcher_platform):
-        from . import C4976202_RigidBody_StopsWhenBelowKineticThreshold as test_module
+        from .rigid_body import C4976202_RigidBody_StopsWhenBelowKineticThreshold as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     def test_C13351703_COM_NotIncludeTriggerShapes(self, request, workspace, editor, launcher_platform):
-        from . import C13351703_COM_NotIncludeTriggerShapes as test_module
+        from .rigid_body import C13351703_COM_NotIncludeTriggerShapes as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     def test_C5296614_PhysXMaterial_ColliderShape(self, request, workspace, editor, launcher_platform):
-        from . import C5296614_PhysXMaterial_ColliderShape as test_module
+        from .material import C5296614_PhysXMaterial_ColliderShape as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     def test_C4982595_Collider_TriggerDisablesCollision(self, request, workspace, editor, launcher_platform):
-        from . import C4982595_Collider_TriggerDisablesCollision as test_module
+        from .collider import C4982595_Collider_TriggerDisablesCollision as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     def test_C14976307_Gravity_SetGravityWorks(self, request, workspace, editor, launcher_platform):
-        from . import C14976307_Gravity_SetGravityWorks as test_module
+        from .general import C14976307_Gravity_SetGravityWorks as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     @fm.file_override('physxsystemconfiguration.setreg','C15556261_PhysXMaterials_CharacterControllerMaterialAssignment.setreg_override', 'AutomatedTesting/Registry')
     def test_C15556261_PhysXMaterials_CharacterControllerMaterialAssignment(self, request, workspace, editor, launcher_platform):
-        from . import C15556261_PhysXMaterials_CharacterControllerMaterialAssignment as test_module
+        from .material import C15556261_PhysXMaterials_CharacterControllerMaterialAssignment as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     def test_C4044694_Material_EmptyLibraryUsesDefault(self, request, workspace, editor, launcher_platform):
-        from . import C4044694_Material_EmptyLibraryUsesDefault as test_module
+        from .material import C4044694_Material_EmptyLibraryUsesDefault as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     def test_C15845879_ForceRegion_HighLinearDampingForce(self, request, workspace, editor, launcher_platform):
-        from . import C15845879_ForceRegion_HighLinearDampingForce as test_module
+        from .force_region import C15845879_ForceRegion_HighLinearDampingForce as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     def test_C4976218_RigidBodies_InertiaObjectsNotComputed(self, request, workspace, editor, launcher_platform):
-        from . import C4976218_RigidBodies_InertiaObjectsNotComputed as test_module
+        from .rigid_body import C4976218_RigidBodies_InertiaObjectsNotComputed as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     def test_C14902098_ScriptCanvas_PostPhysicsUpdate(self, request, workspace, editor, launcher_platform):
-        from . import C14902098_ScriptCanvas_PostPhysicsUpdate as test_module
+        from .script_canvas import C14902098_ScriptCanvas_PostPhysicsUpdate as test_module
         # Fixme: unexpected_lines = ["Assert"] + test_module.Lines.unexpected
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     @fm.file_override('physxsystemconfiguration.setreg','C4976245_PhysXCollider_CollisionLayerTest.setreg_override', 'AutomatedTesting/Registry')
     def test_C4976245_PhysXCollider_CollisionLayerTest(self, request, workspace, editor, launcher_platform):
-        from . import C4976245_PhysXCollider_CollisionLayerTest as test_module
+        from .collider import C4976245_PhysXCollider_CollisionLayerTest as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     @fm.file_override('physxsystemconfiguration.setreg','C4976244_Collider_SameGroupSameLayerCollision.setreg_override', 'AutomatedTesting/Registry')
     def test_C4976244_Collider_SameGroupSameLayerCollision(self, request, workspace, editor, launcher_platform):
-        from . import C4976244_Collider_SameGroupSameLayerCollision as test_module
+        from .collider import C4976244_Collider_SameGroupSameLayerCollision as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     @fm.file_override('physxdefaultsceneconfiguration.setreg','C14195074_ScriptCanvas_PostUpdateEvent.setreg_override', 'AutomatedTesting/Registry')
     def test_C14195074_ScriptCanvas_PostUpdateEvent(self, request, workspace, editor, launcher_platform):
-        from . import C14195074_ScriptCanvas_PostUpdateEvent as test_module
+        from .script_canvas import C14195074_ScriptCanvas_PostUpdateEvent as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     @fm.file_override('physxsystemconfiguration.setreg','C4044461_Material_Restitution.setreg_override', 'AutomatedTesting/Registry')
     def test_C4044461_Material_Restitution(self, request, workspace, editor, launcher_platform):
-        from . import C4044461_Material_Restitution as test_module
+        from .material import C4044461_Material_Restitution as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     @fm.file_override('physxdefaultsceneconfiguration.setreg','C14902097_ScriptCanvas_PreUpdateEvent.setreg_override', 'AutomatedTesting/Registry')
     def test_C14902097_ScriptCanvas_PreUpdateEvent(self, request, workspace, editor, launcher_platform):
-        from . import C14902097_ScriptCanvas_PreUpdateEvent as test_module
+        from .script_canvas import C14902097_ScriptCanvas_PreUpdateEvent as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     def test_C5959761_ForceRegion_PhysAssetExertsPointForce(self, request, workspace, editor, launcher_platform):
-        from . import C5959761_ForceRegion_PhysAssetExertsPointForce as test_module
+        from .force_region import C5959761_ForceRegion_PhysAssetExertsPointForce as test_module
         self._run_test(request, workspace, editor, test_module)
 
     # Marking the Test  as expected to fail using the xfail decorator due to sporadic failure on Automated Review: SPEC-3146
@@ -349,138 +349,138 @@ class TestAutomation(TestAutomationBase):
     @pytest.mark.xfail(reason="Test Sporadically fails with message [ NOT FOUND ] Success: Bar1 : Expected angular velocity")
     @revert_physics_config
     def test_C13352089_RigidBodies_MaxAngularVelocity(self, request, workspace, editor, launcher_platform):
-        from . import C13352089_RigidBodies_MaxAngularVelocity as test_module
+        from .rigid_body import C13352089_RigidBodies_MaxAngularVelocity as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     def test_C18243584_Joints_HingeSoftLimitsConstrained(self, request, workspace, editor, launcher_platform):
-        from . import C18243584_Joints_HingeSoftLimitsConstrained as test_module
+        from .joints import C18243584_Joints_HingeSoftLimitsConstrained as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     def test_C18243589_Joints_BallSoftLimitsConstrained(self, request, workspace, editor, launcher_platform):
-        from . import C18243589_Joints_BallSoftLimitsConstrained as test_module
+        from .joints import C18243589_Joints_BallSoftLimitsConstrained as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     def test_C18243591_Joints_BallLeadFollowerCollide(self, request, workspace, editor, launcher_platform):
-        from . import C18243591_Joints_BallLeadFollowerCollide as test_module
+        from .joints import C18243591_Joints_BallLeadFollowerCollide as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     @fm.file_override('physxsystemconfiguration.setreg','C4976227_Collider_NewGroup.setreg_override', 'AutomatedTesting/Registry')
     def test_C4976227_Collider_NewGroup(self, request, workspace, editor, launcher_platform):
-        from . import C4976227_Collider_NewGroup as test_module
+        from .collider import C4976227_Collider_NewGroup as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     def test_C19578018_ShapeColliderWithNoShapeComponent(self, request, workspace, editor, launcher_platform):
-        from . import C19578018_ShapeColliderWithNoShapeComponent as test_module
+        from .collider import C19578018_ShapeColliderWithNoShapeComponent as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     def test_C14861500_DefaultSetting_ColliderShape(self, request, workspace, editor, launcher_platform):
-        from . import C14861500_DefaultSetting_ColliderShape as test_module
+        from .collider import C14861500_DefaultSetting_ColliderShape as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     def test_C19723164_ShapeCollider_WontCrashEditor(self, request, workspace, editor, launcher_platform):
-        from . import C19723164_ShapeColliders_WontCrashEditor as test_module
+        from .collider import C19723164_ShapeColliders_WontCrashEditor as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     def test_C4982800_PhysXColliderShape_CanBeSelected(self, request, workspace, editor, launcher_platform):
-        from . import C4982800_PhysXColliderShape_CanBeSelected as test_module
+        from .collider import C4982800_PhysXColliderShape_CanBeSelected as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     def test_C4982801_PhysXColliderShape_CanBeSelected(self, request, workspace, editor, launcher_platform):
-        from . import C4982801_PhysXColliderShape_CanBeSelected as test_module
+        from .collider import C4982801_PhysXColliderShape_CanBeSelected as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     def test_C4982802_PhysXColliderShape_CanBeSelected(self, request, workspace, editor, launcher_platform):
-        from . import C4982802_PhysXColliderShape_CanBeSelected as test_module
+        from .collider import C4982802_PhysXColliderShape_CanBeSelected as test_module
         self._run_test(request, workspace, editor, test_module)
 
     def test_C12905528_ForceRegion_WithNonTriggerCollider(self, request, workspace, editor, launcher_platform):
-        from . import C12905528_ForceRegion_WithNonTriggerCollider as test_module
+        from .force_region import C12905528_ForceRegion_WithNonTriggerCollider as test_module
         # Fixme: expected_lines = ["[Warning] (PhysX Force Region) - Please ensure collider component marked as trigger exists in entity"]
         self._run_test(request, workspace, editor, test_module)
 
     def test_C5932040_ForceRegion_CubeExertsWorldForce(self, request, workspace, editor, launcher_platform):
-        from . import C5932040_ForceRegion_CubeExertsWorldForce as test_module
+        from .force_region import C5932040_ForceRegion_CubeExertsWorldForce as test_module
         self._run_test(request, workspace, editor, test_module)
 
     def test_C5932044_ForceRegion_PointForceOnRigidBody(self, request, workspace, editor, launcher_platform):
-        from . import C5932044_ForceRegion_PointForceOnRigidBody as test_module
+        from .force_region import C5932044_ForceRegion_PointForceOnRigidBody as test_module
         self._run_test(request, workspace, editor, test_module)
 
     def test_C5959759_RigidBody_ForceRegionSpherePointForce(self, request, workspace, editor, launcher_platform):
-        from . import C5959759_RigidBody_ForceRegionSpherePointForce as test_module
+        from .force_region import C5959759_RigidBody_ForceRegionSpherePointForce as test_module
         self._run_test(request, workspace, editor, test_module)
 
     def test_C5959809_ForceRegion_RotationalOffset(self, request, workspace, editor, launcher_platform):
-        from . import C5959809_ForceRegion_RotationalOffset as test_module
+        from .force_region import C5959809_ForceRegion_RotationalOffset as test_module
         self._run_test(request, workspace, editor, test_module)
 
     def test_C15096740_Material_LibraryUpdatedCorrectly(self, request, workspace, editor, launcher_platform):
-        from . import C15096740_Material_LibraryUpdatedCorrectly as test_module
+        from .material import C15096740_Material_LibraryUpdatedCorrectly as test_module
         self._run_test(request, workspace, editor, test_module)
 
     def test_C4976236_AddPhysxColliderComponent(self, request, workspace, editor, launcher_platform):
-        from . import C4976236_AddPhysxColliderComponent as test_module
+        from .collider import C4976236_AddPhysxColliderComponent as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @pytest.mark.xfail(
         reason="This will fail due to this issue ATOM-15487.")
     def test_C14861502_PhysXCollider_AssetAutoAssigned(self, request, workspace, editor, launcher_platform):
-        from . import C14861502_PhysXCollider_AssetAutoAssigned as test_module
+        from .collider import C14861502_PhysXCollider_AssetAutoAssigned as test_module
         self._run_test(request, workspace, editor, test_module)
 
     def test_C14861501_PhysXCollider_RenderMeshAutoAssigned(self, request, workspace, editor, launcher_platform):
-        from . import C14861501_PhysXCollider_RenderMeshAutoAssigned as test_module
+        from .collider import C14861501_PhysXCollider_RenderMeshAutoAssigned as test_module
         self._run_test(request, workspace, editor, test_module)
 
     def test_C4044695_PhysXCollider_AddMultipleSurfaceFbx(self, request, workspace, editor, launcher_platform):
-        from . import C4044695_PhysXCollider_AddMultipleSurfaceFbx as test_module
+        from .collider import C4044695_PhysXCollider_AddMultipleSurfaceFbx as test_module
         self._run_test(request, workspace, editor, test_module)
 
     def test_C14861504_RenderMeshAsset_WithNoPxAsset(self, request, workspace, editor, launcher_platform):
-        from . import C14861504_RenderMeshAsset_WithNoPxAsset as test_module
+        from .collider import C14861504_RenderMeshAsset_WithNoPxAsset as test_module
         self._run_test(request, workspace, editor, test_module)
 
     def test_C100000_RigidBody_EnablingGravityWorksPoC(self, request, workspace, editor, launcher_platform):
-        from . import C100000_RigidBody_EnablingGravityWorksPoC as test_module
+        from .collider import C100000_RigidBody_EnablingGravityWorksPoC as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     @fm.file_override('physxsystemconfiguration.setreg','C3510644_Collider_CollisionGroups.setreg_override', 'AutomatedTesting/Registry')
     def test_C3510644_Collider_CollisionGroups(self, request, workspace, editor, launcher_platform):
-        from . import C3510644_Collider_CollisionGroups as test_module
+        from .collider import C3510644_Collider_CollisionGroups as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     def test_C4982798_Collider_ColliderRotationOffset(self, request, workspace, editor, launcher_platform):
-        from . import C4982798_Collider_ColliderRotationOffset as test_module
+        from .collider import C4982798_Collider_ColliderRotationOffset as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     def test_C15308217_NoCrash_LevelSwitch(self, request, workspace, editor, launcher_platform):
-        from . import C15308217_NoCrash_LevelSwitch as test_module
+        from .terrain import C15308217_NoCrash_LevelSwitch as test_module
         self._run_test(request, workspace, editor, test_module)
 
     @revert_physics_config
     def test_C6090547_ForceRegion_ParentChildForceRegions(self, request, workspace, editor, launcher_platform):
-        from . import C6090547_ForceRegion_ParentChildForceRegions as test_module
+        from .force_region import C6090547_ForceRegion_ParentChildForceRegions as test_module
         self._run_test(request, workspace, editor, test_module)
         
     @revert_physics_config
     def test_C19578021_ShapeCollider_CanBeAdded(self, request, workspace, editor, launcher_platform):
-        from . import C19578021_ShapeCollider_CanBeAdded as test_module
+        from .collider import C19578021_ShapeCollider_CanBeAdded as test_module
         self._run_test(request, workspace, editor, test_module)
         
     @revert_physics_config
     def test_C15425929_Undo_Redo(self, request, workspace, editor, launcher_platform):
-        from . import C15425929_Undo_Redo as test_module
+        from .general import C15425929_Undo_Redo as test_module
         self._run_test(request, workspace, editor, test_module)

AutomatedTesting/Gem/PythonTests/physics/TestSuite_Sandbox.py

@@ -12,7 +12,7 @@ import pytest
 import os
 import sys
 
-from .FileManagement import FileManagement as fm
+from .utils.FileManagement import FileManagement as fm
 from ly_test_tools import LAUNCHERS
 
 sys.path.append(os.path.dirname(os.path.abspath(__file__)) + '/../automatedtesting_shared')
@@ -30,13 +30,13 @@ class TestAutomation(TestAutomationBase):
 
     ## Seems to be flaky, need to investigate
     def test_C19536274_GetCollisionName_PrintsName(self, request, workspace, editor, launcher_platform):
-        from . import C19536274_GetCollisionName_PrintsName as test_module
+        from .general import C19536274_GetCollisionName_PrintsName as test_module
         # Fixme: expected_lines=["Layer Name: Right"]
         self._run_test(request, workspace, editor, test_module)
 
     ## Seems to be flaky, need to investigate
     def test_C19536277_GetCollisionName_PrintsNothing(self, request, workspace, editor, launcher_platform):
-        from . import C19536277_GetCollisionName_PrintsNothing as test_module
+        from .general import C19536277_GetCollisionName_PrintsNothing as test_module
         # All groups present in the PhysX Collider that could show up in test
         # Fixme: collision_groups = ["All", "None", "All_NoTouchBend", "All_3", "None_1", "All_NoTouchBend_1", "All_2", "None_1_1", "All_NoTouchBend_1_1", "All_1", "None_1_1_1", "All_NoTouchBend_1_1_1", "All_4", "None_1_1_1_1", "All_NoTouchBend_1_1_1_1", "GroupLeft", "GroupRight"]
         # Fixme: for group in collision_groups:
@@ -49,5 +49,5 @@ class TestAutomation(TestAutomationBase):
         reason="Editor crashes and errors about files accessed by multiple processes appear in the log.")
     @revert_physics_config
     def test_C15425929_Undo_Redo(self, request, workspace, editor, launcher_platform):
-        from . import C15425929_Undo_Redo as test_module
+        from .general import C15425929_Undo_Redo as test_module
         self._run_test(request, workspace, editor, test_module)

AutomatedTesting/Gem/PythonTests/physics/TestSuite_Utils.py

@@ -29,14 +29,14 @@ class TestUtils(TestAutomationBase):
         :param request: Built in pytest object, and is needed to call the pytest "addfinalizer" teardown command.
         :editor: Fixture containing editor details
         """
-        from . import UtilTest_Physmaterial_Editor as physmaterial_editor_test_module
+        from .utils import UtilTest_Physmaterial_Editor as physmaterial_editor_test_module
 
         expected_lines = []
         unexpected_lines = ["Assert"]
         self._run_test(request, workspace, editor, physmaterial_editor_test_module, expected_lines, unexpected_lines)
     
     def test_UtilTest_Tracer_PicksErrorsAndWarnings(self, request, workspace, editor):
-        from . import UtilTest_Tracer_PicksErrorsAndWarnings as testcase_module
+        from .utils import UtilTest_Tracer_PicksErrorsAndWarnings as testcase_module
         self._run_test(request, workspace, editor, testcase_module, [], [])
 
     def test_FileManagement_FindingFiles(self, workspace):
@@ -262,7 +262,7 @@ class TestUtils(TestAutomationBase):
     )
     @fm.file_override("default.physxconfiguration", "UtilTest_PhysxConfig_Override.physxconfiguration")
     def test_UtilTest_Managed_Files(self, request, workspace, editor):
-        from . import UtilTest_Managed_Files as test_module
+        from .utils import UtilTest_Managed_Files as test_module
 
         expected_lines = []
         unexpected_lines = ["Assert"]

AutomatedTesting/Gem/PythonTests/physics/character_controller/C14654881_CharacterController_SwitchLevels.py

@@ -53,11 +53,6 @@ def C14654881_CharacterController_SwitchLevels():
 
     import os
     import sys
-
-    import ImportPathHelper as imports
-
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
     import azlmbr.legacy.general as general
@@ -93,8 +88,5 @@ def C14654881_CharacterController_SwitchLevels():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C14654881_CharacterController_SwitchLevels)

AutomatedTesting/Gem/PythonTests/physics/collider/C100000_RigidBody_EnablingGravityWorksPoC.py

@@ -25,11 +25,6 @@ class Tests():
 def C100000_RigidBody_EnablingGravityWorksPoC():
     import os
     import sys
-
-    import ImportPathHelper as imports
-
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
 
@@ -77,8 +72,5 @@ def C100000_RigidBody_EnablingGravityWorksPoC():
     helper.exit_game_mode(Tests.exit_game_mode)
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C100000_RigidBody_EnablingGravityWorksPoC)

AutomatedTesting/Gem/PythonTests/physics/collider/C111111_RigidBody_EnablingGravityWorksUsingNotificationsPoC.py

@@ -24,11 +24,6 @@ def C111111_RigidBody_EnablingGravityWorksUsingNotificationsPoC():
     # Setup path
     import os
     import sys
-
-    import ImportPathHelper as imports
-
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
 
@@ -84,8 +79,5 @@ def C111111_RigidBody_EnablingGravityWorksUsingNotificationsPoC():
     helper.exit_game_mode(Tests.exit_game_mode)
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C111111_RigidBody_EnablingGravityWorksUsingNotificationsPoC)

AutomatedTesting/Gem/PythonTests/physics/collider/C14861498_ConfirmError_NoPxMesh.py

@@ -48,11 +48,6 @@ def C14861498_ConfirmError_NoPxMesh():
     """
     import os
     import sys
-
-    import ImportPathHelper as imports
-
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
     from editor_python_test_tools.utils import Tracer
@@ -85,8 +80,5 @@ def C14861498_ConfirmError_NoPxMesh():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C14861498_ConfirmError_NoPxMesh)

AutomatedTesting/Gem/PythonTests/physics/collider/C14861500_DefaultSetting_ColliderShape.py

@@ -40,9 +40,7 @@ def C14861500_DefaultSetting_ColliderShape():
     :return: None
     """
     # Helper Files
-    import ImportPathHelper as imports
 
-    imports.init()
     from editor_python_test_tools.editor_entity_utils import EditorEntity as Entity
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
@@ -70,8 +68,5 @@ def C14861500_DefaultSetting_ColliderShape():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C14861500_DefaultSetting_ColliderShape)

AutomatedTesting/Gem/PythonTests/physics/collider/C14861501_PhysXCollider_RenderMeshAutoAssigned.py

@@ -48,13 +48,11 @@ def C14861501_PhysXCollider_RenderMeshAutoAssigned():
     import os
 
     # Helper Files
-    import ImportPathHelper as imports
 
-    imports.init()
     from editor_python_test_tools.editor_entity_utils import EditorEntity as Entity
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
-    from asset_utils import Asset
+    from editor_python_test_tools.asset_utils import Asset
 
     # Asset paths
     STATIC_MESH = os.path.join("assets", "c14861501_physxcollider_rendermeshautoassigned", "spherebot", "r0-b_body.azmodel")
@@ -91,8 +89,5 @@ def C14861501_PhysXCollider_RenderMeshAutoAssigned():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C14861501_PhysXCollider_RenderMeshAutoAssigned)

AutomatedTesting/Gem/PythonTests/physics/collider/C14861502_PhysXCollider_AssetAutoAssigned.py

@@ -47,13 +47,11 @@ def C14861502_PhysXCollider_AssetAutoAssigned():
     import os
 
     # Helper Files
-    import ImportPathHelper as imports
 
-    imports.init()
     from editor_python_test_tools.editor_entity_utils import EditorEntity as Entity
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
-    from asset_utils import Asset
+    from editor_python_test_tools.asset_utils import Asset
 
     # Open 3D Engine Imports
     import azlmbr.legacy.general as general
@@ -93,8 +91,5 @@ def C14861502_PhysXCollider_AssetAutoAssigned():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C14861502_PhysXCollider_AssetAutoAssigned)

AutomatedTesting/Gem/PythonTests/physics/collider/C14861504_RenderMeshAsset_WithNoPxAsset.py

@@ -22,7 +22,7 @@ class Tests():
 # fmt: on
 
 
-def run():
+def C14861504_RenderMeshAsset_WithNoPxAsset():
     """
     Summary:
      Create entity with Mesh component and assign a render mesh that has no physics asset to the Mesh component.
@@ -52,14 +52,12 @@ def run():
     import os
 
     # Helper Files
-    import ImportPathHelper as imports
 
-    imports.init()
     from editor_python_test_tools.editor_entity_utils import EditorEntity as Entity
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
     from editor_python_test_tools.utils import Tracer
-    from asset_utils import Asset
+    from editor_python_test_tools.asset_utils import Asset
 
     # Open 3D Engine Imports
     import azlmbr.asset as azasset
@@ -102,4 +100,5 @@ def run():
 
 
 if __name__ == "__main__":
-    run()
+    from editor_python_test_tools.utils import Report
+    Report.start_test(C14861504_RenderMeshAsset_WithNoPxAsset)

AutomatedTesting/Gem/PythonTests/physics/collider/C19578018_ShapeColliderWithNoShapeComponent.py

@@ -47,9 +47,7 @@ def C19578018_ShapeColliderWithNoShapeComponent():
     """
 
     # Built-in Imports
-    import ImportPathHelper as imports
 
-    imports.init()
 
     # Helper Imports
     from editor_python_test_tools.utils import Report
@@ -92,8 +90,5 @@ def C19578018_ShapeColliderWithNoShapeComponent():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C19578018_ShapeColliderWithNoShapeComponent)

AutomatedTesting/Gem/PythonTests/physics/collider/C19578021_ShapeCollider_CanBeAdded.py

@@ -44,9 +44,7 @@ def C19578021_ShapeCollider_CanBeAdded():
     :return: None
     """
     # Helper Files
-    import ImportPathHelper as imports
 
-    imports.init()
     from editor_python_test_tools.editor_entity_utils import EditorEntity as Entity
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
@@ -90,8 +88,5 @@ def C19578021_ShapeCollider_CanBeAdded():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C19578021_ShapeCollider_CanBeAdded)

AutomatedTesting/Gem/PythonTests/physics/collider/C19723164_ShapeColliders_WontCrashEditor.py

@@ -40,9 +40,7 @@ def C19723164_ShapeColliders_WontCrashEditor():
     :return: None
     """
     # Helper Files
-    import ImportPathHelper as imports
 
-    imports.init()
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
     from editor_python_test_tools.editor_entity_utils import EditorEntity as Entity
@@ -96,8 +94,5 @@ def C19723164_ShapeColliders_WontCrashEditor():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C19723164_ShapeColliders_WontCrashEditor)

AutomatedTesting/Gem/PythonTests/physics/collider/C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain.py

@@ -51,9 +51,7 @@ def C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain():
     import os
     import sys
 
-    import ImportPathHelper as imports
 
-    imports.init()
     from editor_python_test_tools.editor_entity_utils import EditorEntity
     import azlmbr.legacy.general as general
     import azlmbr.bus
@@ -134,8 +132,5 @@ def C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain)

AutomatedTesting/Gem/PythonTests/physics/collider/C3510644_Collider_CollisionGroups.py

@@ -90,11 +90,6 @@ def C3510644_Collider_CollisionGroups():
 
     import os
     import sys
-
-    import ImportPathHelper as imports
-
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
 
@@ -362,8 +357,5 @@ def C3510644_Collider_CollisionGroups():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C3510644_Collider_CollisionGroups)

AutomatedTesting/Gem/PythonTests/physics/collider/C4044695_PhysXCollider_AddMultipleSurfaceFbx.py

@@ -48,13 +48,11 @@ def C4044695_PhysXCollider_AddMultipleSurfaceFbx():
     import os
 
     # Helper Files
-    import ImportPathHelper as imports
 
-    imports.init()
     from editor_python_test_tools.editor_entity_utils import EditorEntity as Entity
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
-    from asset_utils import Asset
+    from editor_python_test_tools.asset_utils import Asset
 
     # Constants
     PHYSICS_ASSET_INDEX = 7  # Hardcoded enum index value for Shape property
@@ -107,8 +105,5 @@ def C4044695_PhysXCollider_AddMultipleSurfaceFbx():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C4044695_PhysXCollider_AddMultipleSurfaceFbx)

AutomatedTesting/Gem/PythonTests/physics/collider/C4976227_Collider_NewGroup.py

@@ -51,11 +51,6 @@ def C4976227_Collider_NewGroup():
 
     import os
     import sys
-
-    import ImportPathHelper as imports
-
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
 
@@ -84,8 +79,5 @@ def C4976227_Collider_NewGroup():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C4976227_Collider_NewGroup)

AutomatedTesting/Gem/PythonTests/physics/collider/C4976236_AddPhysxColliderComponent.py

@@ -42,14 +42,12 @@ def C4976236_AddPhysxColliderComponent():
     """
 
     # Helper file Imports
-    import ImportPathHelper as imports
 
-    imports.init()
     from editor_python_test_tools.editor_entity_utils import EditorEntity
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
     from editor_python_test_tools.utils import Tracer
-    from asset_utils import Asset
+    from editor_python_test_tools.asset_utils import Asset
     
     helper.init_idle()
     # 1) Load the level
@@ -84,8 +82,5 @@ def C4976236_AddPhysxColliderComponent():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C4976236_AddPhysxColliderComponent)

AutomatedTesting/Gem/PythonTests/physics/collider/C4976242_Collision_SameCollisionlayerSameCollisiongroup.py

@@ -62,11 +62,6 @@ def C4976242_Collision_SameCollisionlayerSameCollisiongroup():
 
     import os
     import sys
-
-    import ImportPathHelper as imports
-
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
 
@@ -188,8 +183,5 @@ def C4976242_Collision_SameCollisionlayerSameCollisiongroup():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C4976242_Collision_SameCollisionlayerSameCollisiongroup)

AutomatedTesting/Gem/PythonTests/physics/collider/C4976243_Collision_SameCollisionGroupDiffCollisionLayers.py

@@ -66,11 +66,6 @@ def C4976243_Collision_SameCollisionGroupDiffCollisionLayers():
 
     import os
     import sys
-
-    import ImportPathHelper as imports
-
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
 
@@ -127,8 +122,5 @@ def C4976243_Collision_SameCollisionGroupDiffCollisionLayers():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C4976243_Collision_SameCollisionGroupDiffCollisionLayers)

AutomatedTesting/Gem/PythonTests/physics/collider/C4976244_Collider_SameGroupSameLayerCollision.py

@@ -62,11 +62,6 @@ def C4976244_Collider_SameGroupSameLayerCollision():
 
     import os
     import sys
-
-    import ImportPathHelper as imports
-
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
 
@@ -185,8 +180,5 @@ def C4976244_Collider_SameGroupSameLayerCollision():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C4976244_Collider_SameGroupSameLayerCollision)

AutomatedTesting/Gem/PythonTests/physics/collider/C4976245_PhysXCollider_CollisionLayerTest.py

@@ -67,11 +67,6 @@ def C4976245_PhysXCollider_CollisionLayerTest():
 
     import os
     import sys
-
-    import ImportPathHelper as imports
-
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
     import azlmbr.legacy.general as general
@@ -223,8 +218,5 @@ def C4976245_PhysXCollider_CollisionLayerTest():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C4976245_PhysXCollider_CollisionLayerTest)

AutomatedTesting/Gem/PythonTests/physics/collider/C4982593_PhysXCollider_CollisionLayerTest.py

@@ -67,11 +67,6 @@ def C4982593_PhysXCollider_CollisionLayerTest():
 
     import os
     import sys
-
-    import ImportPathHelper as imports
-
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
     import azlmbr.legacy.general as general
@@ -231,8 +226,5 @@ def C4982593_PhysXCollider_CollisionLayerTest():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C4982593_PhysXCollider_CollisionLayerTest)

AutomatedTesting/Gem/PythonTests/physics/collider/C4982595_Collider_TriggerDisablesCollision.py

@@ -75,11 +75,6 @@ def C4982595_Collider_TriggerDisablesCollision():
     # Setup path
     import os
     import sys
-
-    import ImportPathHelper as imports
-
-    imports.init()
-
     import azlmbr.legacy.general as general
     import azlmbr.bus
     import azlmbr.components
@@ -234,8 +229,5 @@ def C4982595_Collider_TriggerDisablesCollision():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C4982595_Collider_TriggerDisablesCollision)

AutomatedTesting/Gem/PythonTests/physics/collider/C4982797_Collider_ColliderOffset.py

@@ -87,9 +87,7 @@ def C4982797_Collider_ColliderOffset():
     import sys
 
     # Internal editor imports
-    import ImportPathHelper as imports
 
-    imports.init()
 
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
@@ -332,8 +330,5 @@ def C4982797_Collider_ColliderOffset():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C4982797_Collider_ColliderOffset)

AutomatedTesting/Gem/PythonTests/physics/collider/C4982798_Collider_ColliderRotationOffset.py

@@ -86,9 +86,7 @@ def C4982798_Collider_ColliderRotationOffset():
     :return: None
     """
 
-    import ImportPathHelper as imports
 
-    imports.init()
 
 
     # Internal editor imports
@@ -300,8 +298,5 @@ def C4982798_Collider_ColliderRotationOffset():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C4982798_Collider_ColliderRotationOffset)

AutomatedTesting/Gem/PythonTests/physics/collider/C4982800_PhysXColliderShape_CanBeSelected.py

@@ -43,9 +43,7 @@ def C4982800_PhysXColliderShape_CanBeSelected():
     :return: None
     """
     # Helper Files
-    import ImportPathHelper as imports
 
-    imports.init()
     from editor_python_test_tools.editor_entity_utils import EditorEntity as Entity
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
@@ -91,8 +89,5 @@ def C4982800_PhysXColliderShape_CanBeSelected():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C4982800_PhysXColliderShape_CanBeSelected)

AutomatedTesting/Gem/PythonTests/physics/collider/C4982801_PhysXColliderShape_CanBeSelected.py

@@ -43,9 +43,7 @@ def C4982801_PhysXColliderShape_CanBeSelected():
     :return: None
     """
     # Helper Files
-    import ImportPathHelper as imports
 
-    imports.init()
     from editor_python_test_tools.editor_entity_utils import EditorEntity as Entity
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
@@ -103,8 +101,5 @@ def C4982801_PhysXColliderShape_CanBeSelected():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C4982801_PhysXColliderShape_CanBeSelected)

AutomatedTesting/Gem/PythonTests/physics/collider/C4982802_PhysXColliderShape_CanBeSelected.py

@@ -43,9 +43,7 @@ def C4982802_PhysXColliderShape_CanBeSelected():
     :return: None
     """
     # Helper Files
-    import ImportPathHelper as imports
 
-    imports.init()
     from editor_python_test_tools.editor_entity_utils import EditorEntity as Entity
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
@@ -103,8 +101,5 @@ def C4982802_PhysXColliderShape_CanBeSelected():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C4982802_PhysXColliderShape_CanBeSelected)

AutomatedTesting/Gem/PythonTests/physics/collider/C4982803_Enable_PxMesh_Option.py

@@ -57,13 +57,11 @@ def C4982803_Enable_PxMesh_Option():
     import os
 
     # Helper Files
-    import ImportPathHelper as imports
 
-    imports.init()
     from editor_python_test_tools.editor_entity_utils import EditorEntity
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
-    from asset_utils import Asset
+    from editor_python_test_tools.asset_utils import Asset
     import azlmbr.math as math
 
     # Open 3D Engine Imports
@@ -141,8 +139,5 @@ def C4982803_Enable_PxMesh_Option():
     helper.exit_game_mode(Tests.exit_game_mode)
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C4982803_Enable_PxMesh_Option)

AutomatedTesting/Gem/PythonTests/physics/force_region/C12868578_ForceRegion_DirectionHasNoAffectOnMagnitude.py

@@ -86,11 +86,6 @@ def C12868578_ForceRegion_DirectionHasNoAffectOnMagnitude():
     """
     import os
     import sys
-
-    import ImportPathHelper as imports
-
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
 
@@ -283,8 +278,5 @@ def C12868578_ForceRegion_DirectionHasNoAffectOnMagnitude():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C12868578_ForceRegion_DirectionHasNoAffectOnMagnitude)

AutomatedTesting/Gem/PythonTests/physics/force_region/C12868580_ForceRegion_SplineModifiedTransform.py

@@ -73,12 +73,6 @@ def C12868580_ForceRegion_SplineModifiedTransform():
     """
     import os
     import sys
-
-    import ImportPathHelper as imports
-
-    imports.init()
-
-
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
 
@@ -168,8 +162,5 @@ def C12868580_ForceRegion_SplineModifiedTransform():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C12868580_ForceRegion_SplineModifiedTransform)

AutomatedTesting/Gem/PythonTests/physics/force_region/C12905527_ForceRegion_MagnitudeDeviation.py

@@ -54,12 +54,6 @@ def C12905527_ForceRegion_MagnitudeDeviation():
     """
     import os
     import sys
-
-    import ImportPathHelper as imports
-
-    imports.init()
-
-
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
 
@@ -144,8 +138,5 @@ def C12905527_ForceRegion_MagnitudeDeviation():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C12905527_ForceRegion_MagnitudeDeviation)

AutomatedTesting/Gem/PythonTests/physics/force_region/C12905528_ForceRegion_WithNonTriggerCollider.py

@@ -19,7 +19,7 @@ class Tests():
 # fmt: on
 
 
-def run():
+def C12905528_ForceRegion_WithNonTriggerCollider():
     """
     Summary:
      Create entity with PhysX Force Region component. Check that user is warned if new PhysX Collider component is
@@ -43,13 +43,10 @@ def run():
 
     :return: None
     """
-    # Helper file Imports
+    import azlmbr.legacy.general as general
-    import ImportPathHelper as imports
-
     from editor_python_test_tools.editor_entity_utils import EditorEntity
     from editor_python_test_tools.utils import Report
 
-    imports.init()
     from editor_python_test_tools.utils import TestHelper as helper
     from editor_python_test_tools.utils import Tracer
 
@@ -66,11 +63,14 @@ def run():
     Report.result(Tests.add_physx_force_region, test_entity.has_component("PhysX Force Region"))
 
     # 4) Start the Tracer to catch any errors and warnings
+    Report.info("Starting warning monitoring")
     with Tracer() as section_tracer:
         # 5) Add the PhysX Collider component
         test_entity.add_component("PhysX Collider")
         Report.result(Tests.add_physx_collider, test_entity.has_component("PhysX Collider"))
-
+        general.idle_wait_frames(1)
+    Report.info("Ending warning monitoring")
+    
     # ) Verify there is warning in the logs
     success_condition = section_tracer.has_warnings
     # Checking if warning exist and the exact warning is caught in the expected lines in Test file
@@ -78,4 +78,5 @@ def run():
 
 
 if __name__ == "__main__":
-    run()
+    from editor_python_test_tools.utils import Report
+    Report.start_test(C12905528_ForceRegion_WithNonTriggerCollider)

AutomatedTesting/Gem/PythonTests/physics/force_region/C15845879_ForceRegion_HighLinearDampingForce.py

@@ -56,11 +56,6 @@ def C15845879_ForceRegion_HighLinearDampingForce():
     """
     import os
     import sys
-
-    import ImportPathHelper as imports
-
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
 
@@ -169,8 +164,5 @@ def C15845879_ForceRegion_HighLinearDampingForce():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C15845879_ForceRegion_HighLinearDampingForce)

AutomatedTesting/Gem/PythonTests/physics/force_region/C5932040_ForceRegion_CubeExertsWorldForce.py

@@ -65,11 +65,6 @@ def C5932040_ForceRegion_CubeExertsWorldForce():
 
     import os
     import sys
-
-    import ImportPathHelper as imports
-
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
 
@@ -183,8 +178,5 @@ def C5932040_ForceRegion_CubeExertsWorldForce():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C5932040_ForceRegion_CubeExertsWorldForce)

AutomatedTesting/Gem/PythonTests/physics/force_region/C5932041_PhysXForceRegion_LocalSpaceForceOnRigidBodies.py

@@ -65,11 +65,6 @@ def C5932041_PhysXForceRegion_LocalSpaceForceOnRigidBodies():
     """
     import os
     import sys
-
-    import ImportPathHelper as imports
-
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
 
@@ -161,8 +156,5 @@ def C5932041_PhysXForceRegion_LocalSpaceForceOnRigidBodies():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C5932041_PhysXForceRegion_LocalSpaceForceOnRigidBodies)

AutomatedTesting/Gem/PythonTests/physics/force_region/C5932042_PhysXForceRegion_LinearDamping.py

@@ -71,11 +71,6 @@ def C5932042_PhysXForceRegion_LinearDamping():
 
     import os
     import sys
-
-    import ImportPathHelper as imports
-
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
 
@@ -269,8 +264,5 @@ def C5932042_PhysXForceRegion_LinearDamping():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C5932042_PhysXForceRegion_LinearDamping)

AutomatedTesting/Gem/PythonTests/physics/force_region/C5932043_ForceRegion_SimpleDragOnRigidBodies.py

@@ -42,9 +42,7 @@ def C5932043_ForceRegion_SimpleDragOnRigidBodies():
     # Setup path
     import os, sys
 
-    import ImportPathHelper as imports
 
-    imports.init()
 
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
@@ -139,8 +137,5 @@ def C5932043_ForceRegion_SimpleDragOnRigidBodies():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C5932043_ForceRegion_SimpleDragOnRigidBodies)

AutomatedTesting/Gem/PythonTests/physics/force_region/C5932044_ForceRegion_PointForceOnRigidBody.py

@@ -65,11 +65,6 @@ def C5932044_ForceRegion_PointForceOnRigidBody():
 
     import os
     import sys
-
-    import ImportPathHelper as imports
-
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
 
@@ -189,8 +184,5 @@ def C5932044_ForceRegion_PointForceOnRigidBody():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C5932044_ForceRegion_PointForceOnRigidBody)

AutomatedTesting/Gem/PythonTests/physics/force_region/C5932045_ForceRegion_Spline.py

@@ -70,11 +70,6 @@ def C5932045_ForceRegion_Spline():
     """
     import os
     import sys
-
-    import ImportPathHelper as imports
-
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
 
@@ -162,8 +157,5 @@ def C5932045_ForceRegion_Spline():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C5932045_ForceRegion_Spline)

AutomatedTesting/Gem/PythonTests/physics/force_region/C5959759_RigidBody_ForceRegionSpherePointForce.py

@@ -38,11 +38,6 @@ def C5959759_RigidBody_ForceRegionSpherePointForce():
     """
     import os
     import sys
-
-    import ImportPathHelper as imports
-
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
 
@@ -150,8 +145,5 @@ def C5959759_RigidBody_ForceRegionSpherePointForce():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C5959759_RigidBody_ForceRegionSpherePointForce)

AutomatedTesting/Gem/PythonTests/physics/force_region/C5959760_PhysXForceRegion_PointForceExertion.py

@@ -63,11 +63,6 @@ def C5959760_PhysXForceRegion_PointForceExertion():
     """
     import os
     import sys
-
-    import ImportPathHelper as imports
-
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
 
@@ -223,8 +218,5 @@ def C5959760_PhysXForceRegion_PointForceExertion():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C5959760_PhysXForceRegion_PointForceExertion)

AutomatedTesting/Gem/PythonTests/physics/force_region/C5959761_ForceRegion_PhysAssetExertsPointForce.py

@@ -61,12 +61,6 @@ def C5959761_ForceRegion_PhysAssetExertsPointForce():
 
     import os
     import sys
-
-    import ImportPathHelper as imports
-
-    imports.init()
-
-
     import azlmbr
     import azlmbr.legacy.general as general
     import azlmbr.bus as bus
@@ -140,8 +134,5 @@ def C5959761_ForceRegion_PhysAssetExertsPointForce():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C5959761_ForceRegion_PhysAssetExertsPointForce)

AutomatedTesting/Gem/PythonTests/physics/force_region/C5959763_ForceRegion_ForceRegionImpulsesCube.py

@@ -42,9 +42,7 @@ def C5959763_ForceRegion_ForceRegionImpulsesCube():
     # Setup path
     import os, sys
 
-    import ImportPathHelper as imports
 
-    imports.init()
 
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
@@ -165,8 +163,5 @@ def C5959763_ForceRegion_ForceRegionImpulsesCube():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C5959763_ForceRegion_ForceRegionImpulsesCube)

AutomatedTesting/Gem/PythonTests/physics/force_region/C5959764_ForceRegion_ForceRegionImpulsesCapsule.py

@@ -42,9 +42,7 @@ def C5959764_ForceRegion_ForceRegionImpulsesCapsule():
     # Setup path
     import os, sys
 
-    import ImportPathHelper as imports
 
-    imports.init()
 
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
@@ -167,8 +165,5 @@ def C5959764_ForceRegion_ForceRegionImpulsesCapsule():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C5959764_ForceRegion_ForceRegionImpulsesCapsule)

AutomatedTesting/Gem/PythonTests/physics/force_region/C5959765_ForceRegion_AssetGetsImpulsed.py

@@ -45,9 +45,7 @@ def C5959765_ForceRegion_AssetGetsImpulsed():
     # Setup path
     import os, sys
 
-    import ImportPathHelper as imports
 
-    imports.init()
 
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
@@ -169,8 +167,5 @@ def C5959765_ForceRegion_AssetGetsImpulsed():
     helper.exit_game_mode(Tests.exit_game_mode)
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C5959765_ForceRegion_AssetGetsImpulsed)

AutomatedTesting/Gem/PythonTests/physics/force_region/C5959808_ForceRegion_PositionOffset.py

@@ -124,11 +124,6 @@ def C5959808_ForceRegion_PositionOffset():
 
     import os
     import sys
-
-    import ImportPathHelper as imports
-
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
 
@@ -405,8 +400,5 @@ def C5959808_ForceRegion_PositionOffset():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C5959808_ForceRegion_PositionOffset)

AutomatedTesting/Gem/PythonTests/physics/force_region/C5959809_ForceRegion_RotationalOffset.py

@@ -125,11 +125,6 @@ def C5959809_ForceRegion_RotationalOffset():
 
     import os
     import sys
-
-    import ImportPathHelper as imports
-
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
 
@@ -405,8 +400,5 @@ def C5959809_ForceRegion_RotationalOffset():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C5959809_ForceRegion_RotationalOffset)

AutomatedTesting/Gem/PythonTests/physics/force_region/C5959810_ForceRegion_ForceRegionCombinesForces.py

@@ -65,11 +65,6 @@ def C5959810_ForceRegion_ForceRegionCombinesForces():
 
     import os
     import sys
-
-    import ImportPathHelper as imports
-
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
 
@@ -234,8 +229,5 @@ def C5959810_ForceRegion_ForceRegionCombinesForces():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C5959810_ForceRegion_ForceRegionCombinesForces)

AutomatedTesting/Gem/PythonTests/physics/force_region/C5968759_ForceRegion_ExertsSeveralForcesOnRigidBody.py

@@ -55,9 +55,7 @@ def C5968759_ForceRegion_ExertsSeveralForcesOnRigidBody():
     Second force region: Name = "Force Region Simple Drag"  Applies a drag force on both spheres
     Setup path
     """
-    import ImportPathHelper as imports
 
-    imports.init()
 
 
     import azlmbr.legacy.general as general
@@ -175,8 +173,5 @@ def C5968759_ForceRegion_ExertsSeveralForcesOnRigidBody():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C5968759_ForceRegion_ExertsSeveralForcesOnRigidBody)

AutomatedTesting/Gem/PythonTests/physics/force_region/C5968760_ForceRegion_CheckNetForceChange.py

@@ -61,11 +61,6 @@ def C5968760_ForceRegion_CheckNetForceChange():
 
     import os
     import sys
-
-    import ImportPathHelper as imports
-
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
 
@@ -163,8 +158,5 @@ def C5968760_ForceRegion_CheckNetForceChange():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C5968760_ForceRegion_CheckNetForceChange)

AutomatedTesting/Gem/PythonTests/physics/force_region/C6090546_ForceRegion_SliceFileInstantiates.py

@@ -63,11 +63,6 @@ def C6090546_ForceRegion_SliceFileInstantiates():
 
     import os
     import sys
-
-    import ImportPathHelper as imports
-
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
 
@@ -138,8 +133,5 @@ def C6090546_ForceRegion_SliceFileInstantiates():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C6090546_ForceRegion_SliceFileInstantiates)

AutomatedTesting/Gem/PythonTests/physics/force_region/C6090547_ForceRegion_ParentChildForceRegions.py

@@ -72,11 +72,6 @@ def C6090547_ForceRegion_ParentChildForceRegions():
 
     import os
     import sys
-
-    import ImportPathHelper as imports
-
-    imports.init()
-
     import azlmbr.legacy.general as general
     import azlmbr.bus
     import azlmbr.math as lymath
@@ -199,8 +194,5 @@ def C6090547_ForceRegion_ParentChildForceRegions():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C6090547_ForceRegion_ParentChildForceRegions)

AutomatedTesting/Gem/PythonTests/physics/force_region/C6090550_ForceRegion_WorldSpaceForceNegative.py

@@ -69,11 +69,6 @@ def C6090550_ForceRegion_WorldSpaceForceNegative():
     """
     import os
     import sys
-
-    import ImportPathHelper as imports
-
-    imports.init()
-
     import azlmbr.legacy.general as general
     import azlmbr.bus
 
@@ -243,8 +238,5 @@ def C6090550_ForceRegion_WorldSpaceForceNegative():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C6090550_ForceRegion_WorldSpaceForceNegative)

AutomatedTesting/Gem/PythonTests/physics/force_region/C6090551_ForceRegion_LocalSpaceForceNegative.py

@@ -69,11 +69,6 @@ def C6090551_ForceRegion_LocalSpaceForceNegative():
     """
     import os
     import sys
-
-    import ImportPathHelper as imports
-
-    imports.init()
-
     import azlmbr.legacy.general as general
     import azlmbr.bus
 
@@ -243,8 +238,5 @@ def C6090551_ForceRegion_LocalSpaceForceNegative():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C6090551_ForceRegion_LocalSpaceForceNegative)

AutomatedTesting/Gem/PythonTests/physics/force_region/C6090552_ForceRegion_LinearDampingNegative.py

@@ -68,11 +68,6 @@ def C6090552_ForceRegion_LinearDampingNegative():
     """
     import os
     import sys
-
-    import ImportPathHelper as imports
-
-    imports.init()
-
     import azlmbr.legacy.general as general
     import azlmbr.bus
 
@@ -242,8 +237,5 @@ def C6090552_ForceRegion_LinearDampingNegative():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C6090552_ForceRegion_LinearDampingNegative)

AutomatedTesting/Gem/PythonTests/physics/force_region/C6090553_ForceRegion_SimpleDragForceOnRigidBodies.py

@@ -63,11 +63,6 @@ def C6090553_ForceRegion_SimpleDragForceOnRigidBodies():
 
     import os
     import sys
-
-    import ImportPathHelper as imports
-
-    imports.init()
-
     import azlmbr.legacy.general as general
     import azlmbr.bus
 
@@ -174,8 +169,5 @@ def C6090553_ForceRegion_SimpleDragForceOnRigidBodies():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C6090553_ForceRegion_SimpleDragForceOnRigidBodies)

AutomatedTesting/Gem/PythonTests/physics/force_region/C6090554_ForceRegion_PointForceNegative.py

@@ -69,11 +69,6 @@ def C6090554_ForceRegion_PointForceNegative():
     """
     import os
     import sys
-
-    import ImportPathHelper as imports
-
-    imports.init()
-
     import azlmbr.legacy.general as general
     import azlmbr.bus
 
@@ -243,8 +238,5 @@ def C6090554_ForceRegion_PointForceNegative():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C6090554_ForceRegion_PointForceNegative)

AutomatedTesting/Gem/PythonTests/physics/force_region/C6090555_ForceRegion_SplineFollowOnRigidBodies.py

@@ -65,11 +65,6 @@ def C6090555_ForceRegion_SplineFollowOnRigidBodies():
     """
     import os
     import sys
-
-    import ImportPathHelper as imports
-
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
 
@@ -176,8 +171,5 @@ def C6090555_ForceRegion_SplineFollowOnRigidBodies():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C6090555_ForceRegion_SplineFollowOnRigidBodies)

AutomatedTesting/Gem/PythonTests/physics/force_region/C6321601_Force_HighValuesDirectionAxes.py

@@ -90,11 +90,6 @@ def C6321601_Force_HighValuesDirectionAxes():
 
     import os
     import sys
-
-    import ImportPathHelper as imports
-
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
     from editor_python_test_tools.utils import Tracer
@@ -246,10 +241,6 @@ def C6321601_Force_HighValuesDirectionAxes():
     Report.result(Tests.error_not_found, not has_physx_error())
 
 
-
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C6321601_Force_HighValuesDirectionAxes)

AutomatedTesting/Gem/PythonTests/physics/general/C14976307_Gravity_SetGravityWorks.py

@@ -60,11 +60,6 @@ def C14976307_Gravity_SetGravityWorks():
 
     import os
     import sys
-
-    import ImportPathHelper as imports
-
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
 
@@ -122,8 +117,5 @@ def C14976307_Gravity_SetGravityWorks():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C14976307_Gravity_SetGravityWorks)

AutomatedTesting/Gem/PythonTests/physics/general/C15425929_Undo_Redo.py

@@ -44,11 +44,6 @@ def C15425929_Undo_Redo():
     """
     import os
     import sys
-
-    import ImportPathHelper as imports
-
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
     from editor_python_test_tools.utils import Tracer
@@ -91,8 +86,5 @@ def C15425929_Undo_Redo():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C15425929_Undo_Redo)

AutomatedTesting/Gem/PythonTests/physics/general/C19536274_GetCollisionName_PrintsName.py

@@ -17,7 +17,7 @@ class Tests():
 # fmt: on
 
 
-def run():
+def C19536274_GetCollisionName_PrintsName():
     """
     Summary:
      Loads a level that contains an entity with script canvas and PhysX Collider components
@@ -43,9 +43,7 @@ def run():
     :return: None
     """
     # Helper Files
-    import ImportPathHelper as imports
 
-    imports.init()
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.editor_entity_utils import EditorEntity as Entity
     from editor_python_test_tools.utils import TestHelper as helper
@@ -66,4 +64,5 @@ def run():
 
 
 if __name__ == "__main__":
-    run()
+    from editor_python_test_tools.utils import Report
+    Report.start_test(C19536274_GetCollisionName_PrintsName)

AutomatedTesting/Gem/PythonTests/physics/general/C19536277_GetCollisionName_PrintsNothing.py

@@ -17,7 +17,7 @@ class Tests():
 # fmt: on
 
 
-def run():
+def C19536277_GetCollisionName_PrintsNothing():
     """
     Summary:
      Loads a level that contains an entity with script canvas and PhysX Collider components
@@ -43,9 +43,7 @@ def run():
     :return: None
     """
     # Helper Files
-    import ImportPathHelper as imports
 
-    imports.init()
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.editor_entity_utils import EditorEntity as Entity
     from editor_python_test_tools.utils import TestHelper as helper
@@ -66,4 +64,5 @@ def run():
 
 
 if __name__ == "__main__":
-    run()
+    from editor_python_test_tools.utils import Report
+    Report.start_test(C19536277_GetCollisionName_PrintsNothing)

AutomatedTesting/Gem/PythonTests/physics/general/C29032500_EditorComponents_WorldBodyBusWorks.py

@@ -82,11 +82,6 @@ def C29032500_EditorComponents_WorldBodyBusWorks():
     """
     import os
     import sys
-
-    import ImportPathHelper as imports
-
-    imports.init()
-
     import azlmbr.legacy.general as general
     import azlmbr.bus
     import math
@@ -154,8 +149,5 @@ def C29032500_EditorComponents_WorldBodyBusWorks():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C29032500_EditorComponents_WorldBodyBusWorks)

AutomatedTesting/Gem/PythonTests/physics/general/C5689529_Verify_Terrain_RigidBody_Collider_Mesh.py

@@ -58,11 +58,6 @@ def C5689529_Verify_Terrain_RigidBody_Collider_Mesh():
 
     import os
     import sys
-
-    import ImportPathHelper as imports
-
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
 
@@ -106,8 +101,5 @@ def C5689529_Verify_Terrain_RigidBody_Collider_Mesh():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C5689529_Verify_Terrain_RigidBody_Collider_Mesh)

AutomatedTesting/Gem/PythonTests/physics/general/C6131473_StaticSlice_OnDynamicSliceSpawn.py

@@ -58,11 +58,6 @@ def C6131473_StaticSlice_OnDynamicSliceSpawn():
 
     import os
     import sys
-
-    import ImportPathHelper as imports
-
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
 
@@ -103,8 +98,5 @@ def C6131473_StaticSlice_OnDynamicSliceSpawn():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C6131473_StaticSlice_OnDynamicSliceSpawn)

AutomatedTesting/Gem/PythonTests/physics/joints/C18243580_Joints_Fixed2BodiesConstrained.py

@@ -49,11 +49,6 @@ def C18243580_Joints_Fixed2BodiesConstrained():
     """
     import os
     import sys
-
-    import ImportPathHelper as imports
-
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
 
@@ -99,8 +94,5 @@ def C18243580_Joints_Fixed2BodiesConstrained():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C18243580_Joints_Fixed2BodiesConstrained)

AutomatedTesting/Gem/PythonTests/physics/joints/C18243581_Joints_FixedBreakable.py

@@ -48,11 +48,6 @@ def C18243581_Joints_FixedBreakable():
     """
     import os
     import sys
-
-    import ImportPathHelper as imports
-
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
 
@@ -98,8 +93,5 @@ def C18243581_Joints_FixedBreakable():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C18243581_Joints_FixedBreakable)

AutomatedTesting/Gem/PythonTests/physics/joints/C18243582_Joints_FixedLeadFollowerCollide.py

@@ -50,11 +50,6 @@ def C18243582_Joints_FixedLeadFollowerCollide():
     """
     import os
     import sys
-
-    import ImportPathHelper as imports
-
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
 
@@ -93,8 +88,5 @@ def C18243582_Joints_FixedLeadFollowerCollide():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C18243582_Joints_FixedLeadFollowerCollide)

AutomatedTesting/Gem/PythonTests/physics/joints/C18243583_Joints_Hinge2BodiesConstrained.py

@@ -52,11 +52,6 @@ def C18243583_Joints_Hinge2BodiesConstrained():
     """
     import os
     import sys
-
-    import ImportPathHelper as imports
-
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
 
@@ -116,8 +111,5 @@ def C18243583_Joints_Hinge2BodiesConstrained():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C18243583_Joints_Hinge2BodiesConstrained)

AutomatedTesting/Gem/PythonTests/physics/joints/C18243584_Joints_HingeSoftLimitsConstrained.py

@@ -54,9 +54,7 @@ def C18243584_Joints_HingeSoftLimitsConstrained():
     import sys
     import math
 
-    import ImportPathHelper as imports
 
-    imports.init()
 
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
@@ -142,8 +140,5 @@ def C18243584_Joints_HingeSoftLimitsConstrained():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C18243584_Joints_HingeSoftLimitsConstrained)

AutomatedTesting/Gem/PythonTests/physics/joints/C18243585_Joints_HingeNoLimitsConstrained.py

@@ -52,11 +52,6 @@ def C18243585_Joints_HingeNoLimitsConstrained():
     """
     import os
     import sys
-
-    import ImportPathHelper as imports
-
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
 
@@ -112,8 +107,5 @@ def C18243585_Joints_HingeNoLimitsConstrained():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C18243585_Joints_HingeNoLimitsConstrained)

AutomatedTesting/Gem/PythonTests/physics/joints/C18243586_Joints_HingeLeadFollowerCollide.py

@@ -49,11 +49,6 @@ def C18243586_Joints_HingeLeadFollowerCollide():
     """
     import os
     import sys
-
-    import ImportPathHelper as imports
-
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
 
@@ -92,8 +87,5 @@ def C18243586_Joints_HingeLeadFollowerCollide():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C18243586_Joints_HingeLeadFollowerCollide)

AutomatedTesting/Gem/PythonTests/physics/joints/C18243587_Joints_HingeBreakable.py

@@ -50,11 +50,6 @@ def C18243587_Joints_HingeBreakable():
     """
     import os
     import sys
-
-    import ImportPathHelper as imports
-
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
 
@@ -110,8 +105,5 @@ def C18243587_Joints_HingeBreakable():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C18243587_Joints_HingeBreakable)

AutomatedTesting/Gem/PythonTests/physics/joints/C18243588_Joints_Ball2BodiesConstrained.py

@@ -51,11 +51,6 @@ def C18243588_Joints_Ball2BodiesConstrained():
     """
     import os
     import sys
-
-    import ImportPathHelper as imports
-
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
 
@@ -114,8 +109,5 @@ def C18243588_Joints_Ball2BodiesConstrained():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C18243588_Joints_Ball2BodiesConstrained)

AutomatedTesting/Gem/PythonTests/physics/joints/C18243589_Joints_BallSoftLimitsConstrained.py

@@ -55,9 +55,7 @@ def C18243589_Joints_BallSoftLimitsConstrained():
     import sys
     import math
 
-    import ImportPathHelper as imports
 
-    imports.init()
 
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
@@ -135,8 +133,5 @@ def C18243589_Joints_BallSoftLimitsConstrained():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C18243589_Joints_BallSoftLimitsConstrained)

AutomatedTesting/Gem/PythonTests/physics/joints/C18243590_Joints_BallNoLimitsConstrained.py

@@ -54,11 +54,6 @@ def C18243590_Joints_BallNoLimitsConstrained():
     """
     import os
     import sys
-
-    import ImportPathHelper as imports
-
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
 
@@ -113,8 +108,5 @@ def C18243590_Joints_BallNoLimitsConstrained():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C18243590_Joints_BallNoLimitsConstrained)

AutomatedTesting/Gem/PythonTests/physics/joints/C18243591_Joints_BallLeadFollowerCollide.py

@@ -49,11 +49,6 @@ def C18243591_Joints_BallLeadFollowerCollide():
     """
     import os
     import sys
-
-    import ImportPathHelper as imports
-
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
 
@@ -92,8 +87,5 @@ def C18243591_Joints_BallLeadFollowerCollide():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C18243591_Joints_BallLeadFollowerCollide)

AutomatedTesting/Gem/PythonTests/physics/joints/C18243592_Joints_BallBreakable.py

@@ -49,11 +49,6 @@ def C18243592_Joints_BallBreakable():
     """
     import os
     import sys
-
-    import ImportPathHelper as imports
-
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
 
@@ -108,8 +103,5 @@ def C18243592_Joints_BallBreakable():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C18243592_Joints_BallBreakable)

AutomatedTesting/Gem/PythonTests/physics/joints/C18243593_Joints_GlobalFrameConstrained.py

@@ -53,11 +53,6 @@ def C18243593_Joints_GlobalFrameConstrained():
     """
     import os
     import sys
-
-    import ImportPathHelper as imports
-
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
 
@@ -121,8 +116,5 @@ def C18243593_Joints_GlobalFrameConstrained():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C18243593_Joints_GlobalFrameConstrained)

AutomatedTesting/Gem/PythonTests/physics/joints/JointsHelper.py

@@ -5,10 +5,6 @@ For complete copyright and license terms please see the LICENSE at the root of t
 SPDX-License-Identifier: Apache-2.0 OR MIT
 """
 
-import ImportPathHelper as imports
-
-imports.init()
-
 from editor_python_test_tools.utils import Report
 import azlmbr.legacy.general as general
 import azlmbr.bus

AutomatedTesting/Gem/PythonTests/physics/material/C15096732_Material_DefaultLibraryUpdatedAcrossLevels_after.py

@@ -99,11 +99,6 @@ def C15096732_Material_DefaultLibraryUpdatedAcrossLevels_after():
     """
     import os
     import sys
-
-    import ImportPathHelper as imports
-
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
 
@@ -285,8 +280,5 @@ def C15096732_Material_DefaultLibraryUpdatedAcrossLevels_after():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C15096732_Material_DefaultLibraryUpdatedAcrossLevels_after)

AutomatedTesting/Gem/PythonTests/physics/material/C15096732_Material_DefaultLibraryUpdatedAcrossLevels_before.py

@@ -92,11 +92,6 @@ def C15096732_Material_DefaultLibraryUpdatedAcrossLevels_before():
     """
     import os
     import sys
-
-    import ImportPathHelper as imports
-
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
 
@@ -237,8 +232,5 @@ def C15096732_Material_DefaultLibraryUpdatedAcrossLevels_before():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C15096732_Material_DefaultLibraryUpdatedAcrossLevels_before)

AutomatedTesting/Gem/PythonTests/physics/material/C15096735_Materials_DefaultLibraryConsistency.py

@@ -140,11 +140,6 @@ def C15096735_Materials_DefaultLibraryConsistency():
     """
     import os
     import sys
-
-    import ImportPathHelper as imports
-
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
 
@@ -417,8 +412,5 @@ def C15096735_Materials_DefaultLibraryConsistency():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C15096735_Materials_DefaultLibraryConsistency)

AutomatedTesting/Gem/PythonTests/physics/material/C15096737_Materials_DefaultMaterialLibraryChanges.py

@@ -107,9 +107,7 @@ def C15096737_Materials_DefaultMaterialLibraryChanges():
 
     import os
     import sys
-    import ImportPathHelper as imports
 
-    imports.init()
 
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
@@ -293,8 +291,5 @@ def C15096737_Materials_DefaultMaterialLibraryChanges():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C15096737_Materials_DefaultMaterialLibraryChanges)

AutomatedTesting/Gem/PythonTests/physics/material/C15096740_Material_LibraryUpdatedCorrectly.py

@@ -49,15 +49,13 @@ def C15096740_Material_LibraryUpdatedCorrectly():
 
     # Built-in Imports
     import os
-    import ImportPathHelper as imports
 
-    imports.init()
 
     # Helper file Imports
     from editor_python_test_tools.editor_entity_utils import EditorEntity
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.utils import TestHelper as helper
-    from asset_utils import Asset
+    from editor_python_test_tools.asset_utils import Asset
 
     # Open 3D Engine Imports
     import azlmbr.asset as azasset
@@ -101,8 +99,5 @@ def C15096740_Material_LibraryUpdatedCorrectly():
 
 
 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
-
     from editor_python_test_tools.utils import Report
     Report.start_test(C15096740_Material_LibraryUpdatedCorrectly)