Merge branch 'development' into Atom/guthadam/atomtools_refactor_document_system

2021-08-16 18:30:49 -05:00
parent ae4ad7dcac 3fb903b03b
commit 5169e98826
186 changed files with 2992 additions and 4818 deletions
@@ -8,7 +8,7 @@ INTRODUCTION
 ------------

 EditorPythonBindings is a Python project that contains a collection of editor testing tools
-developed by the Lumberyard feature teams. The project contains tools for system level
+developed by the O3DE feature teams. The project contains tools for system level
 editor tests.


@@ -23,7 +23,7 @@ installed on your system.

 INSTALL
 -----------
-It is recommended to set up these these tools with Lumberyard's CMake build commands.
+It is recommended to set up these these tools with O3DE's CMake build commands.
 Assuming CMake is already setup on your operating system, below are some sample build commands:
    cd /path/to/od3e/
    mkdir windows_vs2019
@@ -206,8 +206,8 @@ def run():
    # PostFX Layer Component
    ComponentTests("PostFX Layer")

-    # Radius Weight Modifier Component
-    ComponentTests("Radius Weight Modifier")
+    # PostFX Radius Weight Modifier Component
+    ComponentTests("PostFX Radius Weight Modifier")

    # Light Component
    ComponentTests("Light")
@@ -23,8 +23,7 @@ import azlmbr.legacy.general as general
 sys.path.append(os.path.join(azlmbr.paths.devroot, "AutomatedTesting", "Gem", "PythonTests"))

 import editor_python_test_tools.hydra_editor_utils as hydra
-from atom_renderer.atom_utils import screenshot_utils
-from atom_renderer.atom_utils import atom_component_helper
+from atom_renderer.atom_utils import atom_component_helper, atom_constants, screenshot_utils
 from editor_python_test_tools.editor_test_helper import EditorTestHelper

 helper = EditorTestHelper(log_prefix="Atom_EditorTestHelper")
@@ -92,7 +91,7 @@ def area_light_test():
        'SetComponentProperty',
        light_component_id_pair,
        LIGHT_TYPE_PROPERTY,
-        atom_component_helper.LIGHT_TYPES['capsule']
+        atom_constants.LIGHT_TYPES['capsule']
    )

    # Update color and take screenshot in game mode
@@ -118,7 +117,7 @@ def area_light_test():
        'SetComponentProperty',
        light_component_id_pair,
        LIGHT_TYPE_PROPERTY,
-        atom_component_helper.LIGHT_TYPES['spot_disk']
+        atom_constants.LIGHT_TYPES['spot_disk']
    )
    area_light_rotation = math.Vector3(DEGREE_RADIAN_FACTOR * 90.0, 0.0, 0.0)
    azlmbr.components.TransformBus(azlmbr.bus.Event, "SetLocalRotation", area_light.id, area_light_rotation)
@@ -131,7 +130,7 @@ def area_light_test():
        'SetComponentProperty',
        light_component_id_pair,
        LIGHT_TYPE_PROPERTY,
-        atom_component_helper.LIGHT_TYPES['sphere']
+        atom_constants.LIGHT_TYPES['sphere']
    )
    general.idle_wait(1.0)
    screenshot_utils.take_screenshot_game_mode("AreaLight_5", area_light_entity_name)
@@ -210,7 +209,7 @@ def spot_light_test():
        'SetComponentProperty',
        light_component_type,
        LIGHT_TYPE_PROPERTY,
-        atom_component_helper.LIGHT_TYPES['spot_disk']
+        atom_constants.LIGHT_TYPES['spot_disk']
    )

    general.idle_wait(1.0)
@@ -32,7 +32,7 @@ class TestAtomEditorComponentsMain(object):
        Tests the following Atom components and verifies all "expected_lines" appear in Editor.log:
        1. Display Mapper
        2. Light
-        3. Radius Weight Modifier
+        3. PostFX Radius Weight Modifier
        4. PostFX Layer
        5. Physical Sky
        6. Global Skylight (IBL)
@@ -126,18 +126,18 @@ class TestAtomEditorComponentsMain(object):
            "PostFX Layer_test: Entity deleted: True",
            "PostFX Layer_test: UNDO entity deletion works: True",
            "PostFX Layer_test: REDO entity deletion works: True",
-            # Radius Weight Modifier Component
-            "Radius Weight Modifier Entity successfully created",
-            "Radius Weight Modifier_test: Component added to the entity: True",
-            "Radius Weight Modifier_test: Component removed after UNDO: True",
-            "Radius Weight Modifier_test: Component added after REDO: True",
-            "Radius Weight Modifier_test: Entered game mode: True",
-            "Radius Weight Modifier_test: Exit game mode: True",
-            "Radius Weight Modifier_test: Entity is hidden: True",
-            "Radius Weight Modifier_test: Entity is shown: True",
-            "Radius Weight Modifier_test: Entity deleted: True",
-            "Radius Weight Modifier_test: UNDO entity deletion works: True",
-            "Radius Weight Modifier_test: REDO entity deletion works: True",
+            # PostFX Radius Weight Modifier Component
+            "PostFX Radius Weight Modifier Entity successfully created",
+            "PostFX Radius Weight Modifier_test: Component added to the entity: True",
+            "PostFX Radius Weight Modifier_test: Component removed after UNDO: True",
+            "PostFX Radius Weight Modifier_test: Component added after REDO: True",
+            "PostFX Radius Weight Modifier_test: Entered game mode: True",
+            "PostFX Radius Weight Modifier_test: Exit game mode: True",
+            "PostFX Radius Weight Modifier_test: Entity is hidden: True",
+            "PostFX Radius Weight Modifier_test: Entity is shown: True",
+            "PostFX Radius Weight Modifier_test: Entity deleted: True",
+            "PostFX Radius Weight Modifier_test: UNDO entity deletion works: True",
+            "PostFX Radius Weight Modifier_test: REDO entity deletion works: True",
            # Light Component
            "Light Entity successfully created",
            "Light_test: Component added to the entity: True",
@@ -61,7 +61,7 @@ class AssetPickerUIUXTest(EditorTestHelper):
        5) Verify if Mesh Asset is assigned via both OK/Enter options

        Note:
-        - This test file must be called from the Lumberyard Editor command terminal
+        - This test file must be called from the O3DE Editor command terminal
        - Any passed and failed tests are written to the Editor.log file.
                Parsing the file or running a log_monitor are required to observe the test results.

@@ -37,7 +37,7 @@ class TestBasicEditorWorkflows(EditorTestHelper):
    async def run_test(self):
        """
        Summary:
-        Open Lumberyard editor and check if basic Editor workflows are completable.
+        Open O3DE editor and check if basic Editor workflows are completable.

        Expected Behavior:
        - A new level can be created
@@ -48,7 +48,7 @@ class TestBasicEditorWorkflows(EditorTestHelper):
        - Level can be exported

        Note:
-        - This test file must be called from the Lumberyard Editor command terminal
+        - This test file must be called from the O3DE Editor command terminal
        - Any passed and failed tests are written to the Editor.log file.
                Parsing the file or running a log_monitor are required to observe the test results.

@@ -36,7 +36,7 @@ class TestEditMenuOptions(EditorTestHelper):
         2) Interact with Edit Menu options

        Note:
-        - This test file must be called from the Lumberyard Editor command terminal
+        - This test file must be called from the O3DE Editor command terminal
        - Any passed and failed tests are written to the Editor.log file.
                Parsing the file or running a log_monitor are required to observe the test results.

@@ -32,7 +32,7 @@ class TestFileMenuOptions(EditorTestHelper):
         2) Interact with File Menu options

        Note:
-        - This test file must be called from the Lumberyard Editor command terminal
+        - This test file must be called from the O3DE Editor command terminal
        - Any passed and failed tests are written to the Editor.log file.
                Parsing the file or running a log_monitor are required to observe the test results.

@@ -36,7 +36,7 @@ class TestViewMenuOptions(EditorTestHelper):
         2) Interact with View Menu options

        Note:
-        - This test file must be called from the Lumberyard Editor command terminal
+        - This test file must be called from the O3DE Editor command terminal
        - Any passed and failed tests are written to the Editor.log file.
                Parsing the file or running a log_monitor are required to observe the test results.

@@ -52,7 +52,7 @@ def Pane_PropertiesChanged_RetainsOnRestart():
    from utils import TestHelper as helper
    import pyside_utils

-    # Lumberyard Imports
+    # O3DE Imports
    import azlmbr.legacy.general as general

    # Pyside imports
@@ -73,5 +73,17 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
            AutomatedTesting.GameLauncher
            AutomatedTesting.Assets
    )
+    ly_add_pytest(
+        NAME AutomatedTesting::LoadLevelCPU
+        TEST_SUITE sandbox
+        PATH ${CMAKE_CURRENT_LIST_DIR}/test_RemoteConsole_CPULoadLevel_Works.py
+        TIMEOUT 100
+        RUNTIME_DEPENDENCIES
+            AZ::AssetProcessor
+            AZ::PythonBindingsExample
+            Legacy::Editor
+            AutomatedTesting.GameLauncher
+            AutomatedTesting.Assets
+    )

 endif()
@@ -53,7 +53,7 @@ def Editor_NewExistingLevels_Works():
    10) Save, Load and Export an existing level and close editor

    Note:
-    - This test file must be called from the Lumberyard Editor command terminal
+    - This test file must be called from the O3DE Editor command terminal
    - Any passed and failed tests are written to the Editor.log file.
            Parsing the file or running a log_monitor are required to observe the test results.

@@ -24,7 +24,7 @@ from ly_remote_console.remote_console_commands import (
@pytest.mark.parametrize("launcher_platform", ["windows"])
@pytest.mark.parametrize("project", ["AutomatedTesting"])
@pytest.mark.parametrize("level", ["Simple"])
-@pytest.mark.SUITE_smoke
+@pytest.mark.SUITE_sandbox
 class TestRemoteConsoleLoadLevelWorks(object):
    @pytest.fixture
    def remote_console_instance(self, request):