test: new fixes to the tests to handle the fields refactor. add tests for getting Toc values

Author: Cammin

Assets/LDtkUnity/Runtime/Fields/LDtkField.cs

@@ -18,7 +18,7 @@ public class LDtkField
         [SerializeField] private LDtkFieldType _type;
         [SerializeField] internal LDtkFieldElement[] _data;
 
-        public LDtkDefinitionObjectField Def => _def;
+        public LDtkDefinitionObjectField Definition => _def;
         public string Identifier => _def.Identifier;
         public bool IsArray => _def.IsArray;
         public LDtkFieldType Type => _type;

Assets/LDtkUnity/Runtime/Fields/LDtkFieldsPublicAPI.cs

@@ -14,7 +14,7 @@ public LDtkDefinitionObjectField GetDefinition(string identifier)
                 LDtkDebug.LogError($"No field \"{identifier}\" exists in this field component for {obj.name}", obj);
                 return null;
             }
-            return field.Def;
+            return field.Definition;
         }
 
         #region Int

Assets/LDtkUnity/Runtime/UnityAssets/Assets/LDtkTableOfContents.cs

@@ -15,6 +15,8 @@ public sealed class LDtkTableOfContents : ScriptableObject
     {
         [SerializeField] internal List<LDtkTableOfContentsEntry> _entries;
 
+        public IReadOnlyList<LDtkTableOfContentsEntry> Entries => _entries;
+        
         internal void InitializeList(LdtkJson json)
         {
             _entries = new List<LDtkTableOfContentsEntry>(json.Toc.Length);

Assets/Tests/EditMode/FieldsComponent/FieldsTestBase.cs

@@ -12,16 +12,19 @@ public abstract class FieldsTestBase
         protected static Dictionary<string,object> ExpectedSingleValues = FixtureConsts.ExpectedSingleValues;
         protected static Dictionary<string,object[]> ExpectedArrayValues = FixtureConsts.ExpectedArrayValues;
         protected static Dictionary<string,string> ExpectedValuesAsString = FixtureConsts.ExpectedValuesAsString;
+        protected static Dictionary<string,string> ExpectedValuesAsStringForToc = FixtureConsts.ExpectedValuesAsStringForToc;
 
         protected LDtkFields Fields;
         protected LDtkFields FieldsNullable;
+        protected LDtkTableOfContents Toc;
 
         [SetUp]
         public void Setup()
         {
             FieldsFixture.LoadComponents();
             Fields = FieldsFixture.Fields;
             FieldsNullable = FieldsFixture.FieldsNullable;
+            Toc = FieldsFixture.Toc;
         }
     }
 }

Assets/Tests/EditMode/FieldsComponent/FieldsTestErrorHandling.cs

@@ -7,7 +7,7 @@ namespace LDtkUnity.Tests
 {
     public class TestErrorHandling : FieldsTestBase
     {
-        const string identifier = "String";
+        const string identifier = "string";
 
         [Test]
         public void NonExistentField()
@@ -43,7 +43,7 @@ public void OutOfBounds()
         public void MismatchType()
         {
             Assert.NotNull(Fields, "Fields != null");
-            Assert.True(Fields.ContainsField(identifier));
+            Assert.True(Fields.ContainsField(identifier), $"Fields component doesnt contain {identifier}");
 
             if (!Fields.TryGetString(identifier, out string value))
             {

Assets/Tests/EditMode/FieldsComponent/FieldsValuesAsString.cs

@@ -10,24 +10,28 @@ public class FieldsValuesAsString : FieldsTestBase
     {
         #region ExpectIncorrectValues
 
+        /*
         [Test, TestCaseSource(nameof(Singles))]
         public void GetValueAsString_ExpectIncorrectValue(string s)
         {
             var value = Fields.GetValueAsString(s);
+            
             Assert.AreNotEqual(value, s, $"{value} != {s}");
         }
+        */
 
-        [Test, TestCaseSource(nameof(Arrays))]
+        /*[Test, TestCaseSource(nameof(Arrays))]
         public void GetValuesAsStrings_ExpectIncorrectValue(string s)
         {
             var value = Fields.GetValuesAsStrings(s);
             Assert.AreNotEqual(value, s, $"{value} != {s}");
-        }
+        }*/
 
-        [Test, TestCaseSource(nameof(Singles))]
+        /*[Test, TestCaseSource(nameof(Singles))]
         public void TryGetValueAsString_ExpectIncorrectValue(string s)
         {
             Assert.True(Fields.TryGetValueAsString(s, out var value));
+            
             Assert.AreNotEqual(value, s, $"{value} != {s}");
         }
         
@@ -36,7 +40,7 @@ public void TryGetValuesAsStrings_ExpectIncorrectValue(string s)
         {
             Assert.True(Fields.TryGetValuesAsStrings(s, out var value));
             Assert.AreNotEqual(value, s, $"{value} != {s}");
-        }
+        }*/
         #endregion
 
         #region ExpectFailWhenGettingMismatchedSingleOrArray

Assets/Tests/EditMode/FieldsComponent/TestLoadTocFieldValues.cs

@@ -0,0 +1,69 @@
+using NUnit.Framework;
+using UnityEngine;
+
+namespace LDtkUnity.Tests
+{
+    internal sealed class TestLoadTocFieldValues : FieldsTestBase
+    {
+        //public const string FieldsProjectPath = "Assets/Tests/Misc/OtherTechTests/TestAllFieldsLevels.ldtk";
+        
+        /*[Test]
+        public void TestTocJson()
+        {
+            string jsonText = TestJsonLoader.LoadTextAsset(FieldsProjectPath);
+            LdtkJson project = Utf8Json.JsonSerializer.Deserialize<LdtkJson>(jsonText);
+            LdtkTableOfContentEntry[] toc = project.Toc;
+            LdtkTableOfContentEntry entry = toc[0];
+            LdtkTocInstanceData data = entry.InstancesData[0];
+            var fields = data.Fields;
+
+            foreach (var key in fields.Keys)
+            {
+                object value = fields[key];
+                
+                Debug.Log($"{key}: {value}");
+            }
+            
+            double intValue = (double)fields["integer"];
+            double floatValue = (double)fields["float"];
+            string stringValue = (string)fields["string"];
+            
+            
+            Debug.Assert(intValue == 12345);
+        }*/
+
+        [Test]
+        public void TestTocLength()
+        {
+            LDtkTableOfContentsEntry entry = Toc.GetEntry("TestAllFields");
+            LDtkTableOfContentsEntryData firstEntity = entry.Entries[0];
+            Assert.IsTrue(All.Length == firstEntity.Fields.Length);
+        }
+
+        [Test, TestCaseSource(nameof(All))]
+        public void TestTocValues(string fieldIdentifier)
+        {
+            LDtkTableOfContentsEntry entry = Toc.Entries[0];
+            Debug.Assert(entry.Definition.Identifier == "TestAllFields");
+            
+            LDtkTableOfContentsEntryData entity = entry.Entries[0];
+            LDtkField field = entity.GetField(fieldIdentifier);
+
+            string expected = ExpectedValuesAsStringForToc[fieldIdentifier];
+            string actual;
+
+            
+            if (field.Definition.IsArray)
+            {
+                string[] values = field.GetValuesAsStrings();
+                actual = string.Join(", ", values);
+            }
+            else
+            {
+                actual = field.GetValueAsString();
+            }
+
+            Assert.AreEqual(expected, actual);
+        }
+    }
+}