Converting Landscape Canvas tests to utilize the prefab system (#7142)

* Converting LandscapeCanvas automated tests to utilize prefab system Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com> * Finalizing LandscapeCanvas automated test conversions to utilize prefab system Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com> * Removing test gem from enabled_gems for AutomatedTesting Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com> * Removing test gem subdirectory that was mistakenly committed Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com> * Removing debug wait Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>
2022-01-25 13:45:30 -06:00
parent 55146d037a
commit aab3d8df67
31 changed files with 229 additions and 456 deletions
@@ -19,12 +19,16 @@ def find_nodes_matching_entity_component(component_name, entity_id):
    :param entity_id: The entity ID to search for the given component node on
    :return List of matching nodes
    """
+    component_type_id = hydra.get_component_type_id(component_name)
    component = editor.EditorComponentAPIBus(bus.Broadcast, 'GetComponentOfType', entity_id,
-                                             hydra.get_component_type_id(component_name))
+                                             component_type_id)
+
    if component.IsSuccess():
        component_id = component.GetValue()
        component_node = landscapecanvas.LandscapeCanvasRequestBus(bus.Broadcast, 'GetAllNodesMatchingEntityComponent',
                                                                   component_id)
        if component_node:
            print(f"{component_name} node found on entity {entity_id.ToString()}")
+        else:
+            print(f"Failed to find {component_name} node on entity {entity_id.ToString()}")
        return component_node
@@ -43,7 +43,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS AND PAL_TRAIT_
        NAME AutomatedTesting::LandscapeCanvasTests_Main_Optimized
        TEST_SERIAL
        TEST_SUITE main
-        PATH ${CMAKE_CURRENT_LIST_DIR}/landscape_canvas/TestSuite_Main_Optimized.py
+        PATH ${CMAKE_CURRENT_LIST_DIR}/landscape_canvas/TestSuite_Main.py
        RUNTIME_DEPENDENCIES
           AZ::AssetProcessor
           Legacy::Editor
@@ -68,8 +68,7 @@ def AreaNodes_DependentComponentsAdded():
        newEntityId = parameters[0]

    # Open an existing simple level
-    helper.init_idle()
-    helper.open_level("", "Base")
+    hydra.open_base_level()

    # Open Landscape Canvas tool and verify
    general.open_pane('Landscape Canvas')
@@ -58,7 +58,6 @@ def AreaNodes_EntityCreatedOnNodeAdd():

    import editor_python_test_tools.hydra_editor_utils as hydra
    from editor_python_test_tools.utils import Report
-    from editor_python_test_tools.utils import TestHelper as helper

    editorId = azlmbr.globals.property.LANDSCAPE_CANVAS_EDITOR_ID

@@ -67,8 +66,7 @@ def AreaNodes_EntityCreatedOnNodeAdd():
        newEntityId = parameters[0]

    # Open an existing simple level
-    helper.init_idle()
-    helper.open_level("Physics", "Base")
+    hydra.open_base_level()

    # Open Landscape Canvas tool and verify
    general.open_pane('Landscape Canvas')
@@ -59,8 +59,8 @@ def AreaNodes_EntityRemovedOnNodeDelete():
    import azlmbr.math as math
    import azlmbr.paths

+    import editor_python_test_tools.hydra_editor_utils as hydra
    from editor_python_test_tools.utils import Report
-    from editor_python_test_tools.utils import TestHelper as helper

    editorId = azlmbr.globals.property.LANDSCAPE_CANVAS_EDITOR_ID

@@ -73,8 +73,7 @@ def AreaNodes_EntityRemovedOnNodeDelete():
        deletedEntityId = parameters[0]

    # Open an existing simple level
-    helper.init_idle()
-    helper.open_level("Physics", "Base")
+    hydra.open_base_level()

    # Open Landscape Canvas tool and verify
    general.open_pane('Landscape Canvas')
@@ -1,15 +1,14 @@
 """
 Copyright (c) Contributors to the Open 3D Engine Project.
 For complete copyright and license terms please see the LICENSE at the root of this distribution.
-
 SPDX-License-Identifier: Apache-2.0 OR MIT
 """


 class Tests:
-    slice_instantiated = (
-        "Slice instantiated successfully",
-        "Failed to instantiate slice"
+    prefab_instantiated = (
+        "Prefab instantiated successfully",
+        "Failed to instantiate prefab"
    )
    lc_entity_found = (
        "LandscapeCanvas entity found",
@@ -24,7 +23,7 @@ class Tests:
        "Failed to find Distribution Filter component on BushSpawner entity"
    )
    existing_graph_opened = (
-        "Opened existing graph from slice",
+        "Opened existing graph from prefab",
        "Failed to open existing graph"
    )
    dist_filter_node_found = (
@@ -66,10 +65,8 @@ def ComponentUpdates_UpdateGraph():
    Summary:
    This test verifies that the Landscape Canvas graphs update properly when components are added/removed outside of
    Landscape Canvas.
-
    Expected Behavior:
    Graphs properly reflect component changes made to entities outside of Landscape Canvas.
-
    Test Steps:
        1. Open Level
        2. Find LandscapeCanvas named entity
@@ -83,41 +80,36 @@ def ComponentUpdates_UpdateGraph():
        9. Add a new entity with unique name as a child of the Landscape Canvas entity
        10. Add a Box Shape component to the new child entity
        11. Ensure Box Shape node is present on the open graph
-
    Note:
    - This test file must be called from the Open 3D Engine 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.
-
    :return: None
    """

    import os

-    import azlmbr.asset as asset
    import azlmbr.bus as bus
    import azlmbr.editor as editor
    import azlmbr.entity as entity
    import azlmbr.legacy.general as general
    import azlmbr.landscapecanvas as landscapecanvas
    import azlmbr.math as math
-    import azlmbr.slice as slice
+    import azlmbr.prefab as prefab

    import editor_python_test_tools.hydra_editor_utils as hydra
    from editor_python_test_tools.utils import Report
    from editor_python_test_tools.utils import TestHelper as helper

-    # Open a simple level and instantiate LC_BushFlowerBlender.slice
-    helper.init_idle()
-    helper.open_level("Physics", "Base")
+    # Open a simple level and instantiate BushFlowerBlender.prefab
+    hydra.open_base_level()
    transform = math.Transform_CreateIdentity()
    position = math.Vector3(64.0, 64.0, 32.0)
    transform.invoke('SetPosition', position)
-    test_slice_path = os.path.join("Slices", "LC_BushFlowerBlender.slice")
-    test_slice_id = asset.AssetCatalogRequestBus(bus.Broadcast, "GetAssetIdByPath", test_slice_path, math.Uuid(),
-                                                 False)
-    test_slice = slice.SliceRequestBus(bus.Broadcast, 'InstantiateSliceFromAssetId', test_slice_id, transform)
-    Report.critical_result(Tests.slice_instantiated, test_slice.IsValid())
+    test_prefab_path = os.path.join("Assets", "Prefabs", "BushFlowerBlender.prefab")
+    prefab_result = prefab.PrefabPublicRequestBus(bus.Broadcast, 'InstantiatePrefab', test_prefab_path,
+                                                  entity.EntityId(), position)
+    Report.critical_result(Tests.prefab_instantiated, prefab_result.IsSuccess())

    # Find root entity in the loaded level
    search_filter = entity.SearchFilter()
@@ -126,8 +118,8 @@ def ComponentUpdates_UpdateGraph():
    # Allow a few seconds for matching entity to be found
    helper.wait_for_condition(lambda: len(entity.SearchBus(bus.Broadcast, 'SearchEntities', search_filter)) > 0, 5.0)
    lc_matching_entities = entity.SearchBus(bus.Broadcast, 'SearchEntities', search_filter)
-    slice_root_id = lc_matching_entities[0]         #Entity with Landscape Canvas component
-    Report.critical_result(Tests.lc_entity_found, slice_root_id.IsValid())
+    prefab_root_id = lc_matching_entities[0]         #Entity with Landscape Canvas component
+    Report.critical_result(Tests.lc_entity_found, prefab_root_id.IsValid())

    # Find the BushSpawner entity
    search_filter.names = ["BushSpawner"]
@@ -147,7 +139,7 @@ def ComponentUpdates_UpdateGraph():

    # Open Landscape Canvas and the existing graph
    general.open_pane('Landscape Canvas')
-    open_graph = landscapecanvas.LandscapeCanvasRequestBus(bus.Broadcast, 'OnGraphEntity', slice_root_id)
+    open_graph = landscapecanvas.LandscapeCanvasRequestBus(bus.Broadcast, 'OnGraphEntity', prefab_root_id)
    Report.critical_result(Tests.existing_graph_opened, open_graph.IsValid())

    # Verify that Distribution Filter node is present on the graph
@@ -45,11 +45,9 @@ def Component_AddedRemoved():

    import editor_python_test_tools.hydra_editor_utils as hydra
    from editor_python_test_tools.utils import Report
-    from editor_python_test_tools.utils import TestHelper as helper

    # Open an existing simple level
-    helper.init_idle()
-    helper.open_level("Physics", "Base")
+    hydra.open_base_level()

    # Create an Entity at the root of the level
    newEntityId = editor.ToolsApplicationRequestBus(bus.Broadcast, 'CreateNewEntity', entity.EntityId())
@@ -59,8 +59,7 @@ def Edit_DisabledNodeDuplication():
        newEntityId = parameters[0]

    # Open an existing simple level
-    helper.init_idle()
-    helper.open_level("Physics", "Base")
+    hydra.open_base_level()

    # Open Landscape Canvas tool and verify
    general.open_pane('Landscape Canvas')
@@ -1,15 +1,14 @@
 """
 Copyright (c) Contributors to the Open 3D Engine Project.
 For complete copyright and license terms please see the LICENSE at the root of this distribution.
-
 SPDX-License-Identifier: Apache-2.0 OR MIT
 """


 class Tests:
-    slice_spawned = (
-        "Slice instantiated successfully",
-        "Failed to instantiate slice"
+    prefab_instantiated = (
+        "Prefab instantiated successfully",
+        "Failed to instantiate prefab"
    )
    lc_entity_found = (
        "Landscape Canvas entity found",
@@ -31,31 +30,28 @@ class Tests:
        "Vegetation Layer Spawner node was successfully removed",
        "Failed to remove Vegetation Layer Spawner node"
    )
-def Edit_UndoNodeDelete_SliceEntity():
+
+
+def Edit_UndoNodeDelete_PrefabEntity():
    """
    Summary:
-    This test verifies Editor stability after undoing the deletion of nodes on a slice entity.
-
+    This test verifies Editor stability after undoing the deletion of nodes on a prefab entity.
    Expected Behavior:
    Editor remains stable and free of crashes.
-
    Test Steps:
     1) Open a simple level
-     2) Instantiate a slice with a Landscape Canvas setup
+     2) Instantiate a prefab with a Landscape Canvas setup
     3) Find a specific node on the graph, and delete it
     4) Restore the node with Undo
-
    Note:
    - This test file must be called from the Open 3D Engine 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.
-
    :return: None
    """

    import os

-    import azlmbr.asset as asset
    import azlmbr.bus as bus
    import azlmbr.editor as editor
    import azlmbr.entity as entity
@@ -63,25 +59,23 @@ def Edit_UndoNodeDelete_SliceEntity():
    import azlmbr.editor.graph as graph
    import azlmbr.landscapecanvas as landscapecanvas
    import azlmbr.math as math
-    import azlmbr.slice as slice
+    import azlmbr.prefab as prefab

    import editor_python_test_tools.hydra_editor_utils as hydra
    from editor_python_test_tools.utils import Report
    from editor_python_test_tools.utils import TestHelper as helper

    # Open an existing simple level
-    helper.init_idle()
-    helper.open_level("Physics", "Base")
+    hydra.open_base_level()

    # Instantiate slice
    transform = math.Transform_CreateIdentity()
    position = math.Vector3(64.0, 64.0, 32.0)
    transform.invoke('SetPosition', position)
-    test_slice_path = os.path.join("Slices", "LC_BushFlowerBlender.slice")
-    test_slice_id = asset.AssetCatalogRequestBus(bus.Broadcast, "GetAssetIdByPath", test_slice_path, math.Uuid(),
-                                                 False)
-    test_slice = slice.SliceRequestBus(bus.Broadcast, 'InstantiateSliceFromAssetId', test_slice_id, transform)
-    Report.result(Tests.slice_spawned, test_slice.IsValid())
+    test_prefab_path = os.path.join("Assets", "Prefabs", "BushFlowerBlender.prefab")
+    prefab_result = prefab.PrefabPublicRequestBus(bus.Broadcast, 'InstantiatePrefab', test_prefab_path,
+                                                  entity.EntityId(), position)
+    Report.critical_result(Tests.prefab_instantiated, prefab_result.IsSuccess())

    # Find root entity in the loaded level
    search_filter = entity.SearchFilter()
@@ -134,5 +128,4 @@ def Edit_UndoNodeDelete_SliceEntity():
 if __name__ == "__main__":

    from editor_python_test_tools.utils import Report
-    Report.start_test(Edit_UndoNodeDelete_SliceEntity)
-
+    Report.start_test(Edit_UndoNodeDelete_PrefabEntity)
@@ -76,7 +76,6 @@ def GradientMixer_NodeConstruction():

    import editor_python_test_tools.hydra_editor_utils as hydra
    from editor_python_test_tools.utils import Report
-    from editor_python_test_tools.utils import TestHelper as helper

    editorId = azlmbr.globals.property.LANDSCAPE_CANVAS_EDITOR_ID

@@ -85,8 +84,7 @@ def GradientMixer_NodeConstruction():
        newEntityId = parameters[0]

    # Open an existing simple level
-    helper.init_idle()
-    helper.open_level("Physics", "Base")
+    hydra.open_base_level()

    # Open Landscape Canvas tool and verify
    general.open_pane('Landscape Canvas')
@@ -58,7 +58,6 @@ def GradientModifierNodes_EntityCreatedOnNodeAdd():

    import editor_python_test_tools.hydra_editor_utils as hydra
    from editor_python_test_tools.utils import Report
-    from editor_python_test_tools.utils import TestHelper as helper

    editorId = azlmbr.globals.property.LANDSCAPE_CANVAS_EDITOR_ID

@@ -67,8 +66,7 @@ def GradientModifierNodes_EntityCreatedOnNodeAdd():
        newEntityId = parameters[0]

    # Open an existing simple level
-    helper.init_idle()
-    helper.open_level("Physics", "Base")
+    hydra.open_base_level()

    # Open Landscape Canvas tool and verify
    general.open_pane('Landscape Canvas')
@@ -58,8 +58,8 @@ def GradientModifierNodes_EntityRemovedOnNodeDelete():
    import azlmbr.legacy.general as general
    import azlmbr.math as math

+    import editor_python_test_tools.hydra_editor_utils as hydra
    from editor_python_test_tools.utils import Report
-    from editor_python_test_tools.utils import TestHelper as helper

    editorId = azlmbr.globals.property.LANDSCAPE_CANVAS_EDITOR_ID

@@ -72,8 +72,7 @@ def GradientModifierNodes_EntityRemovedOnNodeDelete():
        deletedEntityId = parameters[0]

    # Open an existing simple level
-    helper.init_idle()
-    helper.open_level("Physics", "Base")
+    hydra.open_base_level()

    # Open Landscape Canvas tool and verify
    general.open_pane('Landscape Canvas')
@@ -60,7 +60,6 @@ def GradientNodes_DependentComponentsAdded():

    import editor_python_test_tools.hydra_editor_utils as hydra
    from editor_python_test_tools.utils import Report
-    from editor_python_test_tools.utils import TestHelper as helper

    editorId = azlmbr.globals.property.LANDSCAPE_CANVAS_EDITOR_ID

@@ -69,8 +68,7 @@ def GradientNodes_DependentComponentsAdded():
        newEntityId = parameters[0]

    # Open an existing simple level
-    helper.init_idle()
-    helper.open_level("Physics", "Base")
+    hydra.open_base_level()

    # Open Landscape Canvas tool and verify
    general.open_pane('Landscape Canvas')
@@ -58,7 +58,6 @@ def GradientNodes_EntityCreatedOnNodeAdd():

    import editor_python_test_tools.hydra_editor_utils as hydra
    from editor_python_test_tools.utils import Report
-    from editor_python_test_tools.utils import TestHelper as helper

    editorId = azlmbr.globals.property.LANDSCAPE_CANVAS_EDITOR_ID

@@ -67,8 +66,7 @@ def GradientNodes_EntityCreatedOnNodeAdd():
        newEntityId = parameters[0]

    # Open an existing simple level
-    helper.init_idle()
-    helper.open_level("Physics", "Base")
+    hydra.open_base_level()

    # Open Landscape Canvas tool and verify
    general.open_pane('Landscape Canvas')
@@ -58,8 +58,8 @@ def GradientNodes_EntityRemovedOnNodeDelete():
    import azlmbr.legacy.general as general
    import azlmbr.math as math

+    import editor_python_test_tools.hydra_editor_utils as hydra
    from editor_python_test_tools.utils import Report
-    from editor_python_test_tools.utils import TestHelper as helper

    editorId = azlmbr.globals.property.LANDSCAPE_CANVAS_EDITOR_ID

@@ -72,8 +72,7 @@ def GradientNodes_EntityRemovedOnNodeDelete():
        deletedEntityId = parameters[0]

    # Open an existing simple level
-    helper.init_idle()
-    helper.open_level("Physics", "Base")
+    hydra.open_base_level()

    # Open Landscape Canvas tool and verify
    general.open_pane('Landscape Canvas')
@@ -51,8 +51,8 @@ def GraphClosed_OnEntityDelete():
    import azlmbr.editor.graph as graph
    import azlmbr.legacy.general as general

+    import editor_python_test_tools.hydra_editor_utils as hydra
    from editor_python_test_tools.utils import Report
-    from editor_python_test_tools.utils import TestHelper as helper

    editorId = azlmbr.globals.property.LANDSCAPE_CANVAS_EDITOR_ID

@@ -61,8 +61,7 @@ def GraphClosed_OnEntityDelete():
        newRootEntityId = parameters[0]

    # Open an existing simple level
-    helper.init_idle()
-    helper.open_level("Physics", "Base")
+    hydra.open_base_level()

    # Open Landscape Canvas tool and verify
    general.open_pane('Landscape Canvas')
@@ -51,14 +51,13 @@ def GraphClosed_OnLevelChange():
    import azlmbr.editor.graph as graph
    import azlmbr.legacy.general as general

+    import editor_python_test_tools.hydra_editor_utils as hydra
    from editor_python_test_tools.utils import Report
-    from editor_python_test_tools.utils import TestHelper as helper

    editorId = azlmbr.globals.property.LANDSCAPE_CANVAS_EDITOR_ID

    # Open an existing simple level
-    helper.init_idle()
-    helper.open_level("Physics", "Base")
+    hydra.open_base_level()

    # Open Landscape Canvas tool and verify
    general.open_pane('Landscape Canvas')
@@ -73,7 +72,7 @@ def GraphClosed_OnLevelChange():
    Report.result(Tests.graph_registered, graph_registered)

    # Open a different level, which should close any open Landscape Canvas graphs
-    general.open_level_no_prompt('WhiteBox/EmptyLevel')
+    general.open_level_no_prompt('Base')

    # Make sure the graph we created is now closed
    graphIsOpen = graph.AssetEditorRequestBus(bus.Event, 'ContainsGraph', editorId, newGraphId)
@@ -51,8 +51,8 @@ def GraphClosed_TabbedGraphClosesIndependently():
    import azlmbr.editor.graph as graph
    import azlmbr.legacy.general as general

+    import editor_python_test_tools.hydra_editor_utils as hydra
    from editor_python_test_tools.utils import Report
-    from editor_python_test_tools.utils import TestHelper as helper

    editor_id = azlmbr.globals.property.LANDSCAPE_CANVAS_EDITOR_ID

@@ -65,8 +65,7 @@ def GraphClosed_TabbedGraphClosesIndependently():
        return graph_open

    # Open an existing simple level
-    helper.init_idle()
-    helper.open_level("Physics", "Base")
+    hydra.open_base_level()

    # Open Landscape Canvas tool and verify
    general.open_pane('Landscape Canvas')
@@ -1,18 +1,17 @@
 """
 Copyright (c) Contributors to the Open 3D Engine Project.
 For complete copyright and license terms please see the LICENSE at the root of this distribution.
-
 SPDX-License-Identifier: Apache-2.0 OR MIT
 """


 class Tests:
-    slice_instantiated = (
-        "Slice instantiated successfully",
-        "Failed to instantiate slice"
+    prefab_instantiated = (
+        "Prefab instantiated successfully",
+        "Failed to instantiate prefab"
    )
    existing_graph_opened = (
-        "Opened existing graph from slice",
+        "Opened existing graph from prefab",
        "Failed to open existing graph"
    )
    node_removed = (
@@ -37,13 +36,11 @@ def GraphUpdates_UpdateComponent():
    """
    Summary:
    This test verifies that components are properly updated as nodes are added/removed/updated.
-
    Expected Behavior:
    Landscape Canvas node CRUD properly updates component entities.
-
    Test Steps:
        1. Open Level.
-        2. Open the graph on LC_BushFlowerBlender.slice
+        2. Open the graph on BushFlowerBlender.prefab
        3. Find the Rotation Modifier node on the BushSpawner entity
        4. Delete the Rotation Modifier node
        5. Ensure the Vegetation Rotation Modifier component is removed from the BushSpawner entity
@@ -51,18 +48,15 @@ def GraphUpdates_UpdateComponent():
        7. Ensure BushSpawner entity is deleted
        8. Change connection from second Rotation Modifier node to a different Gradient
        9. Ensure Gradient reference on component is updated
-
    Note:
    - This test file must be called from the Open 3D Engine 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.
-
    :return: None
    """

    import os

-    import azlmbr.asset as asset
    import azlmbr.bus as bus
    import azlmbr.editor as editor
    import azlmbr.entity as entity
@@ -70,39 +64,37 @@ def GraphUpdates_UpdateComponent():
    import azlmbr.editor.graph as graph
    import azlmbr.landscapecanvas as landscapecanvas
    import azlmbr.math as math
-    import azlmbr.slice as slice
+    import azlmbr.prefab as prefab

    import automatedtesting_shared.landscape_canvas_utils as lc
    import editor_python_test_tools.hydra_editor_utils as hydra
    from editor_python_test_tools.utils import Report
    from editor_python_test_tools.utils import TestHelper as helper

-    # Open a simple level and instantiate LC_BushFlowerBlender.slice
-    helper.init_idle()
-    helper.open_level("Physics", "Base")
+    # Open a simple level and instantiate BushFlowerBlender.prefab
+    hydra.open_base_level()
    transform = math.Transform_CreateIdentity()
    position = math.Vector3(64.0, 64.0, 32.0)
    transform.invoke('SetPosition', position)
-    test_slice_path = os.path.join("Slices", "LC_BushFlowerBlender.slice")
-    test_slice_id = asset.AssetCatalogRequestBus(bus.Broadcast, "GetAssetIdByPath", test_slice_path, math.Uuid(),
-                                                 False)
-    test_slice = slice.SliceRequestBus(bus.Broadcast, 'InstantiateSliceFromAssetId', test_slice_id, transform)
-    Report.critical_result(Tests.slice_instantiated, test_slice.IsValid())
+    test_prefab_path = os.path.join("Assets", "Prefabs", "BushFlowerBlender.prefab")
+    prefab_result = prefab.PrefabPublicRequestBus(bus.Broadcast, 'InstantiatePrefab', test_prefab_path,
+                                                  entity.EntityId(), position)
+    Report.critical_result(Tests.prefab_instantiated, prefab_result.IsSuccess())

-    # Search for root entity to ensure slice is loaded
+    # Search for root entity to ensure prefab is loaded
    search_filter = entity.SearchFilter()
    search_filter.names = ["LandscapeCanvas"]
    helper.wait_for_condition(lambda: len(entity.SearchBus(bus.Broadcast, 'SearchEntities', search_filter)) > 0, 5.0)
+    prefab_lc_root = entity.SearchBus(bus.Broadcast, 'SearchEntities', search_filter)[0]

    # Find needed entities in the loaded level
-    slice_root_id = hydra.find_entity_by_name('LandscapeCanvas')
    bush_spawner_id = hydra.find_entity_by_name('BushSpawner')
    flower_spawner_id = hydra.find_entity_by_name('FlowerSpawner')
    inverted_perlin_noise_id = hydra.find_entity_by_name('Invert')

    # Open Landscape Canvas and the existing graph
    general.open_pane('Landscape Canvas')
-    open_graph_id = landscapecanvas.LandscapeCanvasRequestBus(bus.Broadcast, 'OnGraphEntity', slice_root_id)
+    open_graph_id = landscapecanvas.LandscapeCanvasRequestBus(bus.Broadcast, 'OnGraphEntity', prefab_lc_root)
    Report.critical_result(Tests.existing_graph_opened, open_graph_id.IsValid())

    # Find the Rotation Modifier node on the BushSpawner entity
@@ -110,6 +102,7 @@ def GraphUpdates_UpdateComponent():

    # Remove the Rotation Modifier node
    graph.GraphControllerRequestBus(bus.Event, 'RemoveNode', open_graph_id, rotation_modifier_node[0])
+    general.idle_wait_frames(2)

    # Verify node was removed
    rotation_modifier_node = lc.find_nodes_matching_entity_component('Vegetation Rotation Modifier', bush_spawner_id)
@@ -121,14 +114,18 @@ def GraphUpdates_UpdateComponent():
    Report.result(Tests.component_removed, not has_rotation_modifier)

    # Find the Vegetation Layer Spawner node on the BushSpawner entity
+    open_graph_id = landscapecanvas.LandscapeCanvasRequestBus(bus.Broadcast, 'OnGraphEntity', prefab_lc_root)
    layer_spawner_node = lc.find_nodes_matching_entity_component('Vegetation Layer Spawner', bush_spawner_id)

    # Remove the Vegetation Layer Spawner node and verify the corresponding entity is deleted
    graph.GraphControllerRequestBus(bus.Event, 'RemoveNode', open_graph_id, layer_spawner_node[0])
+    general.idle_wait_frames(2)
+    layer_spawner_node = lc.find_nodes_matching_entity_component('Vegetation Layer Spawner', bush_spawner_id)
    bush_spawner_id = hydra.find_entity_by_name('BushSpawner')
-    Report.result(Tests.entity_deleted, not bush_spawner_id)
+    Report.result(Tests.entity_deleted, not layer_spawner_node and not bush_spawner_id)

    # Connect the FlowerSpawner's Rotation Modifier node to the Invert Gradient Modifier node
+    open_graph_id = landscapecanvas.LandscapeCanvasRequestBus(bus.Broadcast, 'OnGraphEntity', prefab_lc_root)
    rotation_modifier_node = lc.find_nodes_matching_entity_component('Vegetation Rotation Modifier', flower_spawner_id)
    invert_node = lc.find_nodes_matching_entity_component('Invert Gradient Modifier', inverted_perlin_noise_id)

@@ -137,7 +134,7 @@ def GraphUpdates_UpdateComponent():
    graph.GraphControllerRequestBus(bus.Event, 'AddConnectionBySlotId', open_graph_id, invert_node[0],
                                    outbound_gradient_slot, rotation_modifier_node[0], inbound_gradient_z_slot)

-    general.idle_wait(1.0)      # Add a small wait to ensure component property has time to update
+    general.idle_wait_frames(2)     # Add a small wait to ensure component property has time to update

    # Verify the Gradient Entity Id reference on the Rotation Modifier component was properly set
    rotation_type_id = hydra.get_component_type_id('Vegetation Rotation Modifier')
@@ -64,7 +64,6 @@ def LayerBlender_NodeConstruction():

    import editor_python_test_tools.hydra_editor_utils as hydra
    from editor_python_test_tools.utils import Report
-    from editor_python_test_tools.utils import TestHelper as helper

    editorId = azlmbr.globals.property.LANDSCAPE_CANVAS_EDITOR_ID

@@ -73,8 +72,7 @@ def LayerBlender_NodeConstruction():
        newEntityId = parameters[0]

    # Open an existing simple level
-    helper.init_idle()
-    helper.open_level("Physics", "Base")
+    hydra.open_base_level()

    # Open Landscape Canvas tool and verify
    general.open_pane('Landscape Canvas')
@@ -63,7 +63,6 @@ def LayerExtenderNodes_ComponentEntitySync():

    import editor_python_test_tools.hydra_editor_utils as hydra
    from editor_python_test_tools.utils import Report
-    from editor_python_test_tools.utils import TestHelper as helper

    editorId = azlmbr.globals.property.LANDSCAPE_CANVAS_EDITOR_ID

@@ -72,8 +71,7 @@ def LayerExtenderNodes_ComponentEntitySync():
        newEntityId = parameters[0]

    # Open an existing simple level
-    helper.init_idle()
-    helper.open_level("Physics", "Base")
+    hydra.open_base_level()

    # Open Landscape Canvas tool and verify
    general.open_pane('Landscape Canvas')
@@ -60,7 +60,6 @@ def NewGraph_CreatedSuccessfully():

    import editor_python_test_tools.hydra_editor_utils as hydra
    from editor_python_test_tools.utils import Report
-    from editor_python_test_tools.utils import TestHelper as helper

    editorId = azlmbr.globals.property.LANDSCAPE_CANVAS_EDITOR_ID

@@ -69,8 +68,7 @@ def NewGraph_CreatedSuccessfully():
        new_root_entity_id = parameters[0]

    # Open an existing simple level
-    helper.init_idle()
-    helper.open_level("Physics", "Base")
+    hydra.open_base_level()

    # Listen for entity creation notifications so we can check if the entity created
    # with the new graph has our Landscape Canvas component automatically added
@@ -0,0 +1,69 @@
+"""
+Copyright (c) Contributors to the Open 3D Engine Project.
+For complete copyright and license terms please see the LICENSE at the root of this distribution.
+SPDX-License-Identifier: Apache-2.0 OR MIT
+"""
+
+
+class Tests:
+    prefab_created = (
+        "Prefab created successfully",
+        "Failed to create prefab"
+    )
+    prefab_instantiated = (
+        "Prefab instantiated successfully",
+        "Failed to instantiate prefab"
+    )
+
+
+def Prefab_CreateInstantiate():
+    """
+    Summary:
+    A prefab containing the LandscapeCanvas component can be created/instantiated.
+    Expected Result:
+    Prefab is created/processed/instantiated successfully and free of errors/warnings.
+    Test Steps:
+     1) Open a simple level
+     2) Create a new entity with a Landscape Canvas component
+     3) Create a prefab of the new entity
+     4) Instantiate a new copy of the prefab
+     Note:
+    - This test file must be called from the Open 3D Engine 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.
+    :return: None
+    """
+
+    import azlmbr.math as math
+
+    import editor_python_test_tools.hydra_editor_utils as hydra
+    from editor_python_test_tools.utils import Report
+    from editor_python_test_tools.utils import TestHelper as helper
+    from editor_python_test_tools.prefab_utils import Prefab
+
+    # Open an existing simple level
+    hydra.open_base_level()
+
+    # Create entity with Landscape Canvas component
+    position = math.Vector3(512.0, 512.0, 32.0)
+    landscape_canvas = hydra.Entity("landscape_canvas_entity")
+    landscape_canvas.create_entity(position, ["Landscape Canvas"])
+
+    # Create in-memory prefab from the created entity
+    lc_prefab_filename = "LC_PrefabTest"
+    lc_prefab, lc_prefab_instance = Prefab.create_prefab([landscape_canvas], lc_prefab_filename)
+
+    # Verify if prefab is created
+    helper.wait_for_condition(lambda: lc_prefab.is_prefab_loaded(lc_prefab_filename), 5.0)
+    Report.result(Tests.prefab_created, lc_prefab.is_prefab_loaded(lc_prefab_filename))
+
+    # Instantiate prefab
+    lc_prefab_instance2 = lc_prefab.instantiate()
+    helper.wait_for_condition(lambda: lc_prefab_instance2.has_editor_prefab_component(), 5.0)
+    Report.result(Tests.prefab_instantiated, lc_prefab_instance2.has_editor_prefab_component())
+
+
+if __name__ == "__main__":
+
+    from editor_python_test_tools.utils import Report
+    Report.start_test(Prefab_CreateInstantiate)
@@ -58,7 +58,6 @@ def ShapeNodes_EntityCreatedOnNodeAdd():

    import editor_python_test_tools.hydra_editor_utils as hydra
    from editor_python_test_tools.utils import Report
-    from editor_python_test_tools.utils import TestHelper as helper

    editorId = azlmbr.globals.property.LANDSCAPE_CANVAS_EDITOR_ID

@@ -66,10 +65,8 @@ def ShapeNodes_EntityCreatedOnNodeAdd():
        global newEntityId
        newEntityId = parameters[0]

-        # Open an existing simple level
-
-    helper.init_idle()
-    helper.open_level("Physics", "Base")
+    # Open an existing simple level
+    hydra.open_base_level()

    # Open Landscape Canvas tool and verify
    general.open_pane('Landscape Canvas')
@@ -58,8 +58,8 @@ def ShapeNodes_EntityRemovedOnNodeDelete():
    import azlmbr.legacy.general as general
    import azlmbr.math as math

+    import editor_python_test_tools.hydra_editor_utils as hydra
    from editor_python_test_tools.utils import Report
-    from editor_python_test_tools.utils import TestHelper as helper

    editorId = azlmbr.globals.property.LANDSCAPE_CANVAS_EDITOR_ID

@@ -72,8 +72,7 @@ def ShapeNodes_EntityRemovedOnNodeDelete():
        deletedEntityId = parameters[0]

    # Open an existing simple level
-    helper.init_idle()
-    helper.open_level("Physics", "Base")
+    hydra.open_base_level()

    # Open Landscape Canvas tool and verify
    general.open_pane('Landscape Canvas')
@@ -1,84 +0,0 @@
-"""
-Copyright (c) Contributors to the Open 3D Engine Project.
-For complete copyright and license terms please see the LICENSE at the root of this distribution.
-
-SPDX-License-Identifier: Apache-2.0 OR MIT
-"""
-
-
-class Tests:
-    slice_created = (
-        "Slice created successfully",
-        "Failed to create slice"
-    )
-    slice_instantiated = (
-        "Slice instantiated successfully",
-        "Failed to instantiate slice"
-    )
-
-
-def Slice_CreateInstantiate():
-    """
-    Summary:
-    A slice containing the LandscapeCanvas component can be created/instantiated.
-
-    Expected Result:
-    Slice is created/processed/instantiated successfully and free of errors/warnings.
-
-    Test Steps:
-     1) Open a simple level
-     2) Create a new entity with a Landscape Canvas component
-     3) Create a slice of the new entity
-     4) Instantiate a new copy of the slice
-
-     Note:
-    - This test file must be called from the Open 3D Engine 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.
-    :return: None
-    """
-
-    import os
-
-    import azlmbr.math as math
-    import azlmbr.bus as bus
-    import azlmbr.asset as asset
-    import azlmbr.slice as slice
-
-    import editor_python_test_tools.hydra_editor_utils as hydra
-    from editor_python_test_tools.utils import Report
-    from editor_python_test_tools.utils import TestHelper as helper
-
-    def path_is_valid_asset(asset_path):
-        asset_id = asset.AssetCatalogRequestBus(bus.Broadcast, "GetAssetIdByPath", asset_path, math.Uuid(), False)
-        return asset_id.invoke("IsValid")
-
-    # Open an existing simple level
-    helper.init_idle()
-    helper.open_level("Physics", "Base")
-
-    # Create entity with Landscape Canvas component
-    position = math.Vector3(512.0, 512.0, 32.0)
-    landscape_canvas = hydra.Entity("landscape_canvas_entity")
-    landscape_canvas.create_entity(position, ["Landscape Canvas"])
-
-    # Create slice from the created entity
-    slice_path = os.path.join("slices", "TestSlice.slice")
-    slice.SliceRequestBus(bus.Broadcast, "CreateNewSlice", landscape_canvas.id, slice_path)
-
-    # Verify if slice is created
-    helper.wait_for_condition(lambda: path_is_valid_asset(slice_path), 5.0)
-    Report.result(Tests.slice_created, path_is_valid_asset(slice_path))
-
-    # Instantiate slice
-    transform = math.Transform_CreateIdentity()
-    asset_id = asset.AssetCatalogRequestBus(bus.Broadcast, "GetAssetIdByPath", slice_path, math.Uuid(), False)
-    test_slice = slice.SliceRequestBus(bus.Broadcast, "InstantiateSliceFromAssetId", asset_id, transform)
-    helper.wait_for_condition(lambda: test_slice.IsValid(), 5.0)
-    Report.result(Tests.slice_instantiated, test_slice.IsValid())
-
-
-if __name__ == "__main__":
-
-    from editor_python_test_tools.utils import Report
-    Report.start_test(Slice_CreateInstantiate)
@@ -67,7 +67,6 @@ def SlotConnections_UpdateComponentReferences():

    import editor_python_test_tools.hydra_editor_utils as hydra
    from editor_python_test_tools.utils import Report
-    from editor_python_test_tools.utils import TestHelper as helper

    editorId = azlmbr.globals.property.LANDSCAPE_CANVAS_EDITOR_ID

@@ -101,8 +100,7 @@ def SlotConnections_UpdateComponentReferences():
        newEntityId = parameters[0]

    # Open an existing simple level
-    helper.init_idle()
-    helper.open_level("Physics", "Base")
+    hydra.open_base_level()

    # Open Landscape Canvas tool and verify
    general.open_pane('Landscape Canvas')
@@ -1,29 +1,88 @@
 """
 Copyright (c) Contributors to the Open 3D Engine Project.
 For complete copyright and license terms please see the LICENSE at the root of this distribution.
-
 SPDX-License-Identifier: Apache-2.0 OR MIT
 """

-import os
 import pytest
-import sys

-import ly_test_tools.environment.file_system as file_system
-
-sys.path.append(os.path.dirname(os.path.abspath(__file__)) + '/../../automatedtesting_shared')
-from base import TestAutomationBase
+from ly_test_tools.o3de.editor_test import EditorSingleTest, EditorSharedTest, EditorParallelTest, EditorTestSuite


-@pytest.mark.SUITE_main
@pytest.mark.parametrize("launcher_platform", ['windows_editor'])
@pytest.mark.parametrize("project", ["AutomatedTesting"])
-class TestAutomation(TestAutomationBase):
+class TestAutomation(EditorTestSuite):

-    def test_LandscapeCanvas_SlotConnections_UpdateComponentReferences(self, request, workspace, editor, launcher_platform):
-        from .EditorScripts import SlotConnections_UpdateComponentReferences as test_module
-        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
+    class test_LandscapeCanvas_AreaNodes_DependentComponentsAdded(EditorSharedTest):
+        from .EditorScripts import AreaNodes_DependentComponentsAdded as test_module

-    def test_LandscapeCanvas_GradientMixer_NodeConstruction(self, request, workspace, editor, launcher_platform):
+    class test_LandscapeCanvas_AreaNodes_EntityCreatedOnNodeAdd(EditorSharedTest):
+        from .EditorScripts import AreaNodes_EntityCreatedOnNodeAdd as test_module
+
+    class test_LandscapeCanvas_AreaNodes_EntityRemovedOnNodeDelete(EditorSharedTest):
+        from .EditorScripts import AreaNodes_EntityRemovedOnNodeDelete as test_module
+
+    class test_LandscapeCanvas_Component_AddedRemoved(EditorSharedTest):
+        from .EditorScripts import Component_AddedRemoved as test_module
+
+    class test_LandscapeCanvas_ComponentUpdates_UpdateGraph(EditorSharedTest):
+        from .EditorScripts import ComponentUpdates_UpdateGraph as test_module
+
+    class test_LandscapeCanvas_Edit_DisabledNodeDuplication(EditorSharedTest):
+        from .EditorScripts import Edit_DisabledNodeDuplication as test_module
+
+    class test_LandscapeCanvas_Edit_UndoNodeDelete_PrefabEntity(EditorSharedTest):
+        from .EditorScripts import Edit_UndoNodeDelete_PrefabEntity as test_module
+
+    class test_LandscapeCanvas_GradientMixer_NodeConstruction(EditorSharedTest):
        from .EditorScripts import GradientMixer_NodeConstruction as test_module
-        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
+
+    class test_LandscapeCanvas_GradientModifierNodes_EntityCreatedOnNodeAdd(EditorSharedTest):
+        from .EditorScripts import GradientModifierNodes_EntityCreatedOnNodeAdd as test_module
+
+    class test_LandscapeCanvas_GradientModifierNodes_EntityRemovedOnNodeDelete(EditorSharedTest):
+        from .EditorScripts import GradientModifierNodes_EntityRemovedOnNodeDelete as test_module
+
+    class test_LandscapeCanvas_GradientNodes_DependentComponentsAdded(EditorSharedTest):
+        from .EditorScripts import GradientNodes_DependentComponentsAdded as test_module
+
+    class test_LandscapeCanvas_GradientNodes_EntityCreatedOnNodeAdd(EditorSharedTest):
+        from .EditorScripts import GradientNodes_EntityCreatedOnNodeAdd as test_module
+
+    class test_LandscapeCanvas_GradientNodes_EntityRemovedOnNodeDelete(EditorSharedTest):
+        from .EditorScripts import GradientNodes_EntityRemovedOnNodeDelete as test_module
+
+    @pytest.mark.xfail(reason="https://github.com/o3de/o3de/issues/2201")
+    class test_LandscapeCanvas_GraphClosed_OnEntityDelete(EditorSharedTest):
+        from .EditorScripts import GraphClosed_OnEntityDelete as test_module
+
+    class test_LandscapeCanvas_GraphClosed_OnLevelChange(EditorSharedTest):
+        from .EditorScripts import GraphClosed_OnLevelChange as test_module
+
+    class test_LandscapeCanvas_GraphClosed_TabbedGraphClosesIndependently(EditorSharedTest):
+        from .EditorScripts import GraphClosed_TabbedGraph as test_module
+
+    @pytest.mark.skip(reason="https://github.com/o3de/o3de/issues/7141" "https://github.com/o3de/o3de/issues/4872")
+    class test_LandscapeCanvas_GraphUpdates_UpdateComponents(EditorSharedTest):
+        from .EditorScripts import GraphUpdates_UpdateComponents as test_module
+
+    class test_LandscapeCanvas_LayerBlender_NodeConstruction(EditorSharedTest):
+        from .EditorScripts import LayerBlender_NodeConstruction as test_module
+
+    class test_LandscapeCanvas_LayerExtenderNodes_ComponentEntitySync(EditorSharedTest):
+        from .EditorScripts import LayerExtenderNodes_ComponentEntitySync as test_module
+
+    class test_LandscapeCanvas_NewGraph_CreatedSuccessfully(EditorSharedTest):
+        from .EditorScripts import NewGraph_CreatedSuccessfully as test_module
+
+    class test_LandscapeCanvas_Prefab_CreateInstantiate(EditorSharedTest):
+        from .EditorScripts import Prefab_CreateInstantiate as test_module
+
+    class test_LandscapeCanvas_ShapeNodes_EntityCreatedOnNodeAdd(EditorSharedTest):
+        from .EditorScripts import ShapeNodes_EntityCreatedOnNodeAdd as test_module
+
+    class test_LandscapeCanvas_ShapeNodes_EntityRemovedOnNodeDelete(EditorSharedTest):
+        from .EditorScripts import ShapeNodes_EntityRemovedOnNodeDelete as test_module
+
+    class test_LandscapeCanvas_SlotConnections_UpdateComponentReferences(EditorSharedTest):
+        from .EditorScripts import SlotConnections_UpdateComponentReferences as test_module
@@ -1,104 +0,0 @@
-"""
-Copyright (c) Contributors to the Open 3D Engine Project.
-For complete copyright and license terms please see the LICENSE at the root of this distribution.
-
-SPDX-License-Identifier: Apache-2.0 OR MIT
-"""
-
-import os
-import pytest
-
-import ly_test_tools.environment.file_system as file_system
-import ly_test_tools._internal.pytest_plugin as internal_plugin
-from ly_test_tools.o3de.editor_test import EditorSingleTest, EditorSharedTest, EditorParallelTest, EditorTestSuite
-
-@pytest.mark.SUITE_periodic
-@pytest.mark.parametrize("launcher_platform", ['windows_editor'])
-@pytest.mark.parametrize("project", ["AutomatedTesting"])
-class TestAutomationWithPrefabSystemEnabled(EditorTestSuite):
-
-    class test_LandscapeCanvas_AreaNodes_DependentComponentsAdded(EditorSharedTest):
-        from .EditorScripts import AreaNodes_DependentComponentsAdded as test_module
-
-@pytest.mark.SUITE_periodic
-@pytest.mark.parametrize("launcher_platform", ['windows_editor'])
-@pytest.mark.parametrize("project", ["AutomatedTesting"])
-class TestAutomation(EditorTestSuite):
-
-    enable_prefab_system = False
-
-    class test_LandscapeCanvas_SlotConnections_UpdateComponentReferences(EditorSharedTest):
-        from .EditorScripts import SlotConnections_UpdateComponentReferences as test_module
-
-    class test_LandscapeCanvas_GradientMixer_NodeConstruction(EditorSharedTest):
-        from .EditorScripts import GradientMixer_NodeConstruction as test_module
-
-    class test_LandscapeCanvas_AreaNodes_EntityCreatedOnNodeAdd(EditorSharedTest):
-        from .EditorScripts import AreaNodes_EntityCreatedOnNodeAdd as test_module
-
-    class test_LandscapeCanvas_AreaNodes_EntityRemovedOnNodeDelete(EditorSharedTest):
-        from .EditorScripts import AreaNodes_EntityRemovedOnNodeDelete as test_module
-
-    class test_LandscapeCanvas_LayerExtenderNodes_ComponentEntitySync(EditorSharedTest):
-        from .EditorScripts import LayerExtenderNodes_ComponentEntitySync as test_module
-
-    class test_LandscapeCanvas_Edit_DisabledNodeDuplication(EditorSharedTest):
-        from .EditorScripts import Edit_DisabledNodeDuplication as test_module
-
-    class test_LandscapeCanvas_Edit_UndoNodeDelete_SliceEntity(EditorSharedTest):
-        from .EditorScripts import Edit_UndoNodeDelete_SliceEntity as test_module
-
-    class test_LandscapeCanvas_NewGraph_CreatedSuccessfully(EditorSharedTest):
-        from .EditorScripts import NewGraph_CreatedSuccessfully as test_module
-
-    class test_LandscapeCanvas_Component_AddedRemoved(EditorSharedTest):
-        from .EditorScripts import Component_AddedRemoved as test_module
-
-    class test_LandscapeCanvas_GraphClosed_OnLevelChange(EditorSharedTest):
-        from .EditorScripts import GraphClosed_OnLevelChange as test_module
-
-    @pytest.mark.xfail(reason="https://github.com/o3de/o3de/issues/2201")
-    class test_LandscapeCanvas_GraphClosed_OnEntityDelete(EditorSharedTest):
-        from .EditorScripts import GraphClosed_OnEntityDelete as test_module
-
-    class test_LandscapeCanvas_GraphClosed_TabbedGraphClosesIndependently(EditorSharedTest):
-        from .EditorScripts import GraphClosed_TabbedGraph as test_module
-
-    class test_LandscapeCanvas_Slice_CreateInstantiate(EditorSingleTest):
-        from .EditorScripts import Slice_CreateInstantiate as test_module
-        # Custom teardown to remove slice asset created during test
-        def teardown(self, request, workspace, editor, editor_test_results, launcher_platform):
-            file_system.delete([os.path.join(workspace.paths.engine_root(), "AutomatedTesting", "slices",
-                                             "TestSlice.slice")], True, True)
-
-    class test_LandscapeCanvas_GradientModifierNodes_EntityCreatedOnNodeAdd(EditorSharedTest):
-        from .EditorScripts import GradientModifierNodes_EntityCreatedOnNodeAdd as test_module
-
-    class test_LandscapeCanvas_GradientModifierNodes_EntityRemovedOnNodeDelete(EditorSharedTest):
-        from .EditorScripts import GradientModifierNodes_EntityRemovedOnNodeDelete as test_module
-
-    class test_LandscapeCanvas_GradientNodes_DependentComponentsAdded(EditorSharedTest):
-        from .EditorScripts import GradientNodes_DependentComponentsAdded as test_module
-
-    class test_LandscapeCanvas_GradientNodes_EntityCreatedOnNodeAdd(EditorSharedTest):
-        from .EditorScripts import GradientNodes_EntityCreatedOnNodeAdd as test_module
-
-    class test_LandscapeCanvas_GradientNodes_EntityRemovedOnNodeDelete(EditorSharedTest):
-        from .EditorScripts import GradientNodes_EntityRemovedOnNodeDelete as test_module
-
-    @pytest.mark.skipif("debug" == os.path.basename(internal_plugin.build_directory),
-                        reason="https://github.com/o3de/o3de/issues/4872")
-    class test_LandscapeCanvas_GraphUpdates_UpdateComponents(EditorSharedTest):
-        from .EditorScripts import GraphUpdates_UpdateComponents as test_module
-
-    class test_LandscapeCanvas_ComponentUpdates_UpdateGraph(EditorSharedTest):
-        from .EditorScripts import ComponentUpdates_UpdateGraph as test_module
-
-    class test_LandscapeCanvas_LayerBlender_NodeConstruction(EditorSharedTest):
-        from .EditorScripts import LayerBlender_NodeConstruction as test_module
-
-    class test_LandscapeCanvas_ShapeNodes_EntityCreatedOnNodeAdd(EditorSharedTest):
-        from .EditorScripts import ShapeNodes_EntityCreatedOnNodeAdd as test_module
-
-    class test_LandscapeCanvas_ShapeNodes_EntityRemovedOnNodeDelete(EditorSharedTest):
-        from .EditorScripts import ShapeNodes_EntityRemovedOnNodeDelete as test_module
@@ -1,121 +0,0 @@
-"""
-Copyright (c) Contributors to the Open 3D Engine Project.
-For complete copyright and license terms please see the LICENSE at the root of this distribution.
-
-SPDX-License-Identifier: Apache-2.0 OR MIT
-"""
-
-import os
-import pytest
-import sys
-
-import ly_test_tools.environment.file_system as file_system
-
-sys.path.append(os.path.dirname(os.path.abspath(__file__)) + '/../../automatedtesting_shared')
-from base import TestAutomationBase
-
-
-@pytest.fixture
-def remove_test_slice(request, workspace, project):
-    file_system.delete([os.path.join(workspace.paths.engine_root(), project, "slices", "TestSlice.slice")], True, True)
-
-    def teardown():
-        file_system.delete([os.path.join(workspace.paths.engine_root(), project, "slices", "TestSlice.slice")], True,
-                           True)
-
-    request.addfinalizer(teardown)
-
-
-@pytest.mark.SUITE_periodic
-@pytest.mark.parametrize("launcher_platform", ['windows_editor'])
-@pytest.mark.parametrize("project", ["AutomatedTesting"])
-class TestAutomation(TestAutomationBase):
-
-    def test_LandscapeCanvas_AreaNodes_DependentComponentsAdded(self, request, workspace, editor, launcher_platform):
-        from .EditorScripts import AreaNodes_DependentComponentsAdded as test_module
-        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
-
-    def test_LandscapeCanvas_AreaNodes_EntityCreatedOnNodeAdd(self, request, workspace, editor, launcher_platform):
-        from .EditorScripts import AreaNodes_EntityCreatedOnNodeAdd as test_module
-        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
-
-    def test_LandscapeCanvas_AreaNodes_EntityRemovedOnNodeDelete(self, request, workspace, editor, launcher_platform):
-        from .EditorScripts import AreaNodes_EntityRemovedOnNodeDelete as test_module
-        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
-
-    def test_LandscapeCanvas_LayerExtenderNodes_ComponentEntitySync(self, request, workspace, editor, launcher_platform):
-        from .EditorScripts import LayerExtenderNodes_ComponentEntitySync as test_module
-        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
-
-    def test_LandscapeCanvas_Edit_DisabledNodeDuplication(self, request, workspace, editor, launcher_platform):
-        from .EditorScripts import Edit_DisabledNodeDuplication as test_module
-        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
-
-    def test_LandscapeCanvas_Edit_UndoNodeDelete_SliceEntity(self, request, workspace, editor, launcher_platform):
-        from .EditorScripts import Edit_UndoNodeDelete_SliceEntity as test_module
-        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
-
-    def test_LandscapeCanvas_NewGraph_CreatedSuccessfully(self, request, workspace, editor, launcher_platform):
-        from .EditorScripts import NewGraph_CreatedSuccessfully as test_module
-        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
-
-    def test_LandscapeCanvas_Component_AddedRemoved(self, request, workspace, editor, launcher_platform):
-        from .EditorScripts import Component_AddedRemoved as test_module
-        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
-
-    def test_LandscapeCanvas_GraphClosed_OnLevelChange(self, request, workspace, editor, launcher_platform):
-        from .EditorScripts import GraphClosed_OnLevelChange as test_module
-        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
-
-    @pytest.mark.xfail(reason="https://github.com/o3de/o3de/issues/2201")
-    def test_LandscapeCanvas_GraphClosed_OnEntityDelete(self, request, workspace, editor, launcher_platform):
-        from .EditorScripts import GraphClosed_OnEntityDelete as test_module
-        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
-
-    def test_LandscapeCanvas_GraphClosed_TabbedGraphClosesIndependently(self, request, workspace, editor, launcher_platform):
-        from .EditorScripts import GraphClosed_TabbedGraph as test_module
-        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
-
-    def test_LandscapeCanvas_Slice_CreateInstantiate(self, request, workspace, editor, remove_test_slice, launcher_platform):
-        from .EditorScripts import Slice_CreateInstantiate as test_module
-        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
-
-    def test_LandscapeCanvas_GradientModifierNodes_EntityCreatedOnNodeAdd(self, request, workspace, editor, launcher_platform):
-        from .EditorScripts import GradientModifierNodes_EntityCreatedOnNodeAdd as test_module
-        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
-
-    def test_LandscapeCanvas_GradientModifierNodes_EntityRemovedOnNodeDelete(self, request, workspace, editor, launcher_platform):
-        from .EditorScripts import GradientModifierNodes_EntityRemovedOnNodeDelete as test_module
-        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
-
-    def test_LandscapeCanvas_GradientNodes_DependentComponentsAdded(self, request, workspace, editor, launcher_platform):
-        from .EditorScripts import GradientNodes_DependentComponentsAdded as test_module
-        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
-
-    def test_LandscapeCanvas_GradientNodes_EntityCreatedOnNodeAdd(self, request, workspace, editor, launcher_platform):
-        from .EditorScripts import GradientNodes_EntityCreatedOnNodeAdd as test_module
-        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
-
-    def test_LandscapeCanvas_GradientNodes_EntityRemovedOnNodeDelete(self, request, workspace, editor, launcher_platform):
-        from .EditorScripts import GradientNodes_EntityRemovedOnNodeDelete as test_module
-        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
-
-    def test_LandscapeCanvas_GraphUpdates_UpdateComponents(self, request, workspace, editor, launcher_platform):
-        from .EditorScripts import GraphUpdates_UpdateComponents as test_module
-        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
-
-    def test_LandscapeCanvas_ComponentUpdates_UpdateGraph(self, request, workspace, editor, launcher_platform):
-        from .EditorScripts import ComponentUpdates_UpdateGraph as test_module
-        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
-
-    def test_LandscapeCanvas_LayerBlender_NodeConstruction(self, request, workspace, editor, launcher_platform):
-        from .EditorScripts import LayerBlender_NodeConstruction as test_module
-        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
-
-    def test_LandscapeCanvas_ShapeNodes_EntityCreatedOnNodeAdd(self, request, workspace, editor, launcher_platform):
-        from .EditorScripts import ShapeNodes_EntityCreatedOnNodeAdd as test_module
-        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
-
-    def test_LandscapeCanvas_ShapeNodes_EntityRemovedOnNodeDelete(self, request, workspace, editor, launcher_platform):
-        from .EditorScripts import ShapeNodes_EntityRemovedOnNodeDelete as test_module
-        self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
@@ -16,4 +16,4 @@
    "external_subdirectories": [
        "Gem"
    ]
-}
+}