Fix tests (#27711)
* Fix tests * Fix test fail * Apply same fix to other tests
This commit is contained in:
@@ -3,6 +3,7 @@ using Content.Shared.Stacks;
|
||||
using Robust.Shared.GameObjects;
|
||||
using Robust.Shared.Map;
|
||||
using Robust.Shared.Prototypes;
|
||||
using static Robust.UnitTesting.RobustIntegrationTest;
|
||||
|
||||
namespace Content.IntegrationTests.Tests.Interaction;
|
||||
|
||||
@@ -54,7 +55,7 @@ public abstract partial class InteractionTest
|
||||
/// <summary>
|
||||
/// Convert applicable entity prototypes into stack prototypes.
|
||||
/// </summary>
|
||||
public void ConvertToStack(IPrototypeManager protoMan, IComponentFactory factory)
|
||||
public async Task ConvertToStack(IPrototypeManager protoMan, IComponentFactory factory, ServerIntegrationInstance server)
|
||||
{
|
||||
if (Converted)
|
||||
return;
|
||||
@@ -73,11 +74,14 @@ public abstract partial class InteractionTest
|
||||
return;
|
||||
}
|
||||
|
||||
if (entProto.TryGetComponent<StackComponent>(factory.GetComponentName(typeof(StackComponent)),
|
||||
out var stackComp))
|
||||
StackComponent? stack = null;
|
||||
await server.WaitPost(() =>
|
||||
{
|
||||
Prototype = stackComp.StackTypeId;
|
||||
}
|
||||
entProto.TryGetComponent(factory.GetComponentName(typeof(StackComponent)), out stack);
|
||||
});
|
||||
|
||||
if (stack != null)
|
||||
Prototype = stack.StackTypeId;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -100,11 +104,14 @@ public abstract partial class InteractionTest
|
||||
return default;
|
||||
}
|
||||
|
||||
if (entProto.TryGetComponent<StackComponent>(Factory.GetComponentName(typeof(StackComponent)),
|
||||
out var stackComp))
|
||||
StackComponent? stack = null;
|
||||
await Server.WaitPost(() =>
|
||||
{
|
||||
return await SpawnEntity((stackComp.StackTypeId, spec.Quantity), coords);
|
||||
}
|
||||
entProto.TryGetComponent(Factory.GetComponentName(typeof(StackComponent)), out stack);
|
||||
});
|
||||
|
||||
if (stack != null)
|
||||
return await SpawnEntity((stack.StackTypeId, spec.Quantity), coords);
|
||||
|
||||
Assert.That(spec.Quantity, Is.EqualTo(1), "SpawnEntity only supports returning a singular entity");
|
||||
await Server.WaitPost(() => uid = SEntMan.SpawnEntity(spec.Prototype, coords));
|
||||
|
||||
Reference in New Issue
Block a user