More BasePlayModeTests

Author: keveleigh

Assets/MRTK/Tests/PlayModeTests/BaseCursorTests.cs

@@ -22,7 +22,7 @@
 namespace Microsoft.MixedReality.Toolkit.Tests
 {
     // Tests to verify that cursor state is updated correctly
-    public class BaseCursorTests
+    public class BaseCursorTests : BasePlayModeTests
     {
         // Keeping this low by default so the test runs fast. Increase it to be able to see hand movements in the editor.
         private const int numFramesPerMove = 1;
@@ -41,10 +41,10 @@ public class BaseCursorTests
         /// for examples.
         /// See also comments at <see cref="TestUtilities.PlayspaceToArbitraryPose"/>.
         /// </remarks>
-        [UnitySetUp]
-        public IEnumerator SetUp()
+        public override IEnumerator Setup()
         {
-            PlayModeTestUtilities.Setup();
+            yield return base.Setup();
+
             TestUtilities.PlayspaceToArbitraryPose();
 
             // Target frame rate is set to 50 to match the physics
@@ -69,12 +69,10 @@ public IEnumerator SetUp()
             yield return null;
         }
 
-        [UnityTearDown]
-        public IEnumerator TearDown()
+        public override IEnumerator TearDown()
         {
             Object.Destroy(cube);
-            TestUtilities.ShutdownMixedRealityToolkit();
-            yield return null;
+            yield return base.TearDown();
         }
 
         private void VerifyCursorStateFromPointers(IEnumerable<IMixedRealityPointer> pointers, CursorStateEnum state)

Assets/MRTK/Tests/PlayModeTests/BaseEventSystemTests.cs

@@ -31,22 +31,8 @@ namespace Microsoft.MixedReality.Toolkit.Tests
     /// (i.e. input and diagnostics are used, but any arbitrary systems that can raise events on demand
     /// would work)
     /// </remarks>
-    class BaseEventSystemTests
+    internal class BaseEventSystemTests : BasePlayModeTests
     {
-        [UnitySetUp]
-        public IEnumerator Setup()
-        {
-            PlayModeTestUtilities.Setup();
-            yield return null;
-        }
-
-        [UnityTearDown]
-        public IEnumerator TearDown()
-        {
-            PlayModeTestUtilities.TearDown();
-            yield return null;
-        }
-
         /// <summary>
         /// Test input system catches exception thrown in global listener responding to input event, and
         /// that the input system is still able to unregister the event listener (i.e. eventExecutionDepth

Assets/MRTK/Tests/PlayModeTests/BoundsControlTests.cs

@@ -27,32 +27,24 @@ namespace Microsoft.MixedReality.Toolkit.Tests
     /// <summary>
     /// Tests for runtime behavior of bounds control
     /// </summary>
-    public class BoundsControlTests
+    public class BoundsControlTests : BasePlayModeTests
     {
         private Material testMaterial;
         private Material testMaterialGrabbed;
 
         #region Utilities
-        [UnitySetUp]
-        public IEnumerator Setup()
-        {
-            PlayModeTestUtilities.Setup();
 
+        public override IEnumerator Setup()
+        {
             // create shared test materials
             var shader = StandardShaderUtility.MrtkStandardShader;
             testMaterial = new Material(shader);
             testMaterial.color = Color.yellow;
 
             testMaterialGrabbed = new Material(shader);
             testMaterialGrabbed.color = Color.green;
-            yield return null;
-        }
 
-        [UnityTearDown]
-        public IEnumerator TearDown()
-        {
-            PlayModeTestUtilities.TearDown();
-            yield return null;
+            yield return base.Setup();
         }
 
         private readonly Vector3 boundsControlStartCenter = Vector3.forward * 1.5f;

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

@@ -12,15 +12,14 @@
 
 using Microsoft.MixedReality.Toolkit.Input;
 using Microsoft.MixedReality.Toolkit.Utilities;
-using NUnit.Framework;
 using System.Collections;
 using UnityEngine;
 using UnityEngine.EventSystems;
 using UnityEngine.TestTools;
 
 namespace Microsoft.MixedReality.Toolkit.Tests
 {
-    public class BaseHandVisualizerTests
+    public class BaseHandVisualizerTests : BasePlayModeTests
     {
         /// <summary>
         /// A mock IMixedRealityInputSource, used to test BaseHandVisualizer::OnHandMeshUpdated.
@@ -71,20 +70,6 @@ private class MockController : IMixedRealityController
             public bool IsInPointingPose => throw new System.NotImplementedException();
         }
 
-        [UnitySetUp]
-        public IEnumerator Setup()
-        {
-            PlayModeTestUtilities.Setup();
-            yield return null;
-        }
-
-        [UnityTearDown]
-        public IEnumerator TearDown()
-        {
-            TestUtilities.ShutdownMixedRealityToolkit();
-            yield return null;
-        }
-
         /// <summary>
         /// Validates that OnHandMeshUpdated can be called with hand mesh vertices of different
         /// lengths and not crash.

Assets/MRTK/Tests/PlayModeTests/SpatialObserverTests.cs

@@ -15,7 +15,6 @@
 using NUnit.Framework;
 using System.Collections;
 using UnityEditor;
-using UnityEngine;
 using UnityEngine.TestTools;
 
 namespace Microsoft.MixedReality.Toolkit.Tests
@@ -117,9 +116,9 @@ public IEnumerator TestManualStartObserver()
         public IEnumerator TestDisableSpatialAwarenessSystem()
         {
             var mrtkProfile = CreateMRTKTestProfile(TestSpatialAwarenessSystemProfilePath);
-            
+
             mrtkProfile.IsSpatialAwarenessSystemEnabled = false;
-            
+
             TestUtilities.InitializeMixedRealityToolkit(mrtkProfile);
             yield return PlayModeTestUtilities.WaitForInputSystemUpdate();
 
@@ -129,11 +128,11 @@ public IEnumerator TestDisableSpatialAwarenessSystem()
         private static MixedRealityToolkitConfigurationProfile CreateMRTKTestProfile(string spatialAwarenessSystemPath)
         {
             var mrtkProfile = TestUtilities.GetDefaultMixedRealityProfile<MixedRealityToolkitConfigurationProfile>();
-            
+
             mrtkProfile.SpatialAwarenessSystemSystemType = new SystemType(typeof(MixedRealitySpatialAwarenessSystem));
             mrtkProfile.IsSpatialAwarenessSystemEnabled = true;
             mrtkProfile.SpatialAwarenessSystemProfile = AssetDatabase.LoadAssetAtPath<MixedRealitySpatialAwarenessSystemProfile>(spatialAwarenessSystemPath);
-            
+
             return mrtkProfile;
         }
     }