Skip to content

Commit f8d5c60

Browse files
committed
Fixes required by pull request
1 parent 3851744 commit f8d5c60

File tree

5 files changed

+14
-12
lines changed

5 files changed

+14
-12
lines changed

Assets/FbxExporters/Editor/UnitTests/DefaultSelectionTest.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@ public class DefaultSelectionTest : ExporterTestBase
1919
protected bool m_centerObjectsSetting;
2020

2121
[SetUp]
22-
public void Init ()
22+
public override void Init ()
2323
{
24+
base.Init();
2425
m_centerObjectsSetting = FbxExporters.EditorTools.ExportSettings.instance.centerObjects;
2526
}
2627

Assets/FbxExporters/Editor/UnitTests/ExportPerformanceTest.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@ public class ExportPerformanceTest : ExporterTestBase
1818
private GameObject m_toExport;
1919

2020
[SetUp]
21-
public void Init()
21+
public override void Init()
2222
{
23+
base.Init();
2324
m_stopwatch = new Stopwatch ();
2425
m_toExport = CreateGameObjectToExport ();
2526
}

Assets/FbxExporters/Editor/UnitTests/ExporterTestBase.cs

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -201,21 +201,18 @@ public virtual void Term ()
201201
// Delete the directory on the next editor update. Otherwise,
202202
// prefabs don't get deleted and the directory delete fails.
203203
EditorApplication.update += DeleteOnNextUpdate;
204+
205+
// Put back the initial setting for the auto-updater toggle
206+
FbxExporters.EditorTools.ExportSettings.instance.autoUpdaterEnabled = isAutoUpdaterOn;
204207
}
205208

206209
[SetUp]
207-
public virtual void InitializeAutoUpdater()
210+
public virtual void Init()
208211
{
209212
isAutoUpdaterOn = FbxExporters.EditorTools.ExportSettings.instance.autoUpdaterEnabled;
210213
FbxExporters.EditorTools.ExportSettings.instance.autoUpdaterEnabled = true;
211214
}
212215

213-
[TearDown]
214-
public virtual void ResetAutoUpdater()
215-
{
216-
// Put back the initial setting for the auto-updater toggle
217-
FbxExporters.EditorTools.ExportSettings.instance.autoUpdaterEnabled = isAutoUpdaterOn;
218-
}
219216

220217
/// <summary>
221218
/// Exports the Objects in selected.

Assets/FbxExporters/Editor/UnitTests/FbxPrefabAutoUpdaterTest.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@ public class FbxPrefabAutoUpdaterTest : ExporterTestBase
1919
string m_prefabPath;
2020

2121
[SetUp]
22-
public void Init ()
22+
public override void Init ()
2323
{
24+
base.Init();
2425
var capsule = GameObject.CreatePrimitive (PrimitiveType.Capsule);
2526
m_fbx = ExportSelection (capsule);
2627
m_fbxPath = AssetDatabase.GetAssetPath (m_fbx);
@@ -226,8 +227,9 @@ public class FbxPrefabAutoUpdaterToggleTest : ExporterTestBase
226227
{
227228
bool isAutoUpdaterOn;
228229
[SetUp]
229-
public void Init()
230+
public override void Init()
230231
{
232+
base.Init();
231233
// Save the initial setting for the auto updater toggle and disable it for the unit test
232234
isAutoUpdaterOn = FbxExporters.EditorTools.ExportSettings.instance.autoUpdaterEnabled;
233235
FbxExporters.EditorTools.ExportSettings.instance.autoUpdaterEnabled = false;

Assets/FbxExporters/Editor/UnitTests/FbxPrefabTest.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,8 @@ public static void AssertAreDifferent(
146146
}
147147

148148
[SetUp]
149-
public void Init() {
149+
public override void Init() {
150+
base.Init();
150151
// Create a test hierarchy. It has unique names.
151152
m_original = CreateHierarchy("FbxPrefabTestRoot");
152153
m_originalRep = Rep(m_original);

0 commit comments

Comments
 (0)