birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sort out cloth tests after Actors work with model mesh assets.

Browse Source
This commit is contained in:
moraaar
2021-04-16 18:26:17 +01:00
parent 9e6a5ecbaf
commit 4b3662ac0a
6 changed files with 96 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/NvCloth/Code/Tests/Components/EditorClothComponentTest.cpp
+11 -9
View File
@@ -184,7 +184,7 @@ namespace UnitTest
const NvCloth::MeshNodeList& meshNodeList = editorClothComponent->GetMeshNodeList();
EXPECT_EQ(meshNodeList.size(), 1);
ASSERT_EQ(meshNodeList.size(), 1);
EXPECT_TRUE(meshNodeList[0] == NvCloth::Internal::StatusMessageNoAsset);
}
@@ -208,7 +208,7 @@ namespace UnitTest
const NvCloth::MeshNodeList& meshNodeList = editorClothComponent->GetMeshNodeList();
EXPECT_EQ(meshNodeList.size(), 1);
ASSERT_EQ(meshNodeList.size(), 1);
EXPECT_TRUE(meshNodeList[0] == NvCloth::Internal::StatusMessageNoClothNodes);
}
@@ -234,7 +234,7 @@ namespace UnitTest
const NvCloth::MeshNodeList& meshNodeList = editorClothComponent->GetMeshNodeList();
EXPECT_EQ(meshNodeList.size(), 1);
ASSERT_EQ(meshNodeList.size(), 1);
EXPECT_TRUE(meshNodeList[0] == NvCloth::Internal::StatusMessageNoClothNodes);
}
@@ -261,7 +261,7 @@ namespace UnitTest
const NvCloth::MeshNodeList& meshNodeList = editorClothComponent->GetMeshNodeList();
EXPECT_EQ(meshNodeList.size(), 2);
ASSERT_EQ(meshNodeList.size(), 2);
EXPECT_TRUE(meshNodeList[0] == NvCloth::Internal::StatusMessageSelectNode);
EXPECT_TRUE(meshNodeList[1] == MeshNodeName);
}
@@ -322,9 +322,11 @@ namespace UnitTest
EXPECT_TRUE(meshNodesWithBackstopData.find(MeshNodeName) != meshNodesWithBackstopData.end());
}
// [TODO LYN-2252]
// Enable test once OnModelDestroyed is available.
TEST_F(NvClothEditorClothComponent, DISABLED_EditorClothComponent_OnMeshDestroyed_ReturnsMeshNodeListWithNoAssetMessage)
// [TODO LYN-1891]
// Revisit when Cloth Component Mesh works with Actors adapted to Atom models.
// Editor Cloth component now uses the new AZ::Render::MeshComponentNotificationBus::OnModelReady
// notification and this test does not setup a model yet.
TEST_F(NvClothEditorClothComponent, DISABLED_EditorClothComponent_OnModelPreDestroy_ReturnsMeshNodeListWithNoAssetMessage)
{
auto editorEntity = CreateInactiveEditorEntity("ClothComponentEditorEntity");
auto* editorClothComponent = editorEntity->CreateComponent<NvCloth::EditorClothComponent>();
@@ -341,12 +343,12 @@ namespace UnitTest
editorActorComponent->SetActorAsset(CreateAssetFromActor(AZStd::move(actor)));
}
//editorClothComponent->OnModelDestroyed();
editorClothComponent->OnModelPreDestroy();
const NvCloth::MeshNodeList& meshNodeList = editorClothComponent->GetMeshNodeList();
const auto& meshNodesWithBackstopData = editorClothComponent->GetMeshNodesWithBackstopData();
EXPECT_EQ(meshNodeList.size(), 1);
ASSERT_EQ(meshNodeList.size(), 1);
EXPECT_TRUE(meshNodeList[0] == NvCloth::Internal::StatusMessageNoAsset);
EXPECT_TRUE(meshNodesWithBackstopData.empty());
}