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

Integrating github/staging through commit ab87ed9

Browse Source
This commit is contained in:
alexpete
2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Tools/SceneAPI/SceneCore/Tests/Containers/SceneBehaviorTests.cpp
+4
View File
@@ -347,10 +347,12 @@ namespace AZ
MockSceneComponentApplication()
{
AZ::ComponentApplicationBus::Handler::BusConnect();
AZ::Interface<AZ::ComponentApplicationRequests>::Register(this);
}
~MockSceneComponentApplication()
{
AZ::Interface<AZ::ComponentApplicationRequests>::Unregister(this);
AZ::ComponentApplicationBus::Handler::BusDisconnect();
}
@@ -359,6 +361,8 @@ namespace AZ
MOCK_METHOD0(Destroy, void());
MOCK_METHOD1(RegisterComponentDescriptor, void(const AZ::ComponentDescriptor*));
MOCK_METHOD1(UnregisterComponentDescriptor, void(const AZ::ComponentDescriptor*));
MOCK_METHOD1(RegisterEntityAddedEventHandler, void(AZ::EntityAddedEvent::Handler&));
MOCK_METHOD1(RegisterEntityRemovedEventHandler, void(AZ::EntityRemovedEvent::Handler&));
MOCK_METHOD1(RemoveEntity, bool(AZ::Entity*));
MOCK_METHOD1(DeleteEntity, bool(const AZ::EntityId&));
MOCK_METHOD1(GetEntityName, AZStd::string(const AZ::EntityId&));
Code/Tools/SceneAPI/SceneCore/Tests/Containers/SceneManifestTests.cpp
+2 -2
View File
@@ -205,7 +205,7 @@ namespace AZ
{
SceneManifest testManifest;
AZStd::shared_ptr<MockManifestInt> testDataObject = AZStd::make_shared<MockManifestInt>(100);
bool result = testManifest.AddEntry(AZStd::move(testDataObject));
testManifest.AddEntry(AZStd::move(testDataObject));
EXPECT_FALSE(testManifest.IsEmpty());
}
@@ -214,7 +214,7 @@ namespace AZ
{
SceneManifest testManifest;
AZStd::shared_ptr<MockManifestInt> testDataObject = AZStd::make_shared<MockManifestInt>(100);
bool result = testManifest.AddEntry(AZStd::move(testDataObject));
testManifest.AddEntry(AZStd::move(testDataObject));
EXPECT_FALSE(testManifest.IsEmpty());
testManifest.Clear();
EXPECT_TRUE(testManifest.IsEmpty());
Code/Tools/SceneAPI/SceneCore/Tests/Containers/Views/IteratorConformityTests.cpp
+4 -4
View File
@@ -327,7 +327,7 @@ namespace AZ
using Iterator = typename AllContext<TypeParam>::Iterator;
Iterator iterator = this->Construct();
Iterator returned = iterator++;
iterator++;
}
// Pre Increment Operator
@@ -344,7 +344,7 @@ namespace AZ
using Iterator = typename AllContext<TypeParam>::Iterator;
Iterator iterator = this->Construct();
Iterator returned = ++iterator;
++iterator;
}
REGISTER_TYPED_TEST_CASE_P(AllContext,
@@ -691,7 +691,7 @@ namespace AZ
Iterator iterator = this->Construct();
iterator++;
Iterator returned = iterator--;
iterator--;
}
TYPED_TEST_P(BidirectionalContext, PostDecrementOperator_IteratorReturnsOriginalIterator_OriginalIteratorMatchesCopiedValueAndNotMoveIterator)
@@ -734,7 +734,7 @@ namespace AZ
using Iterator = typename BidirectionalContext<TypeParam>::Iterator;
Iterator iterator = this->Construct();
Iterator returned = ++iterator;
++iterator;
}
TYPED_TEST_P(BidirectionalContext, PreDecrementOperator_IteratorReturnsMovedIterator_OriginalIteratorDoesNotMatchCopiedValueButMovedIteratorDoes)
Code/Tools/SceneAPI/SceneCore/Tests/Containers/Views/SceneGraphDownwardsIteratorTests.cpp
+2 -2
View File
@@ -240,7 +240,7 @@ namespace AZ
{
using Traversal = typename SceneGraphDownwardsIteratorContext<TypeParam>::Traversal;
auto sceneView = MakeSceneGraphDownwardsView<Traversal>(this->m_graph, this->GetRootHierarchyIterator(), this->m_graph.GetNameStorage().begin(), true);
for (auto& it : sceneView)
for ([[maybe_unused]] auto& it : sceneView)
{
}
}
@@ -252,7 +252,7 @@ namespace AZ
size_t localCount = 0;
auto sceneView = MakeSceneGraphDownwardsView<Traversal>(this->m_graph, this->GetRootHierarchyIterator(), this->m_graph.GetNameStorage().begin(), true);
for (auto& it : sceneView)
for ([[maybe_unused]] auto& it : sceneView)
{
localCount++;
}