From 15e0bb16939b38b578cd075e297794a72fee4eac Mon Sep 17 00:00:00 2001
From: Nicholas Van Sickle <nvsickle@amazon.com>
Date: Thu, 9 Dec 2021 21:37:22 -0800
Subject: [PATCH] Add tests, fix missing bool in Accept and operator[] insert

Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
---
 Code/Framework/AzCore/AzCore/DOM/DomValue.cpp | 21 ++++-
 .../AzCore/Tests/DOM/DomValueTests.cpp        | 87 +++++++++++++++++++
 2 files changed, 107 insertions(+), 1 deletion(-)

diff --git a/Code/Framework/AzCore/AzCore/DOM/DomValue.cpp b/Code/Framework/AzCore/AzCore/DOM/DomValue.cpp
index 2f41835a37..675a6931f5 100644
--- a/Code/Framework/AzCore/AzCore/DOM/DomValue.cpp
+++ b/Code/Framework/AzCore/AzCore/DOM/DomValue.cpp
@@ -407,7 +407,22 @@ namespace AZ::Dom
 
     Value& Value::operator[](KeyType name)
     {
-        return FindMember(name)->second;
+        Object::ContainerType& object = GetObjectInternal();
+        auto existingEntry = AZStd::find_if(
+            object.begin(), object.end(),
+            [&name](const Object::EntryType& entry)
+            {
+                return entry.first == name;
+            });
+        if (existingEntry != object.end())
+        {
+            return existingEntry->second;
+        }
+        else
+        {
+            object.emplace_back(name, Value());
+            return object[object.size() - 1].second;
+        }
     }
 
     const Value& Value::operator[](KeyType name) const
@@ -924,6 +939,10 @@ namespace AZ::Dom
                 {
                     result = visitor.Double(arg);
                 }
+                else if constexpr (AZStd::is_same_v<Alternative, bool>)
+                {
+                    result = visitor.Bool(arg);
+                }
                 else if constexpr (AZStd::is_same_v<Alternative, AZStd::string_view>)
                 {
                     result = visitor.String(arg, copyStrings ? Lifetime::Temporary : Lifetime::Persistent);
diff --git a/Code/Framework/AzCore/Tests/DOM/DomValueTests.cpp b/Code/Framework/AzCore/Tests/DOM/DomValueTests.cpp
index 02777bf6dd..75cb71248f 100644
--- a/Code/Framework/AzCore/Tests/DOM/DomValueTests.cpp
+++ b/Code/Framework/AzCore/Tests/DOM/DomValueTests.cpp
@@ -14,6 +14,7 @@
 #include <AzCore/Serialization/Json/JsonSerialization.h>
 #include <AzCore/Serialization/Json/JsonUtils.h>
 #include <AzCore/UnitTest/TestTypes.h>
+#include <AzCore/std/numeric.h>
 
 namespace AZ::Dom::Tests
 {
@@ -208,4 +209,90 @@ namespace AZ::Dom::Tests
 
         PerformValueChecks();
     }
+
+    TEST_F(DomValueTests, Int64)
+    {
+        m_value.SetObject();
+        m_value["int64_min"] = AZStd::numeric_limits<int64_t>::min();
+        m_value["int64_max"] = AZStd::numeric_limits<int64_t>::max();
+
+        EXPECT_EQ(m_value["int64_min"].GetType(), Type::NumberType);
+        EXPECT_EQ(m_value["int64_min"].GetInt64(), AZStd::numeric_limits<int64_t>::min());
+        EXPECT_EQ(m_value["int64_max"].GetType(), Type::NumberType);
+        EXPECT_EQ(m_value["int64_max"].GetInt64(), AZStd::numeric_limits<int64_t>::max());
+
+        PerformValueChecks();
+    }
+
+    TEST_F(DomValueTests, Uint64)
+    {
+        m_value.SetObject();
+        m_value["uint64_min"] = AZStd::numeric_limits<uint64_t>::min();
+        m_value["uint64_max"] = AZStd::numeric_limits<uint64_t>::max();
+
+        EXPECT_EQ(m_value["uint64_min"].GetType(), Type::NumberType);
+        EXPECT_EQ(m_value["uint64_min"].GetInt64(), AZStd::numeric_limits<uint64_t>::min());
+        EXPECT_EQ(m_value["uint64_max"].GetType(), Type::NumberType);
+        EXPECT_EQ(m_value["uint64_max"].GetInt64(), AZStd::numeric_limits<uint64_t>::max());
+
+        PerformValueChecks();
+    }
+
+    TEST_F(DomValueTests, Double)
+    {
+        m_value.SetObject();
+        m_value["double_min"] = AZStd::numeric_limits<double>::min();
+        m_value["double_max"] = AZStd::numeric_limits<double>::max();
+
+        EXPECT_EQ(m_value["double_min"].GetType(), Type::NumberType);
+        EXPECT_EQ(m_value["double_min"].GetDouble(), AZStd::numeric_limits<double>::min());
+        EXPECT_EQ(m_value["double_max"].GetType(), Type::NumberType);
+        EXPECT_EQ(m_value["double_max"].GetDouble(), AZStd::numeric_limits<double>::max());
+
+        PerformValueChecks();
+    }
+
+    TEST_F(DomValueTests, Null)
+    {
+        m_value.SetObject();
+        m_value["null_value"] = Value(Type::NullType);
+
+        EXPECT_EQ(m_value["null_value"].GetType(), Type::NullType);
+        EXPECT_EQ(m_value["null_type"], Value());
+
+        PerformValueChecks();
+    }
+
+    TEST_F(DomValueTests, Bool)
+    {
+        m_value.SetObject();
+        m_value["true_value"] = true;
+        m_value["false_value"] = false;
+
+        EXPECT_EQ(m_value["true_value"].GetType(), Type::TrueType);
+        EXPECT_EQ(m_value["true_value"].GetBool(), true);
+        EXPECT_EQ(m_value["false_value"].GetType(), Type::FalseType);
+        EXPECT_EQ(m_value["false_value"].GetBool(), false);
+
+        PerformValueChecks();
+    }
+
+    TEST_F(DomValueTests, String)
+    {
+        m_value.SetObject();
+        AZStd::string stringToReference = "foo";
+        m_value["no_copy"] = Value(stringToReference, false);
+        AZStd::string stringToCopy = "bar";
+        m_value["copy"] = Value(stringToCopy, true);
+
+        EXPECT_EQ(m_value["no_copy"].GetType(), Type::StringType);
+        EXPECT_EQ(m_value["no_copy"].GetString(), stringToReference);
+        EXPECT_EQ(m_value["no_copy"].GetString().data(), stringToReference.data());
+
+        EXPECT_EQ(m_value["copy"].GetType(), Type::StringType);
+        EXPECT_EQ(m_value["copy"].GetString(), stringToCopy);
+        EXPECT_NE(m_value["copy"].GetString().data(), stringToCopy.data());
+
+        PerformValueChecks();
+    }
 } // namespace AZ::Dom::Tests