Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch '20-11-19-sandboxing' into 20-11-27-merge

Browse Source
This commit is contained in:
Pieter-Jan Briers
2020-11-27 00:53:48 +01:00
parent 42214036c7 0dbb75051e
commit f29476290c
21 changed files with 174 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Content.Tests/ContentUnitTest.cs
View File

@@ -1,3 +1,5 @@
using System.Collections.Generic;
using System.Reflection;
using Content.Client;
using Content.Server;
using Robust.UnitTesting;
@@ -19,5 +21,26 @@ namespace Content.Tests
ClientContentIoC.Register();
}
}
protected override Assembly[] GetContentAssemblies()
{
var l = new List<Assembly>
{
typeof(Content.Shared.EntryPoint).Assembly
};
if (Project == UnitTestProject.Server)
{
l.Add(typeof(Content.Server.EntryPoint).Assembly);
}
else if (Project == UnitTestProject.Client)
{
l.Add(typeof(Content.Client.EntryPoint).Assembly);
}
l.Add(typeof(ContentUnitTest).Assembly);
return l.ToArray();
}
}
}

1
Content.Tests/Server/GameObjects/Components/Mobs/ServerAlertsComponentTests.cs
View File

@@ -37,7 +37,6 @@ namespace Content.Tests.Server.GameObjects.Components.Mobs
// in a unit test
var prototypeManager = IoCManager.Resolve<IPrototypeManager>();
prototypeManager.RegisterType(typeof(AlertPrototype));
var factory = IoCManager.Resolve<IComponentFactory>();
factory.Register<ServerAlertsComponent>();
prototypeManager.LoadFromStream(new StringReader(PROTOTYPES));

4
Content.Tests/Shared/Alert/AlertManagerTests.cs
View File

@@ -12,7 +12,7 @@ using YamlDotNet.RepresentationModel;
namespace Content.Tests.Shared.Alert
{
[TestFixture, TestOf(typeof(AlertManager))]
public class AlertManagerTests : RobustUnitTest
public class AlertManagerTests : ContentUnitTest
{
const string PROTOTYPES = @"
- type: alert
@@ -28,9 +28,7 @@ namespace Content.Tests.Shared.Alert
public void TestAlertManager()
{
var prototypeManager = IoCManager.Resolve<IPrototypeManager>();
prototypeManager.RegisterType(typeof(AlertPrototype));
prototypeManager.LoadFromStream(new StringReader(PROTOTYPES));
IoCManager.RegisterInstance<AlertManager>(new AlertManager());
var alertManager = IoCManager.Resolve<AlertManager>();
alertManager.Initialize();

4
Content.Tests/Shared/Alert/AlertOrderPrototypeTests.cs
View File

@@ -10,7 +10,7 @@ using Robust.UnitTesting;
namespace Content.Tests.Shared.Alert
{
[TestFixture, TestOf(typeof(AlertOrderPrototype))]
public class AlertOrderPrototypeTests : RobustUnitTest
public class AlertOrderPrototypeTests : ContentUnitTest
{
const string PROTOTYPES = @"
- type: alertOrder
@@ -64,8 +64,6 @@ namespace Content.Tests.Shared.Alert
public void TestAlertOrderPrototype()
{
var prototypeManager = IoCManager.Resolve<IPrototypeManager>();
prototypeManager.RegisterType(typeof(AlertPrototype));
prototypeManager.RegisterType(typeof(AlertOrderPrototype));
prototypeManager.LoadFromStream(new StringReader(PROTOTYPES));
var alertOrder = prototypeManager.EnumeratePrototypes<AlertOrderPrototype>().FirstOrDefault();

2
Content.Tests/Shared/Alert/AlertPrototypeTests.cs
View File

@@ -11,7 +11,7 @@ using YamlDotNet.RepresentationModel;
namespace Content.Tests.Shared.Alert
{
[TestFixture, TestOf(typeof(AlertPrototype))]
public class AlertPrototypeTests : RobustUnitTest
public class AlertPrototypeTests : ContentUnitTest
{
private const string PROTOTYPE = @"- type: alert
alertType: HumanHealth