fixing unit test issues

bdunderscore · Sep 3, 2023 · 6c0753c · 6c0753c
1 parent 26ab00a
commit 6c0753c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Editor/Animation/AnimatorCombiner.cs b/Editor/Animation/AnimatorCombiner.cs
@@ -419,7 +419,7 @@ Dictionary<Object, Object> cloneMap
 
             cloneMap[original] = obj;
 
-            if (isSaved)
+            if (isSaved && _combined != null && EditorUtility.IsPersistent(_combined))
             {
                 AssetDatabase.AddObjectToAsset(obj, _combined);
             }

diff --git a/UnitTests~/TestBase.cs b/UnitTests~/TestBase.cs
@@ -23,7 +23,7 @@ public virtual void Setup()
             if (_scriptToDirectory == null)
             {
                 _scriptToDirectory = new Dictionary<System.Type, string>();
-                foreach (var guid in AssetDatabase.FindAssets("t:MonoScript", new string[] { "Assets/UnitTests" }))
+                foreach (var guid in AssetDatabase.FindAssets("t:MonoScript", new string[] { "Packages/nadena.dev.ndmf/UnitTests" }))
                 {
                     var path = AssetDatabase.GUIDToAssetPath(guid);
                     var obj = AssetDatabase.LoadAssetAtPath<MonoScript>(path);