improve test

Author: i-saint

Assets/FbxExporters/Editor/UnitTests/FbxAnimationTest.cs

@@ -90,6 +90,13 @@ public static IEnumerable SkinnedMeshTestCases {
                 yield return "Models/DefaultMale/Male_DyingHitFromBack_Blend_T3_Cut01_James.fbx";
             }
         }
+
+        public static IEnumerable BlendShapeTestCases {
+            get {
+                yield return "FbxExporters/Editor/UnitTests/Models/blendshape.fbx";
+                yield return "FbxExporters/Editor/UnitTests/Models/blendshape_with_skinning.fbx";
+            }
+        }
     }
 
     [TestFixture]

Assets/FbxExporters/Editor/UnitTests/ModelExporterTest.cs

@@ -690,69 +690,61 @@ public int Compare(Vector3 a, Vector3 b)
             }
         }
 
-        [Test]
-        public void TestBlendShapeExport()
+        [Test, TestCaseSource(typeof(AnimationTestDataClass), "BlendShapeTestCases")]
+        public void TestBlendShapeExport(string fbxPath)
         {
-            // TODO: find more practical test data
-            var fbxPaths = new string[]{
-                "FbxExporters/Editor/UnitTests/Models/blendshape.fbx",
-                "FbxExporters/Editor/UnitTests/Models/blendshape_with_skinning.fbx"
-            };
-            foreach(var fbxPath in fbxPaths)
+            // add fbx to scene
+            GameObject originalFbxObj = AssetDatabase.LoadMainAssetAtPath("Assets/" + fbxPath) as GameObject;
+            Assert.IsNotNull(originalFbxObj);
+            GameObject originalGO = GameObject.Instantiate(originalFbxObj);
+            Assert.IsTrue(originalGO);
+
+            // export fbx
+            // get GameObject
+            string filename = GetRandomFbxFilePath();
+            ModelExporter.ExportObject(filename, originalGO);
+            GameObject fbxObj = AssetDatabase.LoadMainAssetAtPath(filename) as GameObject;
+            Assert.IsTrue(fbxObj);
+
+            var originalSMR = originalGO.GetComponentInChildren<SkinnedMeshRenderer>();
+            var exportedSMR = fbxObj.GetComponentInChildren<SkinnedMeshRenderer>();
+            Assert.IsNotNull(originalSMR);
+            Assert.IsNotNull(exportedSMR);
+
+            var originalMesh = originalSMR.sharedMesh;
+            var exportedMesh = exportedSMR.sharedMesh;
+            Assert.IsNotNull(originalMesh);
+            Assert.IsNotNull(exportedMesh);
+
+            // compare blend shape data
+            Assert.AreNotEqual(originalMesh.blendShapeCount, 0);
+            Assert.AreEqual(originalMesh.blendShapeCount, exportedMesh.blendShapeCount);
             {
-                // add fbx to scene
-                GameObject originalFbxObj = AssetDatabase.LoadMainAssetAtPath("Assets/" + fbxPath) as GameObject;
-                Assert.IsNotNull(originalFbxObj);
-                GameObject originalGO = GameObject.Instantiate(originalFbxObj);
-                Assert.IsTrue(originalGO);
-
-                // export fbx
-                // get GameObject
-                string filename = GetRandomFbxFilePath();
-                ModelExporter.ExportObject(filename, originalGO);
-                GameObject fbxObj = AssetDatabase.LoadMainAssetAtPath(filename) as GameObject;
-                Assert.IsTrue(fbxObj);
-
-                var originalSMR = originalGO.GetComponentInChildren<SkinnedMeshRenderer>();
-                var exportedSMR = fbxObj.GetComponentInChildren<SkinnedMeshRenderer>();
-                Assert.IsNotNull(originalSMR);
-                Assert.IsNotNull(exportedSMR);
-
-                var originalMesh = originalSMR.sharedMesh;
-                var exportedMesh = exportedSMR.sharedMesh;
-                Assert.IsNotNull(originalMesh);
-                Assert.IsNotNull(exportedMesh);
-
-                // compare blend shape data
-                Assert.AreNotEqual(originalMesh.blendShapeCount, 0);
-                Assert.AreEqual(originalMesh.blendShapeCount, exportedMesh.blendShapeCount);
+                var deltaVertices = new Vector3[originalMesh.vertexCount];
+                var deltaNormals = new Vector3[originalMesh.vertexCount];
+                var deltaTangents = new Vector3[originalMesh.vertexCount];
+                var fbxDeltaVertices = new Vector3[originalMesh.vertexCount];
+                var fbxDeltaNormals = new Vector3[originalMesh.vertexCount];
+                var fbxDeltaTangents = new Vector3[originalMesh.vertexCount];
+
+                for (int bi = 0; bi < originalMesh.blendShapeCount; ++bi)
                 {
-                    var deltaVertices = new Vector3[originalMesh.vertexCount];
-                    var deltaNormals = new Vector3[originalMesh.vertexCount];
-                    var deltaTangents = new Vector3[originalMesh.vertexCount];
-                    var fbxDeltaVertices = new Vector3[originalMesh.vertexCount];
-                    var fbxDeltaNormals = new Vector3[originalMesh.vertexCount];
-                    var fbxDeltaTangents = new Vector3[originalMesh.vertexCount];
-
-                    for (int bi = 0; bi < originalMesh.blendShapeCount; ++bi)
-                    {
-                        Assert.AreEqual(originalMesh.GetBlendShapeName(bi), exportedMesh.GetBlendShapeName(bi));
-                        Assert.AreEqual(originalMesh.GetBlendShapeFrameCount(bi), exportedMesh.GetBlendShapeFrameCount(bi));
+                    Assert.AreEqual(originalMesh.GetBlendShapeName(bi), exportedMesh.GetBlendShapeName(bi));
+                    Assert.AreEqual(originalMesh.GetBlendShapeFrameCount(bi), exportedMesh.GetBlendShapeFrameCount(bi));
 
-                        int frameCount = originalMesh.GetBlendShapeFrameCount(bi);
-                        for (int fi = 0; fi < frameCount; ++fi)
-                        {
-                            Assert.AreEqual(originalMesh.GetBlendShapeFrameWeight(bi, fi), exportedMesh.GetBlendShapeFrameWeight(bi, fi));
+                    int frameCount = originalMesh.GetBlendShapeFrameCount(bi);
+                    for (int fi = 0; fi < frameCount; ++fi)
+                    {
+                        Assert.AreEqual(originalMesh.GetBlendShapeFrameWeight(bi, fi), exportedMesh.GetBlendShapeFrameWeight(bi, fi));
 
-                            originalMesh.GetBlendShapeFrameVertices(bi, fi, deltaVertices, deltaNormals, deltaTangents);
-                            exportedMesh.GetBlendShapeFrameVertices(bi, fi, fbxDeltaVertices, fbxDeltaNormals, fbxDeltaTangents);
+                        originalMesh.GetBlendShapeFrameVertices(bi, fi, deltaVertices, deltaNormals, deltaTangents);
+                        exportedMesh.GetBlendShapeFrameVertices(bi, fi, fbxDeltaVertices, fbxDeltaNormals, fbxDeltaTangents);
 
-                            var v3comparer = new Vector3Comparer();
-                            Assert.That(deltaVertices, Is.EqualTo(fbxDeltaVertices).Using<Vector3>(v3comparer), string.Format("delta vertices don't match"));
-                            Assert.That(deltaNormals, Is.EqualTo(fbxDeltaNormals).Using<Vector3>(v3comparer), string.Format("delta normals don't match"));
-                            Assert.That(deltaTangents, Is.EqualTo(fbxDeltaTangents).Using<Vector3>(v3comparer), string.Format("delta tangents don't match"));
+                        var v3comparer = new Vector3Comparer();
+                        Assert.That(deltaVertices, Is.EqualTo(fbxDeltaVertices).Using<Vector3>(v3comparer), string.Format("delta vertices don't match"));
+                        Assert.That(deltaNormals, Is.EqualTo(fbxDeltaNormals).Using<Vector3>(v3comparer), string.Format("delta normals don't match"));
+                        Assert.That(deltaTangents, Is.EqualTo(fbxDeltaTangents).Using<Vector3>(v3comparer), string.Format("delta tangents don't match"));
 
-                        }
                     }
                 }
             }