Skip to content

chore: support standalone mode for netcode runtimetests #1115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 31, 2021
Merged

chore: support standalone mode for netcode runtimetests #1115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
933d96e
chore: Make runtimetests work in standalone player
Aug 30, 2021
20e2a3e
chore: Remove unused using in test file
Aug 30, 2021
c343ebf
Merge branch 'develop' into chore/standalone-runtimetests
Aug 31, 2021
375e9a4
Merge branch 'develop' into chore/standalone-runtimetests
Aug 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion com.unity.netcode.gameobjects/Prototyping/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
2 changes: 1 addition & 1 deletion com.unity.netcode.gameobjects/Runtime/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
4 changes: 4 additions & 0 deletions com.unity.netcode.gameobjects/Tests/Runtime/Transport/SIPTransport.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
using System;
using System.Collections.Generic;
#if UNITY_EDITOR
using Unity.Netcode.Editor;
#endif
using UnityEngine;

namespace Unity.Netcode.RuntimeTests
Expand All @@ -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
/// </summary>
#if UNITY_EDITOR
[DontShowInTransportDropdown]
#endif
public class SIPTransport : NetworkTransport
{
private struct Event
Expand Down
7 changes: 2 additions & 5 deletions com.unity.netcode.gameobjects/Tests/Runtime/com.unity.netcode.runtimetests.asmdef
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [],
Expand All @@ -19,8 +18,6 @@
],
"autoReferenced": false,
"defineConstraints": [
"UNITY_INCLUDE_TESTS",
"UNITY_EDITOR",
"UNITY_INCLUDE_TESTS"
],
"versionDefines": [
Expand Down
0 ...cts/Tests/Runtime/GlobalObjectIdHash.meta → ...ets/Tests/Runtime/GlobalObjectIdHash.meta
View file
Open in desktop
File renamed without changes.
7 changes: 1 addition & 6 deletions ...h/NetworkObjectGlobalObjectIdHashTests.cs → ...h/NetworkObjectGlobalObjectIdHashTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -27,9 +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(NetworkObjectGlobalObjectIdHashTests)}.unity");
const string scenePath = "Assets/Tests/Runtime/GlobalObjectIdHash/" + nameof(NetworkObjectGlobalObjectIdHashTests) + ".unity";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

less programmatic but also less dependent — path looks clear and obvious to me, so I think this is fine.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do these paths work on mobile platforms?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AFAIK, they should. IIRC, Assets/xxx is a project relative path and not directly OS-dependent.


yield return EditorSceneManager.LoadSceneAsyncInPlayMode(scenePath, new LoadSceneParameters(LoadSceneMode.Additive));
Assert.That(m_TestScene.isLoaded, Is.True);
Expand Down
0 ...workObjectGlobalObjectIdHashTests.cs.meta → ...workObjectGlobalObjectIdHashTests.cs.meta
View file
Open in desktop
File renamed without changes.
0 ...etworkObjectGlobalObjectIdHashTests.unity → ...etworkObjectGlobalObjectIdHashTests.unity
View file
Open in desktop
File renamed without changes.
0 ...kObjectGlobalObjectIdHashTests.unity.meta → ...kObjectGlobalObjectIdHashTests.unity.meta
View file
Open in desktop
File renamed without changes.
8 changes: 1 addition & 7 deletions ...h/NetworkPrefabGlobalObjectIdHashTests.cs → ...h/NetworkPrefabGlobalObjectIdHashTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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));
}

Expand Down
0 ...workPrefabGlobalObjectIdHashTests.cs.meta → ...workPrefabGlobalObjectIdHashTests.cs.meta
View file
Open in desktop
File renamed without changes.
0 ...etworkPrefabGlobalObjectIdHashTests.unity → ...etworkPrefabGlobalObjectIdHashTests.unity
View file
Open in desktop
File renamed without changes.
0 ...kPrefabGlobalObjectIdHashTests.unity.meta → ...kPrefabGlobalObjectIdHashTests.unity.meta
View file
Open in desktop
File renamed without changes.
0 .../GlobalObjectIdHash/NetworkPrefabX.prefab → .../GlobalObjectIdHash/NetworkPrefabX.prefab
View file
Open in desktop
File renamed without changes.
0 ...alObjectIdHash/NetworkPrefabX.prefab.meta → ...alObjectIdHash/NetworkPrefabX.prefab.meta
View file
Open in desktop
File renamed without changes.
0 .../GlobalObjectIdHash/NetworkPrefabY.prefab → .../GlobalObjectIdHash/NetworkPrefabY.prefab
View file
Open in desktop
File renamed without changes.
0 ...alObjectIdHash/NetworkPrefabY.prefab.meta → ...alObjectIdHash/NetworkPrefabY.prefab.meta
View file
Open in desktop
File renamed without changes.
0 .../GlobalObjectIdHash/NetworkPrefabZ.prefab → .../GlobalObjectIdHash/NetworkPrefabZ.prefab
View file
Open in desktop
File renamed without changes.
0 ...alObjectIdHash/NetworkPrefabZ.prefab.meta → ...alObjectIdHash/NetworkPrefabZ.prefab.meta
View file
Open in desktop
File renamed without changes.
0 ...bjects/Tests/Runtime/ObjectParenting.meta → ...Assets/Tests/Runtime/ObjectParenting.meta
View file
Open in desktop
File renamed without changes.
0 ...ts/Runtime/ObjectParenting/BlueColMat.mat → ...ts/Runtime/ObjectParenting/BlueColMat.mat
View file
Open in desktop
File renamed without changes.
0 ...ntime/ObjectParenting/BlueColMat.mat.meta → ...ntime/ObjectParenting/BlueColMat.mat.meta
View file
Open in desktop
File renamed without changes.
0 ...ts/Runtime/ObjectParenting/GrayColMat.mat → ...ts/Runtime/ObjectParenting/GrayColMat.mat
View file
Open in desktop
File renamed without changes.
0 ...ntime/ObjectParenting/GrayColMat.mat.meta → ...ntime/ObjectParenting/GrayColMat.mat.meta
View file
Open in desktop
File renamed without changes.
0 ...s/Runtime/ObjectParenting/GreenColMat.mat → ...s/Runtime/ObjectParenting/GreenColMat.mat
View file
Open in desktop
File renamed without changes.
0 ...time/ObjectParenting/GreenColMat.mat.meta → ...time/ObjectParenting/GreenColMat.mat.meta
View file
Open in desktop
File renamed without changes.
7 changes: 1 addition & 6 deletions ...tParenting/NetworkObjectParentingTests.cs → ...tParenting/NetworkObjectParentingTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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));
Expand Down
0 ...nting/NetworkObjectParentingTests.cs.meta → ...nting/NetworkObjectParentingTests.cs.meta
View file
Open in desktop
File renamed without changes.
0 ...renting/NetworkObjectParentingTests.unity → ...renting/NetworkObjectParentingTests.unity
View file
Open in desktop
File renamed without changes.
0 ...ng/NetworkObjectParentingTests.unity.meta → ...ng/NetworkObjectParentingTests.unity.meta
View file
Open in desktop
File renamed without changes.
0 ...ntime/ObjectParenting/PlayerPrefab.prefab → ...ntime/ObjectParenting/PlayerPrefab.prefab
View file
Open in desktop
File renamed without changes.
0 .../ObjectParenting/PlayerPrefab.prefab.meta → .../ObjectParenting/PlayerPrefab.prefab.meta
View file
Open in desktop
File renamed without changes.
0 .../ObjectParenting/ReparentingCubeNetBhv.cs → .../ObjectParenting/ReparentingCubeNetBhv.cs
View file
Open in desktop
File renamed without changes.
0 ...ctParenting/ReparentingCubeNetBhv.cs.meta → ...ctParenting/ReparentingCubeNetBhv.cs.meta
View file
Open in desktop
File renamed without changes.