com.wallstop-studios.unity-helpers 2.0.0-rc05 → 2.0.0-rc06

package/Tests/Runtime/Random/RandomTestBase.cs

@@ -3,11 +3,14 @@
     using System;
     using System.Collections.Generic;
     using System.Linq;
+    using Core.Extension;
+    using Core.Serialization;
     using NUnit.Framework;
     using UnityHelpers.Core.Random;
 
     public abstract class RandomTestBase
     {
+        private const int NumGeneratorChecks = 1_000;
         private const int SampleCount = 12_500_000;
 
         private readonly int[] _samples = new int[1_000];
@@ -96,14 +99,13 @@
         [Test]
         public void Copy()
         {
-            const int numGeneratorChecks = 1_000;
             IRandom random1 = NewRandom();
             IRandom random2 = random1.Copy();
             Assert.AreEqual(random1.InternalState, random2.InternalState);
             // UnityRandom has shared state, the below test is not possible for it. We did all we could.
             if (NewRandom() is not UnityRandom)
             {
-                for (int i = 0; i < numGeneratorChecks; ++i)
+                for (int i = 0; i < NumGeneratorChecks; ++i)
                 {
                     Assert.AreEqual(random1.Next(), random2.Next());
                     Assert.AreEqual(random1.InternalState, random2.InternalState);
@@ -115,7 +117,7 @@
             Assert.AreEqual(random1.InternalState, random3.InternalState);
             if (NewRandom() is not UnityRandom)
             {
-                for (int i = 0; i < numGeneratorChecks; ++i)
+                for (int i = 0; i < NumGeneratorChecks; ++i)
                 {
                     Assert.AreEqual(random1.Next(), random3.Next());
                     Assert.AreEqual(random1.InternalState, random3.InternalState);
@@ -123,6 +125,24 @@
             }
         }
 
+        [Test]
+        public void Json()
+        {
+            IRandom random = NewRandom();
+            string json = random.ToJson();
+            IRandom deserialized = Serializer.JsonDeserialize<IRandom>(json, random.GetType());
+            Assert.AreEqual(random.InternalState, deserialized.InternalState);
+
+            if (NewRandom() is not UnityRandom)
+            {
+                for (int i = 0; i < NumGeneratorChecks; ++i)
+                {
+                    Assert.AreEqual(random.Next(), deserialized.Next());
+                    Assert.AreEqual(random.InternalState, deserialized.InternalState);
+                }
+            }
+        }
+
         private void TestAndVerify(Func<IRandom, int> sample, int? maxLength = null)
         {
             IRandom random = NewRandom();

package/Tests/Runtime/Serialization/JsonSerializationTest.cs

@@ -29,12 +29,12 @@
         [Test]
         public void SerializationWorks()
         {
-            IRandom random = PcgRandom.Instance;
+            IRandom random = PRNG.Instance;
             TestDataObject input = new()
             {
                 field = Guid.NewGuid().ToString(),
                 Property = random.Next(),
-                NamedProperty = random.NextFloat()
+                NamedProperty = random.NextFloat(),
             };
 
             int dictionaryProperties = random.Next(4, 10);
@@ -51,21 +51,34 @@
 
             string json = input.ToJson();
             Assert.IsTrue(
-                json.Contains("DifferentPropertyName"), $"DifferentPropertyName failed to serialize! JSON: {json}");
+                json.Contains("DifferentPropertyName"),
+                $"DifferentPropertyName failed to serialize! JSON: {json}"
+            );
 
             TestDataObject deserialized = Serializer.JsonDeserialize<TestDataObject>(json);
-            Assert.AreEqual(input.field, deserialized.field, $"Unexpected {nameof(deserialized.field)}! JSON: {json}");
             Assert.AreEqual(
-                input.Property, deserialized.Property, $"Unexpected {nameof(deserialized.Property)}! JSON: {json}");
+                input.field,
+                deserialized.field,
+                $"Unexpected {nameof(deserialized.field)}! JSON: {json}"
+            );
             Assert.AreEqual(
-                input.NamedProperty, deserialized.NamedProperty,
-                $"Unexpected {nameof(deserialized.NamedProperty)}! JSON: {json}");
-            Assert.IsTrue( 
+                input.Property,
+                deserialized.Property,
+                $"Unexpected {nameof(deserialized.Property)}! JSON: {json}"
+            );
+            Assert.AreEqual(
+                input.NamedProperty,
+                deserialized.NamedProperty,
+                $"Unexpected {nameof(deserialized.NamedProperty)}! JSON: {json}"
+            );
+            Assert.IsTrue(
                 input.DictionaryProperty.ContentEquals(deserialized.DictionaryProperty),
-                $"Unexpected {nameof(deserialized.DictionaryProperty)}! JSON: {json}");
+                $"Unexpected {nameof(deserialized.DictionaryProperty)}! JSON: {json}"
+            );
             Assert.IsTrue(
                 input.ListProperty.SequenceEqual(deserialized.ListProperty),
-                $"Unexpected {nameof(deserialized.ListProperty)}! JSON: {json}");
+                $"Unexpected {nameof(deserialized.ListProperty)}! JSON: {json}"
+            );
         }
     }
-}
+}

package/Tests/Runtime/Utils/SpriteRendererMetadataTests.cs

@@ -32,7 +32,11 @@
 
         private SpriteRendererMetadata CreateMetadata()
         {
-            GameObject go = new("TestSpriteRendererMetadata", typeof(SpriteRenderer), typeof(SpriteRendererMetadata));
+            GameObject go = new(
+                "TestSpriteRendererMetadata",
+                typeof(SpriteRenderer),
+                typeof(SpriteRendererMetadata)
+            );
             _spawned.Add(go);
             return go.GetComponent<SpriteRendererMetadata>();
         }
@@ -44,8 +48,13 @@
 
         private Color CreateColor()
         {
-            IRandom random = PcgRandom.Instance;
-            Color color = new(random.NextFloat(), random.NextFloat(), random.NextFloat(), random.NextFloat());
+            IRandom random = PRNG.Instance;
+            Color color = new(
+                random.NextFloat(),
+                random.NextFloat(),
+                random.NextFloat(),
+                random.NextFloat()
+            );
             return color;
         }
 
@@ -74,9 +83,8 @@
             Material originalMaterial = metadata.OriginalMaterial;
             do
             {
-                newColor.r = PcgRandom.Instance.NextFloat();
-            }
-            while (newColor == originalColor);
+                newColor.r = PRNG.Instance.NextFloat();
+            } while (newColor == originalColor);
 
             SpriteRendererMetadata second = CreateMetadata();
             SpriteRenderer spriteRenderer = metadata.GetComponent<SpriteRenderer>();
@@ -91,9 +99,8 @@
             Color updatedColor = newColor;
             do
             {
-                updatedColor.g = PcgRandom.Instance.NextFloat();
-            }
-            while (updatedColor == newColor);
+                updatedColor.g = PRNG.Instance.NextFloat();
+            } while (updatedColor == newColor);
 
             metadata.PushColor(spriteRenderer, updatedColor);
             Assert.AreEqual(spriteRenderer.color, metadata.CurrentColor);
@@ -108,9 +115,8 @@
             Color latestColor = updatedColor;
             do
             {
-                latestColor.b = PcgRandom.Instance.NextFloat();
-            }
-            while (latestColor == updatedColor);
+                latestColor.b = PRNG.Instance.NextFloat();
+            } while (latestColor == updatedColor);
 
             metadata.PushColor(second, latestColor);
             Assert.AreEqual(spriteRenderer.color, metadata.CurrentColor);
@@ -120,9 +126,8 @@
             Assert.IsFalse(metadata.Colors.Contains(newColor));
             do
             {
-                newColor.a = PcgRandom.Instance.NextFloat();
-            }
-            while (newColor == latestColor);
+                newColor.a = PRNG.Instance.NextFloat();
+            } while (newColor == latestColor);
 
             metadata.PushColor(second, newColor);
             Assert.AreEqual(spriteRenderer.color, metadata.CurrentColor);
@@ -189,7 +194,6 @@
             yield break;
         }
 
-
         [UnityTest]
         public IEnumerator PopColorIdempotent()
         {
@@ -392,4 +396,4 @@
             yield break;
         }
     }
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.wallstop-studios.unity-helpers",
-  "version": "2.0.0-rc05",
+  "version": "2.0.0-rc06",
   "displayName": "Unity Helpers",
   "description": "Various Unity Helper Library",
   "dependencies": {},