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

Fix content.integration tests warnings (#17817)

Browse Source 
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
This commit is contained in:
TemporalOroboros
2023-07-05 21:54:25 -07:00
committed by GitHub
parent 20c1754abd
commit ba91023a85
121 changed files with 3658 additions and 1961 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,5 @@
using System;
using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Content.Server.Administration.Logs;
using Content.Server.Database;
using Content.Server.GameTicking;
@@ -9,7 +7,6 @@ using Content.Server.GameTicking.Commands;
using Content.Shared.Administration.Logs;
using Content.Shared.CCVar;
using Content.Shared.Database;
using NUnit.Framework;
using Robust.Server.Player;
using Robust.Shared.Configuration;
using Robust.Shared.GameObjects;
@@ -24,7 +21,7 @@ public sealed class AddTests
[Test]
public async Task AddAndGetSingleLog()
{
await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings{NoClient = true});
await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings { NoClient = true });
var server = pairTracker.Pair.Server;
var sEntities = server.ResolveDependency<IEntityManager>();
@@ -71,7 +68,7 @@ public sealed class AddTests
[Test]
public async Task AddAndGetUnformattedLog()
{
await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings{NoClient = true});
await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings { NoClient = true });
var server = pairTracker.Pair.Server;
var sDatabase = server.ResolveDependency<IServerDbManager>();
@@ -115,15 +112,18 @@ public sealed class AddTests
{
Round = sGamerTicker.RoundId,
Search = log.Message,
Types = new HashSet<LogType> {log.Type},
Types = new HashSet<LogType> { log.Type },
};
await foreach (var json in sDatabase.GetAdminLogsJson(filter))
{
var root = json.RootElement;
Assert.That(root.TryGetProperty("entity", out _), Is.True);
Assert.That(root.TryGetProperty("guid", out _), Is.True);
Assert.Multiple(() =>
{
Assert.That(root.TryGetProperty("entity", out _), Is.True);
Assert.That(root.TryGetProperty("guid", out _), Is.True);
});
json.Dispose();
}
@@ -135,7 +135,7 @@ public sealed class AddTests
[TestCase(500)]
public async Task BulkAddLogs(int amount)
{
await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings{NoClient = true});
await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings { NoClient = true });
var server = pairTracker.Pair.Server;
var sEntities = server.ResolveDependency<IEntityManager>();
@@ -204,7 +204,7 @@ public sealed class AddTests
[Test]
public async Task PreRoundAddAndGetSingle()
{
await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings{Dirty = true});
await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings { Dirty = true });
var server = pairTracker.Pair.Server;
var configManager = server.ResolveDependency<IConfigurationManager>();
@@ -255,7 +255,7 @@ public sealed class AddTests
{
Round = sGamerTicker.RoundId,
Search = log.Message,
Types = new HashSet<LogType> {log.Type},
Types = new HashSet<LogType> { log.Type },
};
await foreach (var json in sDatabase.GetAdminLogsJson(filter))

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

@@ -1,12 +1,7 @@
using System;
using System.Threading.Tasks;
using Content.Server.Administration.Logs;
using Content.Shared.Administration.Logs;
using Content.Shared.CCVar;
using Content.Shared.Database;
using NUnit.Framework;
using Robust.Shared.GameObjects;
using Robust.Shared.Map;
namespace Content.IntegrationTests.Tests.Administration.Logs;
@@ -19,7 +14,7 @@ public sealed class FilterTests
[TestCase(DateOrder.Descending)]
public async Task Date(DateOrder order)
{
await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings{NoClient = true});
await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings { NoClient = true });
var server = pairTracker.Pair.Server;
var sEntities = server.ResolveDependency<IEntityManager>();

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

@@ -1,12 +1,8 @@
using System;
using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Content.Server.Administration.Logs;
using Content.Server.GameTicking;
using Content.Shared.CCVar;
using Content.Shared.Database;
using NUnit.Framework;
using Robust.Server.Player;
using Robust.Shared.GameObjects;
@@ -44,9 +40,9 @@ public sealed class QueryTests
{
Round = sGamerTicker.RoundId,
Search = guid.ToString(),
Types = new HashSet<LogType> {LogType.Unknown},
Types = new HashSet<LogType> { LogType.Unknown },
After = date,
AnyPlayers = new[] {player.UserId.UserId}
AnyPlayers = new[] { player.UserId.UserId }
};
await PoolManager.WaitUntil(server, async () =>