fix up Convert to Model unit tests

-remove keepOriginalAfterConvert from export settings
-check that only mesh changes with CopyComponents
-original hierarchy becomes the prefab, keep original checks are
redundant

Author: vkovec

Assets/FbxExporters/Editor/FbxExportSettings.cs

@@ -210,13 +210,6 @@ public static string kDefaultAdskRoot {
         public bool mayaCompatibleNames;
         public bool centerObjects;
 
-        /// <summary>
-        /// In Convert-to-model, by default we delete the original object.
-        /// This option lets you override that.
-        /// </summary>
-        [HideInInspector]
-        public bool keepOriginalAfterConvert;
-
         public int selectedMayaApp = 0;
 
         /// <summary>
@@ -243,7 +236,6 @@ protected override void LoadDefaults()
         {
             mayaCompatibleNames = true;
             centerObjects = true;
-            keepOriginalAfterConvert = false;
             convertToModelSavePath = kDefaultSavePath;
             mayaOptionPaths = null;
             mayaOptionNames = null;

Assets/FbxExporters/Editor/UnitTests/ConvertToModelTest.cs

@@ -60,41 +60,54 @@ public void TestStaticHelpers()
 
             // Test CopyComponents
             {
-                var a = new GameObject("a");
-                var b = new GameObject("b");
+                var a = GameObject.CreatePrimitive (PrimitiveType.Cube);
+                a.name = "a";
+                var b = GameObject.CreatePrimitive (PrimitiveType.Sphere);
+                b.name = "b";
                 a.AddComponent<BoxCollider>();
                 a.transform.localPosition += new Vector3(1,2,3);
                 Assert.IsFalse(b.GetComponent<BoxCollider>());
                 Assert.AreEqual(Vector3.zero, b.transform.localPosition);
-                ConvertToModel.CopyComponents(a, b);
-                Assert.IsTrue(b.GetComponent<BoxCollider>());
-                Assert.AreEqual(new Vector3(1,2,3), b.transform.localPosition);
+                Assert.AreNotEqual (a.GetComponent<MeshFilter>().sharedMesh, b.GetComponent<MeshFilter> ().sharedMesh);
+                ConvertToModel.CopyComponents(b, a);
+                Assert.IsFalse(b.GetComponent<BoxCollider>());
+                Assert.AreEqual(Vector3.zero, b.transform.localPosition);
+                Assert.AreEqual (a.GetComponent<MeshFilter>().sharedMesh, b.GetComponent<MeshFilter> ().sharedMesh);
             }
 
-            // Test SetupImportedGameObject. Very similar but recursive.
+            // Test UpdateFromSourceRecursive. Very similar but recursive.
             {
-                var a = new GameObject ("a");
-                var a1 = new GameObject ("AA");
-                var a2 = new GameObject ("BB");
+                var a = GameObject.CreatePrimitive (PrimitiveType.Cube);
+                a.name = "a";
+                var a1 = GameObject.CreatePrimitive (PrimitiveType.Cube);
+                a1.name = "AA";
+                var a2 = GameObject.CreatePrimitive (PrimitiveType.Cube);
+                a2.name = "BB";
                 a2.transform.parent = a.transform;
                 a1.transform.parent = a.transform; // out of alpha order!
-                var b = new GameObject ("b");
-                var b1 = new GameObject ("AA");
-                var b2 = new GameObject ("BB");
+                var b = GameObject.CreatePrimitive (PrimitiveType.Sphere);
+                b.name = "b";
+                var b1 = GameObject.CreatePrimitive (PrimitiveType.Sphere);
+                b1.name = "AA";
+                var b2 = GameObject.CreatePrimitive (PrimitiveType.Sphere);
+                b2.name = "BB";
                 b1.transform.parent = b.transform;
                 b2.transform.parent = b.transform; // in alpha order
                 a.AddComponent<BoxCollider> ();
                 a1.transform.localPosition = new Vector3 (1, 2, 3);
 
+                Assert.AreNotEqual(b.GetComponent<MeshFilter>().sharedMesh, a.GetComponent<MeshFilter>().sharedMesh);
                 Assert.IsFalse (b.GetComponent<BoxCollider> ());
                 Assert.AreEqual ("BB", b.transform.GetChild (1).name);
                 Assert.AreEqual (Vector3.zero, b1.transform.localPosition);
 
-                ConvertToModel.UpdateFromSourceRecursive (a, b);
+                ConvertToModel.UpdateFromSourceRecursive (b, a);
 
-                Assert.IsTrue (b.GetComponent<BoxCollider> ());
-                Assert.AreEqual ("AA", b.transform.GetChild (1).name);
-                Assert.AreEqual (new Vector3 (1, 2, 3), b1.transform.localPosition);
+                // only the mesh + materials should change
+                Assert.AreEqual(b.GetComponent<MeshFilter>().sharedMesh, a.GetComponent<MeshFilter>().sharedMesh);
+                Assert.IsFalse (b.GetComponent<BoxCollider> ());
+                Assert.AreEqual ("BB", b.transform.GetChild (1).name);
+                Assert.AreEqual (Vector3.zero, b1.transform.localPosition);
             }
         }
 
@@ -114,20 +127,18 @@ public void BasicTest()
             // Make sure it's what we expect.
             Assert.That(cube); // we kept the original
             Assert.That(cubePrefabInstance); // we got the new
+            Assert.AreSame(cube, cubePrefabInstance); // the original and new are the same
             Assert.AreEqual("Cube", cubePrefabInstance.name); // it has the right name
             Assert.That(!EditorUtility.IsPersistent(cubePrefabInstance));
             var cubePrefabAsset = PrefabUtility.GetPrefabParent(cubePrefabInstance);
             Assert.That(cubePrefabAsset);
+            Assert.That (EditorUtility.IsPersistent (cubePrefabAsset));
 
-            // it's a different mesh instance, but the same mesh
-            Assert.AreNotEqual(
-                cube.GetComponent<MeshFilter>().sharedMesh,
-                cubePrefabInstance.GetComponent<MeshFilter>().sharedMesh);
             Assert.That(cubePrefabInstance.GetComponent<FbxPrefab>());
 
             // Should be all the same triangles. But it isn't. TODO.
             // At least the indices should match in multiplicity.
-            var cubeMesh = cube.GetComponent<MeshFilter>().sharedMesh;
+            var cubeMesh = GameObject.CreatePrimitive(PrimitiveType.Cube).GetComponent<MeshFilter>().sharedMesh;
             var cubePrefabMesh = cubePrefabInstance.GetComponent<MeshFilter>().sharedMesh;
             //Assert.That(
             //  cubeMesh.triangles,
@@ -145,16 +156,7 @@ public void BasicTest()
             // Also make sure we deleted.
             var cubePrefabInstance2 = ConvertToModel.Convert(cubePrefabInstance,
                 directoryFullPath: path);
-            Assert.IsFalse(cubePrefabInstance);
             Assert.That(cubePrefabInstance2.GetComponents<FbxPrefab>().Length, Is.EqualTo(1));
-
-            // Create another cube, make sure the export settings drive whether we keep the cube or not.
-            ConvertToModel.Convert(cube, directoryFullPath: path);
-            if (ConvertToModel.ExportSettings.keepOriginalAfterConvert) {
-                Assert.IsTrue(cube);
-            } else {
-                Assert.IsFalse(cube);
-            }
         }
 
         [Test]
@@ -173,9 +175,8 @@ public void SkinnedMeshTest()
             Object.DestroyImmediate(meshRender);
             Object.DestroyImmediate(meshFilter);
 
-            // Convert it. Make sure it gets deleted, to avoid a useless error about internal consistency.
+            // Convert it.
             var cubeInstance = ConvertToModel.Convert(cube, fbxFullPath: GetRandomFbxFilePath());
-            if (cube) { Object.DestroyImmediate(cube); }
 
             // Make sure it doesn't have a skinned mesh renderer on it.
             // In the future we'll want to assert the opposite!