tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Update submodule to 172.0.0 (#21222)" (#21225)

Browse Source
This commit is contained in:
metalgearsloth
2023-10-24 21:55:20 +11:00
committed by GitHub
parent 517aea8bc3
commit a2bbda43cc
249 changed files with 1049 additions and 967 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.IntegrationTests/Pair/TestPair.cs
View File

@@ -3,11 +3,13 @@ using System.Collections.Generic;
using System.IO;
using System.Linq;
using Content.Server.GameTicking;
using Content.Server.Players;
using Content.Shared.Mind;
using Content.Shared.Players;
using Robust.Server.Player;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Network;
using Robust.Shared.Player;
using Robust.Shared.Timing;
using Robust.UnitTesting;
@@ -28,8 +30,8 @@ public sealed partial class TestPair
public RobustIntegrationTest.ServerIntegrationInstance Server { get; private set; } = default!;
public RobustIntegrationTest.ClientIntegrationInstance Client { get; private set; } = default!;
public ICommonSession? Player => Server.PlayerMan.Sessions.FirstOrDefault();
public ContentPlayerData? PlayerData => Player?.Data.ContentData();
public IPlayerSession? Player => (IPlayerSession?) Server.PlayerMan.Sessions.FirstOrDefault();
public PlayerData? PlayerData => Player?.Data.ContentData();
public PoolTestLogHandler ServerLogHandler { get; private set; } = default!;
public PoolTestLogHandler ClientLogHandler { get; private set; } = default!;

4
Content.IntegrationTests/Tests/Actions/ActionsAddedTest.cs
View File

@@ -3,6 +3,8 @@ using Content.Shared.Actions;
using Content.Shared.CombatMode;
using Robust.Server.Player;
using Robust.Shared.GameObjects;
using Robust.Shared.Players;
using PlayerManager = Robust.Client.Player.PlayerManager;
namespace Content.IntegrationTests.Tests.Actions;
@@ -24,7 +26,7 @@ public sealed class ActionsAddedTest
var sEntMan = server.ResolveDependency<IEntityManager>();
var cEntMan = client.ResolveDependency<IEntityManager>();
var clientSession = client.ResolveDependency<Robust.Client.Player.IPlayerManager>().LocalPlayer?.Session;
var serverSession = server.ResolveDependency<IPlayerManager>().Sessions.Single();
var serverSession = server.ResolveDependency<IPlayerManager>().ServerSessions.Single();
var sActionSystem = server.System<SharedActionsSystem>();
var cActionSystem = client.System<SharedActionsSystem>();

8
Content.IntegrationTests/Tests/Administration/Logs/AddTests.cs
View File

@@ -7,6 +7,8 @@ using Content.Shared.Administration.Logs;
using Content.Shared.Database;
using Robust.Server.Player;
using Robust.Shared.GameObjects;
using Robust.Shared.Map;
using Robust.Shared.Utility;
namespace Content.IntegrationTests.Tests.Administration.Logs;
@@ -175,7 +177,7 @@ public sealed class AddTests
await server.WaitPost(() =>
{
var player = sPlayers.Sessions.First();
var player = sPlayers.ServerSessions.First();
playerGuid = player.UserId;
Assert.DoesNotThrow(() =>
@@ -278,7 +280,7 @@ public sealed class AddTests
await server.WaitPost(() =>
{
var player = sPlayers.Sessions.Single();
var player = sPlayers.ServerSessions.Single();
sAdminLogSystem.Add(LogType.Unknown, $"{player} {player} test log: {guid}");
});
@@ -316,7 +318,7 @@ public sealed class AddTests
await server.WaitPost(() =>
{
var player = sPlayers.Sessions.Single();
var player = sPlayers.ServerSessions.Single();
sAdminLogSystem.Add(LogType.Unknown, $"{player:first} {player:second} test log: {guid}");
});

5
Content.IntegrationTests/Tests/Administration/Logs/QueryTests.cs
View File

@@ -5,7 +5,6 @@ using Content.Server.GameTicking;
using Content.Shared.Database;
using Robust.Server.Player;
using Robust.Shared.GameObjects;
using Robust.Shared.Player;
namespace Content.IntegrationTests.Tests.Administration.Logs;
@@ -28,11 +27,11 @@ public sealed class QueryTests
var date = DateTime.UtcNow;
var guid = Guid.NewGuid();
ICommonSession player = default;
IPlayerSession player = default;
await server.WaitPost(() =>
{
player = sPlayers.Sessions.First();
player = sPlayers.ServerSessions.First();
sAdminLogSystem.Add(LogType.Unknown, $"{player.AttachedEntity:Entity} test log: {guid}");
});

2
Content.IntegrationTests/Tests/Cleanup/EuiManagerTest.cs
View File

@@ -25,7 +25,7 @@ public sealed class EuiManagerTest
await server.WaitAssertion(() =>
{
var clientSession = sPlayerManager.Sessions.Single();
var clientSession = sPlayerManager.ServerSessions.Single();
var ui = new AdminAnnounceEui();
eui.OpenEui(ui, clientSession);
});

5
Content.IntegrationTests/Tests/Interaction/InteractionTest.cs
View File

@@ -14,7 +14,6 @@ using Content.Shared.Hands.Components;
using Content.Shared.Hands.EntitySystems;
using Content.Shared.Interaction;
using Content.Shared.Mind;
using Content.Shared.Players;
using Robust.Client.Input;
using Robust.Client.UserInterface;
using Robust.Server.GameObjects;
@@ -22,7 +21,7 @@ using Robust.Server.Player;
using Robust.Shared.GameObjects;
using Robust.Shared.Log;
using Robust.Shared.Map;
using Robust.Shared.Player;
using Robust.Shared.Players;
using Robust.Shared.Prototypes;
using Robust.Shared.Timing;
using Robust.UnitTesting;
@@ -68,7 +67,7 @@ public abstract partial class InteractionTest
protected NetEntity Player;
protected ICommonSession ClientSession = default!;
protected ICommonSession ServerSession = default!;
protected IPlayerSession ServerSession = default!;
public EntityUid? ClientTarget;

3
Content.IntegrationTests/Tests/Minds/GhostRoleTests.cs
View File

@@ -5,7 +5,6 @@ using Content.Server.Ghost.Roles.Components;
using Content.Server.Players;
using Content.Shared.Ghost;
using Content.Shared.Mind;
using Content.Shared.Players;
using Robust.Shared.Console;
using Robust.Shared.GameObjects;
using Robust.Shared.Map;
@@ -44,7 +43,7 @@ public sealed class GhostRoleTests
var sPlayerMan = server.ResolveDependency<Robust.Server.Player.IPlayerManager>();
var conHost = client.ResolveDependency<IConsoleHost>();
var mindSystem = entMan.System<SharedMindSystem>();
var session = sPlayerMan.Sessions.Single();
var session = sPlayerMan.ServerSessions.Single();
var originalMindId = session.ContentData()!.Mind!.Value;
// Spawn player entity & attach

13
Content.IntegrationTests/Tests/Minds/MindTests.EntityDeletion.cs
View File

@@ -2,7 +2,6 @@ using System.Linq;
using Content.Server.Players;
using Content.Shared.Ghost;
using Content.Shared.Mind;
using Content.Shared.Players;
using Robust.Server.Console;
using Robust.Server.GameObjects;
using Robust.Server.Player;
@@ -36,7 +35,7 @@ public sealed partial class MindTests
MindComponent mind = default!;
await server.WaitAssertion(() =>
{
var player = playerMan.Sessions.Single();
var player = playerMan.ServerSessions.Single();
playerEnt = entMan.SpawnEntity(null, MapCoordinates.Nullspace);
visitEnt = entMan.SpawnEntity(null, MapCoordinates.Nullspace);
@@ -82,7 +81,7 @@ public sealed partial class MindTests
var entMan = server.ResolveDependency<IServerEntityManager>();
var mapManager = server.ResolveDependency<IMapManager>();
var playerMan = server.ResolveDependency<IPlayerManager>();
var player = playerMan.Sessions.Single();
var player = playerMan.ServerSessions.Single();
var mindSystem = entMan.EntitySysManager.GetEntitySystem<SharedMindSystem>();
@@ -129,7 +128,7 @@ public sealed partial class MindTests
var entMan = server.ResolveDependency<IServerEntityManager>();
var playerMan = server.ResolveDependency<IPlayerManager>();
var player = playerMan.Sessions.Single();
var player = playerMan.ServerSessions.Single();
Assert.That(!entMan.HasComponent<GhostComponent>(player.AttachedEntity), "Player was initially a ghost?");
@@ -163,7 +162,7 @@ public sealed partial class MindTests
var mindSystem = entMan.EntitySysManager.GetEntitySystem<SharedMindSystem>();
var mind = GetMind(pair);
var player = playerMan.Sessions.Single();
var player = playerMan.ServerSessions.Single();
#pragma warning disable NUnit2045 // Interdependent assertions.
Assert.That(player.AttachedEntity, Is.Not.Null);
Assert.That(entMan.EntityExists(player.AttachedEntity));
@@ -219,7 +218,7 @@ public sealed partial class MindTests
var playerMan = server.ResolveDependency<IPlayerManager>();
var serverConsole = server.ResolveDependency<IServerConsoleHost>();
var player = playerMan.Sessions.Single();
var player = playerMan.ServerSessions.Single();
var ghost = await BecomeGhost(pair);
@@ -264,7 +263,7 @@ public sealed partial class MindTests
var playerMan = server.ResolveDependency<IPlayerManager>();
var serverConsole = server.ResolveDependency<IServerConsoleHost>();
var player = playerMan.Sessions.Single();
var player = playerMan.ServerSessions.Single();
EntityUid ghost = default!;

20
Content.IntegrationTests/Tests/Minds/MindTests.Helpers.cs
View File

@@ -3,14 +3,12 @@ using Content.IntegrationTests.Pair;
using Content.Server.Players;
using Content.Shared.Ghost;
using Content.Shared.Mind;
using Content.Shared.Players;
using Robust.Server.GameObjects;
using Robust.Server.Player;
using Robust.Shared.Enums;
using Robust.Shared.GameObjects;
using Robust.Shared.Map;
using Robust.Shared.Network;
using Robust.Shared.Player;
namespace Content.IntegrationTests.Tests.Minds;
@@ -38,7 +36,7 @@ public sealed partial class MindTests
var playerMan = pair.Server.ResolveDependency<IPlayerManager>();
var mindSys = entMan.System<SharedMindSystem>();
var player = playerMan.Sessions.Single();
var player = playerMan.ServerSessions.Single();
EntityUid entity = default;
EntityUid mindId = default!;
@@ -73,7 +71,7 @@ public sealed partial class MindTests
EntityUid mindId = default!;
MindComponent mind = default!;
var player = playerMan.Sessions.Single();
var player = playerMan.ServerSessions.Single();
await pair.Server.WaitAssertion(() =>
{
var oldUid = player.AttachedEntity;
@@ -120,7 +118,7 @@ public sealed partial class MindTests
{
var playerMan = pair.Server.ResolveDependency<IPlayerManager>();
var entMan = pair.Server.ResolveDependency<IEntityManager>();
var player = playerMan.Sessions.SingleOrDefault();
var player = playerMan.ServerSessions.SingleOrDefault();
Assert.That(player, Is.Not.Null);
var mindId = player.ContentData()!.Mind!.Value;
@@ -141,7 +139,7 @@ public sealed partial class MindTests
var netManager = pair.Client.ResolveDependency<IClientNetManager>();
var playerMan = pair.Server.ResolveDependency<IPlayerManager>();
var entMan = pair.Server.ResolveDependency<IEntityManager>();
var player = playerMan.Sessions.Single();
var player = playerMan.ServerSessions.Single();
var mindId = player.ContentData()!.Mind!.Value;
var mind = entMan.GetComponent<MindComponent>(mindId);
@@ -163,21 +161,21 @@ public sealed partial class MindTests
{
var netManager = pair.Client.ResolveDependency<IClientNetManager>();
var playerMan = pair.Server.ResolveDependency<IPlayerManager>();
Assert.That(!playerMan.Sessions.Any());
Assert.That(!playerMan.ServerSessions.Any());
await Task.WhenAll(pair.Client.WaitIdleAsync(), pair.Client.WaitIdleAsync());
pair.Client.SetConnectTarget(pair.Server);
await pair.Client.WaitPost(() => netManager.ClientConnect(null!, 0, username));
await pair.RunTicksSync(5);
var player = playerMan.Sessions.Single();
var player = playerMan.ServerSessions.Single();
Assert.That(player.Status, Is.EqualTo(SessionStatus.InGame));
}
private static async Task<ICommonSession> DisconnectReconnect(Pair.TestPair pair)
private static async Task<IPlayerSession> DisconnectReconnect(Pair.TestPair pair)
{
var playerMan = pair.Server.ResolveDependency<IPlayerManager>();
var player = playerMan.Sessions.Single();
var player = playerMan.ServerSessions.Single();
var name = player.Name;
var id = player.UserId;
@@ -185,7 +183,7 @@ public sealed partial class MindTests
await Connect(pair, name);
// Session has changed
var newSession = playerMan.Sessions.Single();
var newSession = playerMan.ServerSessions.Single();
Assert.Multiple(() =>
{
Assert.That(newSession, Is.Not.EqualTo(player));

9
Content.IntegrationTests/Tests/Minds/MindTests.ReconnectTests.cs
View File

@@ -49,7 +49,7 @@ public sealed partial class MindTests
var mind = GetMind(pair);
var playerMan = pair.Server.ResolveDependency<IPlayerManager>();
var player = playerMan.Sessions.Single();
var player = playerMan.ServerSessions.Single();
var name = player.Name;
var user = player.UserId;
Assert.That(mind.Comp.OwnedEntity, Is.Not.Null);
@@ -72,7 +72,7 @@ public sealed partial class MindTests
// Reconnect
await Connect(pair, name);
player = playerMan.Sessions.Single();
player = playerMan.ServerSessions.Single();
Assert.Multiple(() =>
{
Assert.That(user, Is.EqualTo(player.UserId));
@@ -127,10 +127,8 @@ public sealed partial class MindTests
var mindSys = entMan.System<SharedMindSystem>();
var mind = GetMind(pair);
Assert.Null(mind.Comp.VisitingEntity);
// Make player visit a new mob
var original = mind.Comp.OwnedEntity;
var original = mind.Comp.CurrentEntity;
EntityUid visiting = default;
await pair.Server.WaitAssertion(() =>
{
@@ -139,7 +137,6 @@ public sealed partial class MindTests
});
await pair.RunTicksSync(5);
Assert.That(mind.Comp.VisitingEntity, Is.EqualTo(visiting));
await DisconnectReconnect(pair);
// Player is back in control of the visited mob, mind was preserved

30
Content.IntegrationTests/Tests/Minds/MindTests.cs
View File

@@ -11,7 +11,6 @@ using Content.Shared.Damage.Prototypes;
using Content.Shared.FixedPoint;
using Content.Shared.Mind;
using Content.Shared.Mind.Components;
using Content.Shared.Players;
using Content.Shared.Roles;
using Content.Shared.Roles.Jobs;
using Robust.Server.Console;
@@ -68,12 +67,13 @@ public sealed partial class MindTests
var entity = entMan.SpawnEntity(null, new MapCoordinates());
var mindComp = entMan.EnsureComponent<MindContainerComponent>(entity);
var mind = mindSystem.CreateMind(null);
var mindId = mindSystem.CreateMind(null);
var mind = entMan.GetComponent<MindComponent>(mindId);
Assert.That(mind.Comp.UserId, Is.EqualTo(null));
Assert.That(mind.UserId, Is.EqualTo(null));
mindSystem.TransferTo(mind, entity, mind: mind);
Assert.That(mindSystem.GetMind(entity, mindComp), Is.EqualTo(mind.Owner));
mindSystem.TransferTo(mindId, entity, mind: mind);
Assert.That(mindSystem.GetMind(entity, mindComp), Is.EqualTo(mindId));
});
await pair.CleanReturnAsync();
@@ -94,11 +94,11 @@ public sealed partial class MindTests
var entity = entMan.SpawnEntity(null, new MapCoordinates());
var mindComp = entMan.EnsureComponent<MindContainerComponent>(entity);
var mindId = mindSystem.CreateMind(null).Owner;
var mindId = mindSystem.CreateMind(null);
mindSystem.TransferTo(mindId, entity);
Assert.That(mindSystem.GetMind(entity, mindComp), Is.EqualTo(mindId));
var mind2 = mindSystem.CreateMind(null).Owner;
var mind2 = mindSystem.CreateMind(null);
mindSystem.TransferTo(mind2, entity);
Assert.Multiple(() =>
{
@@ -184,7 +184,7 @@ public sealed partial class MindTests
var mindComp = entMan.EnsureComponent<MindContainerComponent>(entity);
entMan.EnsureComponent<MindContainerComponent>(targetEntity);
var mind = mindSystem.CreateMind(null).Owner;
var mind = mindSystem.CreateMind(null);
mindSystem.TransferTo(mind, entity);
@@ -276,7 +276,7 @@ public sealed partial class MindTests
var entity = entMan.SpawnEntity(null, new MapCoordinates());
var mindComp = entMan.EnsureComponent<MindContainerComponent>(entity);
var mindId = mindSystem.CreateMind(null).Owner;
var mindId = mindSystem.CreateMind(null);
var mind = entMan.EnsureComponent<MindComponent>(mindId);
Assert.That(mind.UserId, Is.EqualTo(null));
@@ -334,7 +334,7 @@ public sealed partial class MindTests
public async Task TestPlayerCanGhost()
{
// Client is needed to spawn session
await using var pair = await PoolManager.GetServerClient(new PoolSettings { Connected = true, DummyTicker = false });
await using var pair = await PoolManager.GetServerClient(new PoolSettings { Connected = true });
var server = pair.Server;
var entMan = server.ResolveDependency<IServerEntityManager>();
@@ -346,7 +346,7 @@ public sealed partial class MindTests
EntityUid entity = default!;
EntityUid mindId = default!;
MindComponent mind = default!;
var player = playerMan.Sessions.Single();
var player = playerMan.ServerSessions.Single();
await server.WaitAssertion(() =>
{
@@ -407,6 +407,12 @@ public sealed partial class MindTests
await pair.CleanReturnAsync();
}
// TODO Implement
/*[Test]
public async Task TestPlayerCanReturnFromGhostWhenDead()
{
}*/
[Test]
public async Task TestGhostDoesNotInfiniteLoop()
{
@@ -427,7 +433,7 @@ public sealed partial class MindTests
EntityUid ghost = default!;
EntityUid mindId = default!;
MindComponent mind = default!;
var player = playerMan.Sessions.Single();
var player = playerMan.ServerSessions.Single();
await server.WaitAssertion(() =>
{

7
Content.IntegrationTests/Tests/Toolshed/ToolshedTest.cs
View File

@@ -2,7 +2,8 @@
using System.Collections.Generic;
using Content.IntegrationTests.Pair;
using Content.Server.Administration.Managers;
using Robust.Shared.Player;
using Robust.Server.Player;
using Robust.Shared.Players;
using Robust.Shared.Toolshed;
using Robust.Shared.Toolshed.Errors;
using Robust.Shared.Toolshed.Syntax;
@@ -59,7 +60,7 @@ public abstract class ToolshedTest : IInvocationContext
AdminManager = Server.ResolveDependency<IAdminManager>();
}
protected bool InvokeCommand(string command, out object? result, ICommonSession? session = null)
protected bool InvokeCommand(string command, out object? result, IPlayerSession? session = null)
{
return Toolshed.InvokeCommand(this, command, null, out result);
}
@@ -94,7 +95,7 @@ public abstract class ToolshedTest : IInvocationContext
return true;
}
protected ICommonSession? InvocationSession { get; set; }
protected IPlayerSession? InvocationSession { get; set; }
public ICommonSession? Session
{