Device network as ecs (#4205)
* Work on DeviceNetworkSystem * Implement device networking as ecs Remove mailing unit code for now Remove device network metadata * Implement integration tests for device networking * Remove manual updating DeviceNetworkSystem and use WaitRunTicks * Fix wrong component name in ignored components * Apply suggestions from code review Co-authored-by: mirrorcult <notzombiedude@gmail.com> * Rename NetworkUtils to DeviceNetworkConstants Change connection type constants to enum Remove create function from network payload class * Change broken nodegroup check in wirenet to grid check * Change ComponentManager to entity manager in DeviceNetworkSystem * Fix smaller mistakes * Wtf random test fail pls run them again smh * Fix DataField in DeviceNetworkComponent * Fix yaml in DeviceNetworkTest * Fix DeviceNetworkComponent DeviceNetId property Co-authored-by: Julian Giebel <j.giebel@netrocks.info> Co-authored-by: mirrorcult <notzombiedude@gmail.com>
This commit is contained in:
Julian Giebel
@@ -0,0 +1,272 @@
|
||||
using Content.Server.DeviceNetwork;
|
||||
using Content.Server.DeviceNetwork.Components;
|
||||
using Content.Server.DeviceNetwork.Systems;
|
||||
using NUnit.Framework;
|
||||
using Robust.Shared.GameObjects;
|
||||
using Robust.Shared.IoC;
|
||||
using Robust.Shared.Map;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace Content.IntegrationTests.Tests.DeviceNetwork
|
||||
{
|
||||
[TestFixture]
|
||||
[TestOf(typeof(DeviceNetworkComponent))]
|
||||
[TestOf(typeof(WiredNetworkComponent))]
|
||||
[TestOf(typeof(WirelessNetworkComponent))]
|
||||
public class DeviceNetworkTest : ContentIntegrationTest
|
||||
{
|
||||
private const string Prototypes = @"
|
||||
- type: entity
|
||||
name: DummyNetworkDevice
|
||||
id: DummyNetworkDevice
|
||||
components:
|
||||
- type: DeviceNetworkComponent
|
||||
frequency: 100
|
||||
|
||||
- type: entity
|
||||
name: DummyWiredNetworkDevice
|
||||
id: DummyWiredNetworkDevice
|
||||
components:
|
||||
- type: DeviceNetworkComponent
|
||||
deviceNetId: 1
|
||||
- type: WiredNetworkConnection
|
||||
- type: ApcPowerReceiver
|
||||
|
||||
- type: entity
|
||||
name: DummyWirelessNetworkDevice
|
||||
id: DummyWirelessNetworkDevice
|
||||
components:
|
||||
- type: DeviceNetworkComponent
|
||||
frequency: 100
|
||||
deviceNetId: 1
|
||||
- type: WirelessNetworkConnection
|
||||
range: 100
|
||||
";
|
||||
|
||||
[Test]
|
||||
public async Task NetworkDeviceSendAndReceive()
|
||||
{
|
||||
var options = new ServerContentIntegrationOption
|
||||
{
|
||||
ExtraPrototypes = Prototypes,
|
||||
ContentBeforeIoC = () => {
|
||||
IoCManager.Resolve<IEntitySystemManager>().LoadExtraSystemType<DeviceNetworkTestSystem>();
|
||||
}
|
||||
};
|
||||
|
||||
var server = StartServerDummyTicker(options);
|
||||
|
||||
await server.WaitIdleAsync();
|
||||
|
||||
var mapManager = server.ResolveDependency<IMapManager>();
|
||||
var entityManager = server.ResolveDependency<IEntityManager>();
|
||||
var deviceNetSystem = entityManager.EntitySysManager.GetEntitySystem<DeviceNetworkSystem>();
|
||||
var deviceNetTestSystem = entityManager.EntitySysManager.GetEntitySystem<DeviceNetworkTestSystem>();
|
||||
|
||||
|
||||
IEntity device1 = null;
|
||||
IEntity device2 = null;
|
||||
DeviceNetworkComponent networkComponent1 = null;
|
||||
DeviceNetworkComponent networkComponent2 = null;
|
||||
|
||||
var testValue = "test";
|
||||
var payload = new NetworkPayload
|
||||
{
|
||||
["Test"] = testValue,
|
||||
["testnumber"] = 1,
|
||||
["testbool"] = true
|
||||
};
|
||||
|
||||
server.Assert(() => {
|
||||
mapManager.CreateNewMapEntity(MapId.Nullspace);
|
||||
|
||||
device1 = entityManager.SpawnEntity("DummyNetworkDevice", MapCoordinates.Nullspace);
|
||||
|
||||
Assert.That(device1.TryGetComponent(out networkComponent1), Is.True);
|
||||
Assert.That(networkComponent1.Open, Is.True);
|
||||
Assert.That(networkComponent1.Address, Is.Not.EqualTo(string.Empty));
|
||||
|
||||
device2 = entityManager.SpawnEntity("DummyNetworkDevice", MapCoordinates.Nullspace);
|
||||
|
||||
Assert.That(device2.TryGetComponent(out networkComponent2), Is.True);
|
||||
Assert.That(networkComponent2.Open, Is.True);
|
||||
Assert.That(networkComponent2.Address, Is.Not.EqualTo(string.Empty));
|
||||
|
||||
Assert.That(networkComponent1.Address, Is.Not.EqualTo(networkComponent2.Address));
|
||||
|
||||
deviceNetSystem.QueuePacket(device1.Uid, networkComponent2.Address, networkComponent2.Frequency, payload);
|
||||
});
|
||||
|
||||
await server.WaitRunTicks(1);
|
||||
await server.WaitIdleAsync();
|
||||
|
||||
server.Assert(() => {
|
||||
CollectionAssert.AreEquivalent(deviceNetTestSystem.LastPayload, payload);
|
||||
});
|
||||
}
|
||||
|
||||
[Test]
|
||||
public async Task WirelessNetworkDeviceSendAndReceive()
|
||||
{
|
||||
var options = new ServerContentIntegrationOption
|
||||
{
|
||||
ExtraPrototypes = Prototypes,
|
||||
ContentBeforeIoC = () => {
|
||||
IoCManager.Resolve<IEntitySystemManager>().LoadExtraSystemType<DeviceNetworkTestSystem>();
|
||||
}
|
||||
};
|
||||
|
||||
var server = StartServerDummyTicker(options);
|
||||
|
||||
await server.WaitIdleAsync();
|
||||
|
||||
var mapManager = server.ResolveDependency<IMapManager>();
|
||||
var entityManager = server.ResolveDependency<IEntityManager>();
|
||||
var deviceNetSystem = entityManager.EntitySysManager.GetEntitySystem<DeviceNetworkSystem>();
|
||||
var deviceNetTestSystem = entityManager.EntitySysManager.GetEntitySystem<DeviceNetworkTestSystem>();
|
||||
|
||||
|
||||
IEntity device1 = null;
|
||||
IEntity device2 = null;
|
||||
DeviceNetworkComponent networkComponent1 = null;
|
||||
DeviceNetworkComponent networkComponent2 = null;
|
||||
WirelessNetworkComponent wirelessNetworkComponent = null;
|
||||
|
||||
var testValue = "test";
|
||||
var payload = new NetworkPayload
|
||||
{
|
||||
["Test"] = testValue,
|
||||
["testnumber"] = 1,
|
||||
["testbool"] = true
|
||||
};
|
||||
|
||||
server.Assert(() => {
|
||||
mapManager.CreateNewMapEntity(MapId.Nullspace);
|
||||
|
||||
device1 = entityManager.SpawnEntity("DummyWirelessNetworkDevice", MapCoordinates.Nullspace);
|
||||
|
||||
Assert.That(device1.TryGetComponent(out networkComponent1), Is.True);
|
||||
Assert.That(device1.TryGetComponent(out wirelessNetworkComponent), Is.True);
|
||||
Assert.That(networkComponent1.Open, Is.True);
|
||||
Assert.That(networkComponent1.Address, Is.Not.EqualTo(string.Empty));
|
||||
|
||||
device2 = entityManager.SpawnEntity("DummyWirelessNetworkDevice", new MapCoordinates(new Robust.Shared.Maths.Vector2(0,50), MapId.Nullspace));
|
||||
|
||||
Assert.That(device2.TryGetComponent(out networkComponent2), Is.True);
|
||||
Assert.That(networkComponent2.Open, Is.True);
|
||||
Assert.That(networkComponent2.Address, Is.Not.EqualTo(string.Empty));
|
||||
|
||||
Assert.That(networkComponent1.Address, Is.Not.EqualTo(networkComponent2.Address));
|
||||
|
||||
deviceNetSystem.QueuePacket(device1.Uid, networkComponent2.Address, networkComponent2.Frequency, payload);
|
||||
});
|
||||
|
||||
await server.WaitRunTicks(1);
|
||||
await server.WaitIdleAsync();
|
||||
|
||||
server.Assert(() => {
|
||||
CollectionAssert.AreEqual(deviceNetTestSystem.LastPayload, payload);
|
||||
|
||||
payload = new NetworkPayload
|
||||
{
|
||||
["Wirelesstest"] = 5
|
||||
};
|
||||
|
||||
wirelessNetworkComponent.Range = 0;
|
||||
|
||||
deviceNetSystem.QueuePacket(device1.Uid, networkComponent2.Address, networkComponent2.Frequency, payload);
|
||||
});
|
||||
|
||||
await server.WaitRunTicks(1);
|
||||
await server.WaitIdleAsync();
|
||||
|
||||
server.Assert(() => {
|
||||
CollectionAssert.AreNotEqual(deviceNetTestSystem.LastPayload, payload);
|
||||
});
|
||||
|
||||
await server.WaitIdleAsync();
|
||||
}
|
||||
|
||||
[Test]
|
||||
public async Task WiredNetworkDeviceSendAndReceive()
|
||||
{
|
||||
var options = new ServerContentIntegrationOption
|
||||
{
|
||||
ExtraPrototypes = Prototypes,
|
||||
ContentBeforeIoC = () => {
|
||||
IoCManager.Resolve<IEntitySystemManager>().LoadExtraSystemType<DeviceNetworkTestSystem>();
|
||||
}
|
||||
};
|
||||
|
||||
var server = StartServerDummyTicker(options);
|
||||
|
||||
await server.WaitIdleAsync();
|
||||
|
||||
var mapManager = server.ResolveDependency<IMapManager>();
|
||||
var entityManager = server.ResolveDependency<IEntityManager>();
|
||||
var deviceNetSystem = entityManager.EntitySysManager.GetEntitySystem<DeviceNetworkSystem>();
|
||||
var deviceNetTestSystem = entityManager.EntitySysManager.GetEntitySystem<DeviceNetworkTestSystem>();
|
||||
|
||||
|
||||
IEntity device1 = null;
|
||||
IEntity device2 = null;
|
||||
DeviceNetworkComponent networkComponent1 = null;
|
||||
DeviceNetworkComponent networkComponent2 = null;
|
||||
WiredNetworkComponent wiredNetworkComponent = null;
|
||||
IMapGrid grid = null;
|
||||
|
||||
var testValue = "test";
|
||||
var payload = new NetworkPayload
|
||||
{
|
||||
["Test"] = testValue,
|
||||
["testnumber"] = 1,
|
||||
["testbool"] = true
|
||||
};
|
||||
|
||||
await server.WaitRunTicks(1);
|
||||
await server.WaitIdleAsync();
|
||||
|
||||
server.Assert(() => {
|
||||
var map = mapManager.CreateNewMapEntity(MapId.Nullspace);
|
||||
grid = mapManager.CreateGrid(MapId.Nullspace);
|
||||
|
||||
device1 = entityManager.SpawnEntity("DummyWiredNetworkDevice", MapCoordinates.Nullspace);
|
||||
|
||||
Assert.That(device1.TryGetComponent(out networkComponent1), Is.True);
|
||||
Assert.That(device1.TryGetComponent(out wiredNetworkComponent), Is.True);
|
||||
Assert.That(networkComponent1.Open, Is.True);
|
||||
Assert.That(networkComponent1.Address, Is.Not.EqualTo(string.Empty));
|
||||
|
||||
device2 = entityManager.SpawnEntity("DummyWiredNetworkDevice", new MapCoordinates(new Robust.Shared.Maths.Vector2(0, 2), MapId.Nullspace));
|
||||
|
||||
Assert.That(device2.TryGetComponent(out networkComponent2), Is.True);
|
||||
Assert.That(networkComponent2.Open, Is.True);
|
||||
Assert.That(networkComponent2.Address, Is.Not.EqualTo(string.Empty));
|
||||
|
||||
Assert.That(networkComponent1.Address, Is.Not.EqualTo(networkComponent2.Address));
|
||||
|
||||
deviceNetSystem.QueuePacket(device1.Uid, networkComponent2.Address, networkComponent2.Frequency, payload);
|
||||
});
|
||||
|
||||
await server.WaitRunTicks(1);
|
||||
await server.WaitIdleAsync();
|
||||
|
||||
server.Assert(() => {
|
||||
//CollectionAssert.AreNotEqual(deviceNetTestSystem.LastPayload, payload);
|
||||
|
||||
entityManager.SpawnEntity("CableApcExtension", grid.MapToGrid(new MapCoordinates(new Robust.Shared.Maths.Vector2(0, 1), MapId.Nullspace)));
|
||||
|
||||
deviceNetSystem.QueuePacket(device1.Uid, networkComponent2.Address, networkComponent2.Frequency, payload);
|
||||
});
|
||||
|
||||
await server.WaitRunTicks(1);
|
||||
await server.WaitIdleAsync();
|
||||
|
||||
server.Assert(() => {
|
||||
CollectionAssert.AreEqual(deviceNetTestSystem.LastPayload, payload);
|
||||
});
|
||||
|
||||
await server.WaitIdleAsync();
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user