Skip to content

Commit

Permalink
Minor test fixes (#25174)
Browse files Browse the repository at this point in the history 
Stuff that probably shoulda been wrapped ig but our test runner stinky.
  • Loading branch information
@metalgearsloth
metalgearsloth authored Feb 14, 2024
1 parent 159eade commit 212c8b2
Show file tree
Hide file tree
Showing 2 changed files with 69 additions and 45 deletions.
52 changes: 30 additions & 22 deletions Content.IntegrationTests/Tests/Construction/ConstructionActionValid.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,33 +55,36 @@ public async Task ConstructionGraphSpawnPrototypeValid()
var valid = true;
var message = new StringBuilder();

foreach (var graph in protoMan.EnumeratePrototypes<ConstructionGraphPrototype>())
await server.WaitPost(() =>
{
foreach (var node in graph.Nodes.Values)
foreach (var graph in protoMan.EnumeratePrototypes<ConstructionGraphPrototype>())
{
foreach (var action in node.Actions)
foreach (var node in graph.Nodes.Values)
{
if (IsValid(action, protoMan, out var prototype)) continue;

valid = false;
message.Append($"Invalid entity prototype \"{prototype}\" on graph action in node \"{node.Name}\" of graph \"{graph.ID}\"\n");
}

foreach (var edge in node.Edges)
{
foreach (var action in edge.Completed)
foreach (var action in node.Actions)
{
if (IsValid(action, protoMan, out var prototype)) continue;

valid = false;
message.Append($"Invalid entity prototype \"{prototype}\" on graph action in edge \"{edge.Target}\" of node \"{node.Name}\" of graph \"{graph.ID}\"\n");
message.Append($"Invalid entity prototype \"{prototype}\" on graph action in node \"{node.Name}\" of graph \"{graph.ID}\"\n");
}

foreach (var edge in node.Edges)
{
foreach (var action in edge.Completed)
{
if (IsValid(action, protoMan, out var prototype)) continue;

valid = false;
message.Append($"Invalid entity prototype \"{prototype}\" on graph action in edge \"{edge.Target}\" of node \"{node.Name}\" of graph \"{graph.ID}\"\n");
}
}
}
}
}
await pair.CleanReturnAsync();
});

Assert.That(valid, Is.True, $"One or more SpawnPrototype actions specified invalid entity prototypes!\n{message}");
await pair.CleanReturnAsync();
}

[Test]
Expand All @@ -95,19 +98,24 @@ public async Task ConstructionGraphEdgeValid()
var valid = true;
var message = new StringBuilder();

foreach (var graph in protoMan.EnumeratePrototypes<ConstructionGraphPrototype>())
await server.WaitPost(() =>
{
foreach (var node in graph.Nodes.Values)
foreach (var graph in protoMan.EnumeratePrototypes<ConstructionGraphPrototype>())
{
foreach (var edge in node.Edges)
foreach (var node in graph.Nodes.Values)
{
if (graph.Nodes.ContainsKey(edge.Target)) continue;
foreach (var edge in node.Edges)
{
if (graph.Nodes.ContainsKey(edge.Target))
continue;

valid = false;
message.Append($"Invalid target \"{edge.Target}\" in edge on node \"{node.Name}\" of graph \"{graph.ID}\"\n");
valid = false;
message.Append(
$"Invalid target \"{edge.Target}\" in edge on node \"{node.Name}\" of graph \"{graph.ID}\"\n");
}
}
}
}
});

Assert.That(valid, Is.True, $"One or more edges specified invalid node targets!\n{message}");
await pair.CleanReturnAsync();
Expand Down
62 changes: 39 additions & 23 deletions Content.IntegrationTests/Tests/Construction/ConstructionPrototypeTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,17 @@ public async Task TestStartIsValid()

var protoMan = server.ResolveDependency<IPrototypeManager>();

foreach (var proto in protoMan.EnumeratePrototypes<ConstructionPrototype>())
await server.WaitAssertion(() =>
{
var start = proto.StartNode;
var graph = protoMan.Index<ConstructionGraphPrototype>(proto.Graph);
foreach (var proto in protoMan.EnumeratePrototypes<ConstructionPrototype>())
{
var start = proto.StartNode;
var graph = protoMan.Index<ConstructionGraphPrototype>(proto.Graph);

Assert.That(graph.Nodes.ContainsKey(start), $"Found no startNode \"{start}\" on graph \"{graph.ID}\" for construction prototype \"{proto.ID}\"!");
}
Assert.That(graph.Nodes.ContainsKey(start),
$"Found no startNode \"{start}\" on graph \"{graph.ID}\" for construction prototype \"{proto.ID}\"!");
}
});
await pair.CleanReturnAsync();
}

Expand All @@ -76,13 +80,17 @@ public async Task TestTargetIsValid()

var protoMan = server.ResolveDependency<IPrototypeManager>();

foreach (var proto in protoMan.EnumeratePrototypes<ConstructionPrototype>())
await server.WaitAssertion(() =>
{
var target = proto.TargetNode;
var graph = protoMan.Index<ConstructionGraphPrototype>(proto.Graph);
foreach (var proto in protoMan.EnumeratePrototypes<ConstructionPrototype>())
{
var target = proto.TargetNode;
var graph = protoMan.Index<ConstructionGraphPrototype>(proto.Graph);

Assert.That(graph.Nodes.ContainsKey(target), $"Found no targetNode \"{target}\" on graph \"{graph.ID}\" for construction prototype \"{proto.ID}\"!");
}
Assert.That(graph.Nodes.ContainsKey(target),
$"Found no targetNode \"{target}\" on graph \"{graph.ID}\" for construction prototype \"{proto.ID}\"!");
}
});
await pair.CleanReturnAsync();
}

Expand All @@ -92,7 +100,6 @@ public async Task DeconstructionIsValid()
await using var pair = await PoolManager.GetServerClient();
var server = pair.Server;

var entMan = server.ResolveDependency<IEntityManager>();
var protoMan = server.ResolveDependency<IPrototypeManager>();
var compFact = server.ResolveDependency<IComponentFactory>();

Expand Down Expand Up @@ -126,22 +133,31 @@ public async Task TestStartReachesValidTarget()
var protoMan = server.ResolveDependency<IPrototypeManager>();
var entMan = server.ResolveDependency<IEntityManager>();

foreach (var proto in protoMan.EnumeratePrototypes<ConstructionPrototype>())
await server.WaitAssertion(() =>
{
var start = proto.StartNode;
var target = proto.TargetNode;
var graph = protoMan.Index<ConstructionGraphPrototype>(proto.Graph);
foreach (var proto in protoMan.EnumeratePrototypes<ConstructionPrototype>())
{
var start = proto.StartNode;
var target = proto.TargetNode;
var graph = protoMan.Index<ConstructionGraphPrototype>(proto.Graph);

#pragma warning disable NUnit2045 // Interdependent assertions.
Assert.That(graph.TryPath(start, target, out var path), $"Unable to find path from \"{start}\" to \"{target}\" on graph \"{graph.ID}\"");
Assert.That(path, Has.Length.GreaterThanOrEqualTo(1), $"Unable to find path from \"{start}\" to \"{target}\" on graph \"{graph.ID}\".");
var next = path[0];
var nextId = next.Entity.GetId(null, null, new(entMan));
Assert.That(nextId, Is.Not.Null, $"The next node ({next.Name}) in the path from the start node ({start}) to the target node ({target}) must specify an entity! Graph: {graph.ID}");
Assert.That(protoMan.TryIndex(nextId, out EntityPrototype entity), $"The next node ({next.Name}) in the path from the start node ({start}) to the target node ({target}) specified an invalid entity prototype ({nextId} [{next.Entity}])");
Assert.That(entity.Components.ContainsKey("Construction"), $"The next node ({next.Name}) in the path from the start node ({start}) to the target node ({target}) specified an entity prototype ({next.Entity}) without a ConstructionComponent.");
Assert.That(graph.TryPath(start, target, out var path),
$"Unable to find path from \"{start}\" to \"{target}\" on graph \"{graph.ID}\"");
Assert.That(path, Has.Length.GreaterThanOrEqualTo(1),
$"Unable to find path from \"{start}\" to \"{target}\" on graph \"{graph.ID}\".");
var next = path[0];
var nextId = next.Entity.GetId(null, null, new(entMan));
Assert.That(nextId, Is.Not.Null,
$"The next node ({next.Name}) in the path from the start node ({start}) to the target node ({target}) must specify an entity! Graph: {graph.ID}");
Assert.That(protoMan.TryIndex(nextId, out EntityPrototype entity),
$"The next node ({next.Name}) in the path from the start node ({start}) to the target node ({target}) specified an invalid entity prototype ({nextId} [{next.Entity}])");
Assert.That(entity.Components.ContainsKey("Construction"),
$"The next node ({next.Name}) in the path from the start node ({start}) to the target node ({target}) specified an entity prototype ({next.Entity}) without a ConstructionComponent.");
#pragma warning restore NUnit2045
}
}
});

await pair.CleanReturnAsync();
}
}
Expand Down

0 comments on commit 212c8b2

Please sign in to comment.