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

fix physx editor tests

Browse Source
This commit is contained in:
greerdv
2021-05-25 15:52:11 +01:00
parent 92311ddf0d
commit 4d75f00436
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/PhysX/Code/Tests/EditorTestUtilities.cpp
+10 -6
View File
@@ -95,27 +95,31 @@ namespace PhysXEditorTests
editorEntity->Activate(); editorEntity->Activate();
{ {
UnitTest::ErrorHandler warningHandler("Negative or zero cylinder dimensions are invalid"); UnitTest::ErrorHandler dimensionWarningHandler("Negative or zero cylinder dimensions are invalid");
UnitTest::ErrorHandler colliderWarningHandler("No Collider or Shape information found when creating Rigid body");
LmbrCentral::CylinderShapeComponentRequestsBus::Event(editorEntity->GetId(), LmbrCentral::CylinderShapeComponentRequestsBus::Event(editorEntity->GetId(),
&LmbrCentral::CylinderShapeComponentRequests::SetRadius, radius); &LmbrCentral::CylinderShapeComponentRequests::SetRadius, radius);
// expect 2 warnings // expect 2 warnings
//1 if the radius is invalid //1 if the radius is invalid
//2 when re-creating the underlying simulated body //2 when re-creating the underlying simulated body
int expectedWarningCount = radius <= 0.f ? 2 : 0; int expectedWarningCount = radius <= 0.f ? 1 : 0;
EXPECT_EQ(warningHandler.GetWarningCount(), expectedWarningCount); EXPECT_EQ(dimensionWarningHandler.GetExpectedWarningCount(), expectedWarningCount);
EXPECT_EQ(colliderWarningHandler.GetExpectedWarningCount(), expectedWarningCount);
} }
{ {
UnitTest::ErrorHandler warningHandler("Negative or zero cylinder dimensions are invalid"); UnitTest::ErrorHandler dimensionWarningHandler("Negative or zero cylinder dimensions are invalid");
UnitTest::ErrorHandler colliderWarningHandler("No Collider or Shape information found when creating Rigid body");
LmbrCentral::CylinderShapeComponentRequestsBus::Event(editorEntity->GetId(), LmbrCentral::CylinderShapeComponentRequestsBus::Event(editorEntity->GetId(),
&LmbrCentral::CylinderShapeComponentRequests::SetHeight, height); &LmbrCentral::CylinderShapeComponentRequests::SetHeight, height);
// expect 2 warnings // expect 2 warnings
//1 if the radius or height is invalid //1 if the radius or height is invalid
//2 when re-creating the underlying simulated body //2 when re-creating the underlying simulated body
int expectedWarningCount = radius <= 0.f || height <= 0.f ? 2 : 0; int expectedWarningCount = radius <= 0.f || height <= 0.f ? 1 : 0;
EXPECT_EQ(warningHandler.GetWarningCount(), expectedWarningCount); EXPECT_EQ(dimensionWarningHandler.GetExpectedWarningCount(), expectedWarningCount);
EXPECT_EQ(colliderWarningHandler.GetExpectedWarningCount(), expectedWarningCount);
} }
EntityPtr gameEntity = CreateActiveGameEntityFromEditorEntity(editorEntity.get()); EntityPtr gameEntity = CreateActiveGameEntityFromEditorEntity(editorEntity.get());