From fcd989c295ab2191a87aac6a073c32a50a4fb696 Mon Sep 17 00:00:00 2001 From: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com> Date: Mon, 14 Jun 2021 10:00:01 -0700 Subject: [PATCH] Removed unit tests from bool, int and double Json Serialization A future commit will include a generic test conformity test suite to replace these. --- .../Json/BoolSerializerTests.cpp | 20 ------------- .../Json/DoubleSerializerTests.cpp | 30 +------------------ .../Serialization/Json/IntSerializerTests.cpp | 20 ------------- 3 files changed, 1 insertion(+), 69 deletions(-) diff --git a/Code/Framework/AzCore/Tests/Serialization/Json/BoolSerializerTests.cpp b/Code/Framework/AzCore/Tests/Serialization/Json/BoolSerializerTests.cpp index 6396e4ccdf..cd6fcef5c5 100644 --- a/Code/Framework/AzCore/Tests/Serialization/Json/BoolSerializerTests.cpp +++ b/Code/Framework/AzCore/Tests/Serialization/Json/BoolSerializerTests.cpp @@ -260,24 +260,4 @@ namespace JsonSerializationTests Load(m_jsonValue.SetDouble(-1.0f), true, AZ::JsonSerializationResult::Outcomes::Success); Load(m_jsonValue.SetDouble(2.0), true, AZ::JsonSerializationResult::Outcomes::Success); } - - TEST_F(JsonBoolSerializerTests, Load_LoadDefaultToPointer_ValueIsIsInitialized) - { - using namespace AZ::JsonSerializationResult; - - BoolPointerWrapper instance; - - this->m_jsonDocument->Parse(R"({ "Value": {}})"); - ASSERT_FALSE(this->m_jsonDocument->HasParseError()); - - AZ::JsonDeserializerSettings settings; - settings.m_serializeContext = this->m_jsonDeserializationContext->GetSerializeContext(); - settings.m_registrationContext = this->m_jsonDeserializationContext->GetRegistrationContext(); - ResultCode result = AZ::JsonSerialization::Load(instance, *this->m_jsonDocument, settings); - - EXPECT_EQ(Outcomes::DefaultsUsed, result.GetOutcome()); - EXPECT_EQ(Processing::Completed, result.GetProcessing()); - ASSERT_NE(nullptr, instance.m_value); - EXPECT_FALSE(*instance.m_value); - } } // namespace JsonSerializationTests diff --git a/Code/Framework/AzCore/Tests/Serialization/Json/DoubleSerializerTests.cpp b/Code/Framework/AzCore/Tests/Serialization/Json/DoubleSerializerTests.cpp index 4279017276..1556318199 100644 --- a/Code/Framework/AzCore/Tests/Serialization/Json/DoubleSerializerTests.cpp +++ b/Code/Framework/AzCore/Tests/Serialization/Json/DoubleSerializerTests.cpp @@ -32,7 +32,7 @@ namespace JsonSerializationTests AZStd::shared_ptr CreateDefaultInstance() override { - return AZStd::make_shared(-2.0f); + return AZStd::make_shared(0.0f); } AZStd::shared_ptr CreateFullySetInstance() override @@ -296,32 +296,4 @@ namespace JsonSerializationTests EXPECT_EQ(Outcomes::Unsupported, result.GetOutcome()); EXPECT_EQ(42.0f, value); } - - // Pointers - - TEST_F(JsonDoubleSerializerTests, Load_LoadDefaultToPointer_ValuesArIsInitialized) - { - using namespace AZ::JsonSerializationResult; - - DoublePointerWrapper instance; - - this->m_jsonDocument->Parse(R"( - { - "Double": {}, - "Float": {} - })"); - ASSERT_FALSE(this->m_jsonDocument->HasParseError()); - - AZ::JsonDeserializerSettings settings; - settings.m_serializeContext = this->m_jsonDeserializationContext->GetSerializeContext(); - settings.m_registrationContext = this->m_jsonDeserializationContext->GetRegistrationContext(); - ResultCode result = AZ::JsonSerialization::Load(instance, *this->m_jsonDocument, settings); - - EXPECT_EQ(Outcomes::DefaultsUsed, result.GetOutcome()); - EXPECT_EQ(Processing::Completed, result.GetProcessing()); - ASSERT_NE(nullptr, instance.m_double); - ASSERT_NE(nullptr, instance.m_float); - EXPECT_DOUBLE_EQ(0.0, *instance.m_double); - EXPECT_FLOAT_EQ(0.0f, *instance.m_float); - } } // namespace JsonSerializationTests diff --git a/Code/Framework/AzCore/Tests/Serialization/Json/IntSerializerTests.cpp b/Code/Framework/AzCore/Tests/Serialization/Json/IntSerializerTests.cpp index c4132e983c..5f81dd1b9c 100644 --- a/Code/Framework/AzCore/Tests/Serialization/Json/IntSerializerTests.cpp +++ b/Code/Framework/AzCore/Tests/Serialization/Json/IntSerializerTests.cpp @@ -505,26 +505,6 @@ namespace JsonSerializationTests EXPECT_EQ(typename SerializerInfo::DataType(), convertedValue); } - TYPED_TEST(TypedJsonIntSerializerTests, Load_LoadDefaultToPointer_ValueIsIsInitialized) - { - using namespace AZ::JsonSerializationResult; - - IntegerPointerWrapper instance; - - this->m_jsonDocument->Parse(R"({ "Value": {}})"); - ASSERT_FALSE(this->m_jsonDocument->HasParseError()); - - AZ::JsonDeserializerSettings settings; - settings.m_serializeContext = this->m_jsonDeserializationContext->GetSerializeContext(); - settings.m_registrationContext = this->m_jsonDeserializationContext->GetRegistrationContext(); - ResultCode result = AZ::JsonSerialization::Load(instance, *this->m_jsonDocument, settings); - - EXPECT_EQ(Outcomes::DefaultsUsed, result.GetOutcome()); - EXPECT_EQ(Processing::Completed, result.GetProcessing()); - ASSERT_NE(nullptr, instance.m_value); - EXPECT_EQ(0, *instance.m_value); - } - TYPED_TEST(TypedJsonIntSerializerTests, Load_MaxInt8Value_ConvertIfFitsOrUnsupported) { this->template TestMaxValue(); } TYPED_TEST(TypedJsonIntSerializerTests, Load_MaxShortValue_ConvertIfFitsOrUnsupported) { this->template TestMaxValue(); } TYPED_TEST(TypedJsonIntSerializerTests, Load_MaxIntValue_ConvertIfFitsOrUnsupported) { this->template TestMaxValue(); }