Fix of the unit tests, taking into account the Auto Updater toggle.

Author: MarcShakour

Assets/FbxExporters/Editor/FbxPrefabAutoUpdater.cs

@@ -237,9 +237,18 @@ public static void UpdateLinkedPrefab(GameObject prefabInstance)
                 // Launch the manual update UI to allow the user to fix
                 // renamed nodes (or auto-update if there's nothing to rename).
                 var fbxPrefabUtility = new FbxPrefabUtility(fbxPrefabComponent);
-                ManualUpdateEditorWindow window = (ManualUpdateEditorWindow)EditorWindow.GetWindow(typeof(ManualUpdateEditorWindow));
-                window.Init(fbxPrefabUtility, fbxPrefabComponent);
-                window.Show();
+
+                if (FbxExporters.EditorTools.ExportSettings.instance.autoUpdaterEnabled || runningUnitTest)
+                {
+                    fbxPrefabUtility.SyncPrefab();
+                }
+                else
+                {
+                    ManualUpdateEditorWindow window = (ManualUpdateEditorWindow)EditorWindow.GetWindow(typeof(ManualUpdateEditorWindow));
+                    window.Init(fbxPrefabUtility, fbxPrefabComponent);
+                    window.Show();
+                }
+
             }
         }
 

Assets/FbxExporters/Editor/UnitTests/ExporterTestBase.cs

@@ -9,6 +9,7 @@ namespace FbxExporters.UnitTests
 {
     public abstract class ExporterTestBase
     {
+        bool isAutoUpdaterOn;
         /// <summary>
         /// Sleep an amount of time (in ms) so we can safely assume that the
         /// timestamp on an fbx will change.
@@ -202,6 +203,20 @@ public virtual void Term ()
             EditorApplication.update += DeleteOnNextUpdate;
         }
 
+        [SetUp]
+        public virtual void InitializeAutoUpdater()
+        {
+            isAutoUpdaterOn = FbxExporters.EditorTools.ExportSettings.instance.autoUpdaterEnabled;
+            FbxExporters.EditorTools.ExportSettings.instance.autoUpdaterEnabled = true;
+        }
+
+        [TearDown]
+        public virtual void ResetAutoUpdater()
+        {
+            // Put back the initial setting for the auto-updater toggle
+            FbxExporters.EditorTools.ExportSettings.instance.autoUpdaterEnabled = isAutoUpdaterOn;
+        }
+
         /// <summary>
         /// Exports the Objects in selected.
         /// </summary>

Assets/FbxExporters/Editor/UnitTests/FbxPrefabAutoUpdaterTest.cs

@@ -175,14 +175,6 @@ public void TestNameMapping()
 
     public class FbxPrefabAutoUpdaterRemappingTest : ExporterTestBase
     {
-        bool isAutoUpdaterOn;
-        [SetUp]
-        public void Init()
-        {
-            isAutoUpdaterOn = FbxExporters.EditorTools.ExportSettings.instance.autoUpdaterEnabled;
-            FbxExporters.EditorTools.ExportSettings.instance.autoUpdaterEnabled = true;
-        }
-
         [Test]
         public void RemappingTest()
         {
@@ -228,11 +220,6 @@ public void RemappingTest()
             Assert.IsTrue(cubePrefabInstance.transform.GetChild(0).name == "SphereFBX");
             Assert.IsTrue(cubePrefabInstance.transform.GetChild(0).GetComponent<MeshFilter>().sharedMesh != null);
         }
-        [TearDown]
-        public void stopTest()
-        {
-            FbxExporters.EditorTools.ExportSettings.instance.autoUpdaterEnabled = isAutoUpdaterOn;
-        }
     }
 
     public class FbxPrefabAutoUpdaterToggleTest : ExporterTestBase