com.wallstop-studios.unity-helpers 2.0.0-rc81.9 → 2.0.1

package/Tests/Editor/Sprites/SpritePivotAdjusterTests.cs

@@ -35,7 +35,7 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Sprites
             AssetDatabase.Refresh();
 
             TextureImporter imp = AssetImporter.GetAtPath(path) as TextureImporter;
-            Assert.IsNotNull(imp);
+            Assert.IsTrue(imp != null);
             imp.textureType = TextureImporterType.Sprite;
             imp.spriteImportMode = SpriteImportMode.Single;
             imp.isReadable = true;
@@ -45,9 +45,9 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Sprites
             SpritePivotAdjuster window = Track(
                 ScriptableObject.CreateInstance<SpritePivotAdjuster>()
             );
-            window._directoryPaths = new System.Collections.Generic.List<UnityEngine.Object>
+            window._directoryPaths = new System.Collections.Generic.List<Object>
             {
-                AssetDatabase.LoadAssetAtPath<UnityEngine.Object>(Root),
+                AssetDatabase.LoadAssetAtPath<Object>(Root),
             };
             window._alphaCutoff = 0.01f;
             window._skipUnchanged = false;

package/Tests/Editor/Sprites/TexturePlatformNameHelperTests.cs

@@ -23,6 +23,24 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Sprites
             bool hasIOS = System.Array.IndexOf(names, "iOS") >= 0;
             Assert.IsTrue(hasIPhone || hasIOS);
         }
+
+        [Test]
+        public void CachesResultsAndIsSorted()
+        {
+            string[] a = TexturePlatformNameHelper.GetKnownPlatformNames();
+            string[] b = TexturePlatformNameHelper.GetKnownPlatformNames();
+            // Expect the exact same reference due to caching
+            Assert.AreSame(a, b);
+
+            // Verify ascending ordinal order
+            for (int i = 1; i < a.Length; i++)
+            {
+                Assert.LessOrEqual(
+                    string.Compare(a[i - 1], a[i], System.StringComparison.Ordinal),
+                    0
+                );
+            }
+        }
     }
 #endif
 }

package/Tests/Editor/Sprites/TextureResizerWizardTests.cs

@@ -51,7 +51,7 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Sprites
 
             AssetDatabase.Refresh();
             Texture2D tex = AssetDatabase.LoadAssetAtPath<Texture2D>(path);
-            Assert.IsNotNull(tex, "Texture should exist after resize");
+            Assert.IsTrue(tex != null, "Texture should exist after resize");
             Assert.That(tex.width, Is.EqualTo(32), "Width should double");
             Assert.That(tex.height, Is.EqualTo(20), "Height should double");
         }
@@ -125,7 +125,7 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Sprites
             wizard.heightMultiplier = 1f;
             wizard.scalingResizeAlgorithm = TextureResizerWizard.ResizeAlgorithm.Point;
             DefaultAsset outAsset = AssetDatabase.LoadAssetAtPath<DefaultAsset>(OutRoot);
-            Assert.IsNotNull(outAsset, "Output folder asset missing");
+            Assert.IsTrue(outAsset != null, "Output folder asset missing");
             wizard.outputFolder = outAsset;
             wizard.OnWizardCreate();
 
@@ -136,7 +136,7 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Sprites
 
             string outPath = Path.Combine(OutRoot, "out.png").Replace('\\', '/');
             Texture2D outTex = AssetDatabase.LoadAssetAtPath<Texture2D>(outPath);
-            Assert.IsNotNull(outTex, "Expected resized texture in output folder");
+            Assert.IsTrue(outTex != null, "Expected resized texture in output folder");
             Assert.That(outTex.width, Is.EqualTo(16));
             Assert.That(outTex.height, Is.EqualTo(8));
         }
@@ -176,7 +176,7 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Sprites
             AssetDatabase.Refresh();
 
             TextureImporter importer = AssetImporter.GetAtPath(path) as TextureImporter;
-            Assert.IsNotNull(importer);
+            Assert.IsTrue(importer != null);
             importer.isReadable = false;
             importer.SaveAndReimport();
 
@@ -196,7 +196,7 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Sprites
 
             AssetDatabase.Refresh();
             importer = AssetImporter.GetAtPath(path) as TextureImporter;
-            Assert.IsNotNull(importer);
+            Assert.IsTrue(importer != null);
             Assert.IsFalse(importer.isReadable, "Importer readability should be restored");
         }
 

package/Tests/Editor/Sprites/TextureSettingsApplierAPITests.cs

@@ -55,7 +55,7 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Sprites
                 out TextureImporter importer
             );
             Assert.IsTrue(changed, "Expected API to apply changes");
-            Assert.IsNotNull(importer);
+            Assert.IsTrue(importer != null);
             importer.SaveAndReimport();
 
             TextureImporterPlatformSettings ps = importer.GetDefaultPlatformTextureSettings();
@@ -88,7 +88,7 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Sprites
                 out TextureImporter importer
             );
             Assert.IsTrue(changed, "Expected override to apply");
-            Assert.IsNotNull(importer);
+            Assert.IsTrue(importer != null);
             importer.SaveAndReimport();
 
             TextureImporterPlatformSettings ops = importer.GetPlatformTextureSettings("Standalone");
@@ -120,7 +120,7 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Sprites
                 out TextureImporter importer
             );
             Assert.IsTrue(changed, "Expected override to apply even for unknown platform name");
-            Assert.IsNotNull(importer);
+            Assert.IsTrue(importer != null);
             importer.SaveAndReimport();
 
             TextureImporterPlatformSettings ops = importer.GetPlatformTextureSettings(

package/Tests/Editor/Sprites/TextureSettingsApplierWizardAdditionalTests.cs

@@ -75,8 +75,8 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Sprites
 
             impIncluded = AssetImporter.GetAtPath(included) as TextureImporter;
             impOther = AssetImporter.GetAtPath(other) as TextureImporter;
-            Assert.IsNotNull(impIncluded);
-            Assert.IsNotNull(impOther);
+            Assert.IsTrue(impIncluded != null);
+            Assert.IsTrue(impOther != null);
 
             Assert.That(impIncluded.isReadable, Is.False);
             Assert.That(impIncluded.wrapMode, Is.EqualTo(TextureWrapMode.Clamp));
@@ -187,7 +187,7 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Sprites
             AssetDatabase.Refresh();
 
             TextureImporter imp = AssetImporter.GetAtPath(path) as TextureImporter;
-            Assert.IsNotNull(imp);
+            Assert.IsTrue(imp != null);
             TextureImporterPlatformSettings ops = imp.GetPlatformTextureSettings("Standalone");
             Assert.IsTrue(ops.overridden);
             Assert.AreEqual(256, ops.maxTextureSize);
@@ -203,7 +203,7 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Sprites
 
             // Set importer to desired state first
             TextureImporter imp = AssetImporter.GetAtPath(path) as TextureImporter;
-            Assert.IsNotNull(imp);
+            Assert.IsTrue(imp != null);
             imp.wrapMode = TextureWrapMode.Clamp;
             imp.filterMode = FilterMode.Bilinear;
             TextureImporterPlatformSettings ps = imp.GetDefaultPlatformTextureSettings();

package/Tests/Editor/Sprites/TextureSettingsApplierWizardTests.cs

@@ -48,9 +48,9 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Sprites
             };
 
             // Set directories list
-            window.directories = new System.Collections.Generic.List<UnityEngine.Object>
+            window.directories = new System.Collections.Generic.List<Object>
             {
-                AssetDatabase.LoadAssetAtPath<UnityEngine.Object>(Root),
+                AssetDatabase.LoadAssetAtPath<Object>(Root),
             };
 
             // Configure changes
@@ -69,8 +69,8 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Sprites
             AssetDatabase.Refresh();
             TextureImporter impA = AssetImporter.GetAtPath(a) as TextureImporter;
             TextureImporter impB = AssetImporter.GetAtPath(b) as TextureImporter;
-            Assert.IsNotNull(impA);
-            Assert.IsNotNull(impB);
+            Assert.IsTrue(impA != null);
+            Assert.IsTrue(impB != null);
 
             // Verify a subset of settings applied
             Assert.That(impA.isReadable, Is.False); // isReadOnly=true → not readable

package/Tests/Editor/Tools/ImageBlurToolTests.cs

@@ -1,134 +1,46 @@
 namespace WallstopStudios.UnityHelpers.Tests.Editor.Tools
 {
 #if UNITY_EDITOR
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
     using NUnit.Framework;
-    using UnityEditor;
     using UnityEngine;
-    using Object = UnityEngine.Object;
+    using WallstopStudios.UnityHelpers.Editor.Tools;
 
     public sealed class ImageBlurToolTests
     {
-        private const string TempRoot = "Assets/Temp/ImageBlurToolTests";
-
-        [SetUp]
-        public void SetUp()
-        {
-            EnsureFolder(TempRoot);
-        }
-
-        [TearDown]
-        public void TearDown()
-        {
-            AssetDatabase.DeleteAsset("Assets/Temp");
-            AssetDatabase.Refresh();
-        }
-
         [Test]
-        public void GenerateGaussianKernelIsNormalizedAndSymmetric()
+        public void KernelHasExpectedLengthAndNormalizes()
         {
-            float[] k = WallstopStudios.UnityHelpers.Editor.Tools.ImageBlurTool.KernelForTests(5);
-            Assert.IsNotNull(k, "Kernel should not be null");
-            Assert.That(k.Length, Is.EqualTo(11), "Kernel size should be 2r+1");
-
-            float sum = k.Sum();
-            Assert.That(Mathf.Abs(1f - sum) < 1e-3f, "Kernel should sum to 1");
-
-            for (int i = 0; i < k.Length; i++)
+            for (int radius = 1; radius <= 4; radius++)
             {
-                Assert.That(
-                    Mathf.Abs(k[i] - k[k.Length - 1 - i]) < 1e-6f,
-                    $"Kernel must be symmetric at {i}"
-                );
+                float[] kernel = ImageBlurTool.KernelForTests(radius);
+                Assert.NotNull(kernel);
+                Assert.AreEqual(radius * 2 + 1, kernel.Length);
+                float sum = 0f;
+                for (int i = 0; i < kernel.Length; i++)
+                {
+                    sum += kernel[i];
+                }
+                Assert.That(sum, Is.InRange(0.999f, 1.001f));
             }
         }
 
         [Test]
-        public void CreateBlurredTextureSoftensHighContrastPixel()
+        public void BlurredTextureMatchesInputDimensions()
         {
-            Texture2D src = new(5, 5, TextureFormat.RGBA32, false);
-            Color[] pixels = Enumerable.Repeat(Color.black, 25).ToArray();
-            pixels[12] = Color.white;
-            src.SetPixels(pixels);
-            src.Apply();
-
-            Texture2D blurred =
-                WallstopStudios.UnityHelpers.Editor.Tools.ImageBlurTool.BlurredForTests(src, 2);
-            Assert.IsNotNull(blurred, "Blurred texture should be created");
-            Assert.That(blurred.width, Is.EqualTo(5));
-            Assert.That(blurred.height, Is.EqualTo(5));
-
-            Color[] outPix = blurred.GetPixels();
-            Assert.That(outPix[12].maxColorComponent < 1f, "Center intensity should reduce");
-            Assert.That(outPix[11].maxColorComponent > 0f, "Neighbor should gain intensity");
-            Assert.That(outPix[13].maxColorComponent > 0f, "Neighbor should gain intensity");
-        }
-
-        [Test]
-        public void TrySyncDirectoryCollectsTextureAssets()
-        {
-            string texPath = Path.Combine(TempRoot, "tex.png").Replace('\\', '/');
-            CreatePng(texPath, 8, 8, Color.red);
-
-            AssetDatabase.Refresh();
-            Object folderObj = AssetDatabase.LoadAssetAtPath<Object>(TempRoot);
-            Assert.IsNotNull(folderObj, "Temp folder not found as asset");
-
-            List<Texture2D> list = new();
-            WallstopStudios.UnityHelpers.Editor.Tools.ImageBlurTool.TrySyncDirectory(
-                TempRoot,
-                list
-            );
-            Assert.That(
-                list.Count,
-                Is.GreaterThanOrEqualTo(1),
-                "Expected at least one texture collected"
-            );
-            Assert.IsTrue(
-                list.Any(t => t != null && t.name == "tex"),
-                "Texture tex should be present"
-            );
-        }
-
-        private static void EnsureFolder(string relPath)
-        {
-            string[] parts = relPath.Split('/');
-            string cur = parts[0];
-            for (int i = 1; i < parts.Length; i++)
+            Texture2D tex = new(8, 8, TextureFormat.RGBA32, false);
+            for (int y = 0; y < tex.height; y++)
             {
-                string next = cur + "/" + parts[i];
-                if (!AssetDatabase.IsValidFolder(next))
+                for (int x = 0; x < tex.width; x++)
                 {
-                    AssetDatabase.CreateFolder(cur, parts[i]);
+                    tex.SetPixel(x, y, Color.white);
                 }
-                cur = next;
             }
-        }
-
-        private static void CreatePng(string relPath, int w, int h, Color c)
-        {
-            string dir = Path.GetDirectoryName(relPath).Replace('\\', '/');
-            EnsureFolder(dir);
-            Texture2D t = new(w, h, TextureFormat.RGBA32, false);
-            Color[] pix = Enumerable.Repeat(c, w * h).ToArray();
-            t.SetPixels(pix);
-            t.Apply();
-            byte[] data = t.EncodeToPNG();
-            File.WriteAllBytes(RelToFull(relPath), data);
-        }
+            tex.Apply();
 
-        private static string RelToFull(string rel)
-        {
-            return Path.Combine(
-                    Application.dataPath.Substring(
-                        0,
-                        Application.dataPath.Length - "Assets".Length
-                    ),
-                    rel
-                )
-                .Replace('\\', '/');
+            Texture2D blurred = ImageBlurTool.BlurredForTests(tex, 2);
+            Assert.IsTrue(blurred != null);
+            Assert.AreEqual(tex.width, blurred.width);
+            Assert.AreEqual(tex.height, blurred.height);
         }
     }
 #endif

package/Tests/Editor/Utils/CommonTestBase.cs

@@ -3,6 +3,7 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Utils
     using System;
     using System.Collections;
     using System.Collections.Generic;
+    using System.Reflection;
     using NUnit.Framework;
     using UnityEngine;
     using UnityEngine.SceneManagement;
@@ -19,6 +20,22 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Utils
     /// </summary>
     public abstract class CommonTestBase
     {
+        [SetUp]
+        public virtual void BaseSetUp()
+        {
+#if REFLEX_PRESENT
+            Type supportType = Type.GetType(
+                "WallstopStudios.UnityHelpers.Tests.TestUtils.ReflexTestSupport, WallstopStudios.UnityHelpers.Tests.Runtime",
+                throwOnError: false
+            );
+            MethodInfo ensureMethod = supportType?.GetMethod(
+                "EnsureReflexSettings",
+                BindingFlags.Public | BindingFlags.Static
+            );
+            ensureMethod?.Invoke(null, null);
+#endif
+        }
+
         protected readonly List<Object> _trackedObjects = new();
         protected readonly List<IDisposable> _trackedDisposables = new();
         protected readonly List<Scene> _trackedScenes = new();
@@ -40,7 +57,6 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Utils
 #if UNITY_EDITOR
             if (!Application.isPlaying)
             {
-                // In EditMode tests, use EditorSceneManager as CreateScene is play-mode only
                 scene = EditorSceneManager.NewScene(NewSceneSetup.EmptyScene, NewSceneMode.Single);
             }
             else
@@ -55,6 +71,7 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Utils
             {
                 SceneManager.SetActiveScene(scene);
             }
+
             _trackedScenes.Add(scene);
             return scene;
         }
@@ -102,6 +119,27 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Utils
                     {
                         try
                         {
+                            if (SceneManager.GetActiveScene() == scene)
+                            {
+                                int count = SceneManager.sceneCount;
+                                for (int j = 0; j < count; j++)
+                                {
+                                    Scene candidate = SceneManager.GetSceneAt(j);
+                                    if (
+                                        candidate.IsValid()
+                                        && candidate.isLoaded
+                                        && candidate != scene
+                                    )
+                                    {
+                                        SceneManager.SetActiveScene(candidate);
+                                        break;
+                                    }
+                                }
+                                if (SceneManager.sceneCount == 1)
+                                {
+                                    continue;
+                                }
+                            }
                             EditorSceneManager.CloseScene(scene, true);
                         }
                         catch { }
@@ -170,6 +208,27 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Utils
                     {
                         try
                         {
+                            if (SceneManager.GetActiveScene() == scene)
+                            {
+                                int count = SceneManager.sceneCount;
+                                for (int j = 0; j < count; j++)
+                                {
+                                    Scene candidate = SceneManager.GetSceneAt(j);
+                                    if (
+                                        candidate.IsValid()
+                                        && candidate.isLoaded
+                                        && candidate != scene
+                                    )
+                                    {
+                                        SceneManager.SetActiveScene(candidate);
+                                        break;
+                                    }
+                                }
+                                if (SceneManager.sceneCount == 1)
+                                {
+                                    continue;
+                                }
+                            }
                             EditorSceneManager.CloseScene(scene, true);
                         }
                         catch { }

package/Tests/Editor/Utils/ScriptableObjectSingletonCreatorTests.cs

@@ -67,7 +67,7 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Utils
             // Assert: no duplicate folder created and asset placed in reused folder
             Assert.IsTrue(AssetDatabase.IsValidFolder("Assets/Resources/cASEtest"));
             Assert.IsFalse(AssetDatabase.IsValidFolder("Assets/Resources/CaseTest 1"));
-            Assert.IsNotNull(AssetDatabase.LoadAssetAtPath<Object>(assetPath));
+            Assert.IsTrue(AssetDatabase.LoadAssetAtPath<Object>(assetPath) != null);
         }
 
         [UnityTest]
@@ -79,7 +79,7 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Utils
             string occupiedPath = targetFolder + "/Duplicate.asset";
             if (AssetDatabase.LoadAssetAtPath<Object>(occupiedPath) == null)
             {
-                TextAsset ta = new TextAsset("occupied");
+                TextAsset ta = new("occupied");
                 AssetDatabase.CreateAsset(ta, occupiedPath);
             }
 
@@ -89,8 +89,8 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Utils
             yield return null;
 
             // Assert: no duplicate asset created alongside
-            Assert.IsNull(
-                AssetDatabase.LoadAssetAtPath<Object>(targetFolder + "/Duplicate 1.asset")
+            Assert.IsTrue(
+                AssetDatabase.LoadAssetAtPath<Object>(targetFolder + "/Duplicate 1.asset") == null
             );
         }
 
@@ -106,10 +106,10 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Utils
             yield return null;
 
             // Assert: no asset created at the ambiguous path
-            Assert.IsNull(
+            Assert.IsTrue(
                 AssetDatabase.LoadAssetAtPath<Object>(
                     "Assets/Resources/CreatorTests/Collision/NameCollision.asset"
-                )
+                ) == null
             );
         }