Update play mode tests to be BasePlayModeTests for consistent setup/teardown

Author: keveleigh

Assets/MRTK/Tests/PlayModeTests/ConstraintTests.cs

@@ -22,22 +22,8 @@
 
 namespace Microsoft.MixedReality.Toolkit.Tests
 {
-    public class ConstraintTests
+    public class ConstraintTests : BasePlayModeTests
     {
-        [UnitySetUp]
-        public IEnumerator SetUp()
-        {
-            PlayModeTestUtilities.Setup();
-            yield return null;
-        }
-
-        [UnityTearDown]
-        public IEnumerator TearDown()
-        {
-            PlayModeTestUtilities.TearDown();
-            yield return null;
-        }
-
         /// <summary>
         /// Tests that the MoveAxisConstraint works for various axes.
         /// This test uses world space axes.

Assets/MRTK/Tests/PlayModeTests/Core/Providers/Hands/RiggedHandVisualizerTests.cs

@@ -21,27 +21,19 @@
 
 namespace Microsoft.MixedReality.Toolkit.Tests
 {
-    public class RiggedHandVisualizerTests
+    public class RiggedHandVisualizerTests : BasePlayModeTests
     {
         private const string RiggedHandProfileName = "TestRiggedHandVisualizationConfigurationProfile";
 
-        [UnitySetUp]
-        public IEnumerator Setup()
+        public override IEnumerator Setup()
         {
-
             var riggedHandProfile = ScriptableObjectExtensions.GetAllInstances<MixedRealityToolkitConfigurationProfile>()
                            .FirstOrDefault(x => x.name.Equals(RiggedHandProfileName));
             PlayModeTestUtilities.Setup(riggedHandProfile);
 
             yield return null;
         }
 
-        [TearDown]
-        public void TearDown()
-        {
-            PlayModeTestUtilities.TearDown();
-        }
-
 #if UNITY_2019_3_OR_NEWER
         /// <summary>
         /// Run a basic pinch test on the rigged hand to make sure nothing crashes and that the mesh updates appropriately

Assets/MRTK/Tests/PlayModeTests/DialogTests.cs

@@ -21,7 +21,7 @@
 
 namespace Microsoft.MixedReality.Toolkit.Tests
 {
-    public class DialogTests
+    public class DialogTests : BasePlayModeTests
     {
         // SDK/Features/UX/Prefabs/Slate/Slate.prefab
         private const string smallDialogPrefabAssetGuid = "8e686c90124b8e14cbf8093893109e9a";
@@ -33,21 +33,18 @@ public class DialogTests
 
         private const float DialogStabilizationTime = 1.5f;
 
-        [UnitySetUp]
-        public IEnumerator Setup()
+        public override IEnumerator Setup()
         {
-            PlayModeTestUtilities.Setup();
+            yield return base.Setup();
             TestUtilities.PlayspaceToOriginLookingForward();
             yield return null;
         }
 
-        [UnityTearDown]
-        public IEnumerator TearDown()
+        public override IEnumerator TearDown()
         {
-            GameObject.Destroy(dialogGameObject);
-            GameObject.Destroy(dialogComponent);
-            PlayModeTestUtilities.TearDown();
-            yield return null;
+            Object.Destroy(dialogGameObject);
+            Object.Destroy(dialogComponent);
+            yield return base.TearDown();
         }
 
         /// <summary>

Assets/MRTK/Tests/PlayModeTests/FocusProviderRaycastTests.cs

@@ -9,7 +9,6 @@
 using Microsoft.MixedReality.Toolkit.Input;
 using NUnit.Framework;
 using System.Collections;
-using System.IO;
 using UnityEditor;
 using UnityEngine;
 using UnityEngine.TestTools;
@@ -19,7 +18,7 @@ namespace Microsoft.MixedReality.Toolkit.Tests
     /// <summary>
     /// This class is used to test that <see cref="Toolkit.Input.FocusProvider"/> raycasts are selecting the correct focus object.
     /// </summary>
-    public class FocusProviderRaycastTests
+    public class FocusProviderRaycastTests : BasePlayModeTests
     {
         private GameObject raycastTestPrefabInstance = null;
         private TestPointer pointer = null;
@@ -47,10 +46,9 @@ public IEnumerator TestRaycastProxies()
             }
         }
 
-        [UnitySetUp]
-        public IEnumerator SetupFocusProviderRaycastTests()
+        public override IEnumerator Setup()
         {
-            PlayModeTestUtilities.Setup();
+            yield return base.Setup();
 
             focusProvider = PlayModeTestUtilities.GetInputSystem().FocusProvider;
 
@@ -62,8 +60,7 @@ public IEnumerator SetupFocusProviderRaycastTests()
             yield return null;
         }
 
-        [UnityTearDown]
-        public IEnumerator ShutdownFocusProviderRaycastTests()
+        public override IEnumerator TearDown()
         {
             if (raycastTestPrefabInstance)
             {
@@ -75,8 +72,7 @@ public IEnumerator ShutdownFocusProviderRaycastTests()
             focusProvider = null;
             pointer = null;
 
-            PlayModeTestUtilities.TearDown();
-            yield return null;
+            yield return base.TearDown();
         }
     }
 }

Assets/MRTK/Tests/PlayModeTests/FocusProviderTests.cs

@@ -22,22 +22,8 @@
 
 namespace Microsoft.MixedReality.Toolkit.Tests
 {
-    public class FocusProviderTests
+    public class FocusProviderTests : BasePlayModeTests
     {
-        [UnitySetUp]
-        public IEnumerator Setup()
-        {
-            PlayModeTestUtilities.Setup();
-            yield return null;
-        }
-
-        [UnityTearDown]
-        public IEnumerator TearDown()
-        {
-            PlayModeTestUtilities.TearDown();
-            yield return null;
-        }
-
         /// <summary>
         /// Test that the gaze cursor behaves properly with articulated hand pointers.
         /// </summary>
@@ -176,7 +162,6 @@ public IEnumerator TestGazeProviderTargetUnityUi()
         [UnityTest]
         public IEnumerator TestGazeProviderDestroyed()
         {
-            PlayModeTestUtilities.Setup();
             yield return PlayModeTestUtilities.WaitForInputSystemUpdate();
 
             // remove the gaze provider and it's components from the scene
@@ -201,8 +186,6 @@ public IEnumerator TestGazeProviderDestroyed()
         [UnityTest]
         public IEnumerator TestOverrideFocusDetails()
         {
-            PlayModeTestUtilities.Setup();
-
             var cube = GameObject.CreatePrimitive(PrimitiveType.Cube);
             yield return null;
 

Assets/MRTK/Tests/PlayModeTests/GltfTests.cs

@@ -22,26 +22,24 @@
 
 namespace Microsoft.MixedReality.Toolkit.Tests
 {
-    public class GltfTests
+    public class GltfTests : BasePlayModeTests
     {
         private const string AvocadoCustomAttrGuid = "fea29429b97dbb14b97820f56c74060a";
         private const string CubeCustomAttrGuid = "f0bb9fb635c69be4e8526b0fb6b48f39";
 
         private AsyncCoroutineRunner asyncCoroutineRunner;
-        [UnitySetUp]
-        public IEnumerator Setup()
+
+        public override IEnumerator Setup()
         {
-            PlayModeTestUtilities.Setup();
+            yield return base.Setup();
             asyncCoroutineRunner = new GameObject("AsyncCoroutineRunner").AddComponent<AsyncCoroutineRunner>();
             yield return null;
         }
 
-        [UnityTearDown]
-        public IEnumerator TearDown()
+        public override IEnumerator TearDown()
         {
-            PlayModeTestUtilities.TearDown();
-            GameObject.Destroy(asyncCoroutineRunner.gameObject);
-            yield return null;
+            Object.Destroy(asyncCoroutineRunner.gameObject);
+            yield return base.TearDown();
         }
 
         private IEnumerator WaitForTask(Task task)

Assets/MRTK/Tests/PlayModeTests/GridObjectCollectionTests.cs

@@ -31,23 +31,15 @@ namespace Microsoft.MixedReality.Toolkit.Tests
     /// You can use GridObjectLayoutControl.cs in the examples package to
     /// quickly generate the expected positions used in these tests.
     /// </summary>
-    internal class GridObjectCollectionTests
+    internal class GridObjectCollectionTests : BasePlayModeTests
     {
-        [UnitySetUp]
-        public IEnumerator Setup()
+        public override IEnumerator Setup()
         {
-            PlayModeTestUtilities.Setup();
+            yield return base.Setup();
             TestUtilities.PlayspaceToOriginLookingForward();
             yield return null;
         }
 
-        [UnityTearDown]
-        public IEnumerator TearDown()
-        {
-            PlayModeTestUtilities.TearDown();
-            yield return null;
-        }
-
         #region Tests
         /// <summary>
         /// Tests that grid lays out object correctly for all different anchor types

Assets/MRTK/Tests/PlayModeTests/HandCoachTests.cs

@@ -21,26 +21,18 @@
 
 namespace Microsoft.MixedReality.Toolkit.Tests
 {
-    class HandCoachTests
+    class HandCoachTests : BasePlayModeTests
     {
         private const string handCoachRightGuid = "2225b28a6968ba04594a7564e934a679";
         private static readonly string handCoachRightPath = AssetDatabase.GUIDToAssetPath(handCoachRightGuid);
 
-        [UnitySetUp]
-        public IEnumerator Setup()
+        public override IEnumerator Setup()
         {
-            PlayModeTestUtilities.Setup();
+            yield return base.Setup();
             TestUtilities.PlayspaceToOriginLookingForward();
             yield return null;
         }
 
-        [UnityTearDown]
-        public IEnumerator TearDown()
-        {
-            PlayModeTestUtilities.TearDown();
-            yield return null;
-        }
-
         #region Tests
         /// <summary>
         /// Tests that the hand coach is disabled when the hand is brought up

Assets/MRTK/Tests/PlayModeTests/InputEventSystemTests.cs

@@ -26,22 +26,8 @@ namespace Microsoft.MixedReality.Toolkit.Tests
     using Handle = BaseEventSystem.EventHandlerEntry;
     using HandleList = List<BaseEventSystem.EventHandlerEntry>;
 
-    class InputEventSystemTests
+    class InputEventSystemTests : BasePlayModeTests
     {
-        [UnitySetUp]
-        public IEnumerator Setup()
-        {
-            PlayModeTestUtilities.Setup();
-            yield return null;
-        }
-
-        [UnityTearDown]
-        public IEnumerator TearDown()
-        {
-            PlayModeTestUtilities.TearDown();
-            yield return null;
-        }
-
         /// <summary>
         /// </summary>
         [UnityTest]

Assets/MRTK/Tests/PlayModeTests/InputRayUtilsTests.cs

@@ -14,30 +14,21 @@
 using Microsoft.MixedReality.Toolkit.Utilities;
 using NUnit.Framework;
 using System.Collections;
-using UnityEditor;
 using UnityEngine;
 using UnityEngine.TestTools;
 
 namespace Microsoft.MixedReality.Toolkit.Tests
 {
     // Tests to verify that the ray utilities methods are functioning correctly
-    public class InputRayUtilsTests
+    public class InputRayUtilsTests : BasePlayModeTests
     {
-        [UnitySetUp]
-        public IEnumerator Setup()
+        public override IEnumerator Setup()
         {
-            PlayModeTestUtilities.Setup();
+            yield return base.Setup();
             TestUtilities.PlayspaceToOriginLookingForward();
             yield return null;
         }
 
-        [UnityTearDown]
-        public IEnumerator TearDown()
-        {
-            PlayModeTestUtilities.TearDown();
-            yield return null;
-        }
-
         [UnityTest]
         public IEnumerator HeadGazeRayTest()
         {