fix: tests for animator optimizer is executed on 2019

anatawa12 · Mar 21, 2024 · 329d677 · 329d677
1 parent f7d415c
commit 329d677
Show file tree

Hide file tree

Showing 46 changed files with 274 additions and 8 deletions.
diff --git a/Editor/asssembly-info.cs b/Editor/asssembly-info.cs
@@ -1,3 +1,4 @@
 using System.Runtime.CompilerServices;
 
-[assembly:InternalsVisibleTo("com.anatawa12.avatar-optimizer.test")]
+[assembly:InternalsVisibleTo("com.anatawa12.avatar-optimizer.test.basic")]
+[assembly:InternalsVisibleTo("com.anatawa12.avatar-optimizer.test.animator-parser")]
diff --git a/Internal/PrefabSafeSet/Runtime/assembly-info.cs b/Internal/PrefabSafeSet/Runtime/assembly-info.cs
@@ -1,4 +1,4 @@
 using System.Runtime.CompilerServices;
 
 [assembly:InternalsVisibleTo("com.anatawa12.avatar-optimizer.internal.prefab-safe-set.editor")]
-[assembly:InternalsVisibleTo("com.anatawa12.avatar-optimizer.test")]
+[assembly:InternalsVisibleTo("com.anatawa12.avatar-optimizer.test.prefab-safe-set")]
diff --git a/Runtime/assembly-info.cs b/Runtime/assembly-info.cs
@@ -2,4 +2,4 @@
 
 [assembly:InternalsVisibleTo("com.anatawa12.avatar-optimizer.editor")]
 [assembly:InternalsVisibleTo("com.anatawa12.avatar-optimizer.internal.trace-and-optimize-base")]
-[assembly:InternalsVisibleTo("com.anatawa12.avatar-optimizer.test")]
+[assembly:InternalsVisibleTo("com.anatawa12.avatar-optimizer.test.basic")]
diff --git a/Test~/AnimatorOptimizer/com.anatawa12.avatar-optimizer.test.animator-optimizer.asmdef b/Test~/AnimatorOptimizer/com.anatawa12.avatar-optimizer.test.animator-optimizer.asmdef
@@ -0,0 +1,24 @@
+{
+    "name": "com.anatawa12.avatar-optimizer.test.animator-optimizer",
+    "rootNamespace": "",
+    "references": [
+        "com.anatawa12.avatar-optimizer.test.utils",
+        "com.anatawa12.avatar-optimizer.internal.animator-optimizer",
+        "com.anatawa12.avatar-optimizer.internal.trace-and-optimize-base",
+        "UnityEngine.TestRunner",
+        "nadena.dev.ndmf"
+    ],
+    "includePlatforms": [
+        "Editor"
+    ],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": true,
+    "precompiledReferences": [],
+    "autoReferenced": false,
+    "defineConstraints": [
+        "UNITY_2021_3_OR_NEWER"
+    ],
+    "versionDefines": [],
+    "noEngineReferences": false
+}
diff --git a/Test~/AnimatorOptimizer/com.anatawa12.avatar-optimizer.test.animator-optimizer.asmdef.meta b/Test~/AnimatorOptimizer/com.anatawa12.avatar-optimizer.test.animator-optimizer.asmdef.meta
diff --git a/Test~/AnimatorParser/com.anatawa12.avatar-optimizer.test.animator-parser.asmdef b/Test~/AnimatorParser/com.anatawa12.avatar-optimizer.test.animator-parser.asmdef
@@ -0,0 +1,55 @@
+{
+    "name": "com.anatawa12.avatar-optimizer.test.animator-parser",
+    "rootNamespace": "",
+    "references": [
+        "VRC.SDK3A",
+        "VRC.SDKBase",
+        "com.anatawa12.avatar-optimizer.test.runtime",
+        "com.anatawa12.avatar-optimizer.test.utils",
+        "com.anatawa12.avatar-optimizer.editor",
+        "com.anatawa12.avatar-optimizer.runtime",
+        "com.anatawa12.avatar-optimizer.internal.prefab-safe-set",
+        "com.anatawa12.avatar-optimizer.internal.prefab-safe-set.editor",
+        "com.anatawa12.avatar-optimizer.internal.animator-optimizer",
+        "com.anatawa12.avatar-optimizer.internal.meshinfo2",
+        "com.anatawa12.avatar-optimizer.internal.trace-and-optimize-base",
+        "com.anatawa12.avatar-optimizer.internal.utils",
+        "com.anatawa12.avatar-optimizer.api.editor",
+        "UnityEngine.TestRunner",
+        "UnityEditor.TestRunner",
+        "nadena.dev.ndmf"
+    ],
+    "includePlatforms": [
+        "Editor"
+    ],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": true,
+    "precompiledReferences": [
+        "VRC.SDK3.Dynamics.PhysBone.dll",
+        "VRC.Dynamics.dll",
+        "VRCSDK3A.dll",
+        "VRCSDKBase.dll",
+        "System.Memory.dll"
+    ],
+    "autoReferenced": false,
+    "defineConstraints": [],
+    "versionDefines": [
+        {
+            "name": "com.vrchat.avatars",
+            "expression": "",
+            "define": "AAO_VRCSDK3_AVATARS"
+        },
+        {
+            "name": "com.vrmc.univrm",
+            "expression": "",
+            "define": "AAO_VRM0"
+        },
+        {
+            "name": "com.vrmc.vrm",
+            "expression": "",
+            "define": "AAO_VRM1"
+        }
+    ],
+    "noEngineReferences": false
+}
diff --git a/Test~/AnimatorParser/com.anatawa12.avatar-optimizer.test.animator-parser.asmdef.meta b/Test~/AnimatorParser/com.anatawa12.avatar-optimizer.test.animator-parser.asmdef.meta
diff --git a/Test~/Basic.meta b/Test~/Basic.meta
diff --git a/Test~/ApplyObjectMappingTest.cs → Test~/Basic/ApplyObjectMappingTest.cs b/Test~/ApplyObjectMappingTest.cs → Test~/Basic/ApplyObjectMappingTest.cs
diff --git a/Test~/ApplyObjectMappingTest.cs.meta → Test~/Basic/ApplyObjectMappingTest.cs.meta b/Test~/ApplyObjectMappingTest.cs.meta → Test~/Basic/ApplyObjectMappingTest.cs.meta
diff --git a/Test~/BuildAssetBundle.cs → Test~/Basic/BuildAssetBundle.cs b/Test~/BuildAssetBundle.cs → Test~/Basic/BuildAssetBundle.cs
@@ -17,7 +17,7 @@ public void Build()
                 {
                     new AssetBundleBuild
                     {
-                        assetNames = new[] { TestUtils.GetAssetPath("Empty.prefab") },
+                        assetNames = new[] { TestUtils.GetAssetPath("Basic/Empty.prefab") },
                         assetBundleName = "asset.unity3d"
                     }
                 },

diff --git a/Test~/BuildAssetBundle.cs.meta → Test~/Basic/BuildAssetBundle.cs.meta b/Test~/BuildAssetBundle.cs.meta → Test~/Basic/BuildAssetBundle.cs.meta
diff --git a/Test~/ComponentSettingsTest.cs → Test~/Basic/ComponentSettingsTest.cs b/Test~/ComponentSettingsTest.cs → Test~/Basic/ComponentSettingsTest.cs
diff --git a/Test~/ComponentSettingsTest.cs.meta → Test~/Basic/ComponentSettingsTest.cs.meta b/Test~/ComponentSettingsTest.cs.meta → Test~/Basic/ComponentSettingsTest.cs.meta
diff --git a/Test~/ComponentWhitelistTest.cs → Test~/Basic/ComponentWhitelistTest.cs b/Test~/ComponentWhitelistTest.cs → Test~/Basic/ComponentWhitelistTest.cs
diff --git a/Test~/ComponentWhitelistTest.cs.meta → Test~/Basic/ComponentWhitelistTest.cs.meta b/Test~/ComponentWhitelistTest.cs.meta → Test~/Basic/ComponentWhitelistTest.cs.meta
diff --git a/Test~/Empty.prefab → Test~/Basic/Empty.prefab b/Test~/Empty.prefab → Test~/Basic/Empty.prefab
diff --git a/Test~/Empty.prefab.meta → Test~/Basic/Empty.prefab.meta b/Test~/Empty.prefab.meta → Test~/Basic/Empty.prefab.meta
diff --git a/Test~/EnumValues.cs → Test~/Basic/EnumValues.cs b/Test~/EnumValues.cs → Test~/Basic/EnumValues.cs
diff --git a/Test~/EnumValues.cs.meta → Test~/Basic/EnumValues.cs.meta b/Test~/EnumValues.cs.meta → Test~/Basic/EnumValues.cs.meta
diff --git a/Test~/MergeBoneTest.cs → Test~/Basic/MergeBoneTest.cs b/Test~/MergeBoneTest.cs → Test~/Basic/MergeBoneTest.cs
diff --git a/Test~/MergeBoneTest.cs.meta → Test~/Basic/MergeBoneTest.cs.meta b/Test~/MergeBoneTest.cs.meta → Test~/Basic/MergeBoneTest.cs.meta
diff --git a/Test~/MergePhysBoneTest.cs → Test~/Basic/MergePhysBoneTest.cs b/Test~/MergePhysBoneTest.cs → Test~/Basic/MergePhysBoneTest.cs
diff --git a/Test~/MergePhysBoneTest.cs.meta → Test~/Basic/MergePhysBoneTest.cs.meta b/Test~/MergePhysBoneTest.cs.meta → Test~/Basic/MergePhysBoneTest.cs.meta
diff --git a/Test~/ObjectMappingTest.cs → Test~/Basic/ObjectMappingTest.cs b/Test~/ObjectMappingTest.cs → Test~/Basic/ObjectMappingTest.cs
diff --git a/Test~/ObjectMappingTest.cs.meta → Test~/Basic/ObjectMappingTest.cs.meta b/Test~/ObjectMappingTest.cs.meta → Test~/Basic/ObjectMappingTest.cs.meta
diff --git a/Test~/PublicApiCheck.cs → Test~/Basic/PublicApiCheck.cs b/Test~/PublicApiCheck.cs → Test~/Basic/PublicApiCheck.cs
diff --git a/Test~/PublicApiCheck.cs.meta → Test~/Basic/PublicApiCheck.cs.meta b/Test~/PublicApiCheck.cs.meta → Test~/Basic/PublicApiCheck.cs.meta
diff --git a/Test~/RunTest.cs → Test~/Basic/RunTest.cs b/Test~/RunTest.cs → Test~/Basic/RunTest.cs
diff --git a/Test~/RunTest.cs.meta → Test~/Basic/RunTest.cs.meta b/Test~/RunTest.cs.meta → Test~/Basic/RunTest.cs.meta
diff --git a/Test~/UtilsTest.cs → Test~/Basic/UtilsTest.cs b/Test~/UtilsTest.cs → Test~/Basic/UtilsTest.cs
diff --git a/Test~/UtilsTest.cs.meta → Test~/Basic/UtilsTest.cs.meta b/Test~/UtilsTest.cs.meta → Test~/Basic/UtilsTest.cs.meta
diff --git a/Test~/Basic/com.anatawa12.avatar-optimizer.test.basic.asmdef b/Test~/Basic/com.anatawa12.avatar-optimizer.test.basic.asmdef
@@ -0,0 +1,55 @@
+{
+    "name": "com.anatawa12.avatar-optimizer.test.basic",
+    "rootNamespace": "",
+    "references": [
+        "VRC.SDK3A",
+        "VRC.SDKBase",
+        "com.anatawa12.avatar-optimizer.test.runtime",
+        "com.anatawa12.avatar-optimizer.test.utils",
+        "com.anatawa12.avatar-optimizer.editor",
+        "com.anatawa12.avatar-optimizer.runtime",
+        "com.anatawa12.avatar-optimizer.internal.prefab-safe-set",
+        "com.anatawa12.avatar-optimizer.internal.prefab-safe-set.editor",
+        "com.anatawa12.avatar-optimizer.internal.animator-optimizer",
+        "com.anatawa12.avatar-optimizer.internal.meshinfo2",
+        "com.anatawa12.avatar-optimizer.internal.trace-and-optimize-base",
+        "com.anatawa12.avatar-optimizer.internal.utils",
+        "com.anatawa12.avatar-optimizer.api.editor",
+        "UnityEngine.TestRunner",
+        "UnityEditor.TestRunner",
+        "nadena.dev.ndmf"
+    ],
+    "includePlatforms": [
+        "Editor"
+    ],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": true,
+    "precompiledReferences": [
+        "VRC.SDK3.Dynamics.PhysBone.dll",
+        "VRC.Dynamics.dll",
+        "VRCSDK3A.dll",
+        "VRCSDKBase.dll",
+        "System.Memory.dll"
+    ],
+    "autoReferenced": false,
+    "defineConstraints": [],
+    "versionDefines": [
+        {
+            "name": "com.vrchat.avatars",
+            "expression": "",
+            "define": "AAO_VRCSDK3_AVATARS"
+        },
+        {
+            "name": "com.vrmc.univrm",
+            "expression": "",
+            "define": "AAO_VRM0"
+        },
+        {
+            "name": "com.vrmc.vrm",
+            "expression": "",
+            "define": "AAO_VRM1"
+        }
+    ],
+    "noEngineReferences": false
+}
diff --git a/...atawa12.avatar-optimizer.test.asmdef.meta → ...2.avatar-optimizer.test.basic.asmdef.meta b/...atawa12.avatar-optimizer.test.asmdef.meta → ...2.avatar-optimizer.test.basic.asmdef.meta
diff --git a/Test~/Basic/csc.rsp b/Test~/Basic/csc.rsp
@@ -0,0 +1 @@
+../../Editor/csc.rsp
diff --git a/Test~/csc.rsp.meta → Test~/Basic/csc.rsp.meta b/Test~/csc.rsp.meta → Test~/Basic/csc.rsp.meta
diff --git a/Test~/MeshInfo2/com.anatawa12.avatar-optimizer.test.basic.asmdef b/Test~/MeshInfo2/com.anatawa12.avatar-optimizer.test.basic.asmdef
@@ -0,0 +1,55 @@
+{
+    "name": "com.anatawa12.avatar-optimizer.test.meshinfo2",
+    "rootNamespace": "",
+    "references": [
+        "VRC.SDK3A",
+        "VRC.SDKBase",
+        "com.anatawa12.avatar-optimizer.test.runtime",
+        "com.anatawa12.avatar-optimizer.test.utils",
+        "com.anatawa12.avatar-optimizer.editor",
+        "com.anatawa12.avatar-optimizer.runtime",
+        "com.anatawa12.avatar-optimizer.internal.prefab-safe-set",
+        "com.anatawa12.avatar-optimizer.internal.prefab-safe-set.editor",
+        "com.anatawa12.avatar-optimizer.internal.animator-optimizer",
+        "com.anatawa12.avatar-optimizer.internal.meshinfo2",
+        "com.anatawa12.avatar-optimizer.internal.trace-and-optimize-base",
+        "com.anatawa12.avatar-optimizer.internal.utils",
+        "com.anatawa12.avatar-optimizer.api.editor",
+        "UnityEngine.TestRunner",
+        "UnityEditor.TestRunner",
+        "nadena.dev.ndmf"
+    ],
+    "includePlatforms": [
+        "Editor"
+    ],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": true,
+    "precompiledReferences": [
+        "VRC.SDK3.Dynamics.PhysBone.dll",
+        "VRC.Dynamics.dll",
+        "VRCSDK3A.dll",
+        "VRCSDKBase.dll",
+        "System.Memory.dll"
+    ],
+    "autoReferenced": false,
+    "defineConstraints": [],
+    "versionDefines": [
+        {
+            "name": "com.vrchat.avatars",
+            "expression": "",
+            "define": "AAO_VRCSDK3_AVATARS"
+        },
+        {
+            "name": "com.vrmc.univrm",
+            "expression": "",
+            "define": "AAO_VRM0"
+        },
+        {
+            "name": "com.vrmc.vrm",
+            "expression": "",
+            "define": "AAO_VRM1"
+        }
+    ],
+    "noEngineReferences": false
+}
diff --git a/Test~/MeshInfo2/com.anatawa12.avatar-optimizer.test.basic.asmdef.meta b/Test~/MeshInfo2/com.anatawa12.avatar-optimizer.test.basic.asmdef.meta
diff --git a/Test~/PrefabSafeSet/com.anatawa12.avatar-optimizer.test.prefab-safe-set.asmdef b/Test~/PrefabSafeSet/com.anatawa12.avatar-optimizer.test.prefab-safe-set.asmdef
@@ -0,0 +1,55 @@
+{
+    "name": "com.anatawa12.avatar-optimizer.test.prefab-safe-set",
+    "rootNamespace": "",
+    "references": [
+        "VRC.SDK3A",
+        "VRC.SDKBase",
+        "com.anatawa12.avatar-optimizer.test.runtime",
+        "com.anatawa12.avatar-optimizer.test.utils",
+        "com.anatawa12.avatar-optimizer.editor",
+        "com.anatawa12.avatar-optimizer.runtime",
+        "com.anatawa12.avatar-optimizer.internal.prefab-safe-set",
+        "com.anatawa12.avatar-optimizer.internal.prefab-safe-set.editor",
+        "com.anatawa12.avatar-optimizer.internal.animator-optimizer",
+        "com.anatawa12.avatar-optimizer.internal.meshinfo2",
+        "com.anatawa12.avatar-optimizer.internal.trace-and-optimize-base",
+        "com.anatawa12.avatar-optimizer.internal.utils",
+        "com.anatawa12.avatar-optimizer.api.editor",
+        "UnityEngine.TestRunner",
+        "UnityEditor.TestRunner",
+        "nadena.dev.ndmf"
+    ],
+    "includePlatforms": [
+        "Editor"
+    ],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": true,
+    "precompiledReferences": [
+        "VRC.SDK3.Dynamics.PhysBone.dll",
+        "VRC.Dynamics.dll",
+        "VRCSDK3A.dll",
+        "VRCSDKBase.dll",
+        "System.Memory.dll"
+    ],
+    "autoReferenced": false,
+    "defineConstraints": [],
+    "versionDefines": [
+        {
+            "name": "com.vrchat.avatars",
+            "expression": "",
+            "define": "AAO_VRCSDK3_AVATARS"
+        },
+        {
+            "name": "com.vrmc.univrm",
+            "expression": "",
+            "define": "AAO_VRM0"
+        },
+        {
+            "name": "com.vrmc.vrm",
+            "expression": "",
+            "define": "AAO_VRM1"
+        }
+    ],
+    "noEngineReferences": false
+}
diff --git a/Test~/PrefabSafeSet/com.anatawa12.avatar-optimizer.test.prefab-safe-set.asmdef.meta b/Test~/PrefabSafeSet/com.anatawa12.avatar-optimizer.test.prefab-safe-set.asmdef.meta
diff --git a/Test~/Utils.meta b/Test~/Utils.meta
diff --git a/Test~/TestUtils.cs → Test~/Utils/TestUtils.cs b/Test~/TestUtils.cs → Test~/Utils/TestUtils.cs
@@ -4,7 +4,7 @@
 
 namespace Anatawa12.AvatarOptimizer.Test
 {
-    internal static class TestUtils
+    public static class TestUtils
     {
         public static GameObject NewAvatar(string name = null)
         {
@@ -20,7 +20,7 @@ public static GameObject NewAvatar(string name = null)
 
         public static string GetAssetPath(string testRelativePath)
         {
-            var path = AssetDatabase.GUIDToAssetPath("fc50cab76afb46348d98df4ce8d84e8b");
+            var path = AssetDatabase.GUIDToAssetPath("801b64144a3842adb8909fd2d209241a");
             var baseDir = path.Substring(0, path.LastIndexOf('/'));
             return $"{baseDir}/{testRelativePath}";
         }

diff --git a/Test~/TestUtils.cs.meta → Test~/Utils/TestUtils.cs.meta b/Test~/TestUtils.cs.meta → Test~/Utils/TestUtils.cs.meta
diff --git a/...om.anatawa12.avatar-optimizer.test.asmdef → ...tawa12.avatar-optimizer.test.utils.asmdef b/...om.anatawa12.avatar-optimizer.test.asmdef → ...tawa12.avatar-optimizer.test.utils.asmdef
@@ -1,5 +1,5 @@
 {
-    "name": "com.anatawa12.avatar-optimizer.test",
+    "name": "com.anatawa12.avatar-optimizer.test.utils",
     "rootNamespace": "",
     "references": [
         "VRC.SDK3A",

diff --git a/Test~/Utils/com.anatawa12.avatar-optimizer.test.utils.asmdef.meta b/Test~/Utils/com.anatawa12.avatar-optimizer.test.utils.asmdef.meta
diff --git a/Test~/csc.rsp b/Test~/csc.rsp