diff --git a/AutomatedTesting/Gem/PythonTests/WhiteBox/TestSuite_Main.py b/AutomatedTesting/Gem/PythonTests/WhiteBox/TestSuite_Main.py index fa6c81c98a..7c7fd6035c 100644 --- a/AutomatedTesting/Gem/PythonTests/WhiteBox/TestSuite_Main.py +++ b/AutomatedTesting/Gem/PythonTests/WhiteBox/TestSuite_Main.py @@ -9,27 +9,17 @@ SPDX-License-Identifier: Apache-2.0 OR MIT # This suite consists of all test cases that are passing and have been verified. import pytest -import sys -import os - -from ly_test_tools import LAUNCHERS - -sys.path.append(os.path.dirname(os.path.abspath(__file__)) + '/../automatedtesting_shared') - -from base import TestAutomationBase +from ly_test_tools.o3de.editor_test import EditorTestSuite, EditorSharedTest @pytest.mark.SUITE_main @pytest.mark.parametrize("launcher_platform", ['windows_editor']) @pytest.mark.parametrize("project", ["AutomatedTesting"]) -class TestAutomation(TestAutomationBase): - def test_WhiteBox_AddComponentToEntity(self, request, workspace, editor, launcher_platform): +class TestAutomation(EditorTestSuite): + class test_WhiteBox_AddComponentToEntity(EditorSharedTest): from .tests import WhiteBox_AddComponentToEntity as test_module - self._run_test(request, workspace, editor, test_module) - def test_WhiteBox_SetDefaultShape(self, request, workspace, editor, launcher_platform): + class test_WhiteBox_SetDefaultShape(EditorSharedTest): from .tests import WhiteBox_SetDefaultShape as test_module - self._run_test(request, workspace, editor, test_module) - def test_WhiteBox_SetInvisible(self, request, workspace, editor, launcher_platform): + class test_WhiteBox_SetInvisible(EditorSharedTest): from .tests import WhiteBox_SetInvisible as test_module - self._run_test(request, workspace, editor, test_module) diff --git a/AutomatedTesting/Gem/PythonTests/WhiteBox/tests/WhiteBox_AddComponentToEntity.py b/AutomatedTesting/Gem/PythonTests/WhiteBox/tests/WhiteBox_AddComponentToEntity.py index f241a952ec..c368180576 100644 --- a/AutomatedTesting/Gem/PythonTests/WhiteBox/tests/WhiteBox_AddComponentToEntity.py +++ b/AutomatedTesting/Gem/PythonTests/WhiteBox/tests/WhiteBox_AddComponentToEntity.py @@ -18,21 +18,17 @@ class Tests(): def C28798177_WhiteBox_AddComponentToEntity(): - import os - import sys - import WhiteBoxInit as init + import editor_python_test_tools.hydra_editor_utils as hydra import azlmbr.bus as bus import azlmbr.editor as editor import azlmbr.legacy.general as general - - from editor_python_test_tools.utils import Report + import WhiteBoxInit as init - from editor_python_test_tools.utils import TestHelper as helper + from editor_python_test_tools.utils import Report # open level - helper.init_idle() - helper.open_level("WhiteBox", "EmptyLevel", no_prompt=False) + hydra.open_base_level() # create white box entity and attach component white_box_entity = init.create_white_box_entity() @@ -46,10 +42,6 @@ def C28798177_WhiteBox_AddComponentToEntity(): component_enabled = editor.EditorComponentAPIBus(bus.Broadcast, 'IsComponentEnabled', white_box_mesh_component) Report.result(Tests.white_box_component_enabled, component_enabled) - # close editor - helper.close_editor() - - if __name__ == "__main__": from editor_python_test_tools.utils import Report Report.start_test(C28798177_WhiteBox_AddComponentToEntity) diff --git a/AutomatedTesting/Gem/PythonTests/WhiteBox/tests/WhiteBox_SetDefaultShape.py b/AutomatedTesting/Gem/PythonTests/WhiteBox/tests/WhiteBox_SetDefaultShape.py index 1e4a62c346..7ad8cc28b6 100644 --- a/AutomatedTesting/Gem/PythonTests/WhiteBox/tests/WhiteBox_SetDefaultShape.py +++ b/AutomatedTesting/Gem/PythonTests/WhiteBox/tests/WhiteBox_SetDefaultShape.py @@ -22,17 +22,13 @@ class Tests(): critical_shape_check = ("Default shape has more than 0 sides", "default shape has 0 sides") def C29279329_WhiteBox_SetDefaultShape(): - import os - import sys - import WhiteBoxInit as init - import azlmbr.whitebox.api as api import azlmbr.bus as bus - import azlmbr.legacy.general as general - + import editor_python_test_tools.hydra_editor_utils as hydra + import WhiteBoxInit as init + from editor_python_test_tools.utils import Report - - from editor_python_test_tools.utils import TestHelper as helper + def check_shape_result(success_fail_tuple, condition): result = Report.result(success_fail_tuple, condition) @@ -53,8 +49,7 @@ def C29279329_WhiteBox_SetDefaultShape(): } # open level - helper.init_idle() - helper.open_level("WhiteBox", "EmptyLevel", no_prompt=False) + hydra.open_base_level() # create white box entity and attach component white_box_entity = init.create_white_box_entity() @@ -95,10 +90,6 @@ def C29279329_WhiteBox_SetDefaultShape(): Tests.default_shape_sphere, white_box_handle.MeshFaceCount() == expected_results.get(shape_types.SPHERE)) - # close editor - helper.close_editor() - - if __name__ == "__main__": from editor_python_test_tools.utils import Report Report.start_test(C29279329_WhiteBox_SetDefaultShape) diff --git a/AutomatedTesting/Gem/PythonTests/WhiteBox/tests/WhiteBox_SetInvisible.py b/AutomatedTesting/Gem/PythonTests/WhiteBox/tests/WhiteBox_SetInvisible.py index 88deee999d..887c5184be 100644 --- a/AutomatedTesting/Gem/PythonTests/WhiteBox/tests/WhiteBox_SetInvisible.py +++ b/AutomatedTesting/Gem/PythonTests/WhiteBox/tests/WhiteBox_SetInvisible.py @@ -21,25 +21,16 @@ def C28798205_WhiteBox_SetInvisible(): # note: This automated test does not fully replicate the test case in Test Rail as it's # not currently possible using the Hydra API to get an EntityComponentIdPair at runtime, # in future game_mode will be activated and a runtime White Box Component queried - import os - import sys - import WhiteBoxInit as init - import editor_python_test_tools.hydra_editor_utils as hydra - import azlmbr.whitebox.api as api - import azlmbr.whitebox import azlmbr.bus as bus import azlmbr.editor as editor - import azlmbr.entity as entity - import azlmbr.legacy.general as general + import editor_python_test_tools.hydra_editor_utils as hydra + import WhiteBoxInit as init from editor_python_test_tools.utils import Report - from editor_python_test_tools.utils import TestHelper as helper - # open level - helper.init_idle() - helper.open_level("WhiteBox", "EmptyLevel", no_prompt=False) + hydra.open_base_level() white_box_entity_name = 'WhiteBox-Visibility' white_box_visibility_path = 'White Box Material|Visible' @@ -57,9 +48,6 @@ def C28798205_WhiteBox_SetInvisible(): visible_property = hydra.get_component_property_value(white_box_mesh_component, white_box_visibility_path) Report.result(Tests.white_box_set_to_invisible, not visible_property) - helper.close_editor() - - if __name__ == "__main__": from editor_python_test_tools.utils import Report Report.start_test(C28798205_WhiteBox_SetInvisible) diff --git a/AutomatedTesting/Levels/WhiteBox/EmptyLevel/EmptyLevel.ly b/AutomatedTesting/Levels/WhiteBox/EmptyLevel/EmptyLevel.ly deleted file mode 100644 index 9015a0bdab..0000000000 --- a/AutomatedTesting/Levels/WhiteBox/EmptyLevel/EmptyLevel.ly +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2dfc16cf4e47fc73c40d8a30ce08c34fe7805d369bf6ca69bd0d00ede4509902 -size 4542 diff --git a/AutomatedTesting/Levels/WhiteBox/EmptyLevel/EmptyLevel.prefab b/AutomatedTesting/Levels/WhiteBox/EmptyLevel/EmptyLevel.prefab deleted file mode 100644 index d03a63b2c0..0000000000 --- a/AutomatedTesting/Levels/WhiteBox/EmptyLevel/EmptyLevel.prefab +++ /dev/null @@ -1,118 +0,0 @@ -{ - "ContainerEntity": { - "Id": "ContainerEntity", - "Name": "EmptyLevel", - "Components": { - "Component_[10182366347512475253]": { - "$type": "EditorPrefabComponent", - "Id": 10182366347512475253 - }, - "Component_[12917798267488243668]": { - "$type": "EditorPendingCompositionComponent", - "Id": 12917798267488243668 - }, - "Component_[3261249813163778338]": { - "$type": "EditorOnlyEntityComponent", - "Id": 3261249813163778338 - }, - "Component_[3837204912784440039]": { - "$type": "EditorDisabledCompositionComponent", - "Id": 3837204912784440039 - }, - "Component_[4272963378099646759]": { - "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent", - "Id": 4272963378099646759, - "Parent Entity": "" - }, - "Component_[4848458548047175816]": { - "$type": "EditorVisibilityComponent", - "Id": 4848458548047175816 - }, - "Component_[5787060997243919943]": { - "$type": "EditorInspectorComponent", - "Id": 5787060997243919943 - }, - "Component_[7804170251266531779]": { - "$type": "EditorLockComponent", - "Id": 7804170251266531779 - }, - "Component_[7874177159288365422]": { - "$type": "EditorEntitySortComponent", - "Id": 7874177159288365422 - }, - "Component_[8018146290632383969]": { - "$type": "EditorEntityIconComponent", - "Id": 8018146290632383969 - }, - "Component_[8452360690590857075]": { - "$type": "SelectionComponent", - "Id": 8452360690590857075 - } - } - }, - "Entities": { - "Entity_[273050554979]": { - "Id": "Entity_[273050554979]", - "Name": "DefaultLevelSetup", - "Components": { - "Component_[10017568850356726118]": { - "$type": "EditorEntitySortComponent", - "Id": 10017568850356726118 - }, - "Component_[13730791873699866292]": { - "$type": "EditorVisibilityComponent", - "Id": 13730791873699866292 - }, - "Component_[14036484285432839222]": { - "$type": "EditorInspectorComponent", - "Id": 14036484285432839222, - "ComponentOrderEntryArray": [ - { - "ComponentId": 9432950532896492451 - }, - { - "ComponentId": 16094906495473882735, - "SortIndex": 1 - } - ] - }, - "Component_[16744953497953161231]": { - "$type": "EditorOnlyEntityComponent", - "Id": 16744953497953161231 - }, - "Component_[17819059404707659501]": { - "$type": "EditorDisabledCompositionComponent", - "Id": 17819059404707659501 - }, - "Component_[2317367007807622931]": { - "$type": "EditorLockComponent", - "Id": 2317367007807622931 - }, - "Component_[2676812743453687109]": { - "$type": "EditorPendingCompositionComponent", - "Id": 2676812743453687109 - }, - "Component_[3047355939801335922]": { - "$type": "EditorEntityIconComponent", - "Id": 3047355939801335922 - }, - "Component_[3687396159953003426]": { - "$type": "SelectionComponent", - "Id": 3687396159953003426 - }, - "Component_[9432950532896492451]": { - "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent", - "Id": 9432950532896492451, - "Parent Entity": "ContainerEntity", - "Transform Data": { - "Translate": [ - 512.0, - 512.0, - 100.0 - ] - } - } - } - } - } -} \ No newline at end of file diff --git a/AutomatedTesting/Levels/WhiteBox/EmptyLevel/LevelData/Environment.xml b/AutomatedTesting/Levels/WhiteBox/EmptyLevel/LevelData/Environment.xml deleted file mode 100644 index c8398b6257..0000000000 --- a/AutomatedTesting/Levels/WhiteBox/EmptyLevel/LevelData/Environment.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/AutomatedTesting/Levels/WhiteBox/EmptyLevel/LevelData/TerrainTexture.xml b/AutomatedTesting/Levels/WhiteBox/EmptyLevel/LevelData/TerrainTexture.xml deleted file mode 100644 index f43df05b22..0000000000 --- a/AutomatedTesting/Levels/WhiteBox/EmptyLevel/LevelData/TerrainTexture.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/AutomatedTesting/Levels/WhiteBox/EmptyLevel/LevelData/TimeOfDay.xml b/AutomatedTesting/Levels/WhiteBox/EmptyLevel/LevelData/TimeOfDay.xml deleted file mode 100644 index 456d609b8a..0000000000 --- a/AutomatedTesting/Levels/WhiteBox/EmptyLevel/LevelData/TimeOfDay.xml +++ /dev/null @@ -1,356 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/AutomatedTesting/Levels/WhiteBox/EmptyLevel/LevelData/VegetationMap.dat b/AutomatedTesting/Levels/WhiteBox/EmptyLevel/LevelData/VegetationMap.dat deleted file mode 100644 index dce5631cd0..0000000000 --- a/AutomatedTesting/Levels/WhiteBox/EmptyLevel/LevelData/VegetationMap.dat +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0e6a5435c928079b27796f6b202bbc2623e7e454244ddc099a3cadf33b7cb9e9 -size 63 diff --git a/AutomatedTesting/Levels/WhiteBox/EmptyLevel/TerrainTexture.pak b/AutomatedTesting/Levels/WhiteBox/EmptyLevel/TerrainTexture.pak deleted file mode 100644 index fe3604a050..0000000000 --- a/AutomatedTesting/Levels/WhiteBox/EmptyLevel/TerrainTexture.pak +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8739c76e681f900923b900c9df0ef75cf421d39cabb54650c4b9ad19b6a76d85 -size 22 diff --git a/AutomatedTesting/Levels/WhiteBox/EmptyLevel/level.pak b/AutomatedTesting/Levels/WhiteBox/EmptyLevel/level.pak deleted file mode 100644 index 2143b8f09e..0000000000 --- a/AutomatedTesting/Levels/WhiteBox/EmptyLevel/level.pak +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9799510badafd54e2a47574ea7e0112b8cb7eb23facf4dff8adc6f51fa624953 -size 7955