Merged main in

2021-05-07 14:29:14 -05:00
parent 5fbee9c35e bbfb136dc5
commit 4f1c6c2af6
237 changed files with 6876 additions and 1767 deletions
@@ -43,5 +43,6 @@ set(GEM_DEPENDENCIES
    Gem::GradientSignal
    Gem::Vegetation
    Gem::Atom_AtomBridge
+    Gem::NvCloth
    Gem::Blast
 )
@@ -53,5 +53,6 @@ set(GEM_DEPENDENCIES
    Gem::EMotionFX.Editor
    Gem::ImGui.Editor
    Gem::Atom_AtomBridge.Editor
+    Gem::NvCloth.Editor
    Gem::Blast.Editor
 )
@@ -107,20 +107,21 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
 endif()

 ## NvCloth ##
-# [TODO LYN-1928] Enable when AutomatedTesting runs with Atom
-#if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
-#    ly_add_pytest(
-#        NAME AutomatedTesting::NvClothTests
-#        TEST_SUITE main
-#        TEST_SERIAL
-#        PATH ${CMAKE_CURRENT_LIST_DIR}/NvCloth/TestSuite_Active.py
-#        TIMEOUT 1500
-#        RUNTIME_DEPENDENCIES
-#            Legacy::Editor
-#            AZ::AssetProcessor
-#            AutomatedTesting.Assets
-#    )
-#endif()
+if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
+    ly_add_pytest(
+        NAME AutomatedTesting::NvClothTests_Main
+        TEST_SUITE main
+        TEST_SERIAL
+        PATH ${CMAKE_CURRENT_LIST_DIR}/NvCloth/TestSuite_Active.py
+        TIMEOUT 1500
+        RUNTIME_DEPENDENCIES
+            Legacy::Editor
+            AZ::AssetProcessor
+            AutomatedTesting.Assets
+        COMPONENT
+            NvCloth
+    )
+endif()

 ## Editor Python Bindings ##
 if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
@@ -20,7 +20,7 @@ class Tests:
    exit_game_mode               = ("Exited game mode",               "Failed to exit game mode")
 # fmt: on

-def run():
+def C18977329_NvCloth_AddClothSimulationToMesh():
    """
    Summary:
    Load level with Entity having Mesh and Cloth components already setup. Verify that editor remains stable in Game mode.
@@ -89,4 +89,7 @@ def run():
    helper.close_editor()

 if __name__ == "__main__":
-    run()
+    import ImportPathHelper as imports
+    imports.init()
+    from editor_python_test_tools.utils import Report
+    Report.start_test(C18977329_NvCloth_AddClothSimulationToMesh)
@@ -20,7 +20,7 @@ class Tests:
    exit_game_mode               = ("Exited game mode",               "Failed to exit game mode")
 # fmt: on

-def run():
+def C18977330_NvCloth_AddClothSimulationToActor():
    """
    Summary:
    Load level with Entity having Actor and Cloth components already setup. Verify that editor remains stable in Game mode.
@@ -89,4 +89,7 @@ def run():
    helper.close_editor()

 if __name__ == "__main__":
-    run()
+    import ImportPathHelper as imports
+    imports.init()
+    from editor_python_test_tools.utils import Report
+    Report.start_test(C18977330_NvCloth_AddClothSimulationToActor)
@@ -21,14 +21,15 @@ sys.path.append(os.path.dirname(os.path.abspath(__file__)) + '/../automatedtesti

 from base import TestAutomationBase

-@pytest.mark.SUITE_main
@pytest.mark.parametrize("launcher_platform", ['windows_editor'])
@pytest.mark.parametrize("project", ["AutomatedTesting"])
 class TestAutomation(TestAutomationBase):
+    @pytest.mark.xfail(reason="Running with atom null renderer is causing this test to fail")
    def test_C18977329_NvCloth_AddClothSimulationToMesh(self, request, workspace, editor, launcher_platform):
        from . import C18977329_NvCloth_AddClothSimulationToMesh as test_module
        self._run_test(request, workspace, editor, test_module)

+    @pytest.mark.xfail(reason="Running with atom null renderer is causing this test to fail")
    def test_C18977330_NvCloth_AddClothSimulationToActor(self, request, workspace, editor, launcher_platform):
        from . import C18977330_NvCloth_AddClothSimulationToActor as test_module
        self._run_test(request, workspace, editor, test_module)
@@ -42,6 +42,7 @@ class TestAssetPicker(object):

    @pytest.mark.test_case_id("C13751579", "C1508814")
    @pytest.mark.SUITE_periodic
+    @pytest.mark.xfail      # ATOM-15493
    def test_AssetPicker_UI_UX(self, request, editor, level, launcher_platform):
        expected_lines = [
            "TestEntity Entity successfully created",
@@ -98,5 +98,5 @@ if __name__ == "__main__":
    import ImportPathHelper as imports
    imports.init()

-    from utils import Report
+    from editor_python_test_tools.utils import Report
    Report.start_test(C14861501_PhysXCollider_RenderMeshAutoAssigned)
@@ -114,5 +114,5 @@ if __name__ == "__main__":
    import ImportPathHelper as imports
    imports.init()

-    from utils import Report
+    from editor_python_test_tools.utils import Report
    Report.start_test(C4044695_PhysXCollider_AddMultipleSurfaceFbx)
@@ -429,6 +429,8 @@ class TestAutomation(TestAutomationBase):
        from . import C4976236_AddPhysxColliderComponent as test_module
        self._run_test(request, workspace, editor, test_module)

+    @pytest.mark.xfail(
+        reason="This will fail due to this issue ATOM-15487.")
    def test_C14861502_PhysXCollider_AssetAutoAssigned(self, request, workspace, editor, launcher_platform):
        from . import C14861502_PhysXCollider_AssetAutoAssigned as test_module
        self._run_test(request, workspace, editor, test_module)
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a2a3360287a4711882c4254d64ca2ba70cd743012a7d38ca29aa2a57f151efaa
-size 6661
+oid sha256:e15d484113e8151072b410924747a8ad304f6f12457fad577308c0491693ab34
+size 5472
@@ -1,6 +1,6 @@
 <download name="C18977329_NvCloth_AddClothSimulationToMesh" type="Map">
 <index src="filelist.xml" dest="filelist.xml"/>
 <files>
-  <file src="level.pak" dest="level.pak" size="9946" md5="7368d6ce15bfc09a92f694efe73a00ec"/>
+  <file src="level.pak" dest="level.pak" size="97C8" md5="64e64e1e3345dacace01dde152c72250"/>
 </files>
 </download>
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cd8105f020151e65093988dfb09ab42ff8d33ef5b97c61fbe0011384870aadf8
-size 39238
+oid sha256:64de37c805b0be77cdb7a85b5406af58b7f845e7d97fec1721ac5d789bb641db
+size 38856
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f53fb5e096ff562e9f0f12856ce387891596776d086f49c7ed3a59dcd0a0c11a
-size 6535
+oid sha256:7b595323d4d51211463dea0338abb6ce2a4a0a8d41efb12ac3c9dccd1f972171
+size 5504
@@ -1,6 +1,6 @@
 <download name="C18977330_NvCloth_AddClothSimulationToActor" type="Map">
 <index src="filelist.xml" dest="filelist.xml"/>
 <files>
-  <file src="level.pak" dest="level.pak" size="990B" md5="7c17ac9bc5bd3e14e196b731a7e8eed7"/>
+  <file src="level.pak" dest="level.pak" size="9941" md5="297730934d657d7ca57a7357ee9cd566"/>
 </files>
 </download>
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:87fbd9fda267daa505f11276b64f47c26115bee9e6d14f2a6f5a1cf1e1234218
-size 39179
+oid sha256:617c455668fc41cb7fd69de690e4aa3c80f2cb36deaa371902b79de18fcd1cb2
+size 39233