Remove references to deprecated legacy objectmanager calls in python tests

Signed-off-by: Danilo Aimini <[email protected]>

AutomatedTesting/Gem/PythonTests/EditorPythonBindings/tests/Editor_ObjectManagerCommands_Works.py

@@ -22,38 +22,7 @@ def Editor_ObjectManagerCommands_Works(BaseClass):
         BaseClass.check_result(currentLevelName == 'TestDependenciesLevel', "Not TestDependenciesLevel level")
     
         objs_list = general.get_all_objects()
-    
         BaseClass.check_result(len(objs_list) > 0, "get_all_objects works")
-    
-        general.clear_selection()
-        general.select_object(objs_list[0])
-    
-        selected_objs_list = general.get_names_of_selected_objects()
-    
-        BaseClass.check_result(len(selected_objs_list) == 1, "get_names_of_selected_objects works")
-    
-        select = [objs_list[1], objs_list[2]]
-        general.select_objects(select)
-    
-        selected_objs_list = general.get_names_of_selected_objects()
-    
-        BaseClass.check_result(len(selected_objs_list) == 3, f"select_objects works {selected_objs_list}")
-    
-        sel_position = general.get_selection_center()
-        sel_aabb = general.get_selection_aabb()
-        centerX = sel_position.get_property("x")
-        cornerX = sel_aabb.get_property("min").get_property("x")
-    
-        BaseClass.check_result(not(centerX == cornerX), "sel_position and sel_aabb both work")
-    
-        unselect = [objs_list[0], objs_list[2]]
-        general.unselect_objects(unselect)
-    
-        BaseClass.check_result(general.get_num_selected() == 1, "get_num_selected and unselect_objects both work")
-    
-        general.clear_selection()
-    
-        BaseClass.check_result(general.get_num_selected() == 0, "clear_selection works")
 
         def fetch_vector3_parts(vec3):
             x = vec3.get_property('x')
@@ -85,12 +54,6 @@ def Editor_ObjectManagerCommands_Works(BaseClass):
     
         BaseClass.check_result((sx2 > sx1) and (sy2 > sy1) and (sz2 > sz1), "scale setter/getter works")
     
-        general.select_object(objs_list[2])
-        general.delete_selected()
-        new_objs_list = general.get_all_objects()
-    
-        BaseClass.check_result((len(new_objs_list) < len(objs_list)), "delete_selected works")
-    
         general.delete_object(objs_list[0])
         new_objs_list = general.get_all_objects()
     

AutomatedTesting/Gem/PythonTests/editor/EditorScripts/AssetPicker_UI_UX.py

@@ -54,6 +54,8 @@ def AssetPicker_UI_UX():
 
         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.math as math
 
@@ -63,6 +65,12 @@ def AssetPicker_UI_UX():
 
         file_path = ["AutomatedTesting", "Assets", "Objects", "Foliage"]
 
+        def select_entity_by_name(entity_name):
+            searchFilter2 = entity.SearchFilter()
+            searchFilter2.names = [entity_name]
+            entities = entity.SearchBus(bus.Broadcast, 'SearchEntities', searchFilter)
+            editor.ToolsApplicationRequestBus(bus.Broadcast, 'MarkEntitySelected', entities[0])
+            
         def is_asset_assigned(component, interaction_option):
             path = os.path.join("assets", "objects", "foliage", "cedar.fbx.azmodel")
             expected_asset_id = asset.AssetCatalogRequestBus(bus.Broadcast, 'GetAssetIdByPath', path, math.Uuid(),
@@ -228,7 +236,7 @@ def AssetPicker_UI_UX():
         component_list_widget = entity_inspector.findChild(QtWidgets.QWidget, "m_componentListContents")
 
         # 4) Click on Asset Picker (Model Asset)
-        general.select_object("TestEntity")
+        select_entity_by_name("TestEntity")
         general.idle_wait(0.5)
         attached_button = component_list_widget.findChildren(QtWidgets.QPushButton, "attached-button")[0]
 
@@ -251,7 +259,7 @@ def AssetPicker_UI_UX():
 
         # Clear Model Asset
         hydra.get_set_test(entity, 0, "Controller|Configuration|Model Asset", None)
-        general.select_object("TestEntity")
+        select_entity_by_name("TestEntity")
         general.idle_wait(0.5)
         attached_button = component_list_widget.findChildren(QtWidgets.QPushButton, "attached-button")[0]
 

AutomatedTesting/Gem/PythonTests/editor/EditorScripts/ComponentCRUD_Add_Delete_Components.py

@@ -95,6 +95,12 @@ def ComponentCRUD_Add_Delete_Components():
             tree.expand(component_index)
             tree.setCurrentIndex(component_index)
             QtTest.QTest.keyClick(tree, Qt.Key_Enter, Qt.NoModifier)
+        
+        def select_entity_by_name(entity_name):
+            searchFilter2 = entity.SearchFilter()
+            searchFilter2.names = [entity_name]
+            entities = entity.SearchBus(bus.Broadcast, 'SearchEntities', searchFilter)
+            editor.ToolsApplicationRequestBus(bus.Broadcast, 'MarkEntitySelected', entities[0])
 
         # 1) Open an existing simple level
         hydra.open_base_level()
@@ -107,7 +113,7 @@ def ComponentCRUD_Add_Delete_Components():
         Report.critical_result(Tests.entity_created, entity_id.IsValid())
 
         # 3) Select the newly created entity
-        general.select_object("Entity1")
+        select_entity_by_name("Entity1")
 
         # Give the Entity Inspector time to fully create its contents
         general.idle_wait_frames(3)