Integrating github/staging through commit ab87ed9

This commit is contained in:
alexpete
2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
@@ -295,7 +295,6 @@ namespace ScriptEvents
bool ValidateAddressType(const AZ::Uuid& addressTypeId)
{
bool isValid = true;
if (IsAddressableType(addressTypeId))
{
AZ::BehaviorContext* behaviorContext = nullptr;
@@ -82,8 +82,7 @@ namespace ScriptEventsTests
Utilities::Reflect(behaviorContext);
AZ::Entity* systemEntity = s_application->FindEntity(AZ::SystemEntityId);
AZ_Assert(systemEntity, "SystemEntity must exist");
AZ_Assert(s_application->FindEntity(AZ::SystemEntityId), "SystemEntity must exist");
}
@@ -92,8 +91,7 @@ namespace ScriptEventsTests
static void TearDownTestCase()
{
AZ::Entity* systemEntity = s_application->FindEntity(AZ::SystemEntityId);
AZ_Assert(systemEntity, "SystemEntity must exist");
AZ_Assert(s_application->FindEntity(AZ::SystemEntityId), "SystemEntity must exist");
AZ::Data::AssetManager::Instance().DispatchEvents();
@@ -527,7 +527,6 @@ namespace ScriptEventsTests
WaitForAssetSystem([&]() { return assetHandler.IsDone(); });
bool result = false;
AZ::IO::FileIOStream outFileStream("ScriptEvents_TestAsset.xml", AZ::IO::OpenMode::ModeWrite);
if (outFileStream.IsOpen())
{