fix unit test namespace references

vkovec · vkovec · commit 1ac319c7a266 · 2018-05-25T13:04:47.000-04:00
diff --git a/Assets/com.unity.formats.fbx.tests/ConvertToModelTest.cs b/Assets/com.unity.formats.fbx.tests/ConvertToModelTest.cs
@@ -1,9 +1,8 @@
 using UnityEngine;
-using UnityEditor;
 using NUnit.Framework;
 using System.Collections.Generic;
 using System.IO;
-using UnityEditor.Formats.Fbx.Exporter;
+using UnityEngine.Formats.Fbx.Exporter;
 
 namespace UnityEditor.Formats.Fbx.Exporter.UnitTests
 {
diff --git a/Assets/com.unity.formats.fbx.tests/CustomExtensionsTest.cs b/Assets/com.unity.formats.fbx.tests/CustomExtensionsTest.cs
@@ -3,11 +3,8 @@
 //#define DEBUG_UNITTEST
 
 using UnityEngine;
-using UnityEditor;
 using NUnit.Framework;
-using System.Collections.Generic;
-using System.Collections;
-using FbxExporters.CustomExtensions;
+using UnityEditor.Formats.Fbx.Exporter.CustomExtensions;
 using UnityEngine.Formats.FbxSdk;
 
 namespace UnityEditor.Formats.Fbx.Exporter.UnitTests
diff --git a/Assets/com.unity.formats.fbx.tests/DefaultSelectionTest.cs b/Assets/com.unity.formats.fbx.tests/DefaultSelectionTest.cs
@@ -1,11 +1,7 @@
 ﻿using UnityEngine;
-using UnityEditor;
-using UnityEngine.TestTools;
 using NUnit.Framework;
-using System.IO;
 using System.Collections.Generic;
 using UnityEngine.Formats.FbxSdk;
-using FbxExporters.EditorTools;
 
 namespace UnityEditor.Formats.Fbx.Exporter.UnitTests
 {
diff --git a/Assets/com.unity.formats.fbx.tests/ExportPerformanceTest.cs b/Assets/com.unity.formats.fbx.tests/ExportPerformanceTest.cs
@@ -1,8 +1,5 @@
 ﻿using UnityEngine;
-using UnityEditor;
-using UnityEngine.TestTools;
 using NUnit.Framework;
-using System.Collections;
 using System.Diagnostics;
 
 namespace UnityEditor.Formats.Fbx.Exporter.UnitTests
@@ -69,7 +66,7 @@ public void TestPerformance ()
 
             m_stopwatch.Reset ();
             m_stopwatch.Start ();
-            var fbxFileName = FbxExporters.Editor.ModelExporter.ExportObjects (filename, new Object[]{m_toExport}) as string;
+            var fbxFileName = ModelExporter.ExportObjects (filename, new Object[]{m_toExport}) as string;
             m_stopwatch.Stop ();
 
             UnityEngine.Debug.unityLogger.logEnabled = true;
diff --git a/Assets/com.unity.formats.fbx.tests/ExportTimelineClipTest.cs b/Assets/com.unity.formats.fbx.tests/ExportTimelineClipTest.cs
@@ -1,5 +1,4 @@
 ﻿using UnityEngine;
-using UnityEditor;
 using NUnit.Framework;
 using UnityEngine.Timeline;
 using UnityEngine.Playables;
diff --git a/Assets/com.unity.formats.fbx.tests/ExporterTestBase.cs b/Assets/com.unity.formats.fbx.tests/ExporterTestBase.cs
@@ -1,9 +1,6 @@
 ﻿using UnityEngine;
-using UnityEditor;
-using UnityEngine.TestTools;
 using NUnit.Framework;
 using System.IO;
-using UnityEngine.Formats.FbxSdk;
 
 namespace UnityEditor.Formats.Fbx.Exporter.UnitTests
 {
@@ -212,14 +209,14 @@ public virtual void Term ()
             EditorApplication.update += DeleteOnNextUpdate;
 
             // Put back the initial setting for the auto-updater toggle
-            FbxExporters.EditorTools.ExportSettings.instance.autoUpdaterEnabled = isAutoUpdaterOn;
+            ExportSettings.instance.autoUpdaterEnabled = isAutoUpdaterOn;
         }
 
         [SetUp]
         public virtual void Init()
         {
-            isAutoUpdaterOn = FbxExporters.EditorTools.ExportSettings.instance.autoUpdaterEnabled;
-            FbxExporters.EditorTools.ExportSettings.instance.autoUpdaterEnabled = true;
+            isAutoUpdaterOn = ExportSettings.instance.autoUpdaterEnabled;
+            ExportSettings.instance.autoUpdaterEnabled = true;
         }
 
 
@@ -228,27 +225,27 @@ public virtual void Init()
         /// </summary>
         /// <returns>Root of Model Prefab.</returns>
         /// <param name="selected">Objects to export.</param>
-        protected virtual GameObject ExportSelection(Object selected, EditorTools.IExportOptions exportOptions = null)
+        protected virtual GameObject ExportSelection(Object selected, IExportOptions exportOptions = null)
         {
             // export selected to a file, then return the root
             var filename = GetRandomFileNamePath();
             return ExportSelection (filename, selected, exportOptions);
         }
 
-        protected virtual GameObject ExportSelection(Object[] selected, EditorTools.IExportOptions exportOptions = null){
+        protected virtual GameObject ExportSelection(Object[] selected, IExportOptions exportOptions = null){
             var filename = GetRandomFileNamePath();
             return ExportSelection (filename, selected, exportOptions);
         }
 
-        protected virtual GameObject ExportSelection(string filename, Object selected, EditorTools.IExportOptions exportOptions = null)
+        protected virtual GameObject ExportSelection(string filename, Object selected, 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){
+        protected virtual GameObject ExportSelection(string filename, Object[] selected, IExportOptions exportOptions = null){
             Debug.unityLogger.logEnabled = false;
-            var fbxFileName = FbxExporters.Editor.ModelExporter.ExportObjects (filename, selected, exportOptions) as string;
+            var fbxFileName = ModelExporter.ExportObjects (filename, selected, exportOptions) as string;
             Debug.unityLogger.logEnabled = true;
 
             Assert.IsNotNull (fbxFileName);
@@ -276,15 +273,15 @@ protected virtual GameObject ExportSelection(string filename, Object[] selected,
         /// <param name="animOnly">If set to <c>true</c> export animation only.</param>
         protected GameObject ExportToFbx (
             GameObject hierarchy, bool animOnly = false,
-            EditorTools.ExportSettings.LODExportType lodExportType = EditorTools.ExportSettings.LODExportType.All
+            ExportSettings.LODExportType lodExportType = ExportSettings.LODExportType.All
         ){
             string filename = GetRandomFbxFilePath ();
-            var exportOptions = new EditorTools.ExportModelSettingsSerialize ();
+            var exportOptions = new ExportModelSettingsSerialize ();
             exportOptions.SetLODExportType(lodExportType);
             if (animOnly) {
-                exportOptions.SetModelAnimIncludeOption(FbxExporters.EditorTools.ExportSettings.Include.Anim);
+                exportOptions.SetModelAnimIncludeOption(ExportSettings.Include.Anim);
             }
-            var exportedFilePath = FbxExporters.Editor.ModelExporter.ExportObject (
+            var exportedFilePath = ModelExporter.ExportObject (
                 filename, hierarchy, exportOptions
             );
             Assert.That (exportedFilePath, Is.EqualTo (filename));
diff --git a/Assets/com.unity.formats.fbx.tests/FbxAnimationTest.cs b/Assets/com.unity.formats.fbx.tests/FbxAnimationTest.cs
@@ -3,11 +3,9 @@
 //#define DEBUG_UNITTEST
 
 using UnityEngine;
-using UnityEditor;
 using NUnit.Framework;
 using System.Collections;
 using System.Collections.Generic;
-using FbxExporters.Editor;
 using System.Linq;
 
 namespace UnityEditor.Formats.Fbx.Exporter.UnitTests
diff --git a/Assets/com.unity.formats.fbx.tests/FbxCameraTests.cs b/Assets/com.unity.formats.fbx.tests/FbxCameraTests.cs
@@ -3,11 +3,8 @@
 //#define DEBUG_UNITTEST
 
 using UnityEngine;
-using UnityEditor;
 using NUnit.Framework;
-using System.Collections.Generic;
-using System.Collections;
-using FbxExporters.CustomExtensions;
+using UnityEditor.Formats.Fbx.Exporter.CustomExtensions;
 
 namespace UnityEditor.Formats.Fbx.Exporter.UnitTests
 {
@@ -58,7 +55,7 @@ public void GameCameraTest()
 
             // Convert it to FBX. The asset file will be deleted automatically
             // on termination.
-            var fbxAsset = FbxExporters.Editor.ModelExporter.ExportObject(
+            var fbxAsset = ModelExporter.ExportObject(
                 filename, original);
 
             // refresh the assetdata base so that we can query for the model
@@ -96,7 +93,7 @@ public void PhysicalCameraTest()
 
             // Convert it to FBX. The asset file will be deleted automatically
             // on termination.
-            var fbxAsset = FbxExporters.Editor.ModelExporter.ExportObject(
+            var fbxAsset = ModelExporter.ExportObject(
                 filename, original);
             
             var source = AssetDatabase.LoadMainAssetAtPath(fbxAsset) as GameObject;
diff --git a/Assets/com.unity.formats.fbx.tests/FbxPrefabAutoUpdaterTest.cs b/Assets/com.unity.formats.fbx.tests/FbxPrefabAutoUpdaterTest.cs
@@ -4,6 +4,7 @@
 using System.IO;
 using System.Collections.Generic;
 using UnityEditor.Formats.Fbx.Exporter;
+using UnityEngine.Formats.Fbx.Exporter;
 
 namespace UnityEditor.Formats.Fbx.Exporter.UnitTests
 {
@@ -117,7 +118,7 @@ public void RectTransformTest ()
 #endif
             //export our updated hierarchy to the same file path as the original
             SleepForFileTimestamp();
-            FbxExporters.Editor.ModelExporter.ExportObject(filePath1, cube2);
+            ModelExporter.ExportObject(filePath1, cube2);
             AssetDatabase.Refresh();
 
             rectTransform = oldPrefab.transform.GetChild (0).GetComponent<RectTransform> ();
@@ -143,7 +144,7 @@ public void ReplaceTest ()
             // that its timestamp differs enough for Unity to notice it
             // changed.
             SleepForFileTimestamp();
-            FbxExporters.Editor.ModelExporter.ExportObject(m_fbxPath, newHierarchy);
+            ModelExporter.ExportObject(m_fbxPath, newHierarchy);
             AssetDatabase.Refresh();
 
             // Verify that a new instance of the prefab got updated.
@@ -239,8 +240,8 @@ 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;
+            isAutoUpdaterOn = ExportSettings.instance.autoUpdaterEnabled;
+            ExportSettings.instance.autoUpdaterEnabled = false;
             FbxPrefabAutoUpdater.runningUnitTest = true;
         }
 
@@ -339,7 +340,7 @@ public void RemappingTest()
         public void stopTest()
         {
             // Put back the initial setting for the auto-updater toggle
-            FbxExporters.EditorTools.ExportSettings.instance.autoUpdaterEnabled = isAutoUpdaterOn;
+            ExportSettings.instance.autoUpdaterEnabled = isAutoUpdaterOn;
             FbxPrefabAutoUpdater.runningUnitTest = false;
         }
     }
@@ -364,7 +365,7 @@ public void ExpensivePerformanceTest ()
             // Then modify one fbx model. Shouldn't take longer than 1s.
             var hierarchy = CreateGameObject("the_root");
             var baseName = GetRandomFbxFilePath();
-            FbxExporters.Editor.ModelExporter.ExportObject(baseName, hierarchy);
+            ModelExporter.ExportObject(baseName, hierarchy);
 
             // Create N fbx models by copying files. Import them all at once.
             var names = new string[n];
@@ -410,7 +411,7 @@ public void ExpensivePerformanceTest ()
             // creating a file and then copying it, and not the FbxExporter.
             var newHierarchy = CreateHierarchy();
             var newHierarchyName = GetRandomFbxFilePath();
-            FbxExporters.Editor.ModelExporter.ExportObject(newHierarchyName, newHierarchy);
+            ModelExporter.ExportObject(newHierarchyName, newHierarchy);
             try {
                 UnityEngine.Debug.unityLogger.logEnabled = false;
                 stopwatch.Reset ();
diff --git a/Assets/com.unity.formats.fbx.tests/FbxPrefabTest.cs b/Assets/com.unity.formats.fbx.tests/FbxPrefabTest.cs
@@ -1,10 +1,7 @@
 using UnityEngine;
-using UnityEditor;
-using UnityEngine.TestTools;
 using NUnit.Framework;
 using System.Collections.Generic;
-using System.Linq;
-using FbxExporters.Editor;
+using UnityEngine.Formats.Fbx.Exporter;
 
 namespace UnityEditor.Formats.Fbx.Exporter.UnitTests
 {
diff --git a/Assets/com.unity.formats.fbx.tests/ModelExporterTest.cs b/Assets/com.unity.formats.fbx.tests/ModelExporterTest.cs
@@ -1,11 +1,9 @@
 //#define DEBUG_UNITTEST
 using UnityEngine;
-using UnityEditor;
-using UnityEngine.TestTools;
 using NUnit.Framework;
 using System.Collections.Generic;
 using UnityEngine.Formats.FbxSdk;
-using FbxExporters.Editor;
+using UnityEngine.Formats.Fbx.Exporter;
 
 namespace UnityEditor.Formats.Fbx.Exporter.UnitTests
 {
@@ -218,7 +216,7 @@ public void Verify(int cCalls, int goCalls, bool objectResult = false) {
                 objectCalls = 0;
                 this.objectResult = objectResult;
 
-                FbxExporters.Editor.ModelExporter.ExportObject(filename, tree);
+                ModelExporter.ExportObject(filename, tree);
 
                 Assert.AreEqual(cCalls, componentCalls);
                 Assert.AreEqual(goCalls, objectCalls);
@@ -297,7 +295,7 @@ public void TestExporterCallbacks()
                 };
             ModelExporterReflection.RegisterMeshCallback(prefabCallback);
             filename = GetRandomFbxFilePath();
-            FbxExporters.Editor.ModelExporter.ExportObject(filename, tree);
+            ModelExporter.ExportObject(filename, tree);
             ModelExporterReflection.UnRegisterMeshCallback<FbxPrefab>();
 
             asset = AssetDatabase.LoadMainAssetAtPath(filename) as GameObject;
@@ -320,7 +318,7 @@ public void TestExporterCallbacks()
                     }
                 };
             ModelExporterReflection.RegisterMeshObjectCallback(callback);
-            FbxExporters.Editor.ModelExporter.ExportObject(filename, tree);
+            ModelExporter.ExportObject(filename, tree);
             ModelExporterReflection.UnRegisterMeshCallback(callback);
 
             asset = AssetDatabase.LoadMainAssetAtPath(filename) as GameObject;
@@ -801,23 +799,23 @@ public void LODExportTest(){
 
             // test export all
             // expected LODs exported: Sphere_LOD0, Capsule_LOD0, Cube_LOD2
-            GameObject fbxObj = ExportToFbx(lodGroup, lodExportType:EditorTools.ExportSettings.LODExportType.All);
+            GameObject fbxObj = ExportToFbx(lodGroup, lodExportType:ExportSettings.LODExportType.All);
             Assert.IsTrue (fbxObj);
 
             HashSet<string> expectedChildren = new HashSet<string> () { sphereLOD0.name, capsuleLOD0.name, cubeLOD2.name };
             CompareGameObjectChildren (fbxObj, expectedChildren);
 
             // test export highest
             // expected LODs exported: Sphere_LOD0, Capsule_LOD0
-            fbxObj = ExportToFbx(lodGroup, lodExportType:EditorTools.ExportSettings.LODExportType.Highest);
+            fbxObj = ExportToFbx(lodGroup, lodExportType:ExportSettings.LODExportType.Highest);
             Assert.IsTrue (fbxObj);
 
             expectedChildren = new HashSet<string> () { sphereLOD0.name, capsuleLOD0.name };
             CompareGameObjectChildren (fbxObj, expectedChildren);
 
             // test export lowest
             // expected LODs exported: Cube_LOD2
-            fbxObj = ExportToFbx(lodGroup, lodExportType:EditorTools.ExportSettings.LODExportType.Lowest);
+            fbxObj = ExportToFbx(lodGroup, lodExportType:ExportSettings.LODExportType.Lowest);
             Assert.IsTrue (fbxObj);
 
             expectedChildren = new HashSet<string> () { cubeLOD2.name };
diff --git a/Assets/com.unity.formats.fbx.tests/RotationCurveTest.cs b/Assets/com.unity.formats.fbx.tests/RotationCurveTest.cs
@@ -1,9 +1,5 @@
 ﻿using UnityEngine;
-using UnityEditor;
-using UnityEngine.TestTools;
 using NUnit.Framework;
-using System.Collections;
-using FbxExporters.Editor;
 
 namespace UnityEditor.Formats.Fbx.Exporter.UnitTests
 {

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using UnityEngine;`
`2`		`-using UnityEditor;`
`3`	`2`	`using NUnit.Framework;`
`4`	`3`	`using UnityEngine.Timeline;`
`5`	`4`	`using UnityEngine.Playables;`