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

Code review changes

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-07-14 14:54:57 -07:00
parent d8ac5654d2
commit 24831b1970
4 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzToolsFramework/Tests/PlatformAddressedAssetCatalogTests.cpp
+1 -1
View File
@@ -248,7 +248,7 @@ namespace UnitTest
AZ_TEST_START_TRACE_SUPPRESSION;
auto* mockCatalog = new ::testing::NiceMock<PlatformAddressedAssetCatalogMessageTest>(AzFramework::PlatformId::ANDROID_ID);
AZ_TEST_STOP_TRACE_SUPPRESSION_NO_COUNT;
AZ_TEST_STOP_TRACE_SUPPRESSION(1);
AZStd::unique_ptr< ::testing::NiceMock<PlatformAddressedAssetCatalogMessageTest>> catalogHolder;
catalogHolder.reset(mockCatalog);
Code/Framework/AzToolsFramework/Tests/Prefab/PrefabInstantiateTests.cpp
+1 -1
View File
@@ -15,7 +15,7 @@ namespace UnitTest
{
AZ_TEST_START_TRACE_SUPPRESSION;
EXPECT_FALSE(m_prefabSystemComponent->InstantiatePrefab(AzToolsFramework::Prefab::InvalidTemplateId));
AZ_TEST_STOP_TRACE_SUPPRESSION_NO_COUNT;
AZ_TEST_STOP_TRACE_SUPPRESSION(1);
}
TEST_F(PrefabInstantiateTest, PrefabInstantiate_NoNestingTemplate_InstantiateSucceeds)
Code/Framework/AzToolsFramework/Tests/Prefab/PrefabLoadTemplateTests.cpp
+9 -9
View File
@@ -71,7 +71,7 @@ namespace UnitTest
AZ_TEST_START_TRACE_SUPPRESSION;
templateData.m_id = m_prefabLoaderInterface->LoadTemplateFromFile(templateData.m_filePath);
AZ_TEST_STOP_TRACE_SUPPRESSION_NO_COUNT;
AZ_TEST_STOP_TRACE_SUPPRESSION(3);
templateData.m_isLoadedWithErrors = true;
PrefabTestDataUtils::ValidateTemplateLoad(templateData);
@@ -119,7 +119,7 @@ namespace UnitTest
// 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;
AZ_TEST_STOP_TRACE_SUPPRESSION(4);
sourceTemplateData.m_id = m_prefabSystemComponent->GetTemplateIdFromFilePath(sourceTemplateData.m_filePath);
// Because of cyclical dependency, the two Templates should be loaded with errors.
@@ -150,7 +150,7 @@ namespace UnitTest
AZ_TEST_START_TRACE_SUPPRESSION;
templateData.m_id = m_prefabLoaderInterface->LoadTemplateFromFile(templateData.m_filePath);
AZ_TEST_STOP_TRACE_SUPPRESSION_NO_COUNT;
AZ_TEST_STOP_TRACE_SUPPRESSION(2);
PrefabTestDataUtils::ValidateTemplateLoad(templateData);
}
@@ -169,7 +169,7 @@ namespace UnitTest
AZ_TEST_START_TRACE_SUPPRESSION;
templateData.m_id = m_prefabLoaderInterface->LoadTemplateFromFile(templateData.m_filePath);
AZ_TEST_STOP_TRACE_SUPPRESSION_NO_COUNT;
AZ_TEST_STOP_TRACE_SUPPRESSION(2);
PrefabTestDataUtils::ValidateTemplateLoad(templateData);
}
@@ -193,7 +193,7 @@ namespace UnitTest
AZ_TEST_START_TRACE_SUPPRESSION;
templateData.m_id = m_prefabLoaderInterface->LoadTemplateFromFile(templateData.m_filePath);
AZ_TEST_STOP_TRACE_SUPPRESSION_NO_COUNT;
AZ_TEST_STOP_TRACE_SUPPRESSION(3);
PrefabTestDataUtils::ValidateTemplateLoad(templateData);
}
@@ -292,7 +292,7 @@ namespace UnitTest
AZ_TEST_START_TRACE_SUPPRESSION;
TemplateId templateId = m_prefabLoaderInterface->LoadTemplateFromFile(pathToCorruptedPrefab);
AZ_TEST_STOP_TRACE_SUPPRESSION_NO_COUNT;
AZ_TEST_STOP_TRACE_SUPPRESSION(1);
EXPECT_EQ(templateId, AzToolsFramework::Prefab::InvalidTemplateId);
}
@@ -304,7 +304,7 @@ namespace UnitTest
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;
AZ_TEST_STOP_TRACE_SUPPRESSION(2);
}
TEST_F(PrefabLoadTemplateTest, LoadTemplate_LoadFromString_LoadsEmptyPrefab)
@@ -336,7 +336,7 @@ namespace UnitTest
templateData.m_id = m_prefabLoaderInterface->LoadTemplateFromString(
selfDependentPrefabStr,
templateData.m_filePath);
AZ_TEST_STOP_TRACE_SUPPRESSION_NO_COUNT;
AZ_TEST_STOP_TRACE_SUPPRESSION(3);
templateData.m_isLoadedWithErrors = true;
@@ -348,7 +348,7 @@ namespace UnitTest
AZStd::string corruptPrefab = "{ Corrupted PrefabDom";
AZ_TEST_START_TRACE_SUPPRESSION;
TemplateId templateId = m_prefabLoaderInterface->LoadTemplateFromString(corruptPrefab);
AZ_TEST_STOP_TRACE_SUPPRESSION_NO_COUNT;
AZ_TEST_STOP_TRACE_SUPPRESSION(1);
EXPECT_EQ(templateId, AzToolsFramework::Prefab::InvalidTemplateId);
}
}
Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestDomUtils.cpp
+4 -8
View File
@@ -169,14 +169,10 @@ namespace UnitTest
if (expectedNestedInstanceDomInstances->get().IsArray())
{
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);
}
const size_t expectedArraySize = expectedNestedInstanceDomInstances->get().GetArray().Size();
EXPECT_EQ(0, expectedArraySize);
const size_t actualArraySize = actualNestedInstanceDomInstances->get().GetArray().Size();
EXPECT_EQ(0, actualArraySize);
}
if (expectedNestedInstanceDomInstances->get().IsObject())
{