From 2ae7a5ef9f6cc9c0ffd4b41f148dbf58866d8f3b Mon Sep 17 00:00:00 2001
From: santorac <55155825+santorac@users.noreply.github.com>
Date: Wed, 17 Nov 2021 12:04:46 -0800
Subject: [PATCH] Added a unit test for the MaterialPropertyValue bug fix.

Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
---
 .../RPI/Code/Tests/Material/MaterialTests.cpp | 50 +++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/Gems/Atom/RPI/Code/Tests/Material/MaterialTests.cpp b/Gems/Atom/RPI/Code/Tests/Material/MaterialTests.cpp
index 9c3e08ee08..95aa343ed5 100644
--- a/Gems/Atom/RPI/Code/Tests/Material/MaterialTests.cpp
+++ b/Gems/Atom/RPI/Code/Tests/Material/MaterialTests.cpp
@@ -888,4 +888,54 @@ namespace UnitTest
         EXPECT_EQ(indexFromOldName, indexFromNewName);
     }
 
+    template<typename T>
+    void CheckPropertyValueRoundTrip(const T& value)
+    {
+        AZ::RPI::MaterialPropertyValue materialPropertyValue{value};
+        AZStd::any anyValue{value};
+        AZ::RPI::MaterialPropertyValue materialPropertyValueFromAny = MaterialPropertyValue::FromAny(anyValue);
+        AZ::RPI::MaterialPropertyValue materialPropertyValueFromRoundTrip = MaterialPropertyValue::FromAny(MaterialPropertyValue::ToAny(materialPropertyValue));
+        
+        EXPECT_EQ(materialPropertyValue, materialPropertyValueFromAny);
+        EXPECT_EQ(materialPropertyValue, materialPropertyValueFromRoundTrip);
+
+        if (materialPropertyValue.Is<Data::Asset<ImageAsset>>())
+        {
+            EXPECT_EQ(materialPropertyValue.GetValue<Data::Asset<ImageAsset>>().GetHint(), materialPropertyValueFromAny.GetValue<Data::Asset<ImageAsset>>().GetHint());
+            EXPECT_EQ(materialPropertyValue.GetValue<Data::Asset<ImageAsset>>().GetHint(), materialPropertyValueFromRoundTrip.GetValue<Data::Asset<ImageAsset>>().GetHint());
+        }
+    }
+
+    TEST_F(MaterialTests, TestMaterialPropertyValueAsAny)
+    {
+        auto checkRoundTrip = [](const AZ::RPI::MaterialPropertyValue &original)
+        {
+            AZ::RPI::MaterialPropertyValue convertedValue = MaterialPropertyValue::FromAny(MaterialPropertyValue::ToAny(original));
+            EXPECT_EQ(original, convertedValue);
+
+            if (original.Is<Data::Asset<ImageAsset>>())
+            {
+                EXPECT_EQ(original.GetValue<Data::Asset<ImageAsset>>().GetHint(), convertedValue.GetValue<Data::Asset<ImageAsset>>().GetHint());
+            }
+        };
+        
+        CheckPropertyValueRoundTrip(true);
+        CheckPropertyValueRoundTrip(false);
+        CheckPropertyValueRoundTrip(7);
+        CheckPropertyValueRoundTrip(8u);
+        CheckPropertyValueRoundTrip(9.0f);
+        CheckPropertyValueRoundTrip(AZ::Vector2(1.0f, 2.0f));
+        CheckPropertyValueRoundTrip(AZ::Vector3(1.0f, 2.0f, 3.0f));
+        CheckPropertyValueRoundTrip(AZ::Vector4(1.0f, 2.0f, 3.0f, 4.0f));
+        CheckPropertyValueRoundTrip(AZ::Color(1.0f, 2.0f, 3.0f, 4.0f));
+        CheckPropertyValueRoundTrip(Data::Asset<Data::AssetData>{});
+        CheckPropertyValueRoundTrip(Data::Asset<ImageAsset>{});
+        CheckPropertyValueRoundTrip(Data::Asset<StreamingImageAsset>{});
+        CheckPropertyValueRoundTrip(Data::Asset<Data::AssetData>{Uuid::CreateRandom(), azrtti_typeid<AZ::RPI::StreamingImageAsset>(), "TestAssetPath.png"});
+        CheckPropertyValueRoundTrip(Data::Asset<ImageAsset>{Uuid::CreateRandom(), azrtti_typeid<AZ::RPI::StreamingImageAsset>(), "TestAssetPath.png"});
+        CheckPropertyValueRoundTrip(Data::Asset<StreamingImageAsset>{Uuid::CreateRandom(), azrtti_typeid<AZ::RPI::StreamingImageAsset>(), "TestAssetPath.png"});
+        CheckPropertyValueRoundTrip(m_testImageAsset);
+        CheckPropertyValueRoundTrip(Data::Instance<Image>{m_testImage});
+        CheckPropertyValueRoundTrip(AZStd::string{"hello"});
+    }
 }