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

Integrating up through commit 90f050496

Browse Source
This commit is contained in:
alexpete
2021-04-07 14:03:29 -07:00
parent 8f2ed080a9
commit c2cbd430fe
2694 changed files with 285622 additions and 176874 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/PhysX/Code/Tests/SystemComponentTest.cpp
+1 -58
View File
@@ -12,47 +12,10 @@
#include "PhysX_precompiled.h"
#include <gmock/gmock.h>
#include <AzCore/UnitTest/TestTypes.h>
#include <AzCore/Math/Vector3.h>
#include <AzFramework/Physics/World.h>
#include <AzToolsFramework/UnitTest/AzToolsFrameworkTestHelpers.h>
#include <PhysX/SystemComponentBus.h>
#include <Tests/EditorTestUtilities.h>
#include <Tests/PhysXTestCommon.h>
#include <AzFramework/Physics/WorldBody.h>
#include <AzFramework/Physics/Casts.h>
#include <AzFramework/Physics/Material.h>
#include <functional>
#include <AzCore/std/containers/vector.h>
#include <AzCore/Math/Vector3.h>
#include <AzCore/Math/Aabb.h>
#include <AzCore/Math/Transform.h>
#include <AzCore/Component/EntityId.h>
namespace PhysXEditorTests
{
class MockSystemNotificationBusHandler
: public Physics::SystemNotificationBus::Handler
{
public:
MockSystemNotificationBusHandler()
{
Physics::SystemNotificationBus::Handler::BusConnect();
}
~MockSystemNotificationBusHandler()
{
Physics::SystemNotificationBus::Handler::BusDisconnect();
}
MOCK_METHOD1(OnWorldCreated, void(Physics::World*));
};
TEST_F(PhysXEditorFixture, SetDefaultSceneConfiguration_TriggersHandler)
{
bool handlerInvoked = false;
@@ -69,9 +32,7 @@ namespace PhysXEditorTests
AzPhysics::SceneConfiguration newConfiguration;
newConfiguration.m_legacyConfiguration.m_gravity = newGravity;
newConfiguration.m_legacyConfiguration.m_fixedTimeStep = newFixedTimeStep;
newConfiguration.m_legacyConfiguration.m_maxTimeStep = newMaxTimeStep;
newConfiguration.m_gravity = newGravity;
auto* physicsSystem = AZ::Interface<AzPhysics::SystemInterface>::Get();
physicsSystem->RegisterOnDefaultSceneConfigurationChangedEventHandler(defaultSceneConfigHandler);
@@ -79,22 +40,4 @@ namespace PhysXEditorTests
EXPECT_TRUE(handlerInvoked);
}
TEST_F(PhysXEditorFixture, SystemNotificationBus_CreateWorld_HandlerReceivedOnCreateWorldNotification)
{
testing::StrictMock<MockSystemNotificationBusHandler> mockHandler;
EXPECT_CALL(mockHandler, OnWorldCreated).Times(1);
if (auto* physicsSystem = AZ::Interface<AzPhysics::SystemInterface>::Get())
{
AzPhysics::SceneConfiguration sceneConfiguration = physicsSystem->GetDefaultSceneConfiguration();
sceneConfiguration.m_legacyId = AZ::Crc32("SystemNotificationBusTestWorld");
AzPhysics::SceneHandle sceneHandle = physicsSystem->AddScene(sceneConfiguration);
if (AzPhysics::Scene* scene = physicsSystem->GetScene(sceneHandle))
{
auto world = scene->GetLegacyWorld();
}
}
}
} // namespace PhysXEditorTests