From 933d96e0cf9d2c4542207d0c74a49d1260d21493 Mon Sep 17 00:00:00 2001 From: Jesse Olmer Date: Mon, 30 Aug 2021 14:45:29 -0700 Subject: [PATCH 1/2] chore: Make runtimetests work in standalone player - Move GlobalObjectIdHash tests out of package tests and into testproject - Move ObjectParenting tests out of package tests and into testproject - Fix InternalsVisibleTo to work outside of editor for RuntimeTests assembly - if UNITY_EDITOR guards on editor attributes in SIPTransport --- com.unity.netcode.gameobjects/Prototyping/AssemblyInfo.cs | 2 +- com.unity.netcode.gameobjects/Runtime/AssemblyInfo.cs | 2 +- .../Tests/Runtime/Transport/SIPTransport.cs | 4 ++++ .../Tests/Runtime/com.unity.netcode.runtimetests.asmdef | 7 ++----- .../Assets}/Tests/Runtime/GlobalObjectIdHash.meta | 0 .../NetworkObjectGlobalObjectIdHashTests.cs | 5 +---- .../NetworkObjectGlobalObjectIdHashTests.cs.meta | 0 .../NetworkObjectGlobalObjectIdHashTests.unity | 0 .../NetworkObjectGlobalObjectIdHashTests.unity.meta | 0 .../NetworkPrefabGlobalObjectIdHashTests.cs | 8 +------- .../NetworkPrefabGlobalObjectIdHashTests.cs.meta | 0 .../NetworkPrefabGlobalObjectIdHashTests.unity | 0 .../NetworkPrefabGlobalObjectIdHashTests.unity.meta | 0 .../Runtime/GlobalObjectIdHash/NetworkPrefabX.prefab | 0 .../Runtime/GlobalObjectIdHash/NetworkPrefabX.prefab.meta | 0 .../Runtime/GlobalObjectIdHash/NetworkPrefabY.prefab | 0 .../Runtime/GlobalObjectIdHash/NetworkPrefabY.prefab.meta | 0 .../Runtime/GlobalObjectIdHash/NetworkPrefabZ.prefab | 0 .../Runtime/GlobalObjectIdHash/NetworkPrefabZ.prefab.meta | 0 .../Assets}/Tests/Runtime/ObjectParenting.meta | 0 .../Assets}/Tests/Runtime/ObjectParenting/BlueColMat.mat | 0 .../Tests/Runtime/ObjectParenting/BlueColMat.mat.meta | 0 .../Assets}/Tests/Runtime/ObjectParenting/GrayColMat.mat | 0 .../Tests/Runtime/ObjectParenting/GrayColMat.mat.meta | 0 .../Assets}/Tests/Runtime/ObjectParenting/GreenColMat.mat | 0 .../Tests/Runtime/ObjectParenting/GreenColMat.mat.meta | 0 .../ObjectParenting/NetworkObjectParentingTests.cs | 7 +------ .../ObjectParenting/NetworkObjectParentingTests.cs.meta | 0 .../ObjectParenting/NetworkObjectParentingTests.unity | 0 .../NetworkObjectParentingTests.unity.meta | 0 .../Tests/Runtime/ObjectParenting/PlayerPrefab.prefab | 0 .../Runtime/ObjectParenting/PlayerPrefab.prefab.meta | 0 .../Runtime/ObjectParenting/ReparentingCubeNetBhv.cs | 0 .../Runtime/ObjectParenting/ReparentingCubeNetBhv.cs.meta | 0 34 files changed, 11 insertions(+), 24 deletions(-) rename {com.unity.netcode.gameobjects => testproject/Assets}/Tests/Runtime/GlobalObjectIdHash.meta (100%) rename {com.unity.netcode.gameobjects => testproject/Assets}/Tests/Runtime/GlobalObjectIdHash/NetworkObjectGlobalObjectIdHashTests.cs (84%) rename {com.unity.netcode.gameobjects => testproject/Assets}/Tests/Runtime/GlobalObjectIdHash/NetworkObjectGlobalObjectIdHashTests.cs.meta (100%) rename {com.unity.netcode.gameobjects => testproject/Assets}/Tests/Runtime/GlobalObjectIdHash/NetworkObjectGlobalObjectIdHashTests.unity (100%) rename {com.unity.netcode.gameobjects => testproject/Assets}/Tests/Runtime/GlobalObjectIdHash/NetworkObjectGlobalObjectIdHashTests.unity.meta (100%) rename {com.unity.netcode.gameobjects => testproject/Assets}/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabGlobalObjectIdHashTests.cs (84%) rename {com.unity.netcode.gameobjects => testproject/Assets}/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabGlobalObjectIdHashTests.cs.meta (100%) rename {com.unity.netcode.gameobjects => testproject/Assets}/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabGlobalObjectIdHashTests.unity (100%) rename {com.unity.netcode.gameobjects => testproject/Assets}/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabGlobalObjectIdHashTests.unity.meta (100%) rename {com.unity.netcode.gameobjects => testproject/Assets}/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabX.prefab (100%) rename {com.unity.netcode.gameobjects => testproject/Assets}/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabX.prefab.meta (100%) rename {com.unity.netcode.gameobjects => testproject/Assets}/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabY.prefab (100%) rename {com.unity.netcode.gameobjects => testproject/Assets}/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabY.prefab.meta (100%) rename {com.unity.netcode.gameobjects => testproject/Assets}/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabZ.prefab (100%) rename {com.unity.netcode.gameobjects => testproject/Assets}/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabZ.prefab.meta (100%) rename {com.unity.netcode.gameobjects => testproject/Assets}/Tests/Runtime/ObjectParenting.meta (100%) rename {com.unity.netcode.gameobjects => testproject/Assets}/Tests/Runtime/ObjectParenting/BlueColMat.mat (100%) rename {com.unity.netcode.gameobjects => testproject/Assets}/Tests/Runtime/ObjectParenting/BlueColMat.mat.meta (100%) rename {com.unity.netcode.gameobjects => testproject/Assets}/Tests/Runtime/ObjectParenting/GrayColMat.mat (100%) rename {com.unity.netcode.gameobjects => testproject/Assets}/Tests/Runtime/ObjectParenting/GrayColMat.mat.meta (100%) rename {com.unity.netcode.gameobjects => testproject/Assets}/Tests/Runtime/ObjectParenting/GreenColMat.mat (100%) rename {com.unity.netcode.gameobjects => testproject/Assets}/Tests/Runtime/ObjectParenting/GreenColMat.mat.meta (100%) rename {com.unity.netcode.gameobjects => testproject/Assets}/Tests/Runtime/ObjectParenting/NetworkObjectParentingTests.cs (97%) rename {com.unity.netcode.gameobjects => testproject/Assets}/Tests/Runtime/ObjectParenting/NetworkObjectParentingTests.cs.meta (100%) rename {com.unity.netcode.gameobjects => testproject/Assets}/Tests/Runtime/ObjectParenting/NetworkObjectParentingTests.unity (100%) rename {com.unity.netcode.gameobjects => testproject/Assets}/Tests/Runtime/ObjectParenting/NetworkObjectParentingTests.unity.meta (100%) rename {com.unity.netcode.gameobjects => testproject/Assets}/Tests/Runtime/ObjectParenting/PlayerPrefab.prefab (100%) rename {com.unity.netcode.gameobjects => testproject/Assets}/Tests/Runtime/ObjectParenting/PlayerPrefab.prefab.meta (100%) rename {com.unity.netcode.gameobjects => testproject/Assets}/Tests/Runtime/ObjectParenting/ReparentingCubeNetBhv.cs (100%) rename {com.unity.netcode.gameobjects => testproject/Assets}/Tests/Runtime/ObjectParenting/ReparentingCubeNetBhv.cs.meta (100%) diff --git a/com.unity.netcode.gameobjects/Prototyping/AssemblyInfo.cs b/com.unity.netcode.gameobjects/Prototyping/AssemblyInfo.cs index bad6d37805..98d32cab6c 100644 --- a/com.unity.netcode.gameobjects/Prototyping/AssemblyInfo.cs +++ b/com.unity.netcode.gameobjects/Prototyping/AssemblyInfo.cs @@ -2,9 +2,9 @@ #if UNITY_EDITOR [assembly: InternalsVisibleTo("Unity.Netcode.EditorTests")] -[assembly: InternalsVisibleTo("Unity.Netcode.RuntimeTests")] [assembly: InternalsVisibleTo("Unity.Netcode.Editor.CodeGen")] [assembly: InternalsVisibleTo("Unity.Netcode.Editor")] [assembly: InternalsVisibleTo("TestProject.EditorTests")] [assembly: InternalsVisibleTo("TestProject.RuntimeTests")] #endif +[assembly: InternalsVisibleTo("Unity.Netcode.RuntimeTests")] diff --git a/com.unity.netcode.gameobjects/Runtime/AssemblyInfo.cs b/com.unity.netcode.gameobjects/Runtime/AssemblyInfo.cs index bad6d37805..98d32cab6c 100644 --- a/com.unity.netcode.gameobjects/Runtime/AssemblyInfo.cs +++ b/com.unity.netcode.gameobjects/Runtime/AssemblyInfo.cs @@ -2,9 +2,9 @@ #if UNITY_EDITOR [assembly: InternalsVisibleTo("Unity.Netcode.EditorTests")] -[assembly: InternalsVisibleTo("Unity.Netcode.RuntimeTests")] [assembly: InternalsVisibleTo("Unity.Netcode.Editor.CodeGen")] [assembly: InternalsVisibleTo("Unity.Netcode.Editor")] [assembly: InternalsVisibleTo("TestProject.EditorTests")] [assembly: InternalsVisibleTo("TestProject.RuntimeTests")] #endif +[assembly: InternalsVisibleTo("Unity.Netcode.RuntimeTests")] diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/Transport/SIPTransport.cs b/com.unity.netcode.gameobjects/Tests/Runtime/Transport/SIPTransport.cs index 5381a22fb3..76f50d0596 100644 --- a/com.unity.netcode.gameobjects/Tests/Runtime/Transport/SIPTransport.cs +++ b/com.unity.netcode.gameobjects/Tests/Runtime/Transport/SIPTransport.cs @@ -1,6 +1,8 @@ using System; using System.Collections.Generic; +#if UNITY_EDITOR using Unity.Netcode.Editor; +#endif using UnityEngine; namespace Unity.Netcode.RuntimeTests @@ -11,7 +13,9 @@ namespace Unity.Netcode.RuntimeTests /// it's designed for the netcode in a way where no networking stack has to be available /// it's designed for testing purposes and it's not designed with speed in mind /// +#if UNITY_EDITOR [DontShowInTransportDropdown] +#endif public class SIPTransport : NetworkTransport { private struct Event diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/com.unity.netcode.runtimetests.asmdef b/com.unity.netcode.gameobjects/Tests/Runtime/com.unity.netcode.runtimetests.asmdef index c879080ca1..353fdec9b2 100644 --- a/com.unity.netcode.gameobjects/Tests/Runtime/com.unity.netcode.runtimetests.asmdef +++ b/com.unity.netcode.gameobjects/Tests/Runtime/com.unity.netcode.runtimetests.asmdef @@ -5,10 +5,9 @@ "Unity.Netcode.Runtime", "Unity.Netcode.Editor", "Unity.Netcode.Prototyping", - "UnityEngine.TestRunner", - "UnityEditor.TestRunner", "Unity.Multiplayer.MetricTypes", - "Unity.Multiplayer.NetStats" + "Unity.Multiplayer.NetStats", + "UnityEngine.TestRunner" ], "includePlatforms": [], "excludePlatforms": [], @@ -19,8 +18,6 @@ ], "autoReferenced": false, "defineConstraints": [ - "UNITY_INCLUDE_TESTS", - "UNITY_EDITOR", "UNITY_INCLUDE_TESTS" ], "versionDefines": [ diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/GlobalObjectIdHash.meta b/testproject/Assets/Tests/Runtime/GlobalObjectIdHash.meta similarity index 100% rename from com.unity.netcode.gameobjects/Tests/Runtime/GlobalObjectIdHash.meta rename to testproject/Assets/Tests/Runtime/GlobalObjectIdHash.meta diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/GlobalObjectIdHash/NetworkObjectGlobalObjectIdHashTests.cs b/testproject/Assets/Tests/Runtime/GlobalObjectIdHash/NetworkObjectGlobalObjectIdHashTests.cs similarity index 84% rename from com.unity.netcode.gameobjects/Tests/Runtime/GlobalObjectIdHash/NetworkObjectGlobalObjectIdHashTests.cs rename to testproject/Assets/Tests/Runtime/GlobalObjectIdHash/NetworkObjectGlobalObjectIdHashTests.cs index a98de19567..b41c509fe2 100644 --- a/com.unity.netcode.gameobjects/Tests/Runtime/GlobalObjectIdHash/NetworkObjectGlobalObjectIdHashTests.cs +++ b/testproject/Assets/Tests/Runtime/GlobalObjectIdHash/NetworkObjectGlobalObjectIdHashTests.cs @@ -3,7 +3,6 @@ using System.IO; using System.Reflection; using NUnit.Framework; -using UnityEditor.PackageManager; using UnityEditor.SceneManagement; using UnityEngine.SceneManagement; using UnityEngine.TestTools; @@ -27,9 +26,7 @@ public IEnumerator Setup() { SceneManager.sceneLoaded += OnSceneLoaded; - var execAssembly = Assembly.GetExecutingAssembly(); - var packagePath = PackageInfo.FindForAssembly(execAssembly).assetPath; - var scenePath = Path.Combine(packagePath, $"Tests/Runtime/GlobalObjectIdHash/{nameof(NetworkObjectGlobalObjectIdHashTests)}.unity"); + const string scenePath = "Assets/Tests/Runtime/GlobalObjectIdHash/" + nameof(NetworkObjectGlobalObjectIdHashTests) + ".unity"; yield return EditorSceneManager.LoadSceneAsyncInPlayMode(scenePath, new LoadSceneParameters(LoadSceneMode.Additive)); Assert.That(m_TestScene.isLoaded, Is.True); diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/GlobalObjectIdHash/NetworkObjectGlobalObjectIdHashTests.cs.meta b/testproject/Assets/Tests/Runtime/GlobalObjectIdHash/NetworkObjectGlobalObjectIdHashTests.cs.meta similarity index 100% rename from com.unity.netcode.gameobjects/Tests/Runtime/GlobalObjectIdHash/NetworkObjectGlobalObjectIdHashTests.cs.meta rename to testproject/Assets/Tests/Runtime/GlobalObjectIdHash/NetworkObjectGlobalObjectIdHashTests.cs.meta diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/GlobalObjectIdHash/NetworkObjectGlobalObjectIdHashTests.unity b/testproject/Assets/Tests/Runtime/GlobalObjectIdHash/NetworkObjectGlobalObjectIdHashTests.unity similarity index 100% rename from com.unity.netcode.gameobjects/Tests/Runtime/GlobalObjectIdHash/NetworkObjectGlobalObjectIdHashTests.unity rename to testproject/Assets/Tests/Runtime/GlobalObjectIdHash/NetworkObjectGlobalObjectIdHashTests.unity diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/GlobalObjectIdHash/NetworkObjectGlobalObjectIdHashTests.unity.meta b/testproject/Assets/Tests/Runtime/GlobalObjectIdHash/NetworkObjectGlobalObjectIdHashTests.unity.meta similarity index 100% rename from com.unity.netcode.gameobjects/Tests/Runtime/GlobalObjectIdHash/NetworkObjectGlobalObjectIdHashTests.unity.meta rename to testproject/Assets/Tests/Runtime/GlobalObjectIdHash/NetworkObjectGlobalObjectIdHashTests.unity.meta diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabGlobalObjectIdHashTests.cs b/testproject/Assets/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabGlobalObjectIdHashTests.cs similarity index 84% rename from com.unity.netcode.gameobjects/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabGlobalObjectIdHashTests.cs rename to testproject/Assets/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabGlobalObjectIdHashTests.cs index 556be87c37..9048783e43 100644 --- a/com.unity.netcode.gameobjects/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabGlobalObjectIdHashTests.cs +++ b/testproject/Assets/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabGlobalObjectIdHashTests.cs @@ -1,9 +1,6 @@ using System.Collections; using System.Collections.Generic; -using System.IO; -using System.Reflection; using NUnit.Framework; -using UnityEditor.PackageManager; using UnityEditor.SceneManagement; using UnityEngine.SceneManagement; using UnityEngine.TestTools; @@ -27,10 +24,7 @@ public IEnumerator Setup() { SceneManager.sceneLoaded += OnSceneLoaded; - var execAssembly = Assembly.GetExecutingAssembly(); - var packagePath = PackageInfo.FindForAssembly(execAssembly).assetPath; - var scenePath = Path.Combine(packagePath, $"Tests/Runtime/GlobalObjectIdHash/{nameof(NetworkPrefabGlobalObjectIdHashTests)}.unity"); - + const string scenePath = "Assets/Tests/Runtime/GlobalObjectIdHash/" + nameof(NetworkPrefabGlobalObjectIdHashTests) + ".unity"; yield return EditorSceneManager.LoadSceneAsyncInPlayMode(scenePath, new LoadSceneParameters(LoadSceneMode.Additive)); } diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabGlobalObjectIdHashTests.cs.meta b/testproject/Assets/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabGlobalObjectIdHashTests.cs.meta similarity index 100% rename from com.unity.netcode.gameobjects/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabGlobalObjectIdHashTests.cs.meta rename to testproject/Assets/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabGlobalObjectIdHashTests.cs.meta diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabGlobalObjectIdHashTests.unity b/testproject/Assets/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabGlobalObjectIdHashTests.unity similarity index 100% rename from com.unity.netcode.gameobjects/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabGlobalObjectIdHashTests.unity rename to testproject/Assets/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabGlobalObjectIdHashTests.unity diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabGlobalObjectIdHashTests.unity.meta b/testproject/Assets/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabGlobalObjectIdHashTests.unity.meta similarity index 100% rename from com.unity.netcode.gameobjects/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabGlobalObjectIdHashTests.unity.meta rename to testproject/Assets/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabGlobalObjectIdHashTests.unity.meta diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabX.prefab b/testproject/Assets/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabX.prefab similarity index 100% rename from com.unity.netcode.gameobjects/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabX.prefab rename to testproject/Assets/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabX.prefab diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabX.prefab.meta b/testproject/Assets/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabX.prefab.meta similarity index 100% rename from com.unity.netcode.gameobjects/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabX.prefab.meta rename to testproject/Assets/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabX.prefab.meta diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabY.prefab b/testproject/Assets/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabY.prefab similarity index 100% rename from com.unity.netcode.gameobjects/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabY.prefab rename to testproject/Assets/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabY.prefab diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabY.prefab.meta b/testproject/Assets/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabY.prefab.meta similarity index 100% rename from com.unity.netcode.gameobjects/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabY.prefab.meta rename to testproject/Assets/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabY.prefab.meta diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabZ.prefab b/testproject/Assets/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabZ.prefab similarity index 100% rename from com.unity.netcode.gameobjects/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabZ.prefab rename to testproject/Assets/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabZ.prefab diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabZ.prefab.meta b/testproject/Assets/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabZ.prefab.meta similarity index 100% rename from com.unity.netcode.gameobjects/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabZ.prefab.meta rename to testproject/Assets/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabZ.prefab.meta diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/ObjectParenting.meta b/testproject/Assets/Tests/Runtime/ObjectParenting.meta similarity index 100% rename from com.unity.netcode.gameobjects/Tests/Runtime/ObjectParenting.meta rename to testproject/Assets/Tests/Runtime/ObjectParenting.meta diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/ObjectParenting/BlueColMat.mat b/testproject/Assets/Tests/Runtime/ObjectParenting/BlueColMat.mat similarity index 100% rename from com.unity.netcode.gameobjects/Tests/Runtime/ObjectParenting/BlueColMat.mat rename to testproject/Assets/Tests/Runtime/ObjectParenting/BlueColMat.mat diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/ObjectParenting/BlueColMat.mat.meta b/testproject/Assets/Tests/Runtime/ObjectParenting/BlueColMat.mat.meta similarity index 100% rename from com.unity.netcode.gameobjects/Tests/Runtime/ObjectParenting/BlueColMat.mat.meta rename to testproject/Assets/Tests/Runtime/ObjectParenting/BlueColMat.mat.meta diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/ObjectParenting/GrayColMat.mat b/testproject/Assets/Tests/Runtime/ObjectParenting/GrayColMat.mat similarity index 100% rename from com.unity.netcode.gameobjects/Tests/Runtime/ObjectParenting/GrayColMat.mat rename to testproject/Assets/Tests/Runtime/ObjectParenting/GrayColMat.mat diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/ObjectParenting/GrayColMat.mat.meta b/testproject/Assets/Tests/Runtime/ObjectParenting/GrayColMat.mat.meta similarity index 100% rename from com.unity.netcode.gameobjects/Tests/Runtime/ObjectParenting/GrayColMat.mat.meta rename to testproject/Assets/Tests/Runtime/ObjectParenting/GrayColMat.mat.meta diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/ObjectParenting/GreenColMat.mat b/testproject/Assets/Tests/Runtime/ObjectParenting/GreenColMat.mat similarity index 100% rename from com.unity.netcode.gameobjects/Tests/Runtime/ObjectParenting/GreenColMat.mat rename to testproject/Assets/Tests/Runtime/ObjectParenting/GreenColMat.mat diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/ObjectParenting/GreenColMat.mat.meta b/testproject/Assets/Tests/Runtime/ObjectParenting/GreenColMat.mat.meta similarity index 100% rename from com.unity.netcode.gameobjects/Tests/Runtime/ObjectParenting/GreenColMat.mat.meta rename to testproject/Assets/Tests/Runtime/ObjectParenting/GreenColMat.mat.meta diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/ObjectParenting/NetworkObjectParentingTests.cs b/testproject/Assets/Tests/Runtime/ObjectParenting/NetworkObjectParentingTests.cs similarity index 97% rename from com.unity.netcode.gameobjects/Tests/Runtime/ObjectParenting/NetworkObjectParentingTests.cs rename to testproject/Assets/Tests/Runtime/ObjectParenting/NetworkObjectParentingTests.cs index 90f7317216..33b7fd5998 100644 --- a/com.unity.netcode.gameobjects/Tests/Runtime/ObjectParenting/NetworkObjectParentingTests.cs +++ b/testproject/Assets/Tests/Runtime/ObjectParenting/NetworkObjectParentingTests.cs @@ -1,10 +1,7 @@ using System.Collections; -using System.IO; using System.Linq; -using System.Reflection; using System.Text.RegularExpressions; using NUnit.Framework; -using UnityEditor.PackageManager; using UnityEditor.SceneManagement; using UnityEngine; using UnityEngine.SceneManagement; @@ -58,9 +55,7 @@ public IEnumerator Setup() // we are running a unit test or not. (it is this or manually setting a property) Assert.That(MultiInstanceHelpers.Create(k_ClientInstanceCount, out m_ServerNetworkManager, out m_ClientNetworkManagers)); - var execAssembly = Assembly.GetExecutingAssembly(); - var packagePath = PackageInfo.FindForAssembly(execAssembly).assetPath; - var scenePath = Path.Combine(packagePath, $"Tests/Runtime/ObjectParenting/{nameof(NetworkObjectParentingTests)}.unity"); + const string scenePath = "Assets/Tests/Runtime/ObjectParenting/" + nameof(NetworkObjectParentingTests) + ".unity"; m_InitScene = SceneManager.GetActiveScene(); yield return EditorSceneManager.LoadSceneAsyncInPlayMode(scenePath, new LoadSceneParameters(LoadSceneMode.Additive)); diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/ObjectParenting/NetworkObjectParentingTests.cs.meta b/testproject/Assets/Tests/Runtime/ObjectParenting/NetworkObjectParentingTests.cs.meta similarity index 100% rename from com.unity.netcode.gameobjects/Tests/Runtime/ObjectParenting/NetworkObjectParentingTests.cs.meta rename to testproject/Assets/Tests/Runtime/ObjectParenting/NetworkObjectParentingTests.cs.meta diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/ObjectParenting/NetworkObjectParentingTests.unity b/testproject/Assets/Tests/Runtime/ObjectParenting/NetworkObjectParentingTests.unity similarity index 100% rename from com.unity.netcode.gameobjects/Tests/Runtime/ObjectParenting/NetworkObjectParentingTests.unity rename to testproject/Assets/Tests/Runtime/ObjectParenting/NetworkObjectParentingTests.unity diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/ObjectParenting/NetworkObjectParentingTests.unity.meta b/testproject/Assets/Tests/Runtime/ObjectParenting/NetworkObjectParentingTests.unity.meta similarity index 100% rename from com.unity.netcode.gameobjects/Tests/Runtime/ObjectParenting/NetworkObjectParentingTests.unity.meta rename to testproject/Assets/Tests/Runtime/ObjectParenting/NetworkObjectParentingTests.unity.meta diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/ObjectParenting/PlayerPrefab.prefab b/testproject/Assets/Tests/Runtime/ObjectParenting/PlayerPrefab.prefab similarity index 100% rename from com.unity.netcode.gameobjects/Tests/Runtime/ObjectParenting/PlayerPrefab.prefab rename to testproject/Assets/Tests/Runtime/ObjectParenting/PlayerPrefab.prefab diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/ObjectParenting/PlayerPrefab.prefab.meta b/testproject/Assets/Tests/Runtime/ObjectParenting/PlayerPrefab.prefab.meta similarity index 100% rename from com.unity.netcode.gameobjects/Tests/Runtime/ObjectParenting/PlayerPrefab.prefab.meta rename to testproject/Assets/Tests/Runtime/ObjectParenting/PlayerPrefab.prefab.meta diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/ObjectParenting/ReparentingCubeNetBhv.cs b/testproject/Assets/Tests/Runtime/ObjectParenting/ReparentingCubeNetBhv.cs similarity index 100% rename from com.unity.netcode.gameobjects/Tests/Runtime/ObjectParenting/ReparentingCubeNetBhv.cs rename to testproject/Assets/Tests/Runtime/ObjectParenting/ReparentingCubeNetBhv.cs diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/ObjectParenting/ReparentingCubeNetBhv.cs.meta b/testproject/Assets/Tests/Runtime/ObjectParenting/ReparentingCubeNetBhv.cs.meta similarity index 100% rename from com.unity.netcode.gameobjects/Tests/Runtime/ObjectParenting/ReparentingCubeNetBhv.cs.meta rename to testproject/Assets/Tests/Runtime/ObjectParenting/ReparentingCubeNetBhv.cs.meta From 20e2a3e25d34cb8bb6022196f30454b63035eae2 Mon Sep 17 00:00:00 2001 From: Jesse Olmer Date: Mon, 30 Aug 2021 16:29:43 -0700 Subject: [PATCH 2/2] chore: Remove unused using in test file --- .../GlobalObjectIdHash/NetworkObjectGlobalObjectIdHashTests.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/testproject/Assets/Tests/Runtime/GlobalObjectIdHash/NetworkObjectGlobalObjectIdHashTests.cs b/testproject/Assets/Tests/Runtime/GlobalObjectIdHash/NetworkObjectGlobalObjectIdHashTests.cs index b41c509fe2..5a9fec89b9 100644 --- a/testproject/Assets/Tests/Runtime/GlobalObjectIdHash/NetworkObjectGlobalObjectIdHashTests.cs +++ b/testproject/Assets/Tests/Runtime/GlobalObjectIdHash/NetworkObjectGlobalObjectIdHashTests.cs @@ -1,7 +1,5 @@ using System.Collections; using System.Collections.Generic; -using System.IO; -using System.Reflection; using NUnit.Framework; using UnityEditor.SceneManagement; using UnityEngine.SceneManagement;