From 88ac83ea466b542f4693aeadcc88ae9f2bc2f152 Mon Sep 17 00:00:00 2001
From: Pascal Serrarens <pse@pale.blue>
Date: Wed, 2 Feb 2022 17:32:11 +0100
Subject: [PATCH] Make Grabbingtest scene load independent from build settings

---
 .../Runtime/Grabbing/GrabbingHumanoidTest.cs  | 26 +++++--------------
 Tests/Runtime/Sites/Sites_Test.cs             |  2 +-
 2 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/Tests/Runtime/Grabbing/GrabbingHumanoidTest.cs b/Tests/Runtime/Grabbing/GrabbingHumanoidTest.cs
index a90504f..d4b1c3d 100644
--- a/Tests/Runtime/Grabbing/GrabbingHumanoidTest.cs
+++ b/Tests/Runtime/Grabbing/GrabbingHumanoidTest.cs
@@ -9,17 +9,18 @@ using NUnit.Framework;
 namespace Passer.Humanoid {
     public class GrabbingTest {
 
-        public void Setup() {
-            UnityEngine.SceneManagement.SceneManager.LoadScene("[Test]GrabbingHumanoid");
+        [UnitySetUp]
+        public IEnumerator Setup() {
+            //UnityEngine.SceneManagement.SceneManager.LoadScene("[Test]GrabbingHumanoid");
             //UnityEngine.SceneManagement.SceneManager.LoadScene("Passer/Humanoid/Demo/Environments/ObjectTable_env", LoadSceneMode.Additive);
+            UnityEditor.SceneManagement.EditorSceneManager.LoadSceneInPlayMode("Packages/HumanoidControl4_Free/Tests/Runtime/Grabbing/Scenes/[Test]GrabbingHumanoid.unity", new LoadSceneParameters(LoadSceneMode.Single));
+            yield return new WaitForSeconds(0.1F);
+
         }
 
         [UnityTest]
         [Category("Grabbing")]
         public IEnumerator GrabStaticObject() {
-            Setup();
-            yield return new WaitForSeconds(1);
-
             HumanoidControl humanoid = Object.FindObjectOfType<HumanoidControl>();
             Assert.IsFalse(humanoid == null);
 
@@ -63,9 +64,6 @@ namespace Passer.Humanoid {
         [UnityTest]
         [Category("Grabbing")]
         public IEnumerator GrabStaticObjectHandle() {
-            Setup();
-            yield return new WaitForSeconds(1);
-
             HumanoidControl humanoid = Object.FindObjectOfType<HumanoidControl>();
             Assert.IsFalse(humanoid == null);
 
@@ -112,9 +110,6 @@ namespace Passer.Humanoid {
         [UnityTest]
         [Category("Grabbing")]
         public IEnumerator GrabHeavyObjectHandle() {
-            Setup();
-            yield return new WaitForSeconds(1);
-
             HumanoidControl humanoid = Object.FindObjectOfType<HumanoidControl>();
             Assert.IsFalse(humanoid == null);
 
@@ -162,9 +157,6 @@ namespace Passer.Humanoid {
         [UnityTest]
         [Category("Grabbing")]
         public IEnumerator GrabRigidbody() {
-            Setup();
-            yield return new WaitForSeconds(1);
-
             HumanoidControl humanoid = Object.FindObjectOfType<HumanoidControl>();
             Assert.IsFalse(humanoid == null);
 
@@ -213,9 +205,6 @@ namespace Passer.Humanoid {
         [UnityTest]
         [Category("Grabbing")]
         public IEnumerator GrabRigidbodyHandle() {
-            Setup();
-            yield return new WaitForSeconds(1);
-
             HumanoidControl humanoid = Object.FindObjectOfType<HumanoidControl>();
             Assert.IsFalse(humanoid == null);
 
@@ -263,9 +252,6 @@ namespace Passer.Humanoid {
         [UnityTest]
         [Category("Grabbing")]
         public IEnumerator GrabKinematicRigidbodyWithPhysics() {
-            Setup();
-            yield return new WaitForSeconds(1);
-
             HumanoidControl humanoid = Object.FindObjectOfType<HumanoidControl>();
             Assert.IsFalse(humanoid == null);
 
diff --git a/Tests/Runtime/Sites/Sites_Test.cs b/Tests/Runtime/Sites/Sites_Test.cs
index 55113c0..292759c 100644
--- a/Tests/Runtime/Sites/Sites_Test.cs
+++ b/Tests/Runtime/Sites/Sites_Test.cs
@@ -10,7 +10,7 @@ namespace Passer.Humanoid {
     public class Sites_Test {
         [UnitySetUp]
         public IEnumerator Setup() {
-            Scene x = UnityEditor.SceneManagement.EditorSceneManager.LoadSceneInPlayMode("Packages/HumanoidControl4_Free/Tests/Runtime/Sites/[Test]HumanoidVisitor Desktop.unity", new LoadSceneParameters(LoadSceneMode.Single));
+            UnityEditor.SceneManagement.EditorSceneManager.LoadSceneInPlayMode("Packages/HumanoidControl4_Free/Tests/Runtime/Sites/[Test]HumanoidVisitor Desktop.unity", new LoadSceneParameters(LoadSceneMode.Single));
             yield return new WaitForSeconds(0.1F);
         }