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
Code/Tools/AssetProcessor/native/unittests/AssetProcessorManagerUnitTests.cpp
+10 -2
View File
@@ -21,6 +21,7 @@
#include "native/FileWatcher/FileWatcher.h"
#include "native/unittests/MockConnectionHandler.h"
#include <AzTest/AzTest.h>
#include <QCoreApplication>
@@ -39,11 +40,14 @@ namespace AssetProcessor
: AssetProcessorManager(config, parent)
{}
friend class AssetProcessorManagerUnitTests;
friend class AssetProcessorManagerUnitTests_ScanFolders;
#if !AZ_TRAIT_DISABLE_FAILED_ASSET_PROCESSOR_TESTS
friend class AssetProcessorManagerUnitTests;
friend class AssetProcessorManagerUnitTests_JobKeys;
friend class AssetProcessorManagerUnitTests_JobDependencies_Fingerprint;
friend class AssetProcessorManagerUnitTests_CheckOutputFolders;
#endif // AZ_TRAIT_DISABLE_FAILED_ASSET_PROCESSOR_TESTS
public:
using GetRelativeProductPathFromFullSourceOrProductPathRequest = AzFramework::AssetSystem::GetRelativeProductPathFromFullSourceOrProductPathRequest;
@@ -54,11 +58,15 @@ namespace AssetProcessor
REGISTER_UNIT_TEST(AssetProcessorManagerUnitTests)
REGISTER_UNIT_TEST(AssetProcessorManagerUnitTests_ScanFolders)
#if !AZ_TRAIT_DISABLE_FAILED_ASSET_PROCESSOR_TESTS
REGISTER_UNIT_TEST(AssetProcessorManagerUnitTests)
REGISTER_UNIT_TEST(AssetProcessorManagerUnitTests_JobKeys)
REGISTER_UNIT_TEST(AssetProcessorManagerUnitTests_JobDependencies_Fingerprint)
REGISTER_UNIT_TEST(AssetProcessorManagerUnitTests_CheckOutputFolders)
#endif // AZ_TRAIT_DISABLE_FAILED_ASSET_PROCESSOR_TESTS
namespace
{