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

package/Tests/Editor/Sprites/AnimationCopierWindowTests.cs

@@ -185,7 +185,7 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Sprites
         private static void ModifyClip(string relPath)
         {
             AnimationClip clip = AssetDatabase.LoadAssetAtPath<AnimationClip>(relPath);
-            Assert.IsNotNull(clip);
+            Assert.IsTrue(clip != null);
             clip.frameRate = clip.frameRate + 1f;
             EditorUtility.SetDirty(clip);
         }

package/Tests/Editor/Sprites/AnimationViewerWindowTests.cs

@@ -0,0 +1,38 @@
+namespace WallstopStudios.UnityHelpers.Tests.Editor.Sprites
+{
+#if UNITY_EDITOR
+    using NUnit.Framework;
+    using UnityEditor;
+    using UnityEngine;
+    using WallstopStudios.UnityHelpers.Editor.Sprites;
+
+    public sealed class AnimationViewerWindowTests
+    {
+        [Test]
+        public void EditorLayerDataBuildsSpriteListFromClip()
+        {
+            // Build a test clip with 3 sprite keyframes
+            AnimationClip clip = new AnimationClip();
+            Texture2D tex = new Texture2D(2, 2);
+            Sprite s1 = Sprite.Create(tex, new Rect(0, 0, 1, 1), Vector2.zero);
+            Sprite s2 = Sprite.Create(tex, new Rect(0, 0, 1, 1), Vector2.zero);
+            Sprite s3 = Sprite.Create(tex, new Rect(0, 0, 1, 1), Vector2.zero);
+
+            EditorCurveBinding binding = EditorCurveBinding.PPtrCurve(
+                string.Empty,
+                typeof(SpriteRenderer),
+                "m_Sprite"
+            );
+            ObjectReferenceKeyframe[] keys = new ObjectReferenceKeyframe[3];
+            keys[0] = new ObjectReferenceKeyframe { time = 0f, value = s1 };
+            keys[1] = new ObjectReferenceKeyframe { time = 0.1f, value = s2 };
+            keys[2] = new ObjectReferenceKeyframe { time = 0.2f, value = s3 };
+            AnimationUtility.SetObjectReferenceCurve(clip, binding, keys);
+
+            var instance = new AnimationViewerWindow.EditorLayerData(clip);
+            Assert.NotNull(instance);
+            Assert.AreEqual(3, instance.Sprites.Count);
+        }
+    }
+#endif
+}

package/Tests/Editor/Sprites/AnimationViewerWindowTests.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 85db80503d91fb64c903adb74cee007a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Tests/Editor/Sprites/ScriptableSpriteAtlasEditorTests.cs

@@ -57,7 +57,7 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Sprites
 
             string atlasPath = Path.Combine(Root, "TestAtlas.spriteatlas").Replace('\\', '/');
             SpriteAtlas atlas = AssetDatabase.LoadAssetAtPath<SpriteAtlas>(atlasPath);
-            Assert.IsNotNull(atlas, ".spriteatlas should be generated");
+            Assert.IsTrue(atlas != null, ".spriteatlas should be generated");
         }
 
         private static void EnsureFolder(string relPath)

package/Tests/Editor/Sprites/SpriteCropperAdditionalTests.cs

@@ -36,7 +36,7 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Sprites
             AssetDatabase.Refresh();
 
             TextureImporter imp = AssetImporter.GetAtPath(src) as TextureImporter;
-            Assert.IsNotNull(imp);
+            Assert.IsTrue(imp != null);
             imp.textureType = TextureImporterType.Sprite;
             imp.spriteImportMode = SpriteImportMode.Single;
             imp.isReadable = true;
@@ -61,13 +61,13 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Sprites
 
             string dst = (Root + "/Cropped_pad_src.png").Replace('\\', '/');
             Texture2D tex = AssetDatabase.LoadAssetAtPath<Texture2D>(dst);
-            Assert.IsNotNull(tex);
+            Assert.IsTrue(tex != null);
             // Expected size: (10 + 2 + 1) x (10 + 3 + 0) = 13x13
             Assert.That(tex.width, Is.EqualTo(13));
             Assert.That(tex.height, Is.EqualTo(13));
 
             TextureImporter newImp = AssetImporter.GetAtPath(dst) as TextureImporter;
-            Assert.IsNotNull(newImp);
+            Assert.IsTrue(newImp != null);
             Vector2 pivot = newImp.spritePivot;
             // Expected pivot in pixels = (10-3, 10-2) = (7,8) → normalized (7/13, 8/13)
             Assert.That(pivot.x, Is.InRange(7f / 13f - 1e-3f, 7f / 13f + 1e-3f));
@@ -83,7 +83,7 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Sprites
             AssetDatabase.Refresh();
 
             TextureImporter imp = AssetImporter.GetAtPath(src) as TextureImporter;
-            Assert.IsNotNull(imp);
+            Assert.IsTrue(imp != null);
             imp.textureType = TextureImporterType.Sprite;
             imp.spriteImportMode = SpriteImportMode.Single;
             imp.isReadable = true;
@@ -117,7 +117,7 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Sprites
             AssetDatabase.Refresh();
 
             TextureImporter imp = AssetImporter.GetAtPath(src) as TextureImporter;
-            Assert.IsNotNull(imp);
+            Assert.IsTrue(imp != null);
             imp.textureType = TextureImporterType.Sprite;
             imp.spriteImportMode = SpriteImportMode.Single;
             imp.isReadable = false; // start unreadable
@@ -137,12 +137,12 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Sprites
 
             // Original should be restored to unreadable
             imp = AssetImporter.GetAtPath(src) as TextureImporter;
-            Assert.IsNotNull(imp);
+            Assert.IsTrue(imp != null);
             Assert.That(imp.isReadable, Is.False);
 
             string dst = (Root + "/Cropped_readable_toggle.png").Replace('\\', '/');
             TextureImporter newImp = AssetImporter.GetAtPath(dst) as TextureImporter;
-            Assert.IsNotNull(newImp);
+            Assert.IsTrue(newImp != null);
             Assert.That(
                 newImp.isReadable,
                 Is.False,
@@ -165,7 +165,7 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Sprites
 
             string dst2 = (Root + "/Cropped_readable_toggle.png").Replace('\\', '/');
             newImp = AssetImporter.GetAtPath(dst2) as TextureImporter;
-            Assert.IsNotNull(newImp);
+            Assert.IsTrue(newImp != null);
             Assert.That(newImp.isReadable, Is.True);
         }
 
@@ -194,12 +194,12 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Sprites
             AssetDatabase.Refresh();
             string dst = (Root + "/Cropped_all_transparent.png").Replace('\\', '/');
             Texture2D tex = AssetDatabase.LoadAssetAtPath<Texture2D>(dst);
-            Assert.IsNotNull(tex);
+            Assert.IsTrue(tex != null);
             Assert.That(tex.width, Is.EqualTo(1));
             Assert.That(tex.height, Is.EqualTo(1));
 
             TextureImporter newImp = AssetImporter.GetAtPath(dst) as TextureImporter;
-            Assert.IsNotNull(newImp);
+            Assert.IsTrue(newImp != null);
             Vector2 pivot = newImp.spritePivot;
             Assert.That(pivot.x, Is.InRange(0.49f, 0.51f));
             Assert.That(pivot.y, Is.InRange(0.49f, 0.51f));
@@ -213,7 +213,7 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Sprites
             AssetDatabase.Refresh();
 
             TextureImporter imp = AssetImporter.GetAtPath(src) as TextureImporter;
-            Assert.IsNotNull(imp);
+            Assert.IsTrue(imp != null);
             imp.textureType = TextureImporterType.Sprite;
             imp.spriteImportMode = SpriteImportMode.Multiple;
             imp.SaveAndReimport();
@@ -232,7 +232,7 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Sprites
             string dst = (Root + "/Cropped_multi.png").Replace('\\', '/');
             Assert.That(File.Exists(RelToFull(dst)), Is.False);
             Texture2D tex = AssetDatabase.LoadAssetAtPath<Texture2D>(src);
-            Assert.IsNotNull(tex);
+            Assert.IsTrue(tex != null);
             Assert.That(tex.width, Is.EqualTo(16));
             Assert.That(tex.height, Is.EqualTo(16));
         }

package/Tests/Editor/Sprites/SpriteCropperTests.cs

@@ -36,7 +36,7 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Sprites
 
             // Ensure sprite importer single + readable
             TextureImporter imp = AssetImporter.GetAtPath(src) as TextureImporter;
-            Assert.IsNotNull(imp);
+            Assert.IsTrue(imp != null);
             imp.textureType = TextureImporterType.Sprite;
             imp.spriteImportMode = SpriteImportMode.Single;
             imp.spritePivot = new Vector2(0.5f, 0.5f); // center
@@ -45,9 +45,9 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Sprites
 
             SpriteCropper window = Track(ScriptableObject.CreateInstance<SpriteCropper>());
             window._overwriteOriginals = true;
-            window._inputDirectories = new System.Collections.Generic.List<UnityEngine.Object>
+            window._inputDirectories = new System.Collections.Generic.List<Object>
             {
-                AssetDatabase.LoadAssetAtPath<UnityEngine.Object>(Root),
+                AssetDatabase.LoadAssetAtPath<Object>(Root),
             };
             window.FindFilesToProcess();
             window.ProcessFoundSprites();
@@ -56,13 +56,13 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Sprites
 
             // Source should be overwritten and cropped to 10x10
             Texture2D tex = AssetDatabase.LoadAssetAtPath<Texture2D>(src);
-            Assert.IsNotNull(tex);
+            Assert.IsTrue(tex != null);
             Assert.That(tex.width, Is.EqualTo(10));
             Assert.That(tex.height, Is.EqualTo(10));
 
             // Pivot should remain effectively center after crop
             imp = AssetImporter.GetAtPath(src) as TextureImporter;
-            Assert.IsNotNull(imp);
+            Assert.IsTrue(imp != null);
             Assert.That(imp.spriteImportMode, Is.EqualTo(SpriteImportMode.Single));
             Vector2 pivot = imp.spritePivot;
             Assert.That(pivot.x, Is.InRange(0.49f, 0.51f));
@@ -86,10 +86,10 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Sprites
 
             SpriteCropper window = Track(ScriptableObject.CreateInstance<SpriteCropper>());
             window._overwriteOriginals = false;
-            window._outputDirectory = AssetDatabase.LoadAssetAtPath<UnityEngine.Object>(outDir);
-            window._inputDirectories = new System.Collections.Generic.List<UnityEngine.Object>
+            window._outputDirectory = AssetDatabase.LoadAssetAtPath<Object>(outDir);
+            window._inputDirectories = new System.Collections.Generic.List<Object>
             {
-                AssetDatabase.LoadAssetAtPath<UnityEngine.Object>(Root),
+                AssetDatabase.LoadAssetAtPath<Object>(Root),
             };
             window.FindFilesToProcess();
             window.ProcessFoundSprites();
@@ -100,7 +100,7 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Sprites
             Assert.That(File.Exists(RelToFull(dst)), Is.True, "Cropped output should exist");
 
             Texture2D tex = AssetDatabase.LoadAssetAtPath<Texture2D>(dst);
-            Assert.IsNotNull(tex);
+            Assert.IsTrue(tex != null);
             Assert.That(tex.width, Is.EqualTo(4));
             Assert.That(tex.height, Is.EqualTo(4));
         }

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 Texture2D(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

@@ -40,7 +40,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 +54,7 @@ namespace WallstopStudios.UnityHelpers.Tests.Editor.Utils
             {
                 SceneManager.SetActiveScene(scene);
             }
+
             _trackedScenes.Add(scene);
             return scene;
         }
@@ -102,6 +102,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 +191,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 { }