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

Fix tests in AzToolsFramework now that the Trace bus is hooked

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-07-12 18:03:10 -07:00
parent c13720e255
commit 1dec9d4a9a
18 changed files with 77 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzToolsFramework/Tests/Prefab/PrefabInstantiateTests.cpp
+2
View File
@@ -13,7 +13,9 @@ namespace UnitTest
TEST_F(PrefabInstantiateTest, PrefabInstantiate_InstantiateInvalidTemplate_InstantiateFails)
{
AZ_TEST_START_TRACE_SUPPRESSION;
EXPECT_FALSE(m_prefabSystemComponent->InstantiatePrefab(AzToolsFramework::Prefab::InvalidTemplateId));
AZ_TEST_STOP_TRACE_SUPPRESSION_NO_COUNT;
}
TEST_F(PrefabInstantiateTest, PrefabInstantiate_NoNestingTemplate_InstantiateSucceeds)
Code/Framework/AzToolsFramework/Tests/Prefab/PrefabLoadTemplateTests.cpp
+20 -2
View File
@@ -68,8 +68,10 @@ namespace UnitTest
MockPrefabFileIOActionValidator mockIOActionValidator;
mockIOActionValidator.ReadPrefabDom(templateData.m_filePath, templatePrefabDom);
AZ_TEST_START_TRACE_SUPPRESSION;
templateData.m_id = m_prefabLoaderInterface->LoadTemplateFromFile(templateData.m_filePath);
AZ_TEST_STOP_TRACE_SUPPRESSION_NO_COUNT;
templateData.m_isLoadedWithErrors = true;
PrefabTestDataUtils::ValidateTemplateLoad(templateData);
@@ -115,7 +117,9 @@ namespace UnitTest
targetTemplateData.m_filePath, targetTemplatePrefabDom);
// Load target and source Templates and get their Ids.
AZ_TEST_START_TRACE_SUPPRESSION;
targetTemplateData.m_id = m_prefabLoaderInterface->LoadTemplateFromFile(targetTemplateData.m_filePath);
AZ_TEST_STOP_TRACE_SUPPRESSION_NO_COUNT;
sourceTemplateData.m_id = m_prefabSystemComponent->GetTemplateIdFromFilePath(sourceTemplateData.m_filePath);
// Because of cyclical dependency, the two Templates should be loaded with errors.
@@ -144,7 +148,9 @@ namespace UnitTest
MockPrefabFileIOActionValidator mockIOActionValidator;
mockIOActionValidator.ReadPrefabDom(templateData.m_filePath, templatePrefabDom);
AZ_TEST_START_TRACE_SUPPRESSION;
templateData.m_id = m_prefabLoaderInterface->LoadTemplateFromFile(templateData.m_filePath);
AZ_TEST_STOP_TRACE_SUPPRESSION_NO_COUNT;
PrefabTestDataUtils::ValidateTemplateLoad(templateData);
}
@@ -161,7 +167,9 @@ namespace UnitTest
MockPrefabFileIOActionValidator mockIOActionValidator;
mockIOActionValidator.ReadPrefabDom(templateData.m_filePath, templatePrefabDom);
AZ_TEST_START_TRACE_SUPPRESSION;
templateData.m_id = m_prefabLoaderInterface->LoadTemplateFromFile(templateData.m_filePath);
AZ_TEST_STOP_TRACE_SUPPRESSION_NO_COUNT;
PrefabTestDataUtils::ValidateTemplateLoad(templateData);
}
@@ -183,7 +191,9 @@ namespace UnitTest
templateInstanceData.m_source, PrefabTestDomUtils::CreatePrefabDom(),
AZ::IO::ResultCode::Success, AZ::IO::ResultCode::Error);
AZ_TEST_START_TRACE_SUPPRESSION;
templateData.m_id = m_prefabLoaderInterface->LoadTemplateFromFile(templateData.m_filePath);
AZ_TEST_STOP_TRACE_SUPPRESSION_NO_COUNT;
PrefabTestDataUtils::ValidateTemplateLoad(templateData);
}
@@ -279,8 +289,10 @@ namespace UnitTest
MockPrefabFileIOActionValidator mockIOActionValidator;
mockIOActionValidator.ReadPrefabDom(pathToCorruptedPrefab, corruptedPrefabContent);
AZ_TEST_START_TRACE_SUPPRESSION;
TemplateId templateId = m_prefabLoaderInterface->LoadTemplateFromFile(pathToCorruptedPrefab);
AZ_TEST_STOP_TRACE_SUPPRESSION_NO_COUNT;
EXPECT_EQ(templateId, AzToolsFramework::Prefab::InvalidTemplateId);
}
@@ -289,8 +301,10 @@ namespace UnitTest
{
PrefabDom emptyPrefabDom = PrefabTestDomUtils::CreatePrefabDom();
AZStd::string emptyPrefabDomStr = PrefabTestDomUtils::DomToString(emptyPrefabDom);
AZ_TEST_START_TRACE_SUPPRESSION;
EXPECT_EQ(m_prefabLoaderInterface->LoadTemplateFromString(emptyPrefabDomStr, "|?<>"), AzToolsFramework::Prefab::InvalidTemplateId);
EXPECT_EQ(m_prefabLoaderInterface->LoadTemplateFromString(emptyPrefabDomStr, "notAFile/"), AzToolsFramework::Prefab::InvalidTemplateId);
AZ_TEST_STOP_TRACE_SUPPRESSION_NO_COUNT;
}
TEST_F(PrefabLoadTemplateTest, LoadTemplate_LoadFromString_LoadsEmptyPrefab)
@@ -318,9 +332,11 @@ namespace UnitTest
);
AZStd::string selfDependentPrefabStr = PrefabTestDomUtils::DomToString(selfDependentPrefab);
AZ_TEST_START_TRACE_SUPPRESSION;
templateData.m_id = m_prefabLoaderInterface->LoadTemplateFromString(
selfDependentPrefabStr,
templateData.m_filePath);
AZ_TEST_STOP_TRACE_SUPPRESSION_NO_COUNT;
templateData.m_isLoadedWithErrors = true;
@@ -330,7 +346,9 @@ namespace UnitTest
TEST_F(PrefabLoadTemplateTest, LoadTemplate_LoadFromString_CorruptedReturnsInvalidTemplateId)
{
AZStd::string corruptPrefab = "{ Corrupted PrefabDom";
AZ_TEST_START_TRACE_SUPPRESSION;
TemplateId templateId = m_prefabLoaderInterface->LoadTemplateFromString(corruptPrefab);
AZ_TEST_STOP_TRACE_SUPPRESSION_NO_COUNT;
EXPECT_EQ(templateId, AzToolsFramework::Prefab::InvalidTemplateId);
}
}
Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestDomUtils.cpp
+22 -6
View File
@@ -166,13 +166,29 @@ namespace UnitTest
if (expectedNestedInstanceDomInstances.has_value())
{
ASSERT_TRUE(actualNestedInstanceDomInstances.has_value());
for (auto instanceIterator = expectedNestedInstanceDomInstances->get().MemberBegin();
instanceIterator != expectedNestedInstanceDomInstances->get().MemberEnd(); ++instanceIterator)
if (expectedNestedInstanceDomInstances->get().IsArray())
{
ComparePrefabDoms(
instanceIterator->value,
PrefabDomUtils::FindPrefabDomValue(actualNestedInstanceDomInstances->get(), instanceIterator->name.GetString()),
shouldCompareLinkIds, shouldCompareContainerEntities);
ASSERT_TRUE(actualNestedInstanceDomInstances->get().IsArray());
const size_t arraySize = expectedNestedInstanceDomInstances->get().GetArray().Size();
for(size_t i = 0; i < arraySize; ++i)
{
ComparePrefabDoms(
expectedNestedInstanceDomInstances->get().GetArray()[i],
actualNestedInstanceDomInstances->get().GetArray()[i],
shouldCompareLinkIds, shouldCompareContainerEntities);
}
}
if (expectedNestedInstanceDomInstances->get().IsObject())
{
ASSERT_TRUE(actualNestedInstanceDomInstances->get().IsObject());
for (auto instanceIterator = expectedNestedInstanceDomInstances->get().MemberBegin();
instanceIterator != expectedNestedInstanceDomInstances->get().MemberEnd(); ++instanceIterator)
{
ComparePrefabDoms(
instanceIterator->value,
PrefabDomUtils::FindPrefabDomValue(actualNestedInstanceDomInstances->get(), instanceIterator->name.GetString()),
shouldCompareLinkIds, shouldCompareContainerEntities);
}
}
}
}
Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestFixture.h
+1 -2
View File
@@ -37,8 +37,7 @@ namespace UnitTest
};
class PrefabTestFixture
: public ToolsApplicationFixture,
public UnitTest::TraceBusRedirector
: public ToolsApplicationFixture
{
protected: