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

Integrating latest 47acbe8

Browse Source
This commit is contained in:
alexpete
2021-03-25 13:57:57 -07:00
parent 448c549698
commit 75dc720198
10312 changed files with 2711566 additions and 671451 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/ScriptEvents/Code/Tests/Tests/ScriptEventsTest_Core.cpp
+4 -2
View File
@@ -277,6 +277,7 @@ namespace ScriptEventsTests
while (!condition())
{
AZ::Data::AssetBus::ExecuteQueuedEvents();
AZ::SystemTickBus::ExecuteQueuedEvents();
AZ::Data::AssetManager::Instance().DispatchEvents();
AZStd::this_thread::yield();
@@ -335,7 +336,7 @@ namespace ScriptEventsTests
assetHandler.BusDisconnect();
ScriptEvents::Internal::ScriptEvent scriptEventV0;
ScriptEvents::Internal::ScriptEventRegistration scriptEventV0;
assetData = AZ::Data::AssetManager::Instance().FindOrCreateAsset<ScriptEvents::ScriptEventsAsset>(assetId, AZ::Data::AssetLoadBehavior::Default);
@@ -406,7 +407,8 @@ namespace ScriptEventsTests
}
handler->Disconnect();
scriptEventV0.BusDisconnect();
AZ::SystemTickBus::Handler* systemTickBus = &scriptEventV0;
systemTickBus->BusDisconnect();
EXPECT_TRUE(behaviorEbus->m_destroyHandler->Invoke(handler));