cmdrunematti/Delta-v
1
0
Fork 0
mirror of https://github.com/DeltaV-Station/Delta-v.git synced 2026-09-29 23:57:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change _DV Tests to new ones

Browse Source
This commit is contained in:
Coryler
2026-06-29 12:44:21 +02:00
parent 91757358b9
commit f8979bbeda
6 changed files with 43 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Content.IntegrationTests/Tests/_DV/FootPrintsTest.cs
+3 -4
View File
@@ -1,13 +1,14 @@
using Content.IntegrationTests.Fixtures;
using Content.Server._DV.Footprints.Components;
namespace Content.IntegrationTests.Tests._DV;
public sealed class FootPrintsTest
public sealed class FootPrintsTest : GameTest
{
[Test]
public async Task ValidatePrototypes()
{
await using var pair = await PoolManager.GetServerClient();
var pair = Pair;
var server = pair.Server;
var protos = pair.GetPrototypesWithComponent<FootPrintsComponent>();
@@ -23,7 +24,5 @@ public sealed class FootPrintsTest
}
});
});
await pair.CleanReturnAsync();
}
}
Content.IntegrationTests/Tests/_DV/MappingCategoryTest.cs
+9 -4
View File
@@ -11,22 +11,29 @@ using Robust.Shared.Serialization.Markdown.Value;
using Robust.Shared.Utility;
using System.Collections.Generic;
using System.Linq;
using Content.IntegrationTests.Fixtures;
namespace Content.IntegrationTests.Tests._DV;
/// <summary>
/// Checks that every mapped entity with <see cref="MappingCategoriesComponent"/> is allowed to be mapped.
/// </summary>
public sealed class MappingCategoryTest
public sealed class MappingCategoryTest : GameTest
{
private const string MapsPath = "/Maps";
// dev map doesn't matter and don't want to change it
private readonly List<string> _ignoredMapsPath = ["/Maps/Test/", "/Maps/Shuttles/AdminSpawn"];
[TearDown]
public async Task Teardown()
{
await Pair.CleanReturnAsync();
}
[Test]
public async Task NonGameMapsLoadableTest()
{
await using var pair = await PoolManager.GetServerClient();
var pair = Pair;
var server = pair.Server;
var entMan = server.ResolveDependency<IEntityManager>();
var resMan = server.ResolveDependency<IResourceManager>();
@@ -87,8 +94,6 @@ public sealed class MappingCategoryTest
});
await server.WaitRunTicks(1);
await pair.CleanReturnAsync();
}
// me when engine doesnt have this
Content.IntegrationTests/Tests/_DV/RoboisseurTest.cs
+3 -4
View File
@@ -3,17 +3,18 @@ using Content.Shared.Item;
using Robust.Shared.GameObjects;
using Robust.Shared.Prototypes;
using System.Collections.Generic;
using Content.IntegrationTests.Fixtures;
namespace Content.IntegrationTests.Tests._DV;
[TestFixture]
[TestOf(typeof(RoboisseurSystem))]
public sealed class RoboisseurTest
public sealed class RoboisseurTest : GameTest
{
[Test]
public async Task AllRoboisseurRewardsAreItems()
{
await using var pair = await PoolManager.GetServerClient();
var pair = Pair;
var server = pair.Server;
// Per RobustIntegrationTest.cs, wait until state is settled to access it.
await server.WaitIdleAsync();
@@ -33,8 +34,6 @@ public sealed class RoboisseurTest
Check(comp.RobossuierRewards, protoMan, factory);
});
});
await pair.CleanReturnAsync();
}
private void Check(List<EntProtoId> protos, IPrototypeManager protoMan, IComponentFactory factory)
Content.IntegrationTests/Tests/_DV/ShipyardTest.cs
+4 -5
View File
@@ -1,3 +1,4 @@
using Content.IntegrationTests.Fixtures;
using Content.Server.Cargo.Systems;
using Content.Server.Shipyard;
using Content.Server.Shuttles.Components;
@@ -9,12 +10,12 @@ namespace Content.IntegrationTests.Tests._DV;
[TestFixture]
[TestOf(typeof(ShipyardSystem))]
public sealed class ShipyardTest
public sealed class ShipyardTest : GameTest
{
[Test]
public async Task NoShipyardArbitrage()
{
await using var pair = await PoolManager.GetServerClient();
var pair = Pair;
var server = pair.Server;
var entities = server.ResolveDependency<IEntityManager>();
@@ -40,13 +41,12 @@ public sealed class ShipyardTest
});
});
await pair.CleanReturnAsync();
}
[Test]
public async Task AllShuttlesValid()
{
await using var pair = await PoolManager.GetServerClient();
var pair = Pair;
var server = pair.Server;
var entities = server.ResolveDependency<IEntityManager>();
@@ -75,7 +75,6 @@ public sealed class ShipyardTest
});
});
await pair.CleanReturnAsync();
}
private bool FindComponent<T>(IEntityManager entities, EntityUid shuttle) where T: Component
Content.IntegrationTests/Tests/_DV/TraitSystemTest.cs
+23 -41
View File
@@ -1,5 +1,6 @@
using System.Collections.Generic;
using System.Reflection;
using Content.IntegrationTests.Fixtures;
using Content.Server._DV.Traits;
using Content.Shared._DV.Traits;
using Content.Shared._DV.Traits.Conditions;
@@ -22,7 +23,7 @@ namespace Content.IntegrationTests.Tests._DV;
/// </summary>
[TestFixture]
[TestOf(typeof(TraitSystemTest))]
public sealed partial class TraitSystemTest
public sealed partial class TraitSystemTest : GameTest
{
[TestPrototypes]
private const string Prototypes = @"
@@ -168,7 +169,7 @@ public sealed partial class TraitSystemTest
[Test]
public async Task HasCompCondition_WithComponent_ReturnsTrue()
{
await using var pair = await PoolManager.GetServerClient(new PoolSettings { Dirty = true });
var pair = Pair;
var server = pair.Server;
var entMan = server.ResolveDependency<IEntityManager>();
var protoMan = server.ResolveDependency<IPrototypeManager>();
@@ -187,13 +188,12 @@ public sealed partial class TraitSystemTest
entMan.DeleteEntity(player);
});
await pair.CleanReturnAsync();
}
[Test]
public async Task HasCompCondition_WithoutComponent_ReturnsFalse()
{
await using var pair = await PoolManager.GetServerClient(new PoolSettings { Dirty = true });
var pair = Pair;
var server = pair.Server;
var entMan = server.ResolveDependency<IEntityManager>();
var protoMan = server.ResolveDependency<IPrototypeManager>();
@@ -213,13 +213,12 @@ public sealed partial class TraitSystemTest
entMan.DeleteEntity(player);
});
await pair.CleanReturnAsync();
}
[Test]
public async Task HasCompCondition_Inverted_ReturnsOpposite()
{
await using var pair = await PoolManager.GetServerClient(new PoolSettings { Dirty = true });
var pair = Pair;
var server = pair.Server;
var entMan = server.ResolveDependency<IEntityManager>();
var protoMan = server.ResolveDependency<IPrototypeManager>();
@@ -240,13 +239,12 @@ public sealed partial class TraitSystemTest
entMan.DeleteEntity(player);
});
await pair.CleanReturnAsync();
}
[Test]
public async Task HasJobCondition_MatchingJob_ReturnsTrue()
{
await using var pair = await PoolManager.GetServerClient(new PoolSettings { Dirty = true });
var pair = Pair;
var server = pair.Server;
var entMan = server.ResolveDependency<IEntityManager>();
var protoMan = server.ResolveDependency<IPrototypeManager>();
@@ -264,13 +262,12 @@ public sealed partial class TraitSystemTest
entMan.DeleteEntity(player);
});
await pair.CleanReturnAsync();
}
[Test]
public async Task HasJobCondition_DifferentJob_ReturnsFalse()
{
await using var pair = await PoolManager.GetServerClient(new PoolSettings { Dirty = true });
var pair = Pair;
var server = pair.Server;
var entMan = server.ResolveDependency<IEntityManager>();
var protoMan = server.ResolveDependency<IPrototypeManager>();
@@ -288,13 +285,12 @@ public sealed partial class TraitSystemTest
entMan.DeleteEntity(player);
});
await pair.CleanReturnAsync();
}
[Test]
public async Task InDepartmentCondition_JobInDepartment_ReturnsTrue()
{
await using var pair = await PoolManager.GetServerClient(new PoolSettings { Dirty = true });
var pair = Pair;
var server = pair.Server;
var entMan = server.ResolveDependency<IEntityManager>();
var protoMan = server.ResolveDependency<IPrototypeManager>();
@@ -314,13 +310,12 @@ public sealed partial class TraitSystemTest
entMan.DeleteEntity(player);
});
await pair.CleanReturnAsync();
}
[Test]
public async Task InDepartmentCondition_JobNotInDepartment_ReturnsFalse()
{
await using var pair = await PoolManager.GetServerClient(new PoolSettings { Dirty = true });
var pair = Pair;
var server = pair.Server;
var entMan = server.ResolveDependency<IEntityManager>();
var protoMan = server.ResolveDependency<IPrototypeManager>();
@@ -340,13 +335,12 @@ public sealed partial class TraitSystemTest
entMan.DeleteEntity(player);
});
await pair.CleanReturnAsync();
}
[Test]
public async Task IsSpeciesCondition_MatchingSpecies_ReturnsTrue()
{
await using var pair = await PoolManager.GetServerClient(new PoolSettings { Dirty = true });
var pair = Pair;
var server = pair.Server;
var entMan = server.ResolveDependency<IEntityManager>();
var protoMan = server.ResolveDependency<IPrototypeManager>();
@@ -364,13 +358,12 @@ public sealed partial class TraitSystemTest
entMan.DeleteEntity(player);
});
await pair.CleanReturnAsync();
}
[Test]
public async Task IsSpeciesCondition_DifferentSpecies_ReturnsFalse()
{
await using var pair = await PoolManager.GetServerClient(new PoolSettings { Dirty = true });
var pair = Pair;
var server = pair.Server;
var entMan = server.ResolveDependency<IEntityManager>();
var protoMan = server.ResolveDependency<IPrototypeManager>();
@@ -390,7 +383,6 @@ public sealed partial class TraitSystemTest
entMan.DeleteEntity(player);
});
await pair.CleanReturnAsync();
}
#endregion
@@ -400,7 +392,7 @@ public sealed partial class TraitSystemTest
[Test]
public async Task AddCompsEffect_AddsComponents()
{
await using var pair = await PoolManager.GetServerClient(new PoolSettings { Dirty = true });
var pair = Pair;
var server = pair.Server;
var entMan = server.ResolveDependency<IEntityManager>();
var protoMan = server.ResolveDependency<IPrototypeManager>();
@@ -428,13 +420,12 @@ public sealed partial class TraitSystemTest
entMan.DeleteEntity(player);
});
await pair.CleanReturnAsync();
}
[Test]
public async Task AddCompsEffect_DoesNotOverwrite()
{
await using var pair = await PoolManager.GetServerClient(new PoolSettings { Dirty = true });
var pair = Pair;
var server = pair.Server;
var entMan = server.ResolveDependency<IEntityManager>();
var protoMan = server.ResolveDependency<IPrototypeManager>();
@@ -461,13 +452,12 @@ public sealed partial class TraitSystemTest
entMan.DeleteEntity(player);
});
await pair.CleanReturnAsync();
}
[Test]
public async Task OverrideCompsEffect_OverwritesComponent()
{
await using var pair = await PoolManager.GetServerClient(new PoolSettings { Dirty = true });
var pair = Pair;
var server = pair.Server;
var entMan = server.ResolveDependency<IEntityManager>();
var protoMan = server.ResolveDependency<IPrototypeManager>();
@@ -494,13 +484,12 @@ public sealed partial class TraitSystemTest
entMan.DeleteEntity(player);
});
await pair.CleanReturnAsync();
}
[Test]
public async Task RemCompsEffect_RemovesComponents()
{
await using var pair = await PoolManager.GetServerClient(new PoolSettings { Dirty = true });
var pair = Pair;
var server = pair.Server;
var entMan = server.ResolveDependency<IEntityManager>();
var protoMan = server.ResolveDependency<IPrototypeManager>();
@@ -537,13 +526,12 @@ public sealed partial class TraitSystemTest
entMan.DeleteEntity(player);
});
await pair.CleanReturnAsync();
}
[Test]
public async Task SpawnItemInHandEffect_SpawnsItem()
{
await using var pair = await PoolManager.GetServerClient(new PoolSettings { Dirty = true });
var pair = Pair;
var server = pair.Server;
var entMan = server.ResolveDependency<IEntityManager>();
var protoMan = server.ResolveDependency<IPrototypeManager>();
@@ -570,7 +558,6 @@ public sealed partial class TraitSystemTest
entMan.DeleteEntity(player);
});
await pair.CleanReturnAsync();
}
#endregion
@@ -580,7 +567,7 @@ public sealed partial class TraitSystemTest
[Test]
public async Task RespectsConflicts()
{
await using var pair = await PoolManager.GetServerClient(new PoolSettings { Dirty = true });
var pair = Pair;
var server = pair.Server;
var entMan = server.ResolveDependency<IEntityManager>();
@@ -613,13 +600,12 @@ public sealed partial class TraitSystemTest
entMan.DeleteEntity(player);
});
await pair.CleanReturnAsync();
}
[Test]
public async Task RespectsCategoryLimits()
{
await using var pair = await PoolManager.GetServerClient(new PoolSettings { Dirty = true });
var pair = Pair;
var server = pair.Server;
var entMan = server.ResolveDependency<IEntityManager>();
@@ -647,13 +633,12 @@ public sealed partial class TraitSystemTest
entMan.DeleteEntity(player);
});
await pair.CleanReturnAsync();
}
[Test]
public async Task RespectsCategoryPointLimits()
{
await using var pair = await PoolManager.GetServerClient(new PoolSettings { Dirty = true });
var pair = Pair;
var server = pair.Server;
var entMan = server.ResolveDependency<IEntityManager>();
@@ -681,13 +666,12 @@ public sealed partial class TraitSystemTest
entMan.DeleteEntity(player);
});
await pair.CleanReturnAsync();
}
[Test]
public async Task ChecksConditionsOnSpawn()
{
await using var pair = await PoolManager.GetServerClient(new PoolSettings { Dirty = true });
var pair = Pair;
var server = pair.Server;
var entMan = server.ResolveDependency<IEntityManager>();
@@ -714,13 +698,12 @@ public sealed partial class TraitSystemTest
entMan.DeleteEntity(player);
});
await pair.CleanReturnAsync();
}
[Test]
public async Task RejectsTraitsWithUnmetConditions()
{
await using var pair = await PoolManager.GetServerClient(new PoolSettings { Dirty = true });
var pair = Pair;
var server = pair.Server;
var entMan = server.ResolveDependency<IEntityManager>();
@@ -749,7 +732,6 @@ public sealed partial class TraitSystemTest
entMan.DeleteEntity(player);
});
await pair.CleanReturnAsync();
}
#endregion
@@ -761,8 +743,8 @@ public sealed partial class TraitSystemTest
IPrototypeManager protoMan,
IComponentFactory factory,
EntityUid player,
string jobId = null,
string speciesId = null)
string? jobId = null,
string? speciesId = null)
{
return new TraitConditionContext
{