Skip to content

Commit

Permalink
Remove obsolete TestPair.Pair (#19496)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Visne
Visne authored Aug 25, 2023
1 parent e1639b0 commit 3c667b6
Show file tree
Hide file tree
Showing 101 changed files with 717 additions and 727 deletions.
14 changes: 7 additions & 7 deletions Content.Benchmarks/DeviceNetworkingBenchmark.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public async Task SetupAsync()
{
ProgramShared.PathOffset = "../../../../";
_pair = await PoolManager.GetServerClient();
var server = _pair.Pair.Server;
var server = _pair.Server;

await server.WaitPost(() =>
{
Expand Down Expand Up @@ -96,9 +96,9 @@ public async Task Cleanup()
[Benchmark(Baseline = true, Description = "Entity Events")]
public async Task EventSentBaseline()
{
var server = _pair.Pair.Server;
var server = _pair.Server;

_pair.Pair.Server.Post(() =>
_pair.Server.Post(() =>
{
foreach (var entity in _targetEntities)
{
Expand All @@ -113,9 +113,9 @@ public async Task EventSentBaseline()
[Benchmark(Description = "Device Net Broadcast No Connection Checks")]
public async Task DeviceNetworkBroadcastNoConnectionChecks()
{
var server = _pair.Pair.Server;
var server = _pair.Server;

_pair.Pair.Server.Post(() =>
_pair.Server.Post(() =>
{
_deviceNetworkSystem.QueuePacket(_sourceEntity, null, _payload, 100);
});
Expand All @@ -127,9 +127,9 @@ public async Task DeviceNetworkBroadcastNoConnectionChecks()
[Benchmark(Description = "Device Net Broadcast Wireless Connection Checks")]
public async Task DeviceNetworkBroadcastWirelessConnectionChecks()
{
var server = _pair.Pair.Server;
var server = _pair.Server;

_pair.Pair.Server.Post(() =>
_pair.Server.Post(() =>
{
_deviceNetworkSystem.QueuePacket(_sourceWirelessEntity, null, _payload, 100);
});
Expand Down
6 changes: 3 additions & 3 deletions Content.Benchmarks/MapLoadBenchmark.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public void Setup()
ProgramShared.PathOffset = "../../../../";

_pair = PoolManager.GetServerClient().GetAwaiter().GetResult();
var server = _pair.Pair.Server;
var server = _pair.Server;

Paths = server.ResolveDependency<IPrototypeManager>()
.EnumeratePrototypes<GameMapPrototype>()
Expand All @@ -55,7 +55,7 @@ public async Task Cleanup()
public async Task LoadMap()
{
var mapPath = Paths[Map];
var server = _pair.Pair.Server;
var server = _pair.Server;
await server.WaitPost(() =>
{
var success = _mapLoader.TryLoad(new MapId(10), mapPath, out _);
Expand All @@ -67,7 +67,7 @@ await server.WaitPost(() =>
[IterationCleanup]
public void IterationCleanup()
{
var server = _pair.Pair.Server;
var server = _pair.Server;
server.WaitPost(() =>
{
_mapManager.DeleteMap(new MapId(10));
Expand Down
2 changes: 1 addition & 1 deletion Content.Benchmarks/Program.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public static async Task MainAsync(string[] args)
{
PoolManager.Startup(typeof(Program).Assembly);
var pair = await PoolManager.GetServerClient();
var gameMaps = pair.Pair.Server.ResolveDependency<IPrototypeManager>().EnumeratePrototypes<GameMapPrototype>().ToList();
var gameMaps = pair.Server.ResolveDependency<IPrototypeManager>().EnumeratePrototypes<GameMapPrototype>().ToList();
MapLoadBenchmark.MapsSource = gameMaps.Select(x => x.ID);
await pair.CleanReturnAsync();

Expand Down
12 changes: 4 additions & 8 deletions Content.IntegrationTests/Pair/TestPair.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@ namespace Content.IntegrationTests.Pair;
/// </summary>
public sealed partial class TestPair
{
// TODO remove this.
[Obsolete("Field access is redundant")]
public TestPair Pair => this;

public readonly int Id;
private bool _initialized;
private TextWriter _testOut = default!;
Expand All @@ -31,7 +27,7 @@ public sealed partial class TestPair

public PoolTestLogHandler ServerLogHandler { get; private set; } = default!;
public PoolTestLogHandler ClientLogHandler { get; private set; } = default!;

public TestPair(int id)
{
Id = id;
Expand Down Expand Up @@ -72,7 +68,7 @@ await Client.WaitPost(() =>
await Client.WaitRunTicks(1);
}
}

public void Kill()
{
State = PairState.Dead;
Expand Down Expand Up @@ -100,12 +96,12 @@ public void Use()
throw new InvalidOperationException($"Pair is not ready to use. State: {State}");
State = PairState.InUse;
}

public enum PairState : byte
{
Ready = 0,
InUse = 1,
CleanDisposed = 2,
Dead = 3,
}
}
}
19 changes: 9 additions & 10 deletions Content.IntegrationTests/PoolManager.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ await testOut.WriteLineAsync(
}

pair.ValidateSettings(poolSettings);

var poolRetrieveTime = poolRetrieveTimeWatch.Elapsed;
await testOut.WriteLineAsync(
$"{nameof(GetServerClientPair)}: Retrieving pair {pair.Id} from pool took {poolRetrieveTime.TotalMilliseconds} ms");
Expand All @@ -298,7 +298,7 @@ await testOut.WriteLineAsync(
{
if (Pairs[pair])
continue;

if (!pair.Settings.CanFastRecycle(poolSettings))
{
fallback = pair;
Expand All @@ -320,15 +320,14 @@ await testOut.WriteLineAsync(
{
var x = 2;
}

return fallback;
}
}

/// <summary>
/// Used by PairTracker after checking the server/client pair, Don't use this.
/// Used by TestPair after checking the server/client pair, Don't use this.
/// </summary>
/// <param name="pair"></param>
public static void NoCheckReturn(TestPair pair)
{
lock (PairLock)
Expand Down Expand Up @@ -384,12 +383,12 @@ private static async Task<TestPair> CreateServerClientPair(PoolSettings poolSett
/// <summary>
/// Creates a map, a grid, and a tile, and gives back references to them.
/// </summary>
/// <param name="pairTracker">A pairTracker</param>
/// <param name="pair">A pair</param>
/// <returns>A TestMapData</returns>
[Obsolete("use TestPair.CreateMap")]
public static async Task<TestMapData> CreateTestMap(TestPair pairTracker)
public static async Task<TestMapData> CreateTestMap(TestPair pair)
{
return await pairTracker.CreateTestMap();
return await pair.CreateTestMap();
}

/// <summary>
Expand All @@ -406,7 +405,7 @@ public static async Task RunTicksSync(TestPair pair, int ticks)
await pair.Client.WaitRunTicks(1);
}
}

/// <summary>
/// Runs a server, or a client until a condition is true
/// </summary>
Expand Down Expand Up @@ -492,4 +491,4 @@ public static void Startup(Assembly? assembly)
_initialized = true;
DiscoverTestPrototypes(assembly);
}
}
}
8 changes: 4 additions & 4 deletions Content.IntegrationTests/Tests/Access/AccessReaderTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public sealed class AccessReaderTest
public async Task TestProtoTags()
{
await using var pair = await PoolManager.GetServerClient();
var server = pair.Pair.Server;
var server = pair.Server;

var protoManager = server.ResolveDependency<IPrototypeManager>();
var accessName = server.ResolveDependency<IComponentFactory>().GetComponentName(typeof(AccessReaderComponent));
Expand Down Expand Up @@ -44,8 +44,8 @@ await server.WaitAssertion(() =>
[Test]
public async Task TestTags()
{
await using var pairTracker = await PoolManager.GetServerClient();
var server = pairTracker.Pair.Server;
await using var pair = await PoolManager.GetServerClient();
var server = pair.Server;
var entityManager = server.ResolveDependency<IEntityManager>();


Expand Down Expand Up @@ -121,7 +121,7 @@ await server.WaitAssertion(() =>
Assert.That(system.AreAccessTagsAllowed(Array.Empty<string>(), reader), Is.False);
});
});
await pairTracker.CleanReturnAsync();
await pair.CleanReturnAsync();
}

}
Expand Down
48 changes: 24 additions & 24 deletions Content.IntegrationTests/Tests/Administration/Logs/AddTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ public sealed class AddTests
[Test]
public async Task AddAndGetSingleLog()
{
await using var pairTracker = await PoolManager.GetServerClient(LogTestSettings);
var server = pairTracker.Pair.Server;
await using var pair = await PoolManager.GetServerClient(LogTestSettings);
var server = pair.Server;
var sEntities = server.ResolveDependency<IEntityManager>();

var sAdminLogSystem = server.ResolveDependency<IAdminLogManager>();

var guid = Guid.NewGuid();

var testMap = await PoolManager.CreateTestMap(pairTracker);
var testMap = await PoolManager.CreateTestMap(pair);
var coordinates = testMap.GridCoords;
await server.WaitPost(() =>
{
Expand Down Expand Up @@ -65,14 +65,14 @@ await PoolManager.WaitUntil(server, async () =>
return false;
});

await pairTracker.CleanReturnAsync();
await pair.CleanReturnAsync();
}

[Test]
public async Task AddAndGetUnformattedLog()
{
await using var pairTracker = await PoolManager.GetServerClient(LogTestSettings);
var server = pairTracker.Pair.Server;
await using var pair = await PoolManager.GetServerClient(LogTestSettings);
var server = pair.Server;

var sDatabase = server.ResolveDependency<IServerDbManager>();
var sEntities = server.ResolveDependency<IEntityManager>();
Expand All @@ -83,7 +83,7 @@ public async Task AddAndGetUnformattedLog()

var guid = Guid.NewGuid();

var testMap = await PoolManager.CreateTestMap(pairTracker);
var testMap = await PoolManager.CreateTestMap(pair);
var coordinates = testMap.GridCoords;
await server.WaitPost(() =>
{
Expand Down Expand Up @@ -130,20 +130,20 @@ await PoolManager.WaitUntil(server, async () =>
json.Dispose();
}

await pairTracker.CleanReturnAsync();
await pair.CleanReturnAsync();
}

[Test]
[TestCase(500)]
public async Task BulkAddLogs(int amount)
{
await using var pairTracker = await PoolManager.GetServerClient(LogTestSettings);
var server = pairTracker.Pair.Server;
await using var pair = await PoolManager.GetServerClient(LogTestSettings);
var server = pair.Server;

var sEntities = server.ResolveDependency<IEntityManager>();
var sAdminLogSystem = server.ResolveDependency<IAdminLogManager>();

var testMap = await PoolManager.CreateTestMap(pairTracker);
var testMap = await PoolManager.CreateTestMap(pair);
var coordinates = testMap.GridCoords;
await server.WaitPost(() =>
{
Expand All @@ -161,14 +161,14 @@ await PoolManager.WaitUntil(server, async () =>
return messages.Count >= amount;
});

await pairTracker.CleanReturnAsync();
await pair.CleanReturnAsync();
}

[Test]
public async Task AddPlayerSessionLog()
{
await using var pairTracker = await PoolManager.GetServerClient(LogTestSettings);
var server = pairTracker.Pair.Server;
await using var pair = await PoolManager.GetServerClient(LogTestSettings);
var server = pair.Server;

var sPlayers = server.ResolveDependency<IPlayerManager>();

Expand Down Expand Up @@ -197,7 +197,7 @@ await PoolManager.WaitUntil(server, async () =>
Assert.That(logs.First().Players, Does.Contain(playerGuid));
return true;
});
await pairTracker.CleanReturnAsync();
await pair.CleanReturnAsync();
}

[Test]
Expand All @@ -210,8 +210,8 @@ public async Task PreRoundAddAndGetSingle()
AdminLogsEnabled = true
};

await using var pairTracker = await PoolManager.GetServerClient(setting);
var server = pairTracker.Pair.Server;
await using var pair = await PoolManager.GetServerClient(setting);
var server = pair.Server;

var sDatabase = server.ResolveDependency<IServerDbManager>();
var sSystems = server.ResolveDependency<IEntitySystemManager>();
Expand Down Expand Up @@ -264,14 +264,14 @@ await PoolManager.WaitUntil(server, async () =>

json.Dispose();
}
await pairTracker.CleanReturnAsync();
await pair.CleanReturnAsync();
}

[Test]
public async Task DuplicatePlayerDoesNotThrowTest()
{
await using var pairTracker = await PoolManager.GetServerClient(LogTestSettings);
var server = pairTracker.Pair.Server;
await using var pair = await PoolManager.GetServerClient(LogTestSettings);
var server = pair.Server;

var sPlayers = server.ResolveDependency<IPlayerManager>();
var sAdminLogSystem = server.ResolveDependency<IAdminLogManager>();
Expand Down Expand Up @@ -300,15 +300,15 @@ await PoolManager.WaitUntil(server, async () =>
return true;
});

await pairTracker.CleanReturnAsync();
await pair.CleanReturnAsync();
Assert.Pass();
}

[Test]
public async Task DuplicatePlayerIdDoesNotThrowTest()
{
await using var pairTracker = await PoolManager.GetServerClient(LogTestSettings);
var server = pairTracker.Pair.Server;
await using var pair = await PoolManager.GetServerClient(LogTestSettings);
var server = pair.Server;

var sPlayers = server.ResolveDependency<IPlayerManager>();

Expand Down Expand Up @@ -338,7 +338,7 @@ await PoolManager.WaitUntil(server, async () =>
return true;
});

await pairTracker.CleanReturnAsync();
await pair.CleanReturnAsync();
Assert.Pass();
}
}
Loading

0 comments on commit 3c667b6

Please sign in to comment.