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

Code/Framework/AzToolsFramework

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-08-20 17:53:31 -07:00
parent eaefc580d6
commit 588d702e43
9 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SliceRelationshipWidget.hxx
-1
View File
@@ -111,7 +111,6 @@ namespace AzToolsFramework
QTreeWidget* m_sliceDependentsTree; ///< Tree widget for fields (left side)
QTreeWidget* m_sliceDependencyTree; ///< Tree widget for slice targets (right side)
QLabel* m_infoLabel; ///< Label above slice tree describing selection
QVBoxLayout* m_bottomLayout; ///< Bottom layout containing optional status messages, legend and buttons
};
Code/Framework/AzToolsFramework/Tests/EditorTransformComponentSelectionTests.cpp
+1 -1
View File
@@ -1579,7 +1579,7 @@ namespace UnitTest
///////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Given
AZ::Entity* entity = nullptr;
const AZ::EntityId entityId = CreateDefaultEditorEntity("Entity", &entity);
CreateDefaultEditorEntity("Entity", &entity);
entity->Deactivate();
const auto* entityInfoComponent = entity->CreateComponent<EditorEntityInfoRequestActivateTestComponent>();
Code/Framework/AzToolsFramework/Tests/Prefab/PrefabEntityAliasTests.cpp
-3
View File
@@ -160,9 +160,6 @@ namespace UnitTest
ASSERT_TRUE(secondRootInstance);
// Find the new instances versions of the new and referenced entities using the aliases we saved
AZ::EntityId secondNewEntityId = secondRootInstance->GetEntityId(newEntityAlias);
InstanceOptionalReference secondNestedInstance = secondRootInstance->FindNestedInstance(nestedAlias);
ASSERT_TRUE(secondNestedInstance);
AZ::EntityId secondReferencedEntityId = secondNestedInstance->get().GetEntityId(referencedEntityAlias);
Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestDomUtils.cpp
+1 -1
View File
@@ -132,7 +132,7 @@ namespace UnitTest
PrefabDomUtils::FindPrefabDomValue(valueADom, PrefabDomUtils::LinkIdName);
PrefabDomValueConstReference expectedNestedInstanceDomLinkId =
PrefabDomUtils::FindPrefabDomValue(valueBDom, PrefabDomUtils::LinkIdName);
ComparePrefabDomValues(actualNestedInstanceDomLinkId, actualNestedInstanceDomLinkId);
ComparePrefabDomValues(actualNestedInstanceDomLinkId, expectedNestedInstanceDomLinkId);
}
if (shouldCompareContainerEntities)
Code/Framework/AzToolsFramework/Tests/Prefab/PrefabUndoTests.cpp
-1
View File
@@ -99,7 +99,6 @@ namespace UnitTest
//create single entity
AZ::Entity* newEntity = CreateEntity("New Entity", false);
ASSERT_TRUE(newEntity);
AZ::EntityId entityId = newEntity->GetId();
//create a first instance where the entity will be added
AZStd::unique_ptr<Instance> testInstance = m_prefabSystemComponent->CreatePrefab({}, {}, "test/path");
Code/Framework/AzToolsFramework/Tests/Slice.cpp
+1 -1
View File
@@ -225,7 +225,7 @@ namespace UnitTest
tempAssetEntity = aznew AZ::Entity("TestEntity1");
tempAssetEntity->CreateComponent<AzToolsFramework::Components::TransformComponent>();
AZ::Data::AssetId sliceAssetId1 = SaveAsSlice(tempAssetEntity);
SaveAsSlice(tempAssetEntity);
tempAssetEntity = nullptr;
AZ::SliceComponent::EntityList slice1EntitiesA = InstantiateSlice(sliceAssetId0);
Code/Framework/AzToolsFramework/Tests/ToolsComponents/EditorLayerComponentTests.cpp
+2 -2
View File
@@ -401,7 +401,7 @@ namespace AzToolsFramework
TEST_F(EditorLayerComponentTest, LayerTests_TwoLayersUniqueNames_LayerNameIsValid)
{
EntityAndLayerComponent secondLayer = CreateEntityWithLayer("UniqueLayerName");
CreateEntityWithLayer("UniqueLayerName");
bool isLayerNameValid = true;
AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
isLayerNameValid,
@@ -412,7 +412,7 @@ namespace AzToolsFramework
TEST_F(EditorLayerComponentTest, LayerTests_TwoLayersConflictingNames_LayerNameIsNotValid)
{
EntityAndLayerComponent secondLayer = CreateEntityWithLayer(m_entityName);
CreateEntityWithLayer(m_entityName);
bool isLayerNameValid = true;
AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
isLayerNameValid,
Code/Framework/AzToolsFramework/Tests/TransformComponent.cpp
-1
View File
@@ -713,7 +713,6 @@ namespace UnitTest
TransformBus::Event(m_childId, &TransformBus::Events::SetParentRelative, AZ::EntityId());
childLocalPos;
TransformBus::EventResult(childLocalPos, m_childId, &TransformBus::Events::GetLocalTranslation);
EXPECT_TRUE(childLocalPos == expectedChildLocalPos);
Code/Framework/AzToolsFramework/Tests/Viewport/ViewportUiManagerTests.cpp
+1 -1
View File
@@ -168,7 +168,7 @@ namespace UnitTest
m_viewportManagerWrapper.GetMockRenderOverlay()->setVisible(true);
auto clusterId = m_viewportManagerWrapper.GetViewportManager()->CreateCluster(AzToolsFramework::ViewportUi::Alignment::TopLeft);
auto buttonId = m_viewportManagerWrapper.GetViewportManager()->CreateClusterButton(clusterId, "");
m_viewportManagerWrapper.GetViewportManager()->CreateClusterButton(clusterId, "");
m_viewportManagerWrapper.GetViewportManager()->Update();
m_viewportManagerWrapper.GetViewportManager()->SetClusterVisible(clusterId, false);