From c482c17c9ec97e2855c945e7ace7dde9a24afdab Mon Sep 17 00:00:00 2001 From: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com> Date: Wed, 16 Jun 2021 17:14:44 -0700 Subject: [PATCH] Fixed an issue with the new Json Serializer Conformity tests and Atom's materials --- .../Serialization/Json/JsonSerializerConformityTests.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Code/Framework/AzCore/Tests/Serialization/Json/JsonSerializerConformityTests.h b/Code/Framework/AzCore/Tests/Serialization/Json/JsonSerializerConformityTests.h index 1dcf8e29c6..4931c203cf 100644 --- a/Code/Framework/AzCore/Tests/Serialization/Json/JsonSerializerConformityTests.h +++ b/Code/Framework/AzCore/Tests/Serialization/Json/JsonSerializerConformityTests.h @@ -68,7 +68,7 @@ namespace JsonSerializationTests bool m_enableInitializationTest{ true }; //! Enable the test that creates a new instance of the provided test type through the factory that's found in //! the Serialize Context. This test is automatically disabled for classes that don't have a factory or - //! have a null factory. + //! have a null factory as well as for classes that have mandatory fields. bool m_enableNewInstanceTests{ true }; private: @@ -728,7 +728,7 @@ namespace JsonSerializationTests { using namespace AZ::JsonSerializationResult; - if (this->m_features.m_enableNewInstanceTests) + if (this->m_features.m_enableNewInstanceTests && this->m_features.m_mandatoryFields.empty()) { AZ::SerializeContext* serializeContext = this->m_jsonDeserializationContext->GetSerializeContext(); const AZ::SerializeContext::ClassData* classData = serializeContext->FindClassData(azrtti_typeid()); @@ -761,7 +761,7 @@ namespace JsonSerializationTests using namespace AZ; using namespace AZ::JsonSerializationResult; - if (this->m_features.m_enableNewInstanceTests) + if (this->m_features.m_enableNewInstanceTests && this->m_features.m_mandatoryFields.empty()) { auto serializer = this->m_description.CreateSerializer(); if ((serializer->GetOperationsFlags() & BaseJsonSerializer::OperationFlags::InitializeNewInstance) ==