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

package/Tests/Editor/Integrations/Zenject/WallstopStudios.UnityHelpers.Tests.Editor.Zenject.asmdef

@@ -6,13 +6,14 @@
     "UnityEngine.TestRunner",
     "WallstopStudios.UnityHelpers",
     "WallstopStudios.UnityHelpers.Integration.Zenject",
-    "WallstopStudios.UnityHelpers.Tests.Editor"
+    "WallstopStudios.UnityHelpers.Tests.Editor",
+    "Zenject"
   ],
   "includePlatforms": ["Editor"],
   "excludePlatforms": [],
   "allowUnsafeCode": false,
   "overrideReferences": true,
-  "precompiledReferences": ["nunit.framework.dll"],
+  "precompiledReferences": ["nunit.framework.dll", "Zenject-usage.dll"],
   "autoReferenced": false,
   "defineConstraints": ["UNITY_INCLUDE_TESTS", "ZENJECT_PRESENT"],
   "versionDefines": [

package/Tests/Editor/Integrations/Zenject/ZenjectRelationalHelpersTests.cs

@@ -0,0 +1,127 @@
+#if ZENJECT_PRESENT
+namespace WallstopStudios.UnityHelpers.Tests.Integrations.Zenject
+{
+    using global::Zenject;
+    using NUnit.Framework;
+    using UnityEngine;
+    using WallstopStudios.UnityHelpers.Core.Attributes;
+    using WallstopStudios.UnityHelpers.Integrations.Zenject;
+    using WallstopStudios.UnityHelpers.Tests.Editor.Utils;
+
+    public sealed class ZenjectRelationalHelpersTests : CommonTestBase
+    {
+        private sealed class TestComponent : MonoBehaviour
+        {
+            [ParentComponent(OnlyAncestors = true)]
+            public Rigidbody parentBody;
+
+            [ChildComponent(OnlyDescendants = true)]
+            public CapsuleCollider childCollider;
+        }
+
+        [Test]
+        public void InjectWithRelationsAssignsFields()
+        {
+            DiContainer container = new();
+
+            // Build hierarchy: Parent(Rigidbody) -> Middle(TestComponent) -> Child(CapsuleCollider)
+            GameObject parent = NewGameObject("Root");
+            parent.AddComponent<Rigidbody>();
+            GameObject middle = NewGameObject("Middle");
+            middle.transform.SetParent(parent.transform);
+            TestComponent comp = middle.AddComponent<TestComponent>();
+            GameObject child = NewGameObject("Child");
+            child.transform.SetParent(middle.transform);
+            child.AddComponent<CapsuleCollider>();
+
+            TestComponent result = container.InjectWithRelations(comp);
+
+            Assert.That(result, Is.SameAs(comp));
+            Assert.IsTrue(comp.parentBody != null);
+        }
+
+        [Test]
+        public void InjectGameObjectWithRelationsAssignsHierarchy()
+        {
+            DiContainer container = new();
+
+            GameObject root = NewGameObject("Root");
+            root.AddComponent<Rigidbody>();
+            GameObject middle = NewGameObject("Middle");
+            middle.transform.SetParent(root.transform);
+            TestComponent comp = middle.AddComponent<TestComponent>();
+            GameObject child = NewGameObject("Child");
+            child.transform.SetParent(middle.transform);
+            child.AddComponent<CapsuleCollider>();
+
+            container.InjectGameObjectWithRelations(root);
+
+            Assert.IsTrue(comp.parentBody != null);
+            Assert.IsTrue(comp.childCollider != null);
+        }
+
+        [Test]
+        public void InstantiateGameObjectWithRelationsAssignsHierarchy()
+        {
+            DiContainer container = new();
+
+            GameObject prefab = NewGameObject("PrefabRoot");
+            prefab.AddComponent<Rigidbody>();
+            GameObject mid = NewGameObject("PrefabMiddle");
+            mid.transform.SetParent(prefab.transform);
+            _ = mid.AddComponent<TestComponent>();
+            GameObject child = NewGameObject("PrefabChild");
+            child.transform.SetParent(mid.transform);
+            child.AddComponent<CapsuleCollider>();
+
+            GameObject instance = container.InstantiateGameObjectWithRelations(prefab);
+            TestComponent comp = instance.GetComponentInChildren<TestComponent>(true);
+
+            Assert.IsTrue(comp != null);
+            Assert.IsTrue(comp.parentBody != null);
+            Assert.IsTrue(comp.childCollider != null);
+        }
+
+        [Test]
+        public void RelationalMemoryPoolAssignsOnSpawn()
+        {
+            // Create a pool and inject a container into the private field using reflection
+            RelationalMemoryPool<TestComponent> pool = new();
+            DiContainer container = new();
+
+            pool._container = container;
+
+            GameObject go = NewGameObject("PooledRoot");
+            go.AddComponent<Rigidbody>();
+            GameObject middle = NewGameObject("PooledMiddle");
+            middle.transform.SetParent(go.transform);
+            TestComponent comp = middle.AddComponent<TestComponent>();
+            GameObject child = NewGameObject("PooledChild");
+            child.transform.SetParent(middle.transform);
+            child.AddComponent<CapsuleCollider>();
+
+            // Call OnSpawned indirectly via protected method using a small helper
+            PoolHarness harness = new(pool);
+            harness.InvokeOnSpawned(comp);
+
+            Assert.IsTrue(comp.parentBody != null);
+            Assert.IsTrue(comp.childCollider != null);
+        }
+
+        private sealed class PoolHarness
+        {
+            private readonly RelationalMemoryPool<TestComponent> _pool;
+
+            public PoolHarness(RelationalMemoryPool<TestComponent> pool)
+            {
+                _pool = pool;
+            }
+
+            public void InvokeOnSpawned(TestComponent item)
+            {
+                _pool.InternalOnSpawned(item);
+            }
+        }
+    }
+}
+#endif

package/Tests/Editor/Integrations/Zenject/ZenjectRelationalHelpersTests.cs.meta

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

package/Tests/Editor/Integrations/Zenject/ZenjectRelationalInitializerTests.cs

@@ -33,20 +33,19 @@ namespace WallstopStudios.UnityHelpers.Tests.Integrations.Zenject
 
             AttributeMetadataCache cache = CreateScriptableObject<AttributeMetadataCache>();
 #if UNITY_EDITOR
-            AttributeMetadataCache.RelationalTypeMetadata relationalMetadata =
-                new AttributeMetadataCache.RelationalTypeMetadata(
-                    typeof(Consumer).AssemblyQualifiedName,
-                    new[]
-                    {
-                        new AttributeMetadataCache.RelationalFieldMetadata(
-                            "_spriteRenderer",
-                            AttributeMetadataCache.RelationalAttributeKind.Sibling,
-                            AttributeMetadataCache.FieldKind.Single,
-                            typeof(SpriteRenderer).AssemblyQualifiedName,
-                            false
-                        ),
-                    }
-                );
+            AttributeMetadataCache.RelationalTypeMetadata relationalMetadata = new(
+                typeof(Consumer).AssemblyQualifiedName,
+                new[]
+                {
+                    new AttributeMetadataCache.RelationalFieldMetadata(
+                        "_spriteRenderer",
+                        AttributeMetadataCache.RelationalAttributeKind.Sibling,
+                        AttributeMetadataCache.FieldKind.Single,
+                        typeof(SpriteRenderer).AssemblyQualifiedName,
+                        false
+                    ),
+                }
+            );
 
             cache.SetMetadata(
                 System.Array.Empty<string>(),
@@ -54,22 +53,25 @@ namespace WallstopStudios.UnityHelpers.Tests.Integrations.Zenject
                 new[] { relationalMetadata }
             );
             cache.ForceRebuildForTests();
+            yield return null;
 #endif
 
-            RelationalComponentAssigner assigner = new RelationalComponentAssigner(cache);
-            RelationalComponentSceneInitializer initializer =
-                new RelationalComponentSceneInitializer(
-                    assigner,
-                    cache,
-                    RelationalSceneAssignmentOptions.Default
-                );
+            RelationalComponentAssigner assigner = new(cache);
+            RelationalComponentSceneInitializer initializer = new(
+                assigner,
+                cache,
+                RelationalSceneAssignmentOptions.Default
+            );
 
             initializer.Initialize();
 
             yield return null;
 
-            Assert.NotNull(consumer);
-            Assert.NotNull(consumer.SR, "Relational field should be assigned by initializer");
+            Assert.IsTrue(consumer != null);
+            Assert.IsTrue(
+                consumer.SR != null,
+                "Relational field should be assigned by initializer"
+            );
         }
     }
 }

package/Tests/Editor/PersistentDirectorySettingsTests.cs

@@ -0,0 +1,58 @@
+namespace WallstopStudios.UnityHelpers.Tests.Editor
+{
+#if UNITY_EDITOR
+    using NUnit.Framework;
+    using UnityEngine;
+    using WallstopStudios.UnityHelpers.Editor;
+
+    public sealed class PersistentDirectorySettingsTests
+    {
+        [Test]
+        public void GetPathsSortsByCountThenLastUsed()
+        {
+            PersistentDirectorySettings settings =
+                ScriptableObject.CreateInstance<PersistentDirectorySettings>();
+
+            string tool = "TestTool";
+            string ctx = "Context";
+
+            // B: 1 time, A: 3 times, C: 2 times
+            settings.RecordPath(tool, ctx, "Assets/A");
+            settings.RecordPath(tool, ctx, "Assets/A");
+            settings.RecordPath(tool, ctx, "Assets/A");
+
+            settings.RecordPath(tool, ctx, "Assets/C");
+            settings.RecordPath(tool, ctx, "Assets/C");
+
+            settings.RecordPath(tool, ctx, "Assets/B");
+
+            DirectoryUsageData[] paths = settings.GetPaths(tool, ctx);
+            Assert.IsNotNull(paths);
+            Assert.GreaterOrEqual(paths.Length, 3);
+            Assert.AreEqual("Assets/A", paths[0].path);
+            Assert.AreEqual("Assets/C", paths[1].path);
+            Assert.AreEqual("Assets/B", paths[2].path);
+        }
+
+        [Test]
+        public void GetPathsTopOnlyRespectsLimit()
+        {
+            PersistentDirectorySettings settings =
+                ScriptableObject.CreateInstance<PersistentDirectorySettings>();
+
+            string tool = "TopOnlyTool";
+            string ctx = "Context";
+
+            settings.RecordPath(tool, ctx, "Assets/One");
+            settings.RecordPath(tool, ctx, "Assets/One");
+            settings.RecordPath(tool, ctx, "Assets/Two");
+            settings.RecordPath(tool, ctx, "Assets/Three");
+
+            DirectoryUsageData[] top2 = settings.GetPaths(tool, ctx, topOnly: true, topN: 2);
+            Assert.IsNotNull(top2);
+            Assert.AreEqual(2, top2.Length);
+            Assert.AreEqual("Assets/One", top2[0].path);
+        }
+    }
+#endif
+}

package/Tests/Editor/PersistentDirectorySettingsTests.cs.meta

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

package/Tests/Editor/PrefabCheckerReportTests.cs

@@ -0,0 +1,32 @@
+namespace WallstopStudios.UnityHelpers.Tests.Editor
+{
+#if UNITY_EDITOR
+    using System;
+    using System.Collections.Generic;
+    using NUnit.Framework;
+    using WallstopStudios.UnityHelpers.Editor;
+
+    public sealed class PrefabCheckerReportTests
+    {
+        [Test]
+        public void ScanReportConstructorCopiesFolders()
+        {
+            var report = new PrefabChecker.ScanReport(new[] { "A", "B" });
+            string[] folders = report.folders;
+            CollectionAssert.AreEqual(new[] { "A", "B" }, folders);
+        }
+
+        [Test]
+        public void ScanReportAddCopiesMessages()
+        {
+            var report = new PrefabChecker.ScanReport(Array.Empty<string>());
+            report.Add("path.prefab", new List<string> { "m1", "m2" });
+            Assert.AreEqual(1, report.items.Count);
+            var first = report.items[0];
+            Assert.AreEqual("path.prefab", first.path);
+            string[] messages = first.messages;
+            CollectionAssert.AreEqual(new[] { "m1", "m2" }, messages);
+        }
+    }
+#endif
+}

package/Tests/Editor/PrefabCheckerReportTests.cs.meta

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

package/Tests/Editor/Sprites/AnimationCopierFilterTests.cs

@@ -0,0 +1,63 @@
+namespace WallstopStudios.UnityHelpers.Tests.Editor.Sprites
+{
+#if UNITY_EDITOR
+    using System.Collections.Generic;
+    using System.Linq;
+    using NUnit.Framework;
+    using UnityEngine;
+    using WallstopStudios.UnityHelpers.Editor.Sprites;
+
+    public sealed class AnimationCopierFilterTests
+    {
+        private static AnimationCopierWindow.AnimationFileInfo NewFileInfo(string name)
+        {
+            return new AnimationCopierWindow.AnimationFileInfo { FileName = name };
+        }
+
+        [Test]
+        public void SortsAscendingAndDescending()
+        {
+            AnimationCopierWindow wnd = ScriptableObject.CreateInstance<AnimationCopierWindow>();
+            var a = NewFileInfo("zeta.anim");
+            var b = NewFileInfo("alpha.anim");
+            var c = NewFileInfo("beta.anim");
+            var items = new List<AnimationCopierWindow.AnimationFileInfo> { a, b, c };
+
+            wnd._filterText = string.Empty;
+            wnd._filterUseRegex = false;
+            wnd._sortAscending = true;
+            var asc = wnd.ApplyFilterAndSort(items).ToList();
+            string[] ascNames = asc.Select(o => o.FileName).ToArray();
+            CollectionAssert.AreEqual(new[] { "alpha.anim", "beta.anim", "zeta.anim" }, ascNames);
+
+            wnd._sortAscending = false;
+            var desc = wnd.ApplyFilterAndSort(items).ToList();
+            string[] descNames = desc.Select(o => o.FileName).ToArray();
+            CollectionAssert.AreEqual(new[] { "zeta.anim", "beta.anim", "alpha.anim" }, descNames);
+        }
+
+        [Test]
+        public void FiltersBySubstringAndRegex()
+        {
+            AnimationCopierWindow wnd = ScriptableObject.CreateInstance<AnimationCopierWindow>();
+            var a = NewFileInfo("walk.anim");
+            var b = NewFileInfo("attack.anim");
+            var c = NewFileInfo("idle.anim");
+            var items = new List<AnimationCopierWindow.AnimationFileInfo> { a, b, c };
+
+            wnd._filterText = "ta";
+            wnd._filterUseRegex = false;
+            wnd._sortAscending = true;
+            var sub = wnd.ApplyFilterAndSort(items).ToList();
+            string[] subNames = sub.Select(o => o.FileName).ToArray();
+            CollectionAssert.AreEquivalent(new[] { "attack.anim" }, subNames);
+
+            wnd._filterText = "^i";
+            wnd._filterUseRegex = true;
+            var rx = wnd.ApplyFilterAndSort(items).ToList();
+            string[] rxNames = rx.Select(o => o.FileName).ToArray();
+            CollectionAssert.AreEquivalent(new[] { "idle.anim" }, rxNames);
+        }
+    }
+#endif
+}

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

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

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();
+            Texture2D tex = new(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));
         }