Merge pull request #304 from Unity-Technologies/Uni-38306-FixingAutoUpdaterInUnitTest

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

Author: benoithudson

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/DefaultSelectionTest.cs

@@ -19,8 +19,9 @@ public class DefaultSelectionTest : ExporterTestBase
         protected bool m_centerObjectsSetting;
 
         [SetUp]
-        public void Init ()
+        public override void Init ()
         {
+            base.Init();
             m_centerObjectsSetting = FbxExporters.EditorTools.ExportSettings.instance.centerObjects;
         }
 

Assets/FbxExporters/Editor/UnitTests/ExportPerformanceTest.cs

@@ -18,8 +18,9 @@ public class ExportPerformanceTest : ExporterTestBase
         private GameObject m_toExport;
 
         [SetUp]
-        public void Init()
+        public override void Init()
         {
+            base.Init();
             m_stopwatch = new Stopwatch ();
             m_toExport = CreateGameObjectToExport ();
         }

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.
@@ -200,8 +201,19 @@ public virtual void Term ()
             // Delete the directory on the next editor update.  Otherwise,
             // prefabs don't get deleted and the directory delete fails.
             EditorApplication.update += DeleteOnNextUpdate;
+
+            // Put back the initial setting for the auto-updater toggle
+            FbxExporters.EditorTools.ExportSettings.instance.autoUpdaterEnabled = isAutoUpdaterOn;
         }
 
+        [SetUp]
+        public virtual void Init()
+        {
+            isAutoUpdaterOn = FbxExporters.EditorTools.ExportSettings.instance.autoUpdaterEnabled;
+            FbxExporters.EditorTools.ExportSettings.instance.autoUpdaterEnabled = true;
+        }
+
+
         /// <summary>
         /// Exports the Objects in selected.
         /// </summary>

Assets/FbxExporters/Editor/UnitTests/FbxPrefabAutoUpdaterTest.cs

@@ -19,8 +19,9 @@ public class FbxPrefabAutoUpdaterTest : ExporterTestBase
         string m_prefabPath;
 
         [SetUp]
-        public void Init ()
+        public override void Init ()
         {
+            base.Init();
             var capsule = GameObject.CreatePrimitive (PrimitiveType.Capsule);
             m_fbx = ExportSelection (capsule);
             m_fbxPath = AssetDatabase.GetAssetPath (m_fbx);
@@ -175,14 +176,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,19 +221,15 @@ 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
     {
         bool isAutoUpdaterOn;
         [SetUp]
-        public void Init()
+        public override void Init()
         {
+            base.Init();
             // Save the initial setting for the auto updater toggle and disable it for the unit test
             isAutoUpdaterOn = FbxExporters.EditorTools.ExportSettings.instance.autoUpdaterEnabled;
             FbxExporters.EditorTools.ExportSettings.instance.autoUpdaterEnabled = false;

Assets/FbxExporters/Editor/UnitTests/FbxPrefabTest.cs

@@ -146,7 +146,8 @@ public static void AssertAreDifferent(
         }
 
         [SetUp]
-        public void Init() {
+        public override void Init() {
+            base.Init();
             // Create a test hierarchy. It has unique names.
             m_original = CreateHierarchy("FbxPrefabTestRoot");
             m_originalRep = Rep(m_original);