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

Integrating up through commit 90f050496

Browse Source
This commit is contained in:
alexpete
2021-04-07 14:03:29 -07:00
parent 8f2ed080a9
commit c2cbd430fe
2694 changed files with 285622 additions and 176874 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzToolsFramework/Tests/SliceStabilityTests/SliceStabilityReParentTests.cpp
+4
View File
@@ -17,6 +17,8 @@ namespace UnitTest
{
TEST_F(SliceStabilityTest, ReParent_SliceEntityMovedFromOneInstanceToAnother_EntityIDRemainsTheSame_FT)
{
AUTO_RESULT_IF_SETTING_TRUE(UnitTest::prefabSystemSetting, true)
AzToolsFramework::EntityIdList instance1Entities;
AZ::EntityId instance1Root = CreateEditorEntity("Slice1Root", instance1Entities);
ASSERT_TRUE(instance1Root.IsValid());
@@ -54,6 +56,8 @@ namespace UnitTest
*/
TEST_F(SliceStabilityTest, ReParent_NestedSliceCreatedFromSliceInstanceChild_SliceHierarchyRemainsSame_FT)
{
AUTO_RESULT_IF_SETTING_TRUE(UnitTest::prefabSystemSetting, true)
AzToolsFramework::EntityIdList instance1Entities;
AZ::EntityId instance1Root = CreateEditorEntity("Slice1Root", instance1Entities);
ASSERT_TRUE(instance1Root.IsValid());