From e57e1b3ba21eb61116ca9a3331e57ff9e35cbdaf Mon Sep 17 00:00:00 2001 From: jromnoa Date: Mon, 24 May 2021 18:19:09 -0700 Subject: [PATCH 1/5] remove testrail info from tests --- .../atom_renderer/test_Atom_MainSuite.py | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/AutomatedTesting/Gem/PythonTests/atom_renderer/test_Atom_MainSuite.py b/AutomatedTesting/Gem/PythonTests/atom_renderer/test_Atom_MainSuite.py index b64a592c1d..fccd750573 100644 --- a/AutomatedTesting/Gem/PythonTests/atom_renderer/test_Atom_MainSuite.py +++ b/AutomatedTesting/Gem/PythonTests/atom_renderer/test_Atom_MainSuite.py @@ -26,19 +26,23 @@ TEST_DIRECTORY = os.path.join(os.path.dirname(__file__), "atom_hydra_scripts") @pytest.mark.parametrize("launcher_platform", ['windows_editor']) @pytest.mark.parametrize("level", ["auto_test"]) class TestAtomEditorComponentsMain(object): + """Holds tests for Atom components.""" - @pytest.mark.test_case_id( - "C32078130", # Display Mapper - "C32078129", # Light - "C32078131", # Radius Weight Modifier - "C32078127", # PostFX Layer - "C32078125", # Physical Sky - "C32078115", # Global Skylight (IBL) - "C32078121", # Exposure Control - "C32078120", # Directional Light - "C32078119", # DepthOfField - "C32078118") # Decal (Atom) def test_AtomEditorComponents_AddedToEntity(self, request, editor, level, workspace, project, launcher_platform): + """ + Please review the hydra script run by this test for more specific test info. + Tests the following Atom components and verifies all "expected_lines" appear in Editor.log: + 1. Display Mapper + 2. Light + 3. Radius Weight Modifier + 4. PostFX Layer + 5. Physical Sky + 6. Global Skylight (IBL) + 7. Exposure Control + 8. Directional Light + 9. DepthOfField + 10. Decal (Atom) + """ cfg_args = [level] expected_lines = [ From 2c6c639edeef06009ec9a2fd3961dc159e544994 Mon Sep 17 00:00:00 2001 From: jromnoa Date: Tue, 25 May 2021 10:05:55 -0700 Subject: [PATCH 2/5] merging latest main --- ...ydra_AtomEditorComponents_AddedToEntity.py | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_hydra_scripts/hydra_AtomEditorComponents_AddedToEntity.py b/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_hydra_scripts/hydra_AtomEditorComponents_AddedToEntity.py index 35eaa2e4ce..ff061b5e22 100644 --- a/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_hydra_scripts/hydra_AtomEditorComponents_AddedToEntity.py +++ b/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_hydra_scripts/hydra_AtomEditorComponents_AddedToEntity.py @@ -32,15 +32,20 @@ def run(): """ Summary: The below common tests are done for each of the components. - 1) Addition of component to the entity - 2) UNDO/REDO of addition of component - 3) Enter/Exit game mode - 4) Hide/Show entity containing component - 5) Deletion of component - 6) UNDO/REDO of deletion of component - Some additional tests for specific components include - 1) Assigning value to some properties of each component - 2) Verifying if the component is activated only when the required components are added + For each test step, it will generate a general.log() message that is used to verify the step was successful. + Each of the test steps for each component are listed below: + 1) Addition of component to the entity + 2) UNDO/REDO of addition of component + 3) Enter/Exit game mode + 4) Hide/Show entity containing component. + 5) Deletion of component + 6) UNDO/REDO of deletion of component + + Some additional tests for specific components include: + 1) "Display Mapper" component having its required "PostFX Layer" component attached. + 2) + 1) Assigning value to some properties of each component + 2) Verifying if the component is activated only when the required components are added Expected Result: 1) Component can be added to an entity. From bdedf419b40a0901595842bd37a45869624cc69e Mon Sep 17 00:00:00 2001 From: jromnoa Date: Tue, 25 May 2021 10:08:11 -0700 Subject: [PATCH 3/5] revert accidental docstring change --- ...ydra_AtomEditorComponents_AddedToEntity.py | 23 ++++++++----------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_hydra_scripts/hydra_AtomEditorComponents_AddedToEntity.py b/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_hydra_scripts/hydra_AtomEditorComponents_AddedToEntity.py index ff061b5e22..35eaa2e4ce 100644 --- a/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_hydra_scripts/hydra_AtomEditorComponents_AddedToEntity.py +++ b/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_hydra_scripts/hydra_AtomEditorComponents_AddedToEntity.py @@ -32,20 +32,15 @@ def run(): """ Summary: The below common tests are done for each of the components. - For each test step, it will generate a general.log() message that is used to verify the step was successful. - Each of the test steps for each component are listed below: - 1) Addition of component to the entity - 2) UNDO/REDO of addition of component - 3) Enter/Exit game mode - 4) Hide/Show entity containing component. - 5) Deletion of component - 6) UNDO/REDO of deletion of component - - Some additional tests for specific components include: - 1) "Display Mapper" component having its required "PostFX Layer" component attached. - 2) - 1) Assigning value to some properties of each component - 2) Verifying if the component is activated only when the required components are added + 1) Addition of component to the entity + 2) UNDO/REDO of addition of component + 3) Enter/Exit game mode + 4) Hide/Show entity containing component + 5) Deletion of component + 6) UNDO/REDO of deletion of component + Some additional tests for specific components include + 1) Assigning value to some properties of each component + 2) Verifying if the component is activated only when the required components are added Expected Result: 1) Component can be added to an entity. From 47df212ecdcf17cb803dd24ed7441894b2f1633a Mon Sep 17 00:00:00 2001 From: jromnoa Date: Tue, 25 May 2021 10:08:51 -0700 Subject: [PATCH 4/5] Revert "revert accidental docstring change" This reverts commit bdedf419b40a0901595842bd37a45869624cc69e. --- ...ydra_AtomEditorComponents_AddedToEntity.py | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_hydra_scripts/hydra_AtomEditorComponents_AddedToEntity.py b/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_hydra_scripts/hydra_AtomEditorComponents_AddedToEntity.py index 35eaa2e4ce..ff061b5e22 100644 --- a/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_hydra_scripts/hydra_AtomEditorComponents_AddedToEntity.py +++ b/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_hydra_scripts/hydra_AtomEditorComponents_AddedToEntity.py @@ -32,15 +32,20 @@ def run(): """ Summary: The below common tests are done for each of the components. - 1) Addition of component to the entity - 2) UNDO/REDO of addition of component - 3) Enter/Exit game mode - 4) Hide/Show entity containing component - 5) Deletion of component - 6) UNDO/REDO of deletion of component - Some additional tests for specific components include - 1) Assigning value to some properties of each component - 2) Verifying if the component is activated only when the required components are added + For each test step, it will generate a general.log() message that is used to verify the step was successful. + Each of the test steps for each component are listed below: + 1) Addition of component to the entity + 2) UNDO/REDO of addition of component + 3) Enter/Exit game mode + 4) Hide/Show entity containing component. + 5) Deletion of component + 6) UNDO/REDO of deletion of component + + Some additional tests for specific components include: + 1) "Display Mapper" component having its required "PostFX Layer" component attached. + 2) + 1) Assigning value to some properties of each component + 2) Verifying if the component is activated only when the required components are added Expected Result: 1) Component can be added to an entity. From 72d394dfca762aefff50d7cb852e4829998e5cad Mon Sep 17 00:00:00 2001 From: jromnoa Date: Tue, 25 May 2021 10:09:08 -0700 Subject: [PATCH 5/5] Revert "merging latest main" This reverts commit 2c6c639edeef06009ec9a2fd3961dc159e544994. --- ...ydra_AtomEditorComponents_AddedToEntity.py | 23 ++++++++----------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_hydra_scripts/hydra_AtomEditorComponents_AddedToEntity.py b/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_hydra_scripts/hydra_AtomEditorComponents_AddedToEntity.py index ff061b5e22..35eaa2e4ce 100644 --- a/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_hydra_scripts/hydra_AtomEditorComponents_AddedToEntity.py +++ b/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_hydra_scripts/hydra_AtomEditorComponents_AddedToEntity.py @@ -32,20 +32,15 @@ def run(): """ Summary: The below common tests are done for each of the components. - For each test step, it will generate a general.log() message that is used to verify the step was successful. - Each of the test steps for each component are listed below: - 1) Addition of component to the entity - 2) UNDO/REDO of addition of component - 3) Enter/Exit game mode - 4) Hide/Show entity containing component. - 5) Deletion of component - 6) UNDO/REDO of deletion of component - - Some additional tests for specific components include: - 1) "Display Mapper" component having its required "PostFX Layer" component attached. - 2) - 1) Assigning value to some properties of each component - 2) Verifying if the component is activated only when the required components are added + 1) Addition of component to the entity + 2) UNDO/REDO of addition of component + 3) Enter/Exit game mode + 4) Hide/Show entity containing component + 5) Deletion of component + 6) UNDO/REDO of deletion of component + Some additional tests for specific components include + 1) Assigning value to some properties of each component + 2) Verifying if the component is activated only when the required components are added Expected Result: 1) Component can be added to an entity.