move export + add to scene functions to exporter test base

Author: vkovec

Assets/FbxExporters/Editor/UnitTests/ExporterTestBase.cs

@@ -240,6 +240,33 @@ protected virtual string ExportSelectedObjects(string filename, params Object[]
             return fbxFileName;
         }
 
+        /// <summary>
+        /// Exports a single hierarchy to a random fbx file.
+        /// </summary>
+        /// <returns>The exported fbx file path.</returns>
+        /// <param name="hierarchy">Hierarchy.</param>
+        /// <param name="animOnly">If set to <c>true</c> export animation only.</param>
+        protected string ExportToFbx (GameObject hierarchy, bool animOnly = false){
+            string filename = GetRandomFbxFilePath ();
+            var exportedFilePath = FbxExporters.Editor.ModelExporter.ExportObject (filename, hierarchy, animOnly);
+            Assert.That (exportedFilePath, Is.EqualTo (filename));
+            return filename;
+        }
+
+        /// <summary>
+        /// Adds the asset at asset path to the scene.
+        /// </summary>
+        /// <returns>The new GameObject in the scene.</returns>
+        /// <param name="assetPath">Asset path.</param>
+        protected GameObject AddAssetToScene(string assetPath){
+            GameObject originalObj = AssetDatabase.LoadMainAssetAtPath ("Assets/" + assetPath) as GameObject;
+            Assert.IsNotNull (originalObj);
+            GameObject originalGO = GameObject.Instantiate (originalObj);
+            Assert.IsTrue (originalGO);
+
+            return originalGO;
+        }
+
         /// <summary>
         /// Compares two hierarchies, asserts that they match precisely.
         /// The root can be allowed to mismatch. That's normal with

Assets/FbxExporters/Editor/UnitTests/FbxAnimationTest.cs

@@ -682,8 +682,7 @@ public void LegacySkinnedMeshAnimTest (string fbxPath)
 
             // export fbx
             // get GameObject
-            string filename = GetRandomFbxFilePath ();
-            ExportToFbx(filename, originalGO);
+            string filename = ExportToFbx(originalGO);
 
             // TODO: Uni-34492 change importer settings of (newly exported model) 
             // so that it's not resampled and it is legacy animation
@@ -835,8 +834,7 @@ public void AnimOnlyExportTest(string prefabPath)
 
             // export fbx
             // get GameObject
-            string filename = GetRandomFbxFilePath ();
-            ExportToFbx(filename, originalGO, true);
+            string filename = ExportToFbx(originalGO, true);
 
             GameObject fbxObj = AssetDatabase.LoadMainAssetAtPath (filename) as GameObject;
             Assert.IsTrue (fbxObj);
@@ -864,11 +862,6 @@ public void AnimOnlyExportTest(string prefabPath)
             AnimTester.MultiClipTest (animClips, fbxAnimClips);
         }
 
-        public static void ExportToFbx (string filename, GameObject hierarchy, bool animOnly = false){
-            var exportedFilePath = ModelExporter.ExportObject (filename, hierarchy, animOnly);
-            Assert.That (exportedFilePath, Is.EqualTo (filename));
-        }
-
         public static AnimationClip[] GetClipsFromAnimator(Animator animator){
             Assert.That (animator, Is.Not.Null);
 
@@ -881,15 +874,6 @@ public static AnimationClip[] GetClipsFromAnimator(Animator animator){
             return animClips;
         }
 
-        public static GameObject AddAssetToScene(string assetPath){
-            GameObject originalObj = AssetDatabase.LoadMainAssetAtPath ("Assets/" + assetPath) as GameObject;
-            Assert.IsNotNull (originalObj);
-            GameObject originalGO = GameObject.Instantiate (originalObj);
-            Assert.IsTrue (originalGO);
-
-            return originalGO;
-        }
-
         private HashSet<string> GetAnimatedGameObjects(AnimationClip[] animClips, GameObject animatorObject){
             var animatedObjects = new HashSet<string>();
             foreach (var clip in animClips) {

Assets/FbxExporters/Editor/UnitTests/RotationCurveTest.cs

@@ -40,20 +40,19 @@ public void TestBasics() {
     	}
 
         [Test, TestCaseSource (typeof (AnimationTestDataClass), "RotationCurveTestCases")]
-        public void TestCurveExport (string prefabPath) {
+        public void TestEulerCurveExport (string prefabPath) {
             prefabPath = FindPathInUnitTests (prefabPath);
             Assert.That (prefabPath, Is.Not.Null);
 
             // add fbx to scene
-            GameObject originalGO = FbxAnimationTest.AddAssetToScene(prefabPath);
+            GameObject originalGO = AddAssetToScene(prefabPath);
 
             // get clips
             var animator = originalGO.GetComponentInChildren<Animator> ();
             var animClips = FbxAnimationTest.GetClipsFromAnimator (animator);
 
             // export fbx
-            string filename = GetRandomFbxFilePath ();
-            FbxAnimationTest.ExportToFbx(filename, originalGO);
+            string filename = ExportToFbx(originalGO);
 
             var fbxAnimClips = FbxAnimationTest.AnimTester.GetClipsFromFbx (filename);