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

Minor fixes to the configurable stack based on provided feedback.

Browse Source 
Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com>
This commit is contained in:
AMZN-koppersr
2022-02-15 10:11:41 -08:00
parent d00436e26a
commit 9bd487e3bd
3 changed files with 15 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzCore/AzCore/Settings/ConfigurableStack.h
+1 -3
View File
@@ -110,9 +110,7 @@ namespace AZ
Iterator end();
ConstIterator begin() const;
ConstIterator end() const;
ConstIterator cbegin() const;
ConstIterator cend() const;
size_t size() const;
protected:
Code/Framework/AzCore/AzCore/Settings/ConfigurableStack.inl
-12
View File
@@ -44,18 +44,6 @@ namespace AZ
return m_nodes.end();
}
template<typename StackBaseType>
auto ConfigurableStack<StackBaseType>::cbegin() const -> ConstIterator
{
return m_nodes.cbegin();
}
template<typename StackBaseType>
auto ConfigurableStack<StackBaseType>::cend() const -> ConstIterator
{
return m_nodes.cend();
}
template<typename StackBaseType>
size_t ConfigurableStack<StackBaseType>::size() const
{
Code/Framework/AzCore/Tests/Settings/ConfigurableStackTests.cpp
+14 -16
View File
@@ -12,6 +12,7 @@
#include <AzCore/Serialization/Json/JsonSerialization.h>
#include <AzCore/Serialization/Json/RegistrationContext.h>
#include <AzCore/Serialization/Json/JsonSystemComponent.h>
#include <AzCore/std/smart_ptr/unique_ptr.h>
#include <AzCore/UnitTest/TestTypes.h>
namespace UnitTest
@@ -32,7 +33,7 @@ namespace UnitTest
}
};
struct ConfigurableStackTests : public AllocatorsFixture
struct ConfigurableStackTests : public ScopedAllocatorSetupFixture
{
void Reflect(AZ::ReflectContext* context)
{
@@ -50,32 +51,29 @@ namespace UnitTest
void SetUp() override
{
AllocatorsFixture::SetUp();
ScopedAllocatorSetupFixture::SetUp();
m_serializeContext = aznew AZ::SerializeContext();
m_jsonRegistrationContext = aznew AZ::JsonRegistrationContext();
m_serializeContext = AZStd::make_unique<AZ::SerializeContext>();
m_jsonRegistrationContext = AZStd::make_unique<AZ::JsonRegistrationContext>();
Reflect(m_serializeContext);
Reflect(m_jsonRegistrationContext);
Reflect(m_serializeContext.get());
Reflect(m_jsonRegistrationContext.get());
m_deserializationSettings.m_registrationContext = m_jsonRegistrationContext;
m_deserializationSettings.m_serializeContext = m_serializeContext;
m_deserializationSettings.m_registrationContext = m_jsonRegistrationContext.get();
m_deserializationSettings.m_serializeContext = m_serializeContext.get();
}
void TearDown()
{
m_jsonRegistrationContext->EnableRemoveReflection();
Reflect(m_jsonRegistrationContext);
Reflect(m_jsonRegistrationContext.get());
m_jsonRegistrationContext->DisableRemoveReflection();
m_serializeContext->EnableRemoveReflection();
Reflect(m_serializeContext);
Reflect(m_serializeContext.get());
m_serializeContext->DisableRemoveReflection();
delete m_jsonRegistrationContext;
delete m_serializeContext;
AllocatorsFixture::TearDown();
ScopedAllocatorSetupFixture::TearDown();
}
void ObjectTest(AZStd::string_view jsonText)
@@ -100,8 +98,8 @@ namespace UnitTest
}
}
AZ::SerializeContext* m_serializeContext;
AZ::JsonRegistrationContext* m_jsonRegistrationContext;
AZStd::unique_ptr<AZ::SerializeContext> m_serializeContext;
AZStd::unique_ptr<AZ::JsonRegistrationContext> m_jsonRegistrationContext;
AZ::JsonDeserializerSettings m_deserializationSettings;
};