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

[LYN-9953] Asset Processor: Fix file watcher event handlers calling APM methods directly instead … (#7289)

Browse Source 
* Fix file watcher event handlers calling APM methods directly instead of queuing them to run on the APM thread

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Add unit test

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Fix compile errors

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Fix compile errors

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Fix compile errors

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Fix compile errors

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Change ASSERT_ checks to EXPECT_ checks

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Refactored Test

Removed leftover direct call
Changed invokeMethod to use lambda form

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Fix compile error

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
This commit is contained in:
amzn-mike
2022-02-14 11:09:39 -06:00
committed by GitHub
parent 6f52fcb9f0
commit 5dd88ba05c
18 changed files with 452 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Tools/AssetProcessor/native/tests/FileStateCache/FileStateCacheTests.cpp
+6 -4
View File
@@ -12,10 +12,12 @@
namespace UnitTests
{
using AssetFileInfo = AssetProcessor::AssetFileInfo;
void FileStateCacheTests::SetUp()
{
m_temporarySourceDir = QDir(m_temporaryDir.path());
m_fileStateCache = AZStd::make_unique<FileStateCache>();
m_fileStateCache = AZStd::make_unique<AssetProcessor::FileStateCache>();
}
void FileStateCacheTests::TearDown()
@@ -26,9 +28,9 @@ namespace UnitTests
void FileStateCacheTests::CheckForFile(QString path, bool shouldExist)
{
bool exists = false;
FileStateInfo fileInfo;
AssetProcessor::FileStateInfo fileInfo;
auto* fileStateInterface = AZ::Interface<IFileStateRequests>::Get();
auto* fileStateInterface = AZ::Interface<AssetProcessor::IFileStateRequests>::Get();
ASSERT_NE(fileStateInterface, nullptr);
exists = fileStateInterface->Exists(path);
@@ -142,7 +144,7 @@ namespace UnitTests
TEST_F(FileStateCacheTests, PassthroughTest)
{
m_fileStateCache = nullptr; // Need to release the existing one first since only one handler can exist for the ebus
m_fileStateCache = AZStd::make_unique<FileStatePassthrough>();
m_fileStateCache = AZStd::make_unique<AssetProcessor::FileStatePassthrough>();
QString testPath = m_temporarySourceDir.absoluteFilePath("test.txt");
CheckForFile(testPath, false);