Fix a bunch of tests

This commit is contained in:
Pieter-Jan Briers
2020-02-28 04:04:55 +01:00
parent d7e0edd1a3
commit 3e62e6d1f6
10 changed files with 28 additions and 1 deletions

View File

@@ -36,6 +36,11 @@ namespace Robust.Shared.GameObjects
/// <inheritdoc />
public event EventHandler<ComponentEventArgs> ComponentDeleted;
public void Initialize()
{
FillComponentDict();
}
/// <inheritdoc />
public void Clear()
{

View File

@@ -64,7 +64,7 @@ namespace Robust.Shared.GameObjects
EntityNetworkManager.ReceivedComponentMessage += (sender, compMsg) => DispatchComponentMessage(compMsg);
EntityNetworkManager.ReceivedSystemMessage += (sender, systemMsg) => EventBus.RaiseEvent(EventSource.Network, systemMsg);
ComponentManager.Clear();
ComponentManager.Initialize();
_componentManager.ComponentRemoved += (sender, args) => _eventBus.UnsubscribeEvents(args.Component);
}

View File

@@ -34,6 +34,8 @@ namespace Robust.Shared.Interfaces.GameObjects
/// </summary>
void Clear();
void Initialize();
/// <summary>
/// Adds a Component type to an entity. If the entity is already Initialized, the component will
/// automatically be Initialized and Started.

View File

@@ -38,6 +38,8 @@ namespace Robust.UnitTesting.Client.GameObjects.Components
[OneTimeSetUp]
public void Setup()
{
var compMan = IoCManager.Resolve<IComponentManager>();
compMan.Initialize();
EntityManager = IoCManager.Resolve<IClientEntityManager>();
MapManager = IoCManager.Resolve<IMapManager>();
MapManager.Initialize();

View File

@@ -3,6 +3,7 @@ using System.IO;
using NUnit.Framework;
using Robust.Server.GameObjects.Components.Container;
using Robust.Server.Interfaces.GameObjects;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.GameObjects.Components;
using Robust.Shared.Interfaces.Map;
using Robust.Shared.IoC;
@@ -19,6 +20,8 @@ namespace Robust.UnitTesting.Server.GameObjects.Components
[OneTimeSetUp]
public void Setup()
{
var compMan = IoCManager.Resolve<IComponentManager>();
compMan.Initialize();
EntityManager = IoCManager.Resolve<IServerEntityManager>();
var mapManager = IoCManager.Resolve<IMapManager>();

View File

@@ -2,6 +2,7 @@
using NUnit.Framework;
using Robust.Server.Interfaces.GameObjects;
using Robust.Shared.GameObjects.Components.Transform;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Map;
using Robust.Shared.Interfaces.Timing;
using Robust.Shared.IoC;
@@ -38,6 +39,9 @@ namespace Robust.UnitTesting.Server.GameObjects.Components
[OneTimeSetUp]
public void Setup()
{
var compMan = IoCManager.Resolve<IComponentManager>();
compMan.Initialize();
EntityManager = IoCManager.Resolve<IServerEntityManager>();
MapManager = IoCManager.Resolve<IMapManager>();
MapManager.Initialize();

View File

@@ -49,6 +49,9 @@ namespace Robust.UnitTesting.Server.GameObjects
_componentFactory.Register<ThrowsInInitializeComponent>();
_componentFactory.Register<ThrowsInStartupComponent>();
var compMan = IoCManager.Resolve<IComponentManager>();
compMan.Initialize();
EntityManager = IoCManager.Resolve<IServerEntityManager>();
MapManager = IoCManager.Resolve<IMapManager>();
MapManager.Initialize();

View File

@@ -249,6 +249,7 @@ namespace Robust.UnitTesting.Shared.GameObjects
mockFactory.Setup(x => x.GetRegistration(It.IsAny<IComponent>())).Returns(mockRegistration.Object);
mockFactory.Setup(x => x.GetRegistration(It.IsAny<Type>())).Returns(mockRegistration.Object);
mockFactory.Setup(x => x.GetComponent<DummyComponent>()).Returns(new DummyComponent());
mockFactory.Setup(x => x.GetAllRefTypes()).Returns(new[] { typeof(DummyComponent) });
dependencies.RegisterInstance<IComponentFactory>(mockFactory.Object);
// set up the entity manager
@@ -257,6 +258,7 @@ namespace Robust.UnitTesting.Shared.GameObjects
var manager = new ComponentManager();
dependencies.InjectDependencies(manager);
manager.Initialize();
entityManager = mockEntMan.Object;
return manager;

View File

@@ -21,6 +21,9 @@ namespace Robust.UnitTesting.Shared.Map
[OneTimeSetUp]
public void Setup()
{
var compMan = IoCManager.Resolve<IComponentManager>();
compMan.Initialize();
var mapMan = IoCManager.Resolve<IMapManager>();
mapMan.Initialize();

View File

@@ -17,6 +17,9 @@ namespace Robust.UnitTesting.Shared.Map
[OneTimeSetUp]
public void OneTimeSetup()
{
var compMan = IoCManager.Resolve<IComponentManager>();
compMan.Initialize();
var mapMan = IoCManager.Resolve<IMapManager>();
mapMan.Initialize();
}