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

Fix unit test

Browse Source 
Signed-off-by: rhhong <rhhong@amazon.com>
This commit is contained in:
rhhong
2021-08-24 11:36:13 -07:00
parent 5369df4195
commit 4767d2a891
31 changed files with 341 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/EMotionFX/Code/Tests/SimulatedObjectCommandTests.cpp
+46 -46
View File
@@ -55,25 +55,25 @@ namespace EMotionFX
CommandSystem::CommandManager commandManager;
MCore::CommandGroup commandGroup;
const uint32 actorId = m_actor->GetID();
const uint32 actorId = GetActor()->GetID();
const AZStd::vector<AZStd::string> jointNames = GetTestJointNames();
// 1. Add simulated object.
const AZStd::string serializedBeforeAdd = SerializeSimulatedObjectSetup(m_actor.get());
const AZStd::string serializedBeforeAdd = SerializeSimulatedObjectSetup(GetActor());
CommandSimulatedObjectHelpers::AddSimulatedObject(actorId, AZStd::nullopt, &commandGroup);
CommandSimulatedObjectHelpers::AddSimulatedObject(actorId, AZStd::nullopt, &commandGroup);
CommandSimulatedObjectHelpers::AddSimulatedObject(actorId, AZStd::nullopt, &commandGroup);
EXPECT_TRUE(commandManager.ExecuteCommandGroup(commandGroup, result));
const AZStd::string serializedAfterAdd = SerializeSimulatedObjectSetup(m_actor.get());
EXPECT_EQ(3, CountSimulatedObjects(m_actor.get()));
const AZStd::string serializedAfterAdd = SerializeSimulatedObjectSetup(GetActor());
EXPECT_EQ(3, CountSimulatedObjects(GetActor()));
EXPECT_TRUE(commandManager.Undo(result));
EXPECT_EQ(0, CountSimulatedObjects(m_actor.get()));
EXPECT_EQ(serializedBeforeAdd, SerializeSimulatedObjectSetup(m_actor.get()));
EXPECT_EQ(0, CountSimulatedObjects(GetActor()));
EXPECT_EQ(serializedBeforeAdd, SerializeSimulatedObjectSetup(GetActor()));
EXPECT_TRUE(commandManager.Redo(result));
EXPECT_EQ(3, CountSimulatedObjects(m_actor.get()));
EXPECT_EQ(serializedAfterAdd, SerializeSimulatedObjectSetup(m_actor.get()));
EXPECT_EQ(3, CountSimulatedObjects(GetActor()));
EXPECT_EQ(serializedAfterAdd, SerializeSimulatedObjectSetup(GetActor()));
// 2. Remove simulated object.
commandGroup.RemoveAllCommands();
@@ -81,22 +81,22 @@ namespace EMotionFX
CommandSimulatedObjectHelpers::RemoveSimulatedObject(actorId, 0, &commandGroup);
CommandSimulatedObjectHelpers::RemoveSimulatedObject(actorId, 0, &commandGroup);
EXPECT_TRUE(commandManager.ExecuteCommandGroup(commandGroup, result));
EXPECT_EQ(0, CountSimulatedObjects(m_actor.get()));
EXPECT_EQ(serializedBeforeAdd, SerializeSimulatedObjectSetup(m_actor.get()));
EXPECT_EQ(0, CountSimulatedObjects(GetActor()));
EXPECT_EQ(serializedBeforeAdd, SerializeSimulatedObjectSetup(GetActor()));
EXPECT_TRUE(commandManager.Undo(result));
EXPECT_EQ(3, CountSimulatedObjects(m_actor.get()));
EXPECT_EQ(serializedAfterAdd, SerializeSimulatedObjectSetup(m_actor.get()));
EXPECT_EQ(3, CountSimulatedObjects(GetActor()));
EXPECT_EQ(serializedAfterAdd, SerializeSimulatedObjectSetup(GetActor()));
EXPECT_TRUE(commandManager.Redo(result));
EXPECT_EQ(0, CountSimulatedObjects(m_actor.get()));
EXPECT_EQ(serializedBeforeAdd, SerializeSimulatedObjectSetup(m_actor.get()));
EXPECT_EQ(0, CountSimulatedObjects(GetActor()));
EXPECT_EQ(serializedBeforeAdd, SerializeSimulatedObjectSetup(GetActor()));
// 3. Add simulated joints.
// 3.1 Add a simulated object first to put in the simulated joints.
commandGroup.RemoveAllCommands();
CommandSimulatedObjectHelpers::AddSimulatedObject(actorId);
const AZStd::string serialized3_1 = SerializeSimulatedObjectSetup(m_actor.get());
const AZStd::string serialized3_1 = SerializeSimulatedObjectSetup(GetActor());
// 3.2 Add simulated joints.
// Joint hierarchy as follow:
@@ -105,7 +105,7 @@ namespace EMotionFX
// --l_loLeg
// --l_ankle
// --l_ball
const Skeleton* skeleton = m_actor->GetSkeleton();
const Skeleton* skeleton = GetActor()->GetSkeleton();
const size_t l_upLegIdx = skeleton->FindNodeByName("l_upLeg")->GetNodeIndex();
const size_t l_upLegRollIdx = skeleton->FindNodeByName("l_upLegRoll")->GetNodeIndex();
const size_t l_loLegIdx = skeleton->FindNodeByName("l_loLeg")->GetNodeIndex();
@@ -113,33 +113,33 @@ namespace EMotionFX
const size_t l_ballIdx = skeleton->FindNodeByName("l_ball")->GetNodeIndex();
CommandSimulatedObjectHelpers::AddSimulatedJoints(actorId, {l_upLegIdx, l_upLegRollIdx, l_loLegIdx, l_ankleIdx, l_ballIdx}, 0, false, &commandGroup);
EXPECT_TRUE(commandManager.ExecuteCommandGroup(commandGroup, result));
const AZStd::string serialized3_2 = SerializeSimulatedObjectSetup(m_actor.get());
EXPECT_EQ(5, CountSimulatedJoints(m_actor.get(), 0));
EXPECT_EQ(2, CountChildJoints(m_actor.get(), 0, l_upLegIdx));
EXPECT_EQ(0, CountChildJoints(m_actor.get(), 0, l_upLegRollIdx));
EXPECT_EQ(1, CountChildJoints(m_actor.get(), 0, l_loLegIdx));
const AZStd::string serialized3_2 = SerializeSimulatedObjectSetup(GetActor());
EXPECT_EQ(5, CountSimulatedJoints(GetActor(), 0));
EXPECT_EQ(2, CountChildJoints(GetActor(), 0, l_upLegIdx));
EXPECT_EQ(0, CountChildJoints(GetActor(), 0, l_upLegRollIdx));
EXPECT_EQ(1, CountChildJoints(GetActor(), 0, l_loLegIdx));
EXPECT_TRUE(commandManager.Undo(result));
EXPECT_EQ(0, CountSimulatedJoints(m_actor.get(), 0));
EXPECT_EQ(serialized3_1, SerializeSimulatedObjectSetup(m_actor.get()));
EXPECT_EQ(0, CountSimulatedJoints(GetActor(), 0));
EXPECT_EQ(serialized3_1, SerializeSimulatedObjectSetup(GetActor()));
EXPECT_TRUE(commandManager.Redo(result));
EXPECT_EQ(5, CountSimulatedJoints(m_actor.get(), 0));
EXPECT_EQ(serialized3_2, SerializeSimulatedObjectSetup(m_actor.get()));
EXPECT_EQ(5, CountSimulatedJoints(GetActor(), 0));
EXPECT_EQ(serialized3_2, SerializeSimulatedObjectSetup(GetActor()));
// 4 Remove simulated joints.
// 4.1 Test sparse chain.
EXPECT_EQ(1, CountRootJoints(m_actor.get(), 0));
EXPECT_EQ(1, CountRootJoints(GetActor(), 0));
commandGroup.RemoveAllCommands();
CommandSimulatedObjectHelpers::RemoveSimulatedJoints(actorId, {l_loLegIdx}, 0, false, &commandGroup);
EXPECT_TRUE(commandManager.ExecuteCommandGroup(commandGroup, result));
EXPECT_EQ(2, CountRootJoints(m_actor.get(), 0));
EXPECT_EQ(2, CountRootJoints(GetActor(), 0));
EXPECT_TRUE(commandManager.Undo(result));
EXPECT_EQ(1, CountRootJoints(m_actor.get(), 0));
EXPECT_EQ(1, CountRootJoints(GetActor(), 0));
EXPECT_TRUE(commandManager.Redo(result));
EXPECT_EQ(2, CountRootJoints(m_actor.get(), 0));
EXPECT_EQ(2, CountRootJoints(GetActor(), 0));
EXPECT_TRUE(commandManager.Undo(result));
@@ -147,23 +147,23 @@ namespace EMotionFX
commandGroup.RemoveAllCommands();
CommandSimulatedObjectHelpers::RemoveSimulatedJoints(actorId, { l_upLegIdx, l_upLegRollIdx, l_loLegIdx, l_ankleIdx, l_ballIdx }, 0, false, &commandGroup);
EXPECT_TRUE(commandManager.ExecuteCommandGroup(commandGroup, result));
EXPECT_EQ(0, CountSimulatedJoints(m_actor.get(), 0));
EXPECT_EQ(serialized3_1, SerializeSimulatedObjectSetup(m_actor.get()));
EXPECT_EQ(0, CountSimulatedJoints(GetActor(), 0));
EXPECT_EQ(serialized3_1, SerializeSimulatedObjectSetup(GetActor()));
EXPECT_TRUE(commandManager.Undo(result));
EXPECT_EQ(5, CountSimulatedJoints(m_actor.get(), 0));
EXPECT_EQ(serialized3_2, SerializeSimulatedObjectSetup(m_actor.get()));
EXPECT_EQ(5, CountSimulatedJoints(GetActor(), 0));
EXPECT_EQ(serialized3_2, SerializeSimulatedObjectSetup(GetActor()));
// 4.3 Test removing the root joint and children.
commandGroup.RemoveAllCommands();
CommandSimulatedObjectHelpers::RemoveSimulatedJoints(actorId, { l_upLegIdx }, 0, true, &commandGroup);
EXPECT_TRUE(commandManager.ExecuteCommandGroup(commandGroup, result));
EXPECT_EQ(0, CountSimulatedJoints(m_actor.get(), 0));
EXPECT_EQ(serialized3_1, SerializeSimulatedObjectSetup(m_actor.get()));
EXPECT_EQ(0, CountSimulatedJoints(GetActor(), 0));
EXPECT_EQ(serialized3_1, SerializeSimulatedObjectSetup(GetActor()));
EXPECT_TRUE(commandManager.Undo(result));
EXPECT_EQ(5, CountSimulatedJoints(m_actor.get(), 0));
EXPECT_EQ(serialized3_2, SerializeSimulatedObjectSetup(m_actor.get()));
EXPECT_EQ(5, CountSimulatedJoints(GetActor(), 0));
EXPECT_EQ(serialized3_2, SerializeSimulatedObjectSetup(GetActor()));
}
TEST_F(SimulatedObjectCommandTests, SimulatedObjectCommands_UndoRemoveJointTest)
@@ -172,35 +172,35 @@ namespace EMotionFX
CommandSystem::CommandManager commandManager;
MCore::CommandGroup commandGroup;
const uint32 actorId = m_actor->GetID();
const uint32 actorId = GetActor()->GetID();
const AZStd::vector<AZStd::string> jointNames = GetTestJointNames();
// 1. Add simulated object
CommandSimulatedObjectHelpers::AddSimulatedObject(actorId, AZStd::nullopt, &commandGroup);
EXPECT_TRUE(commandManager.ExecuteCommandGroup(commandGroup, result));
const AZStd::string serializedBase = SerializeSimulatedObjectSetup(m_actor.get());
const AZStd::string serializedBase = SerializeSimulatedObjectSetup(GetActor());
const size_t simulatedObjectIndex = 0;
// 2. Add r_upLeg simulated joints
const Skeleton* skeleton = m_actor->GetSkeleton();
const Skeleton* skeleton = GetActor()->GetSkeleton();
const size_t r_upLegIdx = skeleton->FindNodeByName("r_upLeg")->GetNodeIndex();
const size_t r_loLegIdx = skeleton->FindNodeByName("r_loLeg")->GetNodeIndex();
CommandSimulatedObjectHelpers::AddSimulatedJoints(actorId, { r_upLegIdx, r_loLegIdx }, 0, false);
EXPECT_EQ(2, CountSimulatedJoints(m_actor.get(), 0));
const AZStd::string serializedUpLeg = SerializeSimulatedObjectSetup(m_actor.get());
EXPECT_EQ(2, CountSimulatedJoints(GetActor(), 0));
const AZStd::string serializedUpLeg = SerializeSimulatedObjectSetup(GetActor());
// 3. Remove the r_loLeg simulated joint
AZStd::vector<SimulatedJoint*> jointsToBeRemoved;
commandGroup.RemoveAllCommands();
CommandSimulatedObjectHelpers::RemoveSimulatedJoints(actorId, { r_upLegIdx }, simulatedObjectIndex, true, &commandGroup);
EXPECT_TRUE(commandManager.ExecuteCommandGroup(commandGroup, result));
EXPECT_EQ(0, CountSimulatedJoints(m_actor.get(), 0));
EXPECT_EQ(serializedBase, SerializeSimulatedObjectSetup(m_actor.get()));
EXPECT_EQ(0, CountSimulatedJoints(GetActor(), 0));
EXPECT_EQ(serializedBase, SerializeSimulatedObjectSetup(GetActor()));
// 4. Undo
// This recreates r_loLeg and r_loLeg but won't add all other children recursively as only these two joints got aded in step 3.
EXPECT_TRUE(commandManager.Undo(result));
EXPECT_EQ(2, CountSimulatedJoints(m_actor.get(), 0));
EXPECT_EQ(serializedUpLeg, SerializeSimulatedObjectSetup(m_actor.get()));
EXPECT_EQ(2, CountSimulatedJoints(GetActor(), 0));
EXPECT_EQ(serializedUpLeg, SerializeSimulatedObjectSetup(GetActor()));
}
} // namespace EMotionFX