Skip to content
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
using System.Collections;
using System.Collections.Generic;
using MLAPI;
using MLAPI.RuntimeTests;
using NUnit.Framework;
using UnityEngine;
using UnityEngine.TestTools;
Expand All @@ -10,6 +8,9 @@ namespace MLAPI.RuntimeTests
{
public class NetworkObjectOnSpawnTests : BaseMultiInstanceTest
{
private GameObject m_TestNetworkObjectPrefab;
private GameObject m_TestNetworkObjectInstance;

protected override int NbClients => 2;


Expand All @@ -21,15 +22,12 @@ public class NetworkObjectOnSpawnTests : BaseMultiInstanceTest
[UnityTest]
public IEnumerator InstantiateDestroySpawnNotCalled()
{
var gameObject = new GameObject("InstantiateDestroySpawnNotCalled_Object");
var networkObject = gameObject.AddComponent<NetworkObject>();
var fail = gameObject.AddComponent<FailWhenSpawned>();

yield return null;
m_TestNetworkObjectPrefab = new GameObject("InstantiateDestroySpawnNotCalled_Object");
var networkObject = m_TestNetworkObjectPrefab.AddComponent<NetworkObject>();
var fail = m_TestNetworkObjectPrefab.AddComponent<FailWhenSpawned>();

// destroy
Object.Destroy(gameObject);

// instantiate
m_TestNetworkObjectInstance = Object.Instantiate(m_TestNetworkObjectPrefab);
yield return null;
}

Expand All @@ -56,6 +54,22 @@ public override IEnumerator Setup()
});
}

[UnityTearDown]
public override IEnumerator Teardown()
{
yield return base.Teardown();

if (m_TestNetworkObjectPrefab != null)
{
Object.Destroy(m_TestNetworkObjectPrefab);
}

if (m_TestNetworkObjectInstance != null)
{
Object.Destroy(m_TestNetworkObjectInstance);
}
}

/// <summary>
/// Test that callbacks are run for playerobject spawn, despawn, regular spawn, destroy on server.
/// </summary>
Expand Down