fix so unit tests pass

Author: vkovec

Assets/FbxExporters/Editor/FbxExporter.cs

@@ -3640,7 +3640,7 @@ public static string ExportObjects (
                         clipList.Add (timelineClip);
                         animationExportData = fbxExporter.GetTimelineAnimationExportData (rootObject, clipList);
                     }
-                    else if (exportOptions.GetModelAnimIncludeOption () == ExportModelSettingsSerialize.Include.Anim) {
+                    else if (fbxExporter.ExportOptions.GetModelAnimIncludeOption () == ExportModelSettingsSerialize.Include.Anim) {
                         HashSet<GameObject> gos = new HashSet<GameObject> ();
                         foreach (var obj in objects) {
                             gos.Add (ModelExporter.GetGameObject (obj));

Assets/FbxExporters/Editor/UnitTests/DefaultSelectionTest.cs

@@ -17,13 +17,13 @@ namespace FbxExporters.UnitTests
     public class DefaultSelectionTest : ExporterTestBase
     {
         protected GameObject m_root;
-        protected ExportModelSettingsSerialize.ObjectPosition m_centerObjectsSetting;
+        protected ExportModelSettings m_centerObjectsSetting;
 
         [SetUp]
         public override void Init ()
         {
             base.Init();
-           // m_centerObjectsSetting = FbxExporters.EditorTools.ExportSettings.GetObjectPosition();
+            m_centerObjectsSetting = ScriptableObject.CreateInstance (typeof(ExportModelSettings)) as ExportModelSettings;
         }
 
         [TearDown]
@@ -33,8 +33,6 @@ public override void Term ()
             if (m_root) {
                 UnityEngine.Object.DestroyImmediate (m_root);
             }
-            // restore original setting
-           // FbxExporters.EditorTools.ExportSettings.SetObjectPosition(m_centerObjectsSetting);
         }
 
         [Test]
@@ -63,12 +61,12 @@ public void TestDefaultSelection ()
             Assert.IsNotNull (m_root);
 
             // test without centered objects
-            //FbxExporters.EditorTools.ExportSettings.SetObjectPosition(ExportModelSettingsSerialize.ObjectPosition.WorldAbsolute);
+            m_centerObjectsSetting.SetObjectPosition(ExportModelSettingsSerialize.ObjectPosition.WorldAbsolute);
 
             // test Export Root
             // Expected result: everything gets exported
             // Expected transform: all transforms unchanged
-            var exportedRoot = ExportSelection (new Object[]{ m_root });
+            var exportedRoot = ExportSelection (m_root, m_centerObjectsSetting);
             CompareHierarchies (m_root, exportedRoot, true, false);
             CompareGlobalTransform (exportedRoot.transform, m_root.transform);
 
@@ -77,15 +75,15 @@ public void TestDefaultSelection ()
             // Expected transform: all transforms unchanged
             var parent1 = m_root.transform.Find ("Parent1");
             var child1 = parent1.Find ("Child1");
-            exportedRoot = ExportSelection (new Object[]{ parent1.gameObject, child1.gameObject });
+            exportedRoot = ExportSelection (new Object[]{ parent1.gameObject, child1.gameObject }, m_centerObjectsSetting);
             CompareHierarchies (parent1.gameObject, exportedRoot, true, false);
             CompareGlobalTransform (exportedRoot.transform, parent1);
 
             // test Export Child2
             // Expected result: Child2
             // Expected transform: Child2 unchanged
             var child2 = parent1.Find ("Child2").gameObject;
-            exportedRoot = ExportSelection (new Object[]{ child2 });
+            exportedRoot = ExportSelection (child2, m_centerObjectsSetting);
             CompareHierarchies (child2, exportedRoot, true, false);
             CompareGlobalTransform (exportedRoot.transform, child2.transform);
 
@@ -98,20 +96,20 @@ public void TestDefaultSelection ()
             var goExportSet = new GameObject[]{ child2.gameObject, parent2.gameObject };
 
             // test without centering objects
-            //FbxExporters.EditorTools.ExportSettings.SetObjectPosition(ExportModelSettingsSerialize.ObjectPosition.WorldAbsolute);
+            m_centerObjectsSetting.SetObjectPosition(ExportModelSettingsSerialize.ObjectPosition.WorldAbsolute);
 
-            exportedRoot = ExportSelection (exportSet);
+            exportedRoot = ExportSelection (exportSet, m_centerObjectsSetting);
             List<GameObject> children = new List<GameObject> ();
             foreach (Transform child in exportedRoot.transform) {
                 children.Add (child.gameObject);
             }
             CompareHierarchies (new GameObject[]{ child2, parent2.gameObject }, children.ToArray ());
 
             // test with centered objects
-            //FbxExporters.EditorTools.ExportSettings.SetObjectPosition(ExportModelSettingsSerialize.ObjectPosition.LocalCentered);
+            m_centerObjectsSetting.SetObjectPosition(ExportModelSettingsSerialize.ObjectPosition.LocalCentered);
             var newCenter = FbxExporters.Editor.ModelExporter.FindCenter (goExportSet);
 
-            exportedRoot = ExportSelection (exportSet);
+            exportedRoot = ExportSelection (exportSet, m_centerObjectsSetting);
             children = new List<GameObject> ();
             foreach (Transform child in exportedRoot.transform) {
                 children.Add (child.gameObject);

Assets/FbxExporters/Editor/UnitTests/ExporterTestBase.cs

@@ -221,16 +221,27 @@ public virtual void Init()
         /// </summary>
         /// <returns>Root of Model Prefab.</returns>
         /// <param name="selected">Objects to export.</param>
-        protected virtual GameObject ExportSelection(params Object[] selected)
+        protected virtual GameObject ExportSelection(Object selected, EditorTools.IExportOptions exportOptions = null)
         {
             // export selected to a file, then return the root
             var filename = GetRandomFileNamePath();
-            return ExportSelection (filename, selected);
+            return ExportSelection (filename, selected, exportOptions);
         }
 
-        protected virtual GameObject ExportSelection(string filename, params Object[] selected){
+        protected virtual GameObject ExportSelection(Object[] selected, EditorTools.IExportOptions exportOptions = null){
+            var filename = GetRandomFileNamePath();
+            return ExportSelection (filename, selected, exportOptions);
+        }
+
+        protected virtual GameObject ExportSelection(string filename, Object selected, EditorTools.IExportOptions exportOptions = null)
+        {
+            // export selected to a file, then return the root
+            return ExportSelection (filename, new Object[]{selected}, exportOptions);
+        }
+
+        protected virtual GameObject ExportSelection(string filename, Object[] selected, EditorTools.IExportOptions exportOptions = null){
             Debug.unityLogger.logEnabled = false;
-            var fbxFileName = FbxExporters.Editor.ModelExporter.ExportObjects (filename, selected) as string;
+            var fbxFileName = FbxExporters.Editor.ModelExporter.ExportObjects (filename, selected, exportOptions) as string;
             Debug.unityLogger.logEnabled = true;
 
             Assert.IsNotNull (fbxFileName);
@@ -250,13 +261,6 @@ protected virtual GameObject ExportSelection(string filename, params Object[] se
             return fbxRoot;
         }
 
-        protected virtual string ExportSelectedObjects(string filename, params Object[] selected)
-        {
-            string fbxFileName = FbxExporters.Editor.ModelExporter.ExportObjects(filename, selected);
-
-            return fbxFileName;
-        }
-
         /// <summary>
         /// Exports a single hierarchy to a random fbx file.
         /// </summary>

Assets/FbxExporters/Editor/UnitTests/FbxExportSettingsTest.cs

@@ -180,8 +180,9 @@ public void TestGetSetFields ()
             ExportSettings.AddFbxSavePath ("/a\\b/c/\\");
             ExportSettings.AddPrefabSavePath ("/a\\b/c/\\");
 
-            Assert.That (ExportSettings.GetRelativeFbxSavePaths () [0], Is.EqualTo ("Assets \u2044 a⁄b⁄c"));
-            Assert.That (ExportSettings.GetRelativePrefabSavePaths () [0], Is.EqualTo ("Assets \u2044 a⁄b⁄c"));
+            string forwardSlash = " ⁄ "; // special unicode forward slash
+            Assert.That (ExportSettings.GetRelativeFbxSavePaths () [0], Is.EqualTo (string.Format("Assets{0}a{0}b{0}c", forwardSlash)));
+            Assert.That (ExportSettings.GetRelativePrefabSavePaths () [0], Is.EqualTo (string.Format("Assets{0}a{0}b{0}c", forwardSlash)));
 
             var platformPath = Path.Combine ("a", Path.Combine ("b", "c"));
             Assert.AreEqual (Path.Combine (appDataPath, platformPath), ExportSettings.GetFbxAbsoluteSavePath ());

Assets/FbxExporters/Editor/UnitTests/FbxPrefabAutoUpdaterTest.cs

@@ -210,7 +210,7 @@ public void RemappingTest()
             //export our updated hierarchy to the same file path as the original
             SleepForFileTimestamp();
             // "Import" model to Unity (Exporting modified FBX to Unity to see if the remapping works)
-            ExportSelectedObjects(filePath, cube2);
+            ExportSelection(filePath, cube2);
             AssetDatabase.Refresh();
 
             // Assert Check Sphere = SphereFBX
@@ -272,7 +272,7 @@ public void RemappingTest()
             //export our updated hierarchy to the same file path as the original
             SleepForFileTimestamp();
             // "Import" model to Unity (Exporting modified FBX to Unity to see if the remapping works)
-            ExportSelectedObjects(filePath, cube2);
+            ExportSelection(filePath, cube2);
             AssetDatabase.Refresh();
 
             // Assert Check Sphere = Sphere and has been changed by the Auto-Updater.