diff --git a/AutomatedTesting/Gem/PythonTests/Blast/CMakeLists.txt b/AutomatedTesting/Gem/PythonTests/Blast/CMakeLists.txt index 172eded09a..cb83fe5344 100644 --- a/AutomatedTesting/Gem/PythonTests/Blast/CMakeLists.txt +++ b/AutomatedTesting/Gem/PythonTests/Blast/CMakeLists.txt @@ -8,10 +8,10 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS) ly_add_pytest( - NAME AutomatedTesting::BlastTests + NAME AutomatedTesting::BlastTests_Main TEST_SUITE main TEST_SERIAL TRUE - PATH ${CMAKE_CURRENT_LIST_DIR}/TestSuite_Active.py + PATH ${CMAKE_CURRENT_LIST_DIR}/TestSuite_Main.py RUNTIME_DEPENDENCIES Legacy::Editor AZ::AssetProcessor diff --git a/AutomatedTesting/Gem/PythonTests/Blast/ImportPathHelper.py b/AutomatedTesting/Gem/PythonTests/Blast/ImportPathHelper.py deleted file mode 100755 index 0e395664ad..0000000000 --- a/AutomatedTesting/Gem/PythonTests/Blast/ImportPathHelper.py +++ /dev/null @@ -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') diff --git a/AutomatedTesting/Gem/PythonTests/Blast/TestSuite_Active.py b/AutomatedTesting/Gem/PythonTests/Blast/TestSuite_Main.py old mode 100755 new mode 100644 similarity index 76% rename from AutomatedTesting/Gem/PythonTests/Blast/TestSuite_Active.py rename to AutomatedTesting/Gem/PythonTests/Blast/TestSuite_Main.py index 111f6d62e6..dbc4a1a456 --- a/AutomatedTesting/Gem/PythonTests/Blast/TestSuite_Active.py +++ b/AutomatedTesting/Gem/PythonTests/Blast/TestSuite_Main.py @@ -22,29 +22,29 @@ from base import TestAutomationBase @pytest.mark.parametrize("project", ["AutomatedTesting"]) class TestAutomation(TestAutomationBase): def test_ActorSplitsAfterCollision(self, request, workspace, editor, launcher_platform): - from . import ActorSplitsAfterCollision as test_module + from .tests import Blast_ActorSplitsAfterCollision as test_module self._run_test(request, workspace, editor, test_module) def test_ActorSplitsAfterRadialDamage(self, request, workspace, editor, launcher_platform): - from . import ActorSplitsAfterRadialDamage as test_module + from .tests import Blast_ActorSplitsAfterRadialDamage as test_module self._run_test(request, workspace, editor, test_module) def test_ActorSplitsAfterCapsuleDamage(self, request, workspace, editor, launcher_platform): - from . import ActorSplitsAfterCapsuleDamage as test_module + from .tests import Blast_ActorSplitsAfterCapsuleDamage as test_module self._run_test(request, workspace, editor, test_module) def test_ActorSplitsAfterImpactSpreadDamage(self, request, workspace, editor, launcher_platform): - from . import ActorSplitsAfterImpactSpreadDamage as test_module + from .tests import Blast_ActorSplitsAfterImpactSpreadDamage as test_module self._run_test(request, workspace, editor, test_module) def test_ActorSplitsAfterShearDamage(self, request, workspace, editor, launcher_platform): - from . import ActorSplitsAfterShearDamage as test_module + from .tests import Blast_ActorSplitsAfterShearDamage as test_module self._run_test(request, workspace, editor, test_module) def test_ActorSplitsAfterTriangleDamage(self, request, workspace, editor, launcher_platform): - from . import ActorSplitsAfterTriangleDamage as test_module + from .tests import Blast_ActorSplitsAfterTriangleDamage as test_module self._run_test(request, workspace, editor, test_module) def test_ActorSplitsAfterStressDamage(self, request, workspace, editor, launcher_platform): - from . import ActorSplitsAfterStressDamage as test_module + from .tests import Blast_ActorSplitsAfterStressDamage as test_module self._run_test(request, workspace, editor, test_module) diff --git a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterDamage.py b/AutomatedTesting/Gem/PythonTests/Blast/tests/BaseDamageTest.py old mode 100755 new mode 100644 similarity index 98% rename from AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterDamage.py rename to AutomatedTesting/Gem/PythonTests/Blast/tests/BaseDamageTest.py index 109dbf13f3..87340ebb26 --- a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterDamage.py +++ b/AutomatedTesting/Gem/PythonTests/Blast/tests/BaseDamageTest.py @@ -41,11 +41,7 @@ def base_run(damage_func): :return: None """ - - import ImportPathHelper as imports - - imports.init() - + from editor_python_test_tools.utils import Report from editor_python_test_tools.utils import TestHelper as helper diff --git a/AutomatedTesting/Gem/PythonTests/Blast/BlastUtils.py b/AutomatedTesting/Gem/PythonTests/Blast/tests/BlastUtils.py similarity index 100% rename from AutomatedTesting/Gem/PythonTests/Blast/BlastUtils.py rename to AutomatedTesting/Gem/PythonTests/Blast/tests/BlastUtils.py diff --git a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterCapsuleDamage.py b/AutomatedTesting/Gem/PythonTests/Blast/tests/Blast_ActorSplitsAfterCapsuleDamage.py old mode 100755 new mode 100644 similarity index 79% rename from AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterCapsuleDamage.py rename to AutomatedTesting/Gem/PythonTests/Blast/tests/Blast_ActorSplitsAfterCapsuleDamage.py index 96087569b3..11b395d927 --- a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterCapsuleDamage.py +++ b/AutomatedTesting/Gem/PythonTests/Blast/tests/Blast_ActorSplitsAfterCapsuleDamage.py @@ -9,10 +9,8 @@ import os import sys sys.path.append(os.path.dirname(os.path.abspath(__file__))) -from ActorSplitsAfterDamage import Tests - -def ActorSplitsAfterCapsuleDamage(): - from ActorSplitsAfterDamage import base_run as internal_run +def Blast_ActorSplitsAfterCapsuleDamage(): + from BaseDamageTest import base_run as internal_run from BlastUtils import Constants def CapsuleDamage(target_id, position0): @@ -26,8 +24,5 @@ def ActorSplitsAfterCapsuleDamage(): if __name__ == "__main__": - import ImportPathHelper as imports - imports.init() - from editor_python_test_tools.utils import Report - Report.start_test(ActorSplitsAfterCapsuleDamage) + Report.start_test(Blast_ActorSplitsAfterCapsuleDamage) diff --git a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterCollision.py b/AutomatedTesting/Gem/PythonTests/Blast/tests/Blast_ActorSplitsAfterCollision.py old mode 100755 new mode 100644 similarity index 95% rename from AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterCollision.py rename to AutomatedTesting/Gem/PythonTests/Blast/tests/Blast_ActorSplitsAfterCollision.py index af6bc62f71..815db78ddc --- a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterCollision.py +++ b/AutomatedTesting/Gem/PythonTests/Blast/tests/Blast_ActorSplitsAfterCollision.py @@ -18,7 +18,7 @@ class Tests(): # fmt: on -def ActorSplitsAfterCollision(): +def Blast_ActorSplitsAfterCollision(): """ Summary: @@ -46,10 +46,6 @@ def ActorSplitsAfterCollision(): :return: None """ - 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 +99,5 @@ def ActorSplitsAfterCollision(): if __name__ == "__main__": - import ImportPathHelper as imports - imports.init() - from editor_python_test_tools.utils import Report - Report.start_test(ActorSplitsAfterCollision) + Report.start_test(Blast_ActorSplitsAfterCollision) diff --git a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterImpactSpreadDamage.py b/AutomatedTesting/Gem/PythonTests/Blast/tests/Blast_ActorSplitsAfterImpactSpreadDamage.py old mode 100755 new mode 100644 similarity index 75% rename from AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterImpactSpreadDamage.py rename to AutomatedTesting/Gem/PythonTests/Blast/tests/Blast_ActorSplitsAfterImpactSpreadDamage.py index e98c7108ba..6cea44af17 --- a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterImpactSpreadDamage.py +++ b/AutomatedTesting/Gem/PythonTests/Blast/tests/Blast_ActorSplitsAfterImpactSpreadDamage.py @@ -9,10 +9,8 @@ import os import sys sys.path.append(os.path.dirname(os.path.abspath(__file__))) -from ActorSplitsAfterDamage import Tests - -def ActorSplitsAfterImpactSpreadDamage(): - from ActorSplitsAfterDamage import base_run as internal_run +def Blast_ActorSplitsAfterImpactSpreadDamage(): + from BaseDamageTest import base_run as internal_run from BlastUtils import Constants def ImpactSpreadDamage(target_id, position): @@ -24,8 +22,5 @@ def ActorSplitsAfterImpactSpreadDamage(): if __name__ == "__main__": - import ImportPathHelper as imports - imports.init() - from editor_python_test_tools.utils import Report - Report.start_test(ActorSplitsAfterImpactSpreadDamage) + Report.start_test(Blast_ActorSplitsAfterImpactSpreadDamage) diff --git a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterRadialDamage.py b/AutomatedTesting/Gem/PythonTests/Blast/tests/Blast_ActorSplitsAfterRadialDamage.py old mode 100755 new mode 100644 similarity index 75% rename from AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterRadialDamage.py rename to AutomatedTesting/Gem/PythonTests/Blast/tests/Blast_ActorSplitsAfterRadialDamage.py index 9f5f37752c..b3ddc9143c --- a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterRadialDamage.py +++ b/AutomatedTesting/Gem/PythonTests/Blast/tests/Blast_ActorSplitsAfterRadialDamage.py @@ -9,10 +9,8 @@ import os import sys sys.path.append(os.path.dirname(os.path.abspath(__file__))) -from ActorSplitsAfterDamage import Tests - -def ActorSplitsAfterRadialDamage(): - from ActorSplitsAfterDamage import base_run as internal_run +def Blast_ActorSplitsAfterRadialDamage(): + from BaseDamageTest import base_run as internal_run from BlastUtils import Constants def RadialDamage(target_id, position): @@ -24,8 +22,5 @@ def ActorSplitsAfterRadialDamage(): if __name__ == "__main__": - import ImportPathHelper as imports - imports.init() - from editor_python_test_tools.utils import Report - Report.start_test(ActorSplitsAfterRadialDamage) \ No newline at end of file + Report.start_test(Blast_ActorSplitsAfterRadialDamage) \ No newline at end of file diff --git a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterShearDamage.py b/AutomatedTesting/Gem/PythonTests/Blast/tests/Blast_ActorSplitsAfterShearDamage.py old mode 100755 new mode 100644 similarity index 77% rename from AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterShearDamage.py rename to AutomatedTesting/Gem/PythonTests/Blast/tests/Blast_ActorSplitsAfterShearDamage.py index 16abcbceea..8d14898fe6 --- a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterShearDamage.py +++ b/AutomatedTesting/Gem/PythonTests/Blast/tests/Blast_ActorSplitsAfterShearDamage.py @@ -9,10 +9,8 @@ import os import sys sys.path.append(os.path.dirname(os.path.abspath(__file__))) -from ActorSplitsAfterDamage import Tests - -def ActorSplitsAfterShearDamage(): - from ActorSplitsAfterDamage import base_run as internal_run +def Blast_ActorSplitsAfterShearDamage(): + from BaseDamageTest import base_run as internal_run from BlastUtils import Constants def ShearDamage(target_id, position): @@ -25,8 +23,5 @@ def ActorSplitsAfterShearDamage(): if __name__ == "__main__": - import ImportPathHelper as imports - imports.init() - from editor_python_test_tools.utils import Report - Report.start_test(ActorSplitsAfterShearDamage) \ No newline at end of file + Report.start_test(Blast_ActorSplitsAfterShearDamage) \ No newline at end of file diff --git a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterStressDamage.py b/AutomatedTesting/Gem/PythonTests/Blast/tests/Blast_ActorSplitsAfterStressDamage.py old mode 100755 new mode 100644 similarity index 75% rename from AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterStressDamage.py rename to AutomatedTesting/Gem/PythonTests/Blast/tests/Blast_ActorSplitsAfterStressDamage.py index a66efc5159..538d62929f --- a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterStressDamage.py +++ b/AutomatedTesting/Gem/PythonTests/Blast/tests/Blast_ActorSplitsAfterStressDamage.py @@ -9,10 +9,8 @@ import os import sys sys.path.append(os.path.dirname(os.path.abspath(__file__))) -from ActorSplitsAfterDamage import Tests - -def ActorSplitsAfterStressDamage(): - from ActorSplitsAfterDamage import base_run as internal_run +def Blast_ActorSplitsAfterStressDamage(): + from BaseDamageTest import base_run as internal_run from BlastUtils import Constants def StressDamage(target_id, position): @@ -24,8 +22,5 @@ def ActorSplitsAfterStressDamage(): if __name__ == "__main__": - import ImportPathHelper as imports - imports.init() - from editor_python_test_tools.utils import Report - Report.start_test(ActorSplitsAfterStressDamage) + Report.start_test(Blast_ActorSplitsAfterStressDamage) diff --git a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterTriangleDamage.py b/AutomatedTesting/Gem/PythonTests/Blast/tests/Blast_ActorSplitsAfterTriangleDamage.py old mode 100755 new mode 100644 similarity index 81% rename from AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterTriangleDamage.py rename to AutomatedTesting/Gem/PythonTests/Blast/tests/Blast_ActorSplitsAfterTriangleDamage.py index 0dcd6d5354..31a7dc083e --- a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterTriangleDamage.py +++ b/AutomatedTesting/Gem/PythonTests/Blast/tests/Blast_ActorSplitsAfterTriangleDamage.py @@ -9,10 +9,8 @@ import os import sys sys.path.append(os.path.dirname(os.path.abspath(__file__))) -from ActorSplitsAfterDamage import Tests - -def ActorSplitsAfterTriangleDamage(): - from ActorSplitsAfterDamage import base_run as internal_run +def Blast_ActorSplitsAfterTriangleDamage(): + from BaseDamageTest import base_run as internal_run from BlastUtils import Constants def TriangleDamage(target_id, position): @@ -28,8 +26,5 @@ def ActorSplitsAfterTriangleDamage(): if __name__ == "__main__": - import ImportPathHelper as imports - imports.init() - from editor_python_test_tools.utils import Report - Report.start_test(ActorSplitsAfterTriangleDamage) \ No newline at end of file + Report.start_test(Blast_ActorSplitsAfterTriangleDamage) \ No newline at end of file