Added base level for tests, updated automation to use prefabs, and restored sandboxed tests (#6993)

Signed-off-by: Sean Masterson <semaster@amazon.com>
2022-01-24 09:50:37 -08:00
parent 0d2204917e
commit 7bf7b03dd2
31 changed files with 153 additions and 41 deletions
@@ -21,7 +21,7 @@ TEST_DIRECTORY = os.path.join(os.path.dirname(__file__), "tests")
@pytest.mark.parametrize("launcher_platform", ['windows_editor'])
 class TestAutomation(EditorTestSuite):

-    enable_prefab_system = False
+    enable_prefab_system = True

    @pytest.mark.test_case_id("C36525657")
    class AtomEditorComponents_BloomAdded(EditorSharedTest):
@@ -120,6 +120,14 @@ class TestAutomation(EditorTestSuite):
    class AtomEditorComponents_SSAOAdded(EditorSharedTest):
        from Atom.tests import hydra_AtomEditorComponents_SSAOAdded as test_module

+    @pytest.mark.test_case_id("C36529666")
+    class AtomEditorComponentsLevel_DiffuseGlobalIlluminationAdded(EditorSharedTest):
+        from Atom.tests import hydra_AtomEditorComponentsLevel_DiffuseGlobalIlluminationAdded as test_module
+
+    @pytest.mark.test_case_id("C36525660")
+    class AtomEditorComponentsLevel_DisplayMapperAdded(EditorSharedTest):
+        from Atom.tests import hydra_AtomEditorComponentsLevel_DisplayMapperAdded as test_module
+
    class ShaderAssetBuilder_RecompilesShaderAsChainOfDependenciesChanges(EditorSharedTest):
        from Atom.tests import hydra_ShaderAssetBuilder_RecompilesShaderAsChainOfDependenciesChanges as test_module

@@ -26,13 +26,3 @@ class TestAutomation(EditorTestSuite):
    @pytest.mark.test_case_id("C36525660")
    class AtomEditorComponents_DisplayMapperAdded(EditorSharedTest):
        from Atom.tests import hydra_AtomEditorComponents_DisplayMapperAdded as test_module
-
-    # this test causes editor to crash when using slices. once automation transitions to prefabs it should pass
-    @pytest.mark.test_case_id("C36529666")
-    class AtomEditorComponentsLevel_DiffuseGlobalIlluminationAdded(EditorSharedTest):
-        from Atom.tests import hydra_AtomEditorComponentsLevel_DiffuseGlobalIlluminationAdded as test_module
-
-    # this test causes editor to crash when using slices. once automation transitions to prefabs it should pass
-    @pytest.mark.test_case_id("C36525660")
-    class AtomEditorComponentsLevel_DisplayMapperAdded(EditorSharedTest):
-        from Atom.tests import hydra_AtomEditorComponentsLevel_DisplayMapperAdded as test_module
@@ -60,7 +60,7 @@ def AtomEditorComponentsLevel_DiffuseGlobalIllumination_AddedToEntity():
        # Test setup begins.
        # Setup: Wait for Editor idle loop before executing Python hydra scripts then open "Base" level.
        TestHelper.init_idle()
-        TestHelper.open_level("", "Base")
+        TestHelper.open_level("Graphics", "base_empty")

        # Test steps begin.
        # 1. Add Diffuse Global Illumination level component to the level entity.
@@ -86,10 +86,10 @@ def AtomEditorComponentsLevel_DiffuseGlobalIllumination_AddedToEntity():

        # 4. Set Quality Level property to Low
        diffuse_global_illumination_component.set_component_property_value(
-            AtomComponentProperties.diffuse_global_illumination('Quality Level', GLOBAL_ILLUMINATION_QUALITY['Low']))
+            AtomComponentProperties.diffuse_global_illumination('Quality Level'), GLOBAL_ILLUMINATION_QUALITY['Low'])
        quality = diffuse_global_illumination_component.get_component_property_value(
            AtomComponentProperties.diffuse_global_illumination('Quality Level'))
-        Report.result(diffuse_global_illumination_quality, quality == GLOBAL_ILLUMINATION_QUALITY['Low'])
+        Report.result(Tests.diffuse_global_illumination_quality, quality == GLOBAL_ILLUMINATION_QUALITY['Low'])

        # 5. Enter/Exit game mode.
        TestHelper.enter_game_mode(Tests.enter_game_mode)
@@ -67,7 +67,7 @@ def AtomEditorComponentsLevel_DisplayMapper_AddedToEntity():
        # Test setup begins.
        # Setup: Wait for Editor idle loop before executing Python hydra scripts then open "Base" level.
        TestHelper.init_idle()
-        TestHelper.open_level("", "Base")
+        TestHelper.open_level("Graphics", "base_empty")

        # Test steps begin.
        # 1. Add Display Mapper level component to the level entity.
@@ -102,7 +102,7 @@ def AtomEditorComponentsLevel_DisplayMapper_AddedToEntity():
        display_mapper_component.set_component_property_value(
            AtomComponentProperties.display_mapper('Enable LDR color grading LUT'), True)
        Report.result(
-            Test.enable_ldr_color_grading_lut,
+            Tests.enable_ldr_color_grading_lut,
            display_mapper_component.get_component_property_value(
                AtomComponentProperties.display_mapper('Enable LDR color grading LUT')) is True)

@@ -97,7 +97,7 @@ def AtomEditorComponents_Bloom_AddedToEntity():
        # Test setup begins.
        # Setup: Wait for Editor idle loop before executing Python hydra scripts then open "Base" level.
        TestHelper.init_idle()
-        TestHelper.open_level("", "Base")
+        TestHelper.open_level("Graphics", "base_empty")

        # Test steps begin.
        # 1. Create an Bloom entity with no components.
@@ -170,10 +170,12 @@ def AtomEditorComponents_Bloom_AddedToEntity():

        # 13. UNDO deletion.
        general.undo()
+        general.idle_wait_frames(1)
        Report.result(Tests.deletion_undo, bloom_entity.exists())

        # 14. REDO deletion.
        general.redo()
+        general.idle_wait_frames(1)
        Report.result(Tests.deletion_redo, not bloom_entity.exists())

        # 15. Look for errors and asserts.
@@ -95,7 +95,7 @@ def AtomEditorComponents_Decal_AddedToEntity():
        # Test setup begins.
        # Setup: Wait for Editor idle loop before executing Python hydra scripts then open "Base" level.
        TestHelper.init_idle()
-        TestHelper.open_level("", "Base")
+        TestHelper.open_level("Graphics", "base_empty")

        # Test steps begin.
        # 1. Create a Decal entity with no components.
@@ -162,6 +162,7 @@ def AtomEditorComponents_Decal_AddedToEntity():

        # 11. REDO deletion.
        general.redo()
+        general.idle_wait_frames(1)
        Report.result(Tests.deletion_redo, not decal_entity.exists())

        # 12. Look for errors and asserts.
@@ -97,7 +97,7 @@ def AtomEditorComponents_DeferredFog_AddedToEntity():
        # Test setup begins.
        # Setup: Wait for Editor idle loop before executing Python hydra scripts then open "Base" level.
        TestHelper.init_idle()
-        TestHelper.open_level("", "Base")
+        TestHelper.open_level("Graphics", "base_empty")

        # Test steps begin.
        # 1. Create an Deferred Fog entity with no components.
@@ -174,10 +174,12 @@ def AtomEditorComponents_DeferredFog_AddedToEntity():

        # 13. UNDO deletion.
        general.undo()
+        general.idle_wait_frames(1)
        Report.result(Tests.deletion_undo, deferred_fog_entity.exists())

        # 14. REDO deletion.
        general.redo()
+        general.idle_wait_frames(1)
        Report.result(Tests.deletion_redo, not deferred_fog_entity.exists())

        # 15. Look for errors and asserts.
@@ -107,7 +107,7 @@ def AtomEditorComponents_DepthOfField_AddedToEntity():
        # Test setup begins.
        # Setup: Wait for Editor idle loop before executing Python hydra scripts then open "Base" level.
        TestHelper.init_idle()
-        TestHelper.open_level("", "Base")
+        TestHelper.open_level("Graphics", "base_empty")

        # Test steps begin.
        # 1. Create a DepthOfField entity with no components.
@@ -189,10 +189,12 @@ def AtomEditorComponents_DepthOfField_AddedToEntity():

        # 15. UNDO deletion.
        general.undo()
+        general.idle_wait_frames(1)
        Report.result(Tests.deletion_undo, depth_of_field_entity.exists())

        # 16. REDO deletion.
        general.redo()
+        general.idle_wait_frames(1)
        Report.result(Tests.deletion_redo, not depth_of_field_entity.exists())

        # 17. Look for errors and asserts.
@@ -90,7 +90,7 @@ def AtomEditorComponents_DiffuseProbeGrid_AddedToEntity():
        # Test setup begins.
        # Setup: Wait for Editor idle loop before executing Python hydra scripts then open "Base" level.
        TestHelper.init_idle()
-        TestHelper.open_level("", "Base")
+        TestHelper.open_level("Graphics", "base_empty")

        # Test steps begin.
        # 1. Create a Diffuse Probe Grid entity with no components.
@@ -168,10 +168,12 @@ def AtomEditorComponents_DiffuseProbeGrid_AddedToEntity():

        # 12. UNDO deletion.
        general.undo()
+        general.idle_wait_frames(1)
        Report.result(Tests.deletion_undo, diffuse_probe_grid_entity.exists())

        # 13. REDO deletion.
        general.redo()
+        general.idle_wait_frames(1)
        Report.result(Tests.deletion_redo, not diffuse_probe_grid_entity.exists())

        # 14. Look for errors or asserts.
@@ -95,7 +95,7 @@ def AtomEditorComponents_DirectionalLight_AddedToEntity():
        # Test setup begins.
        # Setup: Wait for Editor idle loop before executing Python hydra scripts then open "Base" level.
        TestHelper.init_idle()
-        TestHelper.open_level("", "Base")
+        TestHelper.open_level("Graphics", "base_empty")

        # Test steps begin.
        # 1. Create a Directional Light entity with no components.
@@ -168,10 +168,12 @@ def AtomEditorComponents_DirectionalLight_AddedToEntity():

        # 12. UNDO deletion.
        general.undo()
+        general.idle_wait_frames(1)
        Report.result(Tests.deletion_undo, directional_light_entity.exists())

        # 13. REDO deletion.
        general.redo()
+        general.idle_wait_frames(1)
        Report.result(Tests.deletion_redo, not directional_light_entity.exists())

        # 14. Look for errors and asserts.
@@ -91,7 +91,7 @@ def AtomEditorComponents_DisplayMapper_AddedToEntity():
        # Test setup begins.
        # Setup: Wait for Editor idle loop before executing Python hydra scripts then open "Base" level.
        TestHelper.init_idle()
-        TestHelper.open_level("", "Base")
+        TestHelper.open_level("Graphics", "base_empty")

        # Test steps begin.
        # 1. Create a Display Mapper entity with no components.
@@ -166,10 +166,12 @@ def AtomEditorComponents_DisplayMapper_AddedToEntity():

        # 11. UNDO deletion.
        general.undo()
+        general.idle_wait_frames(1)
        Report.result(Tests.deletion_undo, display_mapper_entity.exists())

        # 12. REDO deletion.
        general.redo()
+        general.idle_wait_frames(1)
        Report.result(Tests.deletion_redo, not display_mapper_entity.exists())

        # 13. Look for errors and asserts.
@@ -81,7 +81,7 @@ def AtomEditorComponents_EntityReference_AddedToEntity():
        # Test setup begins.
        # Setup: Wait for Editor idle loop before executing Python hydra scripts then open "Base" level.
        TestHelper.init_idle()
-        TestHelper.open_level("", "Base")
+        TestHelper.open_level("Graphics", "base_empty")

        # Test steps begin.
        # 1. Create an Entity Reference entity with no components.
@@ -139,10 +139,12 @@ def AtomEditorComponents_EntityReference_AddedToEntity():

        # 9. UNDO deletion.
        general.undo()
+        general.idle_wait_frames(1)
        Report.result(Tests.deletion_undo, entity_reference_entity.exists())

        # 10. REDO deletion.
        general.redo()
+        general.idle_wait_frames(1)
        Report.result(Tests.deletion_redo, not entity_reference_entity.exists())

        # 11. Look for errors and asserts.
@@ -101,7 +101,7 @@ def AtomEditorComponents_ExposureControl_AddedToEntity():
        # Test setup begins.
        # Setup: Wait for Editor idle loop before executing Python hydra scripts then open "Base" level.
        TestHelper.init_idle()
-        TestHelper.open_level("", "Base")
+        TestHelper.open_level("Graphics", "base_empty")

        # Test steps begin.
        # 1. Creation of Exposure Control entity with no components.
@@ -169,10 +169,12 @@ def AtomEditorComponents_ExposureControl_AddedToEntity():

        # 12. UNDO deletion.
        general.undo()
+        general.idle_wait_frames(1)
        Report.result(Tests.deletion_undo, exposure_control_entity.exists())

        # 13. REDO deletion.
        general.redo()
+        general.idle_wait_frames(1)
        Report.result(Tests.deletion_redo, not exposure_control_entity.exists())

        # 14. Look for errors and asserts.
@@ -99,7 +99,7 @@ def AtomEditorComponents_GlobalSkylightIBL_AddedToEntity():
        # Test setup begins.
        # Setup: Wait for Editor idle loop before executing Python hydra scripts then open "Base" level.
        TestHelper.init_idle()
-        TestHelper.open_level("", "Base")
+        TestHelper.open_level("Graphics", "base_empty")

        # Test steps begin.
        # 1. Create a Global Skylight (IBL) entity with no components.
@@ -176,10 +176,12 @@ def AtomEditorComponents_GlobalSkylightIBL_AddedToEntity():

        # 11. UNDO deletion.
        general.undo()
+        general.idle_wait_frames(1)
        Report.result(Tests.deletion_undo, global_skylight_entity.exists())

        # 12. REDO deletion.
        general.redo()
+        general.idle_wait_frames(1)
        Report.result(Tests.deletion_redo, not  global_skylight_entity.exists())

        # 13. Look for errors and asserts.
@@ -82,7 +82,7 @@ def AtomEditorComponents_Grid_AddedToEntity():
        # Test setup begins.
        # Setup: Wait for Editor idle loop before executing Python hydra scripts then open "Base" level.
        TestHelper.init_idle()
-        TestHelper.open_level("", "Base")
+        TestHelper.open_level("Graphics", "base_empty")

        # Test steps begin.
        # 1. Create a Grid entity with no components.
@@ -139,10 +139,12 @@ def AtomEditorComponents_Grid_AddedToEntity():

        # 9. UNDO deletion.
        general.undo()
+        general.idle_wait_frames(1)
        Report.result(Tests.deletion_undo, grid_entity.exists())

        # 10. REDO deletion.
        general.redo()
+        general.idle_wait_frames(1)
        Report.result(Tests.deletion_redo, not grid_entity.exists())

        # 11. Look for errors or asserts.
@@ -96,7 +96,7 @@ def AtomEditorComponents_HDRColorGrading_AddedToEntity():
        # Test setup begins.
        # Setup: Wait for Editor idle loop before executing Python hydra scripts then open "Base" level.
        TestHelper.init_idle()
-        TestHelper.open_level("", "Base")
+        TestHelper.open_level("Graphics", "base_empty")

        # Test steps begin.
        # 1. Create an HDR Color Grading entity with no components.
@@ -173,10 +173,12 @@ def AtomEditorComponents_HDRColorGrading_AddedToEntity():

        # 13. UNDO deletion.
        general.undo()
+        general.idle_wait_frames(1)
        Report.result(Tests.deletion_undo, hdr_color_grading_entity.exists())

        # 14. REDO deletion.
        general.redo()
+        general.idle_wait_frames(1)
        Report.result(Tests.deletion_redo, not hdr_color_grading_entity.exists())

        # 15. Look for errors and asserts.
@@ -87,7 +87,7 @@ def AtomEditorComponents_HDRiSkybox_AddedToEntity():
        # Test setup begins.
        # Setup: Wait for Editor idle loop before executing Python hydra scripts then open "Base" level.
        TestHelper.init_idle()
-        TestHelper.open_level("", "Base")
+        TestHelper.open_level("Graphics", "base_empty")

        # Test steps begin.
        # 1. Create an HDRi Skybox with no components.
@@ -158,10 +158,12 @@ def AtomEditorComponents_HDRiSkybox_AddedToEntity():

        # 10. UNDO deletion.
        general.undo()
+        general.idle_wait_frames(1)
        Report.result(Tests.deletion_undo, hdri_skybox_entity.exists())

        # 11. REDO deletion.
        general.redo()
+        general.idle_wait_frames(1)
        Report.result(Tests.deletion_redo, not hdri_skybox_entity.exists())

        # 12. Look for errors or asserts.
@@ -89,7 +89,7 @@ def AtomEditorComponents_Light_AddedToEntity():
        # Test setup begins.
        # Setup: Wait for Editor idle loop before executing Python hydra scripts then open "Base" level.
        TestHelper.init_idle()
-        TestHelper.open_level("", "Base")
+        TestHelper.open_level("Graphics", "base_empty")

        # Test steps begin.
        # 1. Create a Light entity with no components.
@@ -144,10 +144,12 @@ def AtomEditorComponents_Light_AddedToEntity():

        # 9. UNDO deletion.
        general.undo()
+        general.idle_wait_frames(1)
        Report.result(Tests.deletion_undo, light_entity.exists())

        # 10. REDO deletion.
        general.redo()
+        general.idle_wait_frames(1)
        Report.result(Tests.deletion_redo, not light_entity.exists())

        # 11. Look for errors asserts.
@@ -104,7 +104,7 @@ def AtomEditorComponents_LookModification_AddedToEntity():
        # Test setup begins.
        # Setup: Wait for Editor idle loop before executing Python hydra scripts then open "Base" level.
        TestHelper.init_idle()
-        TestHelper.open_level("", "Base")
+        TestHelper.open_level("Graphics", "base_empty")

        # Test steps begin.
        # 1. Create an Look Modification entity with no components.
@@ -192,10 +192,12 @@ def AtomEditorComponents_LookModification_AddedToEntity():

        # 14. UNDO deletion.
        general.undo()
+        general.idle_wait_frames(1)
        Report.result(Tests.deletion_undo, look_modification_entity.exists())

        # 15. REDO deletion.
        general.redo()
+        general.idle_wait_frames(1)
        Report.result(Tests.deletion_redo, not look_modification_entity.exists())

        # 16. Look for errors and asserts.
@@ -102,7 +102,7 @@ def AtomEditorComponents_Material_AddedToEntity():
        # Test setup begins.
        # Setup: Wait for Editor idle loop before executing Python hydra scripts then open "Base" level.
        TestHelper.init_idle()
-        TestHelper.open_level("", "Base")
+        TestHelper.open_level("Graphics", "base_empty")

        # Test steps begin.
        # 1. Create a Material entity with no components.
@@ -184,10 +184,12 @@ def AtomEditorComponents_Material_AddedToEntity():

        # 16. UNDO deletion.
        general.undo()
+        general.idle_wait_frames(1)
        Report.result(Tests.deletion_undo, material_entity.exists())

        # 17. REDO deletion.
        general.redo()
+        general.idle_wait_frames(1)
        Report.result(Tests.deletion_redo, not material_entity.exists())

        # 18. Look for errors or asserts.
@@ -87,7 +87,7 @@ def AtomEditorComponents_Mesh_AddedToEntity():
        # Test setup begins.
        # Setup: Wait for Editor idle loop before executing Python hydra scripts then open "Base" level.
        TestHelper.init_idle()
-        TestHelper.open_level("", "Base")
+        TestHelper.open_level("Graphics", "base_empty")

        # Test steps begin.
        # 1. Create a Mesh entity with no components.
@@ -151,10 +151,12 @@ def AtomEditorComponents_Mesh_AddedToEntity():

        # 10. UNDO deletion.
        general.undo()
+        general.idle_wait_frames(1)
        Report.result(Tests.deletion_undo, mesh_entity.exists())

        # 11. REDO deletion.
        general.redo()
+        general.idle_wait_frames(1)
        Report.result(Tests.deletion_redo, not mesh_entity.exists())

        # 12. Look for errors or asserts.
@@ -80,7 +80,7 @@ def AtomEditorComponents_OcclusionCullingPlane_AddedToEntity():
        # Test setup begins.
        # Setup: Wait for Editor idle loop before executing Python hydra scripts then open "Base" level.
        TestHelper.init_idle()
-        TestHelper.open_level("", "Base")
+        TestHelper.open_level("Graphics", "base_empty")

        # Test steps begin.
        # 1. Create a occlusion culling plane entity with no components.
@@ -140,10 +140,12 @@ def AtomEditorComponents_OcclusionCullingPlane_AddedToEntity():

        # 9. UNDO deletion.
        general.undo()
+        general.idle_wait_frames(1)
        Report.result(Tests.deletion_undo, occlusion_culling_plane_entity.exists())

        # 10. REDO deletion.
        general.redo()
+        general.idle_wait_frames(1)
        Report.result(Tests.deletion_redo, not occlusion_culling_plane_entity.exists())

        # 11. Look for errors or asserts.
@@ -89,7 +89,7 @@ def AtomEditorComponents_PhysicalSky_AddedToEntity():
        # Test setup begins.
        # Setup: Wait for Editor idle loop before executing Python hydra scripts then open "Base" level.
        TestHelper.init_idle()
-        TestHelper.open_level("", "Base")
+        TestHelper.open_level("Graphics", "base_empty")

        # Test steps begin.
        # 1. Create a Physical Sky entity with no components.
@@ -146,10 +146,12 @@ def AtomEditorComponents_PhysicalSky_AddedToEntity():

        # 9. UNDO deletion.
        general.undo()
+        general.idle_wait_frames(1)
        Report.result(Tests.deletion_undo, physical_sky_entity.exists())

        # 10. REDO deletion.
        general.redo()
+        general.idle_wait_frames(1)
        Report.result(Tests.deletion_redo, not physical_sky_entity.exists())

        # 11. Look for errors and asserts.
@@ -92,7 +92,7 @@ def AtomEditorComponents_PostFXGradientWeightModifier_AddedToEntity():
        # Test setup begins.
        # Setup: Wait for Editor idle loop before executing Python hydra scripts then open "Base" level.
        TestHelper.init_idle()
-        TestHelper.open_level("", "Base")
+        TestHelper.open_level("Graphics", "base_empty")

        # Test steps begin.
        # 1. Create a PostFX Gradient Weight Modifier entity with no components.
@@ -162,10 +162,12 @@ def AtomEditorComponents_PostFXGradientWeightModifier_AddedToEntity():

        # 12. UNDO deletion.
        general.undo()
+        general.idle_wait_frames(1)
        Report.result(Tests.deletion_undo, postfx_gradient_weight_entity.exists())

        # 13. REDO deletion.
        general.redo()
+        general.idle_wait_frames(1)
        Report.result(Tests.deletion_redo, not postfx_gradient_weight_entity.exists())

        # 14. Look for errors or asserts.
@@ -80,7 +80,7 @@ def AtomEditorComponents_postfx_layer_AddedToEntity():
        # Test setup begins.
        # Setup: Wait for Editor idle loop before executing Python hydra scripts then open "Base" level.
        TestHelper.init_idle()
-        TestHelper.open_level("", "Base")
+        TestHelper.open_level("Graphics", "base_empty")

        # Test steps begin.
        # 1. Create a PostFX Layer entity with no components.
@@ -137,10 +137,12 @@ def AtomEditorComponents_postfx_layer_AddedToEntity():

        # 9. UNDO deletion.
        general.undo()
+        general.idle_wait_frames(1)
        Report.result(Tests.deletion_undo, postfx_layer_entity.exists())

        # 10. REDO deletion.
        general.redo()
+        general.idle_wait_frames(1)
        Report.result(Tests.deletion_redo, not postfx_layer_entity.exists())

        # 11. Look for errors or asserts.
@@ -92,7 +92,7 @@ def AtomEditorComponents_PostFXRadiusWeightModifier_AddedToEntity():
        # Test setup begins.
        # Setup: Wait for Editor idle loop before executing Python hydra scripts then open "Base" level.
        TestHelper.init_idle()
-        TestHelper.open_level("", "Base")
+        TestHelper.open_level("Graphics", "base_empty")

        # Test steps begin.
        # 1. Create a Post FX Radius Weight Modifier entity with no components.
@@ -161,10 +161,12 @@ def AtomEditorComponents_PostFXRadiusWeightModifier_AddedToEntity():

        # 12. UNDO deletion.
        general.undo()
+        general.idle_wait_frames(1)
        Report.result(Tests.deletion_undo, postfx_radius_weight_entity.exists())

        # 13. REDO deletion.
        general.redo()
+        general.idle_wait_frames(1)
        Report.result(Tests.deletion_redo, not postfx_radius_weight_entity.exists())

        # 14. Look for errors and asserts.
@@ -98,7 +98,7 @@ def AtomEditorComponents_postfx_shape_weight_AddedToEntity():
        # Test setup begins.
        # Setup: Wait for Editor idle loop before executing Python hydra scripts then open "Base" level.
        TestHelper.init_idle()
-        TestHelper.open_level("", "Base")
+        TestHelper.open_level("Graphics", "base_empty")

        # Test steps begin.
        # 1. Create a PostFx Shape Weight Modifier entity with no components.
@@ -188,10 +188,12 @@ def AtomEditorComponents_postfx_shape_weight_AddedToEntity():

        # 15. UNDO deletion.
        general.undo()
+        general.idle_wait_frames(1)
        Report.result(Tests.deletion_undo, postfx_shape_weight_entity.exists())

        # 16. REDO deletion.
        general.redo()
+        general.idle_wait_frames(1)
        Report.result(Tests.deletion_redo, not postfx_shape_weight_entity.exists())

        # 17. Look for errors or asserts.
@@ -97,7 +97,7 @@ def AtomEditorComponents_ReflectionProbe_AddedToEntity():
        # Test setup begins.
        # Setup: Wait for Editor idle loop before executing Python hydra scripts then open "Base" level.
        TestHelper.init_idle()
-        TestHelper.open_level("", "Base")
+        TestHelper.open_level("Graphics", "base_empty")

        # Test steps begin.
        # 1. Create a Reflection Probe entity with no components.
@@ -183,10 +183,12 @@ def AtomEditorComponents_ReflectionProbe_AddedToEntity():

        # 13. UNDO deletion.
        general.undo()
+        general.idle_wait_frames(1)
        Report.result(Tests.deletion_undo, reflection_probe_entity.exists())

        # 14. REDO deletion.
        general.redo()
+        general.idle_wait_frames(1)
        Report.result(Tests.deletion_redo, not reflection_probe_entity.exists())

        # 15. Look for errors or asserts.
@@ -94,7 +94,7 @@ def AtomEditorComponents_SSAO_AddedToEntity():
        # Test setup begins.
        # Setup: Wait for Editor idle loop before executing Python hydra scripts then open "Base" level.
        TestHelper.init_idle()
-        TestHelper.open_level("", "Base")
+        TestHelper.open_level("Graphics", "base_empty")

        # Test steps begin.
        # 1. Create a SSAO entity with no components.
@@ -163,10 +163,12 @@ def AtomEditorComponents_SSAO_AddedToEntity():

        # 12. UNDO deletion.
        general.undo()
+        general.idle_wait_frames(1)
        Report.result(Tests.deletion_undo, ssao_entity.exists())

        # 13. REDO deletion.
        general.redo()
+        general.idle_wait_frames(1)
        Report.result(Tests.deletion_redo, not ssao_entity.exists())

        # 14. Look for errors and asserts.
@@ -0,0 +1,53 @@
+{
+    "ContainerEntity": {
+        "Id": "Entity_[1146574390643]",
+        "Name": "Level",
+        "Components": {
+            "Component_[10641544592923449938]": {
+                "$type": "EditorInspectorComponent",
+                "Id": 10641544592923449938
+            },
+            "Component_[12039882709170782873]": {
+                "$type": "EditorOnlyEntityComponent",
+                "Id": 12039882709170782873
+            },
+            "Component_[12265484671603697631]": {
+                "$type": "EditorPendingCompositionComponent",
+                "Id": 12265484671603697631
+            },
+            "Component_[14126657869720434043]": {
+                "$type": "EditorEntitySortComponent",
+                "Id": 14126657869720434043
+            },
+            "Component_[15230859088967841193]": {
+                "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                "Id": 15230859088967841193,
+                "Parent Entity": ""
+            },
+            "Component_[16239496886950819870]": {
+                "$type": "EditorDisabledCompositionComponent",
+                "Id": 16239496886950819870
+            },
+            "Component_[5688118765544765547]": {
+                "$type": "EditorEntityIconComponent",
+                "Id": 5688118765544765547
+            },
+            "Component_[6545738857812235305]": {
+                "$type": "SelectionComponent",
+                "Id": 6545738857812235305
+            },
+            "Component_[7247035804068349658]": {
+                "$type": "EditorPrefabComponent",
+                "Id": 7247035804068349658
+            },
+            "Component_[9307224322037797205]": {
+                "$type": "EditorLockComponent",
+                "Id": 9307224322037797205
+            },
+            "Component_[9562516168917670048]": {
+                "$type": "EditorVisibilityComponent",
+                "Id": 9562516168917670048
+            }
+        }
+    }
+}
@@ -0,0 +1,12 @@
+0,0,0,0,0,0
+0,0,0,0,0,0
+0,0,0,0,0,0
+0,0,0,0,0,0
+0,0,0,0,0,0
+0,0,0,0,0,0
+0,0,0,0,0,0
+0,0,0,0,0,0
+0,0,0,0,0,0
+0,0,0,0,0,0
+0,0,0,0,0,0
+0,0,0,0,0,0