Reenable Blast Automated tests (#42)

Co-authored-by: Ulugbek Adilbekov <ulugbek@amazon.com>

AutomatedTesting/Gem/Code/runtime_dependencies.cmake

@@ -42,7 +42,6 @@ set(GEM_DEPENDENCIES
     Gem::SurfaceData
     Gem::GradientSignal
     Gem::Vegetation
-
     Gem::Atom_RHI.Private
     Gem::Atom_RPI.Private
     Gem::Atom_Feature_Common
@@ -54,4 +53,5 @@ set(GEM_DEPENDENCIES
     Gem::ImguiAtom
     Gem::Atom_AtomBridge
     Gem::AtomFont
+    Gem::Blast
 )

AutomatedTesting/Gem/Code/tool_dependencies.cmake

@@ -68,4 +68,5 @@ set(GEM_DEPENDENCIES
     Gem::ImguiAtom
     Gem::AtomFont
     Gem::AtomToolsFramework.Editor
+    Gem::Blast.Editor
 )

AutomatedTesting/Gem/PythonTests/Blast/TestSuite_Active.py

@@ -27,28 +27,28 @@ from base import TestAutomationBase
 class TestAutomation(TestAutomationBase):
     def test_ActorSplitsAfterCollision(self, request, workspace, editor, launcher_platform):
         from . import ActorSplitsAfterCollision as test_module
-        self._run_test(request, workspace, editor, test_module, expected_lines=[], unexpected_lines=["Assert"])
+        self._run_test(request, workspace, editor, test_module)
 
     def test_ActorSplitsAfterRadialDamage(self, request, workspace, editor, launcher_platform):
         from . import ActorSplitsAfterRadialDamage as test_module
-        self._run_test(request, workspace, editor, test_module, expected_lines=[], unexpected_lines=["Assert"])
+        self._run_test(request, workspace, editor, test_module)
 
     def test_ActorSplitsAfterCapsuleDamage(self, request, workspace, editor, launcher_platform):
         from . import ActorSplitsAfterCapsuleDamage as test_module
-        self._run_test(request, workspace, editor, test_module, expected_lines=[], unexpected_lines=["Assert"])
+        self._run_test(request, workspace, editor, test_module)
 
     def test_ActorSplitsAfterImpactSpreadDamage(self, request, workspace, editor, launcher_platform):
         from . import ActorSplitsAfterImpactSpreadDamage as test_module
-        self._run_test(request, workspace, editor, test_module, expected_lines=[], unexpected_lines=["Assert"])
+        self._run_test(request, workspace, editor, test_module)
 
     def test_ActorSplitsAfterShearDamage(self, request, workspace, editor, launcher_platform):
         from . import ActorSplitsAfterShearDamage as test_module
-        self._run_test(request, workspace, editor, test_module, expected_lines=[], unexpected_lines=["Assert"])
+        self._run_test(request, workspace, editor, test_module)
 
     def test_ActorSplitsAfterTriangleDamage(self, request, workspace, editor, launcher_platform):
         from . import ActorSplitsAfterTriangleDamage as test_module
-        self._run_test(request, workspace, editor, test_module, expected_lines=[], unexpected_lines=["Assert"])
+        self._run_test(request, workspace, editor, test_module)
 
     def test_ActorSplitsAfterStressDamage(self, request, workspace, editor, launcher_platform):
         from . import ActorSplitsAfterStressDamage as test_module
-        self._run_test(request, workspace, editor, test_module, expected_lines=[], unexpected_lines=["Assert"])
+        self._run_test(request, workspace, editor, test_module)

AutomatedTesting/Gem/PythonTests/CMakeLists.txt

@@ -135,20 +135,18 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
 endif()
 
 ## Blast ##
-# Disabled until AutomatedTesting runs with Atom.
-# if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
-#     ly_add_pytest(
-#         NAME AutomatedTesting::BlastTests
-#         TEST_SERIAL TRUE
-#         PATH ${CMAKE_CURRENT_LIST_DIR}/Blast/TestSuite_Active.py
-#         TIMEOUT 500
-#         RUNTIME_DEPENDENCIES
-#             Legacy::Editor
-#             Legacy::CryRenderNULL
-#             AZ::AssetProcessor
-#             AutomatedTesting.Assets
-#     )
-# endif()
+if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
+    ly_add_pytest(
+        NAME AutomatedTesting::BlastTests
+        TEST_SERIAL TRUE
+        PATH ${CMAKE_CURRENT_LIST_DIR}/Blast/TestSuite_Active.py
+        TIMEOUT 3600
+        RUNTIME_DEPENDENCIES
+            Legacy::Editor
+            AZ::AssetProcessor
+            AutomatedTesting.Assets
+    )
+endif()
 
 #############
 

AutomatedTesting/default.blastconfiguration

@@ -1,6 +1,6 @@
 <ObjectStream version="3">
 	<Class name="BlastGlobalConfiguration" version="1" type="{0B9DB6DD-0008-4EF6-9D75-141061144353}">
-		<Class name="Asset" field="BlastMaterialLibrary" value="id={251AC171-6B9C-562D-A235-4EF5E1AE6871}:0,type={55F38C86-0767-4E7F-830A-A4BF624BE4DA},hint={assets/destruction/automated_testing.blastmaterial}" version="1" type="{77A19D40-8731-4D3C-9041-1B43047366A4}"/>
+		<Class name="Asset" field="BlastMaterialLibrary" value="id={251AC171-6B9C-562D-A235-4EF5E1AE6871}:0,type={55F38C86-0767-4E7F-830A-A4BF624BE4DA},hint={assets/destruction/automated_testing.blastmaterial},loadBehavior=1" version="2" type="{77A19D40-8731-4D3C-9041-1B43047366A4}"/>
 		<Class name="unsigned int" field="StressSolverIterations" value="180" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
 	</Class>
 </ObjectStream>

Gems/Blast/Code/Source/Editor/EditorBlastMeshDataComponent.cpp

@@ -179,7 +179,7 @@ namespace Blast
 
     void EditorBlastMeshDataComponent::RegisterModel()
     {
-        if (m_meshFeatureProcessor && m_meshAssets[0].GetId().IsValid())
+        if (m_meshFeatureProcessor && !m_meshAssets.empty() && m_meshAssets[0].GetId().IsValid())
         {
             AZ::Render::MaterialAssignmentMap materials;
             AZ::Render::MaterialComponentRequestBus::EventResult(