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

Merge pull request #5206 from bytes-of-pi/graphmodel_fixgetnodesfromgraph

Browse Source 
Prevent GetNodesFromGraphNodeIDs() from adding null pointers to the l…
This commit is contained in:
Chris Galvan
2021-11-09 12:30:59 -06:00
committed by GitHub
parent 5bf0375598 1025d90153
commit 8da65fea0b
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/GraphModel/Code/Source/Integration/GraphController.cpp
+4 -1
View File
@@ -698,7 +698,10 @@ namespace GraphModelIntegration
GraphModel::NodePtrList nodeList;
for (auto nodeId : nodeIds)
{
nodeList.push_back(m_elementMap.Find<GraphModel::Node>(nodeId));
if (GraphModel::NodePtr nodePtr = m_elementMap.Find<GraphModel::Node>(nodeId))
{
nodeList.push_back(nodePtr);
}
}
return nodeList;
Gems/GraphModel/Code/Tests/GraphModelIntegrationTest.cpp
+2 -7
View File
@@ -173,16 +173,11 @@ namespace GraphModelIntegrationTest
};
GraphModel::NodePtrList retrievedNodes;
GraphModelIntegration::GraphControllerRequestBus::EventResult(retrievedNodes, m_sceneId, &GraphModelIntegration::GraphControllerRequests::GetNodesFromGraphNodeIds, nodeIds);
EXPECT_EQ(nodeIds.size(), retrievedNodes.size());
// Test that only one node was found.
EXPECT_EQ(retrievedNodes.size(), 1);
// Test the first node in the list should be our valid test node
EXPECT_EQ(retrievedNodes[0], testNode);
// Test the second node should be a nullptr since it was an invalid NodeId
EXPECT_EQ(retrievedNodes[1], nullptr);
// Test the third node should also be a nullptr since it was a valid NodeId but one that doesn't exist in the scene
EXPECT_EQ(retrievedNodes[2], nullptr);
}
TEST_F(GraphModelIntegrationTests, ExtendableSlotsWithDifferentMinimumValues)