Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Wish the FilterTests thread good night

Browse Source
This commit is contained in:
DrSmugleaf
2021-12-01 00:15:39 +01:00
parent 6178b202ee
commit 9f3549c3c2
1 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
Content.IntegrationTests/Tests/Administration/Logs/FilterTests.cs
View File

@@ -1,7 +1,7 @@
using System; using System;
using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Content.Server.Administration.Logs; using Content.Server.Administration.Logs;
using Content.Server.GameTicking;
using Content.Shared.Administration.Logs; using Content.Shared.Administration.Logs;
using Content.Shared.CCVar; using Content.Shared.CCVar;
using Content.Shared.Database; using Content.Shared.Database;
@@ -37,20 +37,26 @@ public class FilterTests : ContentIntegrationTest
var sAdminLogSystem = sSystems.GetEntitySystem<AdminLogSystem>(); var sAdminLogSystem = sSystems.GetEntitySystem<AdminLogSystem>();
var commonGuid = Guid.NewGuid(); var commonGuid = Guid.NewGuid();
var guids = new[] {Guid.NewGuid(), Guid.NewGuid()}; var firstGuid = Guid.NewGuid();
var secondGuid = Guid.NewGuid();
for (var i = 0; i < 2; i++) await server.WaitPost(() =>
{ {
await server.WaitPost(() => var coordinates = GetMainEntityCoordinates(sMaps);
{ var entity = sEntities.SpawnEntity(null, coordinates);
var coordinates = GetMainEntityCoordinates(sMaps);
var entity = sEntities.SpawnEntity(null, coordinates);
sAdminLogSystem.Add(LogType.Unknown, $"{entity:Entity} test log: {commonGuid} {guids[i]}"); sAdminLogSystem.Add(LogType.Unknown, $"{entity:Entity} test log: {commonGuid} {firstGuid}");
}); });
await server.WaitRunTicks(100); Thread.Sleep(2000);
}
await server.WaitPost(() =>
{
var coordinates = GetMainEntityCoordinates(sMaps);
var entity = sEntities.SpawnEntity(null, coordinates);
sAdminLogSystem.Add(LogType.Unknown, $"{entity:Entity} test log: {commonGuid} {secondGuid}");
});
await WaitUntil(server, async () => await WaitUntil(server, async () =>
{ {
@@ -63,13 +69,13 @@ public class FilterTests : ContentIntegrationTest
{ {
case DateOrder.Ascending: case DateOrder.Ascending:
// Oldest first // Oldest first
firstGuidStr = guids[0].ToString(); firstGuidStr = firstGuid.ToString();
secondGuidStr = guids[1].ToString(); secondGuidStr = secondGuid.ToString();
break; break;
case DateOrder.Descending: case DateOrder.Descending:
// Newest first // Newest first
firstGuidStr = guids[1].ToString(); firstGuidStr = secondGuid.ToString();
secondGuidStr = guids[0].ToString(); secondGuidStr = firstGuid.ToString();
break; break;
default: default:
throw new ArgumentOutOfRangeException(nameof(order), order, null); throw new ArgumentOutOfRangeException(nameof(order), order, null);