Added more subdirectories and better names for prefab automated tests (#5488)

* Added more subdirectories and better names for prefab automated tests

Signed-off-by: srikappa-amzn <82230713+srikappa-amzn@users.noreply.github.com>

* Removed an additional prefab directory prefix for tests

Signed-off-by: srikappa-amzn <82230713+srikappa-amzn@users.noreply.github.com>

* Removed editor_workflows subdirectory and fixed prefab package casing issue

Signed-off-by: srikappa-amzn <82230713+srikappa-amzn@users.noreply.github.com>

AutomatedTesting/Gem/PythonTests/Prefab/TestSuite_Main.py

@@ -12,7 +12,6 @@ import pytest
 import os
 import sys
 
-from ly_test_tools import LAUNCHERS
 sys.path.append(os.path.dirname(os.path.abspath(__file__)) + '/../automatedtesting_shared')
 
 from base import TestAutomationBase
@@ -28,38 +27,38 @@ class TestAutomation(TestAutomationBase):
             batch_mode=batch_mode,
             autotest_mode=autotest_mode)
 
-    def test_PrefabLevel_OpensLevelWithEntities(self, request, workspace, editor, launcher_platform):
-        from .tests import PrefabLevel_OpensLevelWithEntities as test_module
+    def test_OpenLevel_ContainingTwoEntities(self, request, workspace, editor, launcher_platform):
+        from Prefab.tests.open_level import OpenLevel_ContainingTwoEntities as test_module
         self._run_prefab_test(request, workspace, editor, test_module)
 
-    def test_PrefabBasicWorkflow_CreatePrefab(self, request, workspace, editor, launcher_platform):
-        from .tests import PrefabBasicWorkflow_CreatePrefab as test_module
+    def test_CreatePrefab_WithSingleEntity(self, request, workspace, editor, launcher_platform):
+        from Prefab.tests.create_prefab import CreatePrefab_WithSingleEntity as test_module
         self._run_prefab_test(request, workspace, editor, test_module)
         
-    def test_PrefabBasicWorkflow_InstantiatePrefab(self, request, workspace, editor, launcher_platform):
-        from .tests import PrefabBasicWorkflow_InstantiatePrefab as test_module
+    def test_InstantiatePrefab_ContainingASingleEntity(self, request, workspace, editor, launcher_platform):
+        from Prefab.tests.instantiate_prefab import InstantiatePrefab_ContainingASingleEntity as test_module
         self._run_prefab_test(request, workspace, editor, test_module)
 
-    def test_PrefabBasicWorkflow_CreateAndDeletePrefab(self, request, workspace, editor, launcher_platform):
-        from .tests import PrefabBasicWorkflow_CreateAndDeletePrefab as test_module
+    def test_DeletePrefab_ContainingASingleEntity(self, request, workspace, editor, launcher_platform):
+        from Prefab.tests.delete_prefab import DeletePrefab_ContainingASingleEntity as test_module
         self._run_prefab_test(request, workspace, editor, test_module)
 
-    def test_PrefabBasicWorkflow_CreateAndReparentPrefab(self, request, workspace, editor, launcher_platform):
-        from .tests import PrefabBasicWorkflow_CreateAndReparentPrefab as test_module
+    def test_ReparentPrefab_UnderAnotherPrefab(self, request, workspace, editor, launcher_platform):
+        from Prefab.tests.reparent_prefab import ReparentPrefab_UnderAnotherPrefab as test_module
         self._run_prefab_test(request, workspace, editor, test_module, autotest_mode=False)
 
-    def test_PrefabBasicWorkflow_CreateReparentAndDetachPrefab(self, request, workspace, editor, launcher_platform):
-        from .tests import PrefabBasicWorkflow_CreateReparentAndDetachPrefab as test_module
+    def test_DetachPrefab_UnderAnotherPrefab(self, request, workspace, editor, launcher_platform):
+        from Prefab.tests.detach_prefab import DetachPrefab_UnderAnotherPrefab as test_module
         self._run_prefab_test(request, workspace, editor, test_module, autotest_mode=False)
 
-    def test_PrefabBasicWorkflow_CreateAndDuplicatePrefab(self, request, workspace, editor, launcher_platform):
-        from .tests import PrefabBasicWorkflow_CreateAndDuplicatePrefab as test_module
+    def test_DuplicatePrefab_ContainingASingleEntity(self, request, workspace, editor, launcher_platform):
+        from Prefab.tests.duplicate_prefab import DuplicatePrefab_ContainingASingleEntity as test_module
         self._run_prefab_test(request, workspace, editor, test_module)
 
-    def test_PrefabComplexWorflow_CreatePrefabOfChildEntity(self, request, workspace, editor, launcher_platform):
-        from .tests import PrefabComplexWorflow_CreatePrefabOfChildEntity as test_module
+    def test_CreatePrefab_UnderAnEntity(self, request, workspace, editor, launcher_platform):
+        from Prefab.tests.create_prefab import CreatePrefab_UnderAnEntity as test_module
         self._run_prefab_test(request, workspace, editor, test_module, autotest_mode=False)
 
-    def test_PrefabComplexWorflow_CreatePrefabInsidePrefab(self, request, workspace, editor, launcher_platform):
-        from .tests import PrefabComplexWorflow_CreatePrefabInsidePrefab as test_module
+    def test_CreatePrefab_UnderAnotherPrefab(self, request, workspace, editor, launcher_platform):
+        from Prefab.tests.create_prefab import CreatePrefab_UnderAnotherPrefab as test_module
         self._run_prefab_test(request, workspace, editor, test_module, autotest_mode=False)

AutomatedTesting/Gem/PythonTests/Prefab/tests/create_prefab/CreatePrefab_UnderAnEntity.py

@@ -5,7 +5,7 @@ For complete copyright and license terms please see the LICENSE at the root of t
 SPDX-License-Identifier: Apache-2.0 OR MIT
 """
 
-def PrefabComplexWorflow_CreatePrefabOfChildEntity():
+def CreatePrefab_UnderAnEntity():
     """
     Test description:
     - Creates two entities, parent and child. Child entity has Parent entity as its parent.
@@ -18,7 +18,7 @@ def PrefabComplexWorflow_CreatePrefabOfChildEntity():
     from editor_python_test_tools.editor_entity_utils import EditorEntity
     from editor_python_test_tools.prefab_utils import Prefab
 
-    import PrefabTestUtils as prefab_test_utils
+    import Prefab.tests.PrefabTestUtils as prefab_test_utils
 
     prefab_test_utils.open_base_tests_level()
 
@@ -49,4 +49,4 @@ def PrefabComplexWorflow_CreatePrefabOfChildEntity():
 
 if __name__ == "__main__":
     from editor_python_test_tools.utils import Report
-    Report.start_test(PrefabComplexWorflow_CreatePrefabOfChildEntity)
+    Report.start_test(CreatePrefab_UnderAnEntity)

AutomatedTesting/Gem/PythonTests/Prefab/tests/create_prefab/CreatePrefab_UnderAnotherPrefab.py

@@ -5,7 +5,7 @@ For complete copyright and license terms please see the LICENSE at the root of t
 SPDX-License-Identifier: Apache-2.0 OR MIT
 """
 
-def PrefabComplexWorflow_CreatePrefabInsidePrefab():
+def CreatePrefab_UnderAnotherPrefab():
     """
     Test description:
     - Creates an entity with a physx collider
@@ -17,7 +17,7 @@ def PrefabComplexWorflow_CreatePrefabInsidePrefab():
     from editor_python_test_tools.editor_entity_utils import EditorEntity
     from editor_python_test_tools.prefab_utils import Prefab
 
-    import PrefabTestUtils as prefab_test_utils
+    import Prefab.tests.PrefabTestUtils as prefab_test_utils
 
     prefab_test_utils.open_base_tests_level()
 
@@ -54,4 +54,4 @@ def PrefabComplexWorflow_CreatePrefabInsidePrefab():
 
 if __name__ == "__main__":
     from editor_python_test_tools.utils import Report
-    Report.start_test(PrefabComplexWorflow_CreatePrefabInsidePrefab)
+    Report.start_test(CreatePrefab_UnderAnotherPrefab)

AutomatedTesting/Gem/PythonTests/Prefab/tests/create_prefab/CreatePrefab_WithSingleEntity.py

@@ -5,7 +5,7 @@ For complete copyright and license terms please see the LICENSE at the root of t
 SPDX-License-Identifier: Apache-2.0 OR MIT
 """
 
-def PrefabBasicWorkflow_CreatePrefab():
+def CreatePrefab_WithSingleEntity():
 
     CAR_PREFAB_FILE_NAME = 'car_prefab'
 
@@ -13,7 +13,7 @@ def PrefabBasicWorkflow_CreatePrefab():
     from editor_python_test_tools.utils import Report
     from editor_python_test_tools.prefab_utils import Prefab
 
-    import PrefabTestUtils as prefab_test_utils
+    import Prefab.tests.PrefabTestUtils as prefab_test_utils
 
     prefab_test_utils.open_base_tests_level()
 
@@ -26,4 +26,4 @@ def PrefabBasicWorkflow_CreatePrefab():
 
 if __name__ == "__main__":
     from editor_python_test_tools.utils import Report
-    Report.start_test(PrefabBasicWorkflow_CreatePrefab)
+    Report.start_test(CreatePrefab_WithSingleEntity)

AutomatedTesting/Gem/PythonTests/Prefab/tests/delete_prefab/DeletePrefab_ContainingASingleEntity.py

@@ -5,14 +5,14 @@ For complete copyright and license terms please see the LICENSE at the root of t
 SPDX-License-Identifier: Apache-2.0 OR MIT
 """
 
-def PrefabBasicWorkflow_CreateAndDeletePrefab():
+def DeletePrefab_ContainingASingleEntity():
 
     CAR_PREFAB_FILE_NAME = 'car_prefab'
 
     from editor_python_test_tools.editor_entity_utils import EditorEntity
     from editor_python_test_tools.prefab_utils import Prefab
 
-    import PrefabTestUtils as prefab_test_utils
+    import Prefab.tests.PrefabTestUtils as prefab_test_utils
 
     prefab_test_utils.open_base_tests_level()
 
@@ -29,4 +29,4 @@ def PrefabBasicWorkflow_CreateAndDeletePrefab():
 
 if __name__ == "__main__":
     from editor_python_test_tools.utils import Report
-    Report.start_test(PrefabBasicWorkflow_CreateAndDeletePrefab)
+    Report.start_test(DeletePrefab_ContainingASingleEntity)

AutomatedTesting/Gem/PythonTests/Prefab/tests/detach_prefab/DetachPrefab_UnderAnotherPrefab.py

@@ -5,7 +5,7 @@ For complete copyright and license terms please see the LICENSE at the root of t
 SPDX-License-Identifier: Apache-2.0 OR MIT
 """
 
-def PrefabBasicWorkflow_CreateReparentAndDetachPrefab():
+def DetachPrefab_UnderAnotherPrefab():
 
     CAR_PREFAB_FILE_NAME = 'car_prefab'
     WHEEL_PREFAB_FILE_NAME = 'wheel_prefab'
@@ -18,7 +18,7 @@ def PrefabBasicWorkflow_CreateReparentAndDetachPrefab():
         from editor_python_test_tools.editor_entity_utils import EditorEntity
         from editor_python_test_tools.prefab_utils import Prefab
 
-        import PrefabTestUtils as prefab_test_utils
+        import Prefab.tests.PrefabTestUtils as prefab_test_utils
 
         prefab_test_utils.open_base_tests_level()
 
@@ -48,4 +48,4 @@ def PrefabBasicWorkflow_CreateReparentAndDetachPrefab():
 
 if __name__ == "__main__":
     from editor_python_test_tools.utils import Report
-    Report.start_test(PrefabBasicWorkflow_CreateReparentAndDetachPrefab)
+    Report.start_test(DetachPrefab_UnderAnotherPrefab)

AutomatedTesting/Gem/PythonTests/Prefab/tests/duplicate_prefab/DuplicatePrefab_ContainingASingleEntity.py

@@ -5,14 +5,14 @@ For complete copyright and license terms please see the LICENSE at the root of t
 SPDX-License-Identifier: Apache-2.0 OR MIT
 """
 
-def PrefabBasicWorkflow_CreateAndDuplicatePrefab():
+def DuplicatePrefab_ContainingASingleEntity():
 
     CAR_PREFAB_FILE_NAME = 'car_prefab'
 
     from editor_python_test_tools.editor_entity_utils import EditorEntity
     from editor_python_test_tools.prefab_utils import Prefab
 
-    import PrefabTestUtils as prefab_test_utils
+    import Prefab.tests.PrefabTestUtils as prefab_test_utils
 
     prefab_test_utils.open_base_tests_level()
 
@@ -29,4 +29,4 @@ def PrefabBasicWorkflow_CreateAndDuplicatePrefab():
 
 if __name__ == "__main__":
     from editor_python_test_tools.utils import Report
-    Report.start_test(PrefabBasicWorkflow_CreateAndDuplicatePrefab)
+    Report.start_test(DuplicatePrefab_ContainingASingleEntity)

AutomatedTesting/Gem/PythonTests/Prefab/tests/instantiate_prefab/InstantiatePrefab_ContainingASingleEntity.py

@@ -5,7 +5,7 @@ For complete copyright and license terms please see the LICENSE at the root of t
 SPDX-License-Identifier: Apache-2.0 OR MIT
 """
 
-def PrefabBasicWorkflow_InstantiatePrefab():
+def InstantiatePrefab_ContainingASingleEntity():
 
     from azlmbr.math import Vector3
 
@@ -15,7 +15,7 @@ def PrefabBasicWorkflow_InstantiatePrefab():
 
     from editor_python_test_tools.prefab_utils import Prefab
 
-    import PrefabTestUtils as prefab_test_utils
+    import Prefab.tests.PrefabTestUtils as prefab_test_utils
 
     prefab_test_utils.open_base_tests_level()
 
@@ -30,4 +30,4 @@ def PrefabBasicWorkflow_InstantiatePrefab():
 
 if __name__ == "__main__":
     from editor_python_test_tools.utils import Report
-    Report.start_test(PrefabBasicWorkflow_InstantiatePrefab)
+    Report.start_test(InstantiatePrefab_ContainingASingleEntity)

AutomatedTesting/Gem/PythonTests/Prefab/tests/open_level/OpenLevel_ContainingTwoEntities.py

@@ -14,7 +14,7 @@ class Tests():
 
 # fmt:on
 
-def PrefabLevel_OpensLevelWithEntities():
+def OpenLevel_ContainingTwoEntities():
     """
     Opens the level that contains 2 entities, "EmptyEntity" and "EntityWithPxCollider".
     This test makes sure that both entities exist after opening the level and that:
@@ -70,4 +70,4 @@ def PrefabLevel_OpensLevelWithEntities():
 if __name__ == "__main__":
 
     from editor_python_test_tools.utils import Report
-    Report.start_test(PrefabLevel_OpensLevelWithEntities)
+    Report.start_test(OpenLevel_ContainingTwoEntities)

AutomatedTesting/Gem/PythonTests/Prefab/tests/reparent_prefab/ReparentPrefab_UnderAnotherPrefab.py

@@ -5,7 +5,7 @@ For complete copyright and license terms please see the LICENSE at the root of t
 SPDX-License-Identifier: Apache-2.0 OR MIT
 """
 
-def PrefabBasicWorkflow_CreateAndReparentPrefab():
+def ReparentPrefab_UnderAnotherPrefab():
 
     CAR_PREFAB_FILE_NAME = 'car_prefab'
     WHEEL_PREFAB_FILE_NAME = 'wheel_prefab'
@@ -18,7 +18,7 @@ def PrefabBasicWorkflow_CreateAndReparentPrefab():
         from editor_python_test_tools.editor_entity_utils import EditorEntity
         from editor_python_test_tools.prefab_utils import Prefab
 
-        import PrefabTestUtils as prefab_test_utils
+        import Prefab.tests.PrefabTestUtils as prefab_test_utils
 
         prefab_test_utils.open_base_tests_level()
 
@@ -45,4 +45,4 @@ def PrefabBasicWorkflow_CreateAndReparentPrefab():
 
 if __name__ == "__main__":
     from editor_python_test_tools.utils import Report
-    Report.start_test(PrefabBasicWorkflow_CreateAndReparentPrefab)
+    Report.start_test(ReparentPrefab_UnderAnotherPrefab)