diff --git a/.github/workflows/build-test-debug.yml b/.github/workflows/build-test-debug.yml index 4aab5d9595c..57400747fe7 100644 --- a/.github/workflows/build-test-debug.yml +++ b/.github/workflows/build-test-debug.yml @@ -50,11 +50,11 @@ jobs: - name: Run Content.Tests run: dotnet test --no-build --configuration DebugOpt Content.Tests/Content.Tests.csproj -- NUnit.ConsoleOut=0 -# - name: Run Content.IntegrationTests -# shell: pwsh -# run: | -# $env:DOTNET_gcServer=1 -# dotnet test --no-build --configuration DebugOpt Content.IntegrationTests/Content.IntegrationTests.csproj -- NUnit.ConsoleOut=0 NUnit.MapWarningTo=Failed + # - name: Run Content.IntegrationTests + # shell: pwsh + # run: | + # $env:DOTNET_gcServer=1 + # dotnet test --no-build --configuration DebugOpt Content.IntegrationTests/Content.IntegrationTests.csproj --filter FullyQualifiedName!~ShipyardTest -- NUnit.ConsoleOut=0 NUnit.MapWarningTo=Failed ci-success: name: Build & Test Debug needs: diff --git a/Content.IntegrationTests/Tests/CargoTest.cs b/Content.IntegrationTests/Tests/CargoTest.cs index 70ea3b2fbb2..e111b79b96a 100644 --- a/Content.IntegrationTests/Tests/CargoTest.cs +++ b/Content.IntegrationTests/Tests/CargoTest.cs @@ -5,7 +5,7 @@ using Content.Server.Cargo.Systems; using Content.Server.Nutrition.Components; using Content.Server.Nutrition.EntitySystems; -using Content.Shared.Cargo.Components; +using Content.Shared.Cargo.Components; // Frontier using Content.Shared.Cargo.Prototypes; using Content.Shared.IdentityManagement; using Content.Shared.Stacks; diff --git a/Content.IntegrationTests/Tests/Internals/AutoInternalsTests.cs b/Content.IntegrationTests/Tests/Internals/AutoInternalsTests.cs index 4455af19eee..a61cf1a0465 100644 --- a/Content.IntegrationTests/Tests/Internals/AutoInternalsTests.cs +++ b/Content.IntegrationTests/Tests/Internals/AutoInternalsTests.cs @@ -10,7 +10,7 @@ namespace Content.IntegrationTests.Tests.Internals; [TestOf(typeof(InternalsSystem))] public sealed class AutoInternalsTests { - [Test] + [Ignore("Not relevant for Frontier")] // Frontier public async Task TestInternalsAutoActivateInSpaceForStationSpawn() { await using var pair = await PoolManager.GetServerClient(); @@ -39,7 +39,7 @@ await server.WaitAssertion(() => await pair.CleanReturnAsync(); } - [Test] + [Ignore("Not relevant for Frontier")] // Frontier public async Task TestInternalsAutoActivateInSpaceForEntitySpawn() { await using var pair = await PoolManager.GetServerClient(); @@ -73,7 +73,6 @@ await server.WaitAssertion(() => equipment: mask: ClothingMaskBreath suitstorage: OxygenTankFilled - outerClothing: ClothingOuterVestTank # Frontier - type: job id: TestInternalsDummy diff --git a/Content.IntegrationTests/Tests/PostMapInitTest.cs b/Content.IntegrationTests/Tests/PostMapInitTest.cs index f1d42c11e9b..f4825b92252 100644 --- a/Content.IntegrationTests/Tests/PostMapInitTest.cs +++ b/Content.IntegrationTests/Tests/PostMapInitTest.cs @@ -17,9 +17,9 @@ using Robust.Shared.Map.Components; using Robust.Shared.Prototypes; using Content.Shared.Station.Components; -using FastAccessors; using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; +using Content.IntegrationTests.Tests._NF; namespace Content.IntegrationTests.Tests { @@ -38,32 +38,13 @@ public sealed class PostMapInitTest private static readonly string[] Grids = { - "/Maps/centcomm.yml", - "/Maps/Shuttles/cargo.yml", - "/Maps/Shuttles/emergency.yml", - "/Maps/Shuttles/infiltrator.yml", + // Admin + "/Maps/_NF/Shuttles/Admin/fishbowl.yml", + // Bus + "/Maps/_NF/Shuttles/Bus/publicts.yml", }; - private static readonly string[] GameMaps = - { - "Dev", - "TestTeg", - "Fland", - "Meta", - "Packed", - "Omega", - "Bagel", - "CentComm", - "Box", - "Core", - "Marathon", - "MeteorArena", - "Saltern", - "Reach", - "Train", - "Oasis", - "Cog" - }; + private static readonly string[] GameMaps = FrontierConstants.GameMapPrototypes; // Frontier: not inline constants /// /// Asserts that specific files have been saved as grids and not maps. diff --git a/Content.IntegrationTests/Tests/Station/StationJobsTest.cs b/Content.IntegrationTests/Tests/Station/StationJobsTest.cs index d68fdafb769..e57b35c2297 100644 --- a/Content.IntegrationTests/Tests/Station/StationJobsTest.cs +++ b/Content.IntegrationTests/Tests/Station/StationJobsTest.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using System.Linq; +using Content.IntegrationTests.Tests._NF; using Content.Server.Maps; using Content.Server.Station.Components; using Content.Server.Station.Systems; @@ -227,8 +228,15 @@ await server.WaitAssertion(() => Assert.Multiple(() => { - foreach (var gameMap in prototypeManager.EnumeratePrototypes()) + foreach (var mapProto in FrontierConstants.GameMapPrototypes) // Frontier: EnumeratePrototypes < FrontierConstants.GameMapPrototypes { + // Frontier: get prototype from proto ID + if (!prototypeManager.TryIndex(mapProto, out var gameMap)) + { + Assert.Fail($"Could not find GameMapPrototype with ID {mapProto}! Is FrontierConstants up to date?"); + } + // End Frontier + foreach (var (stationId, station) in gameMap.Stations) { if (!station.StationComponentOverrides.TryGetComponent(name, out var comp)) diff --git a/Content.IntegrationTests/Tests/_NF/FrontierConstants.cs b/Content.IntegrationTests/Tests/_NF/FrontierConstants.cs new file mode 100644 index 00000000000..9f8cf97fd87 --- /dev/null +++ b/Content.IntegrationTests/Tests/_NF/FrontierConstants.cs @@ -0,0 +1,10 @@ +namespace Content.IntegrationTests.Tests._NF; + +public sealed class FrontierConstants +{ + public static readonly string[] GameMapPrototypes = + { + "Frontier", + "NFDev" + }; +} \ No newline at end of file