test: fix shared state, CI-vacuous tests and harness duplication (#2722)
Follow-up to #2721. It fixes how the remaining tests behave and changes no production code. ## CI - Both `dotnet test` steps pass `--filter "Category!=Manual"`. Before this, Manual-tagged tests ran on CI anyway. - The one surviving movement-throttle latency test is the only coverage of burst forgiveness over a full, wrapped history. It loses its Manual tag, so it runs on CI. ## Tests that passed on CI without testing anything - **Corpse and throwing tests.** They relied on tiledata for the weapon `Layer`, so on CI the equip silently failed and they asserted against empty lists. They now set `Layer` explicitly and assert the equip took effect. `TestThrown` also pins its own strength and range values, so a shard retuning SoulGlaive no longer breaks them. - **Healthbar poison rows.** Server.Tests registers no poisons, so every row tested `null`. They now use real poison levels. - **Account packet tests.** The mock accounts reported `Length` 0, so the character-list tests only ever encoded empty slots. They now encode the real characters. - **Pathing and AI tests that only mean something on real Trammel/Felucca terrain** are now guarded with `TileDataRequirement.SkipIfMissing()`: Britain desk and clutter scenes, house footprints (no MultiData on CI) and fingerprints. Tests that are valid on flat blank terrain stay unguarded. (A synthetic tiledata fixture to run these on CI is a planned follow-up.) - **Assertions that couldn't fail now check their claim.** Affected tests include the `DefaultWalker` cache use, cache on/off parity requiring a path, the recorder capability flags, the idle-pet gate, the monthly DST recurrence, the AdvancedSearch `Record.Exception` wrappers, `CanFitItem` with no branch-guarded assert, the Firewall callback, and `Import_NoMap`. The Geometry Parse asserts also now use the same input as their TryParse. ## Shared state Every test that changes process-wide state now restores it, even when an assert fails: - **The clock.** A new `TimerWheelScope` saves and restores `Core._tickCount`, `Core._now` and the timer wheel. `SimulatedClockScope` covers decay tests. - **StepCache settings and caches**, via `StepCacheStateScope`. - **Network state.** The ManualAllowlist, LoginAllowlist, firewall and BanChannel reporters are restored. Global packet handlers are now registered per test and removed afterwards, so they no longer stay registered for later tests. - **Data and config tables.** `ArchiveJournal` statics, `TileData.ItemTable`, `ObjectPropertyList.Enabled`, `Core.Expansion` and the localization table are restored. One `MobileStatusVersion` restore was resetting a different expansion than the one the test changed. - **Entities.** Tests with fixed serials now delete what they create. Fixed mobile serials moved to `World.NewMobile`, because deleting a hard-coded serial could unregister a live entity. - **Collection race.** `SpiralScanTests` no longer clears the spawn cache from a separate collection that could run in parallel with the cache-manager tests. - **Shared statics.** Classes reading shared static allowlists joined the sequential collection. ## Duplication New shared helpers replace copy-pasted harness code: - **Server.Tests:** `PacketAssert.Sends`, used by about 130 packet tests; `TestClientHarness`, `PersistencePipelineScope`, `NetTestHelpers`, `EntityCleanup` and one `TestMulti`. - **UOContent.Tests:** `TimerWheelScope`, which also holds one wraparound-safe `RunFor`/`RunUntil`; `AiTestStubs`, which merges six walker copies and five identical creature stubs; `MobileTestHarness`, `CommandTestHarness` and `TempDirectory`. Dead oracle packet classes are removed. ## Cost | Test | Before | After | |---|---|---| | `VirtualSerialTests` | 1.57s | 2ms (starts near the wrap via reflection instead of drawing ~17.9M serials) | | Event scheduler recurrence loop | 473ms | 1ms | | CrowdSec drain | 517ms | 16ms (event-driven instead of a fixed 500ms wait) | | AuthId tests | 248ms | 99ms (SHA2 except the two GameLogin tests) | | Container cap tests | 5,000 items | 3,449 / 3,277 (one past each protocol cap) | | Bulk removal | 100k children | 20k children | | OPL hash distribution | 60k builds | 10k builds | ## Shard-tuning decoupling - AI assertions read `ReacquireDelay` and `FollowMoveSpeed` instead of hard-coding production tuning. - The guard friendly-fire test uses an `AI_Mage` stub instead of WhiteWyrm. - Argon2 assertions pin the `argon2id` variant and `v=19` but read the cost parameters from the configured hasher. ## Tests | Run | Server.Tests | UOContent.Tests | |---|---|---| | With client files | 812 pass | 1,123 pass | | Without client files (CI simulation) | 800 pass, 12 skip | 1,021 pass, 102 skip | - The UOContent fixture reads `MODERNUO_TEST_DATA_DIR`; Server.Tests reads `MODERNUO_CLIENT_PATH`. - The 15 new UOContent skips are the map-dependent guards above. - Total run time with client files is about 5s, down from about 8s.
This commit is contained in:
Kamron Batman
GitHub
parent
79f736aa83
commit
00134cac33
135 changed files with 3164 additions and 4020 deletions
|
|
@ -14,13 +14,7 @@ public class ContainerPacketTests
|
|||
var serial = (Serial)0x1024;
|
||||
ushort gumpId = 100;
|
||||
|
||||
var expected = new ContainerDisplay(serial, gumpId).Compile();
|
||||
|
||||
using var ns = PacketTestUtilities.CreateTestNetState();
|
||||
ns.SendDisplayContainer(serial, gumpId);
|
||||
|
||||
var result = ns.SendBuffer.GetReadSpan();
|
||||
AssertThat.Equal(result, expected);
|
||||
PacketAssert.Sends(new ContainerDisplay(serial, gumpId), ns => ns.SendDisplayContainer(serial, gumpId));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
|
|
@ -29,14 +23,11 @@ public class ContainerPacketTests
|
|||
var serial = (Serial)0x1024;
|
||||
ushort gumpId = 100;
|
||||
|
||||
var expected = new ContainerDisplayHS(serial, gumpId).Compile();
|
||||
|
||||
using var ns = PacketTestUtilities.CreateTestNetState();
|
||||
ns.ProtocolChanges = ns.ProtocolChanges | ProtocolChanges.ContainerGridLines | ProtocolChanges.HighSeas;
|
||||
ns.SendDisplayContainer(serial, gumpId);
|
||||
|
||||
var result = ns.SendBuffer.GetReadSpan();
|
||||
AssertThat.Equal(result, expected);
|
||||
PacketAssert.Sends(
|
||||
new ContainerDisplayHS(serial, gumpId),
|
||||
ns => ns.SendDisplayContainer(serial, gumpId),
|
||||
ProtocolChanges.ContainerGridLines | ProtocolChanges.HighSeas
|
||||
);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
|
|
@ -44,13 +35,7 @@ public class ContainerPacketTests
|
|||
{
|
||||
var serial = (Serial)0x1024;
|
||||
|
||||
var expected = new DisplaySpellbook(serial).Compile();
|
||||
|
||||
using var ns = PacketTestUtilities.CreateTestNetState();
|
||||
ns.SendDisplaySpellbook(serial);
|
||||
|
||||
var result = ns.SendBuffer.GetReadSpan();
|
||||
AssertThat.Equal(result, expected);
|
||||
PacketAssert.Sends(new DisplaySpellbook(serial), ns => ns.SendDisplaySpellbook(serial));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
|
|
@ -58,14 +43,11 @@ public class ContainerPacketTests
|
|||
{
|
||||
var serial = (Serial)0x1024;
|
||||
|
||||
var expected = new DisplaySpellbookHS(serial).Compile();
|
||||
|
||||
using var ns = PacketTestUtilities.CreateTestNetState();
|
||||
ns.ProtocolChanges = ns.ProtocolChanges | ProtocolChanges.ContainerGridLines | ProtocolChanges.HighSeas;
|
||||
ns.SendDisplaySpellbook(serial);
|
||||
|
||||
var result = ns.SendBuffer.GetReadSpan();
|
||||
AssertThat.Equal(result, expected);
|
||||
PacketAssert.Sends(
|
||||
new DisplaySpellbookHS(serial),
|
||||
ns => ns.SendDisplaySpellbook(serial),
|
||||
ProtocolChanges.ContainerGridLines | ProtocolChanges.HighSeas
|
||||
);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
|
|
@ -76,17 +58,20 @@ public class ContainerPacketTests
|
|||
ushort offset = 10;
|
||||
ulong content = 0x123456789ABCDEF0;
|
||||
var opl = ObjectPropertyList.Enabled;
|
||||
|
||||
var expected = new NewSpellbookContent(serial, graphic, offset, content).Compile();
|
||||
|
||||
using var ns = PacketTestUtilities.CreateTestNetState();
|
||||
ns.ProtocolChanges = ns.ProtocolChanges | ProtocolChanges.ContainerGridLines | ProtocolChanges.NewSpellbook;
|
||||
ObjectPropertyList.Enabled = true;
|
||||
ns.SendSpellbookContent(serial, graphic, offset, content);
|
||||
ObjectPropertyList.Enabled = opl;
|
||||
|
||||
var result = ns.SendBuffer.GetReadSpan();
|
||||
AssertThat.Equal(result, expected);
|
||||
try
|
||||
{
|
||||
PacketAssert.Sends(
|
||||
new NewSpellbookContent(serial, graphic, offset, content),
|
||||
ns => ns.SendSpellbookContent(serial, graphic, offset, content),
|
||||
ProtocolChanges.ContainerGridLines | ProtocolChanges.NewSpellbook
|
||||
);
|
||||
}
|
||||
finally
|
||||
{
|
||||
ObjectPropertyList.Enabled = opl;
|
||||
}
|
||||
}
|
||||
|
||||
[Fact]
|
||||
|
|
@ -97,13 +82,10 @@ public class ContainerPacketTests
|
|||
ushort graphic = 100;
|
||||
ulong content = 0x123456789ABCDEF0;
|
||||
|
||||
var expected = new SpellbookContent(serial, offset, content).Compile();
|
||||
|
||||
using var ns = PacketTestUtilities.CreateTestNetState();
|
||||
ns.SendSpellbookContent(serial, graphic, offset, content);
|
||||
|
||||
var result = ns.SendBuffer.GetReadSpan();
|
||||
AssertThat.Equal(result, expected);
|
||||
PacketAssert.Sends(
|
||||
new SpellbookContent(serial, offset, content),
|
||||
ns => ns.SendSpellbookContent(serial, graphic, offset, content)
|
||||
);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
|
|
@ -114,14 +96,11 @@ public class ContainerPacketTests
|
|||
ushort graphic = 100;
|
||||
ulong content = 0x123456789ABCDEF0;
|
||||
|
||||
var expected = new SpellbookContent6017(serial, offset, content).Compile();
|
||||
|
||||
using var ns = PacketTestUtilities.CreateTestNetState();
|
||||
ns.ProtocolChanges |= ProtocolChanges.ContainerGridLines;
|
||||
ns.SendSpellbookContent(serial, graphic, offset, content);
|
||||
|
||||
var result = ns.SendBuffer.GetReadSpan();
|
||||
AssertThat.Equal(result, expected);
|
||||
PacketAssert.Sends(
|
||||
new SpellbookContent6017(serial, offset, content),
|
||||
ns => ns.SendSpellbookContent(serial, graphic, offset, content),
|
||||
ProtocolChanges.ContainerGridLines
|
||||
);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
|
|
@ -130,13 +109,7 @@ public class ContainerPacketTests
|
|||
var serial = (Serial)0x1024;
|
||||
var item = new Item(serial);
|
||||
|
||||
var expected = new ContainerContentUpdate(item).Compile();
|
||||
|
||||
using var ns = PacketTestUtilities.CreateTestNetState();
|
||||
ns.SendContainerContentUpdate(item);
|
||||
|
||||
var result = ns.SendBuffer.GetReadSpan();
|
||||
AssertThat.Equal(result, expected);
|
||||
PacketAssert.Sends(new ContainerContentUpdate(item), ns => ns.SendContainerContentUpdate(item));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
|
|
@ -145,66 +118,17 @@ public class ContainerPacketTests
|
|||
var serial = (Serial)0x1024;
|
||||
var item = new Item(serial);
|
||||
|
||||
var expected = new ContainerContentUpdate6017(item).Compile();
|
||||
|
||||
using var ns = PacketTestUtilities.CreateTestNetState();
|
||||
ns.ProtocolChanges |= ProtocolChanges.ContainerGridLines;
|
||||
ns.SendContainerContentUpdate(item);
|
||||
|
||||
var result = ns.SendBuffer.GetReadSpan();
|
||||
AssertThat.Equal(result, expected);
|
||||
PacketAssert.Sends(
|
||||
new ContainerContentUpdate6017(item),
|
||||
ns => ns.SendContainerContentUpdate(item),
|
||||
ProtocolChanges.ContainerGridLines
|
||||
);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void TestContainerContent()
|
||||
// An administrator beholder on the container's map, so every item is visible and sent.
|
||||
private static (Container Container, Mobile Beholder) CreateViewedContainer(int itemCount)
|
||||
{
|
||||
var cont = new Container(World.NewItem);
|
||||
cont.AddItem(new Item(World.NewItem));
|
||||
cont.Map = Map.Felucca;
|
||||
|
||||
var m = new Mobile((Serial)0x1);
|
||||
m.DefaultMobileInit();
|
||||
m.AccessLevel = AccessLevel.Administrator;
|
||||
m.Map = Map.Felucca;
|
||||
|
||||
var expected = new ContainerContent(m, cont).Compile();
|
||||
|
||||
using var ns = PacketTestUtilities.CreateTestNetState();
|
||||
ns.SendContainerContent(m, cont);
|
||||
|
||||
var result = ns.SendBuffer.GetReadSpan();
|
||||
AssertThat.Equal(result, expected);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void TestContainerContent6017()
|
||||
{
|
||||
var cont = new Container(World.NewItem);
|
||||
cont.AddItem(new Item(World.NewItem));
|
||||
cont.Map = Map.Felucca;
|
||||
|
||||
var m = new Mobile((Serial)0x1);
|
||||
m.DefaultMobileInit();
|
||||
m.AccessLevel = AccessLevel.Administrator;
|
||||
m.Map = Map.Felucca;
|
||||
|
||||
var expected = new ContainerContent6017(m, cont).Compile();
|
||||
|
||||
using var ns = PacketTestUtilities.CreateTestNetState();
|
||||
ns.ProtocolChanges |= ProtocolChanges.ContainerGridLines;
|
||||
ns.SendContainerContent(m, cont);
|
||||
|
||||
var result = ns.SendBuffer.GetReadSpan();
|
||||
AssertThat.Equal(result, expected);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void TestContainerContent_CapsAtProtocolLimit()
|
||||
{
|
||||
var cont = new Container(World.NewItem);
|
||||
|
||||
// Past the 3448-entry cap (19-byte entries) so truncation engages.
|
||||
const int itemCount = 5000;
|
||||
for (var i = 0; i < itemCount; i++)
|
||||
{
|
||||
cont.AddItem(new Item(World.NewItem));
|
||||
|
|
@ -217,9 +141,62 @@ public class ContainerPacketTests
|
|||
m.AccessLevel = AccessLevel.Administrator;
|
||||
m.Map = Map.Felucca;
|
||||
|
||||
return (cont, m);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void TestContainerContent()
|
||||
{
|
||||
var (cont, m) = CreateViewedContainer(1);
|
||||
|
||||
try
|
||||
{
|
||||
PacketAssert.Sends(new ContainerContent(m, cont), ns => ns.SendContainerContent(m, cont));
|
||||
}
|
||||
finally
|
||||
{
|
||||
cont.Delete();
|
||||
m.Delete();
|
||||
}
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void TestContainerContent6017()
|
||||
{
|
||||
var (cont, m) = CreateViewedContainer(1);
|
||||
|
||||
try
|
||||
{
|
||||
PacketAssert.Sends(
|
||||
new ContainerContent6017(m, cont),
|
||||
ns => ns.SendContainerContent(m, cont),
|
||||
ProtocolChanges.ContainerGridLines
|
||||
);
|
||||
}
|
||||
finally
|
||||
{
|
||||
cont.Delete();
|
||||
m.Delete();
|
||||
}
|
||||
}
|
||||
|
||||
// 0x3C's length and count fields are 16-bit: 19-byte entries cap at 3448, 20-byte grid-line entries at 3276.
|
||||
[Theory]
|
||||
[InlineData(false, 3448, 65517)]
|
||||
[InlineData(true, 3276, 65525)]
|
||||
public void TestContainerContent_CapsAtProtocolLimit(bool gridLines, int maxEntries, int maxLength)
|
||||
{
|
||||
// One item past the cap is enough to make truncation engage.
|
||||
var (cont, m) = CreateViewedContainer(maxEntries + 1);
|
||||
|
||||
try
|
||||
{
|
||||
using var ns = PacketTestUtilities.CreateTestNetState();
|
||||
if (gridLines)
|
||||
{
|
||||
ns.ProtocolChanges |= ProtocolChanges.ContainerGridLines;
|
||||
}
|
||||
|
||||
// A ~64KB packet exceeds the 4KB pre-auth send buffer; an account lets Send() promote it
|
||||
// on demand instead of exhausting the buffer and disconnecting.
|
||||
ns.Account = new MockAccount();
|
||||
|
|
@ -233,57 +210,9 @@ public class ContainerPacketTests
|
|||
var length = BinaryPrimitives.ReadUInt16BigEndian(span[1..3]);
|
||||
var count = BinaryPrimitives.ReadUInt16BigEndian(span[3..5]);
|
||||
|
||||
const int entrySize = 19; // no grid lines negotiated on this NetState
|
||||
var expectedMaxEntries = (ushort.MaxValue - 5) / entrySize;
|
||||
|
||||
Assert.Equal(65517, length);
|
||||
Assert.Equal(maxLength, length);
|
||||
Assert.Equal(length, span.Length);
|
||||
Assert.Equal(expectedMaxEntries, count);
|
||||
}
|
||||
finally
|
||||
{
|
||||
cont.Delete();
|
||||
m.Delete();
|
||||
}
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void TestContainerContent_CapsAtProtocolLimit_WithGridLines()
|
||||
{
|
||||
var cont = new Container(World.NewItem);
|
||||
|
||||
// Past the 3276-entry cap (20-byte entries with grid lines) so truncation engages.
|
||||
const int itemCount = 5000;
|
||||
for (var i = 0; i < itemCount; i++)
|
||||
{
|
||||
cont.AddItem(new Item(World.NewItem));
|
||||
}
|
||||
|
||||
cont.Map = Map.Felucca;
|
||||
|
||||
var m = new Mobile((Serial)0x1);
|
||||
m.DefaultMobileInit();
|
||||
m.AccessLevel = AccessLevel.Administrator;
|
||||
m.Map = Map.Felucca;
|
||||
|
||||
try
|
||||
{
|
||||
using var ns = PacketTestUtilities.CreateTestNetState();
|
||||
ns.ProtocolChanges |= ProtocolChanges.ContainerGridLines;
|
||||
ns.Account = new MockAccount();
|
||||
|
||||
var ex = Record.Exception(() => ns.SendContainerContent(m, cont));
|
||||
Assert.Null(ex);
|
||||
|
||||
var span = ns.SendBuffer.GetReadSpan();
|
||||
Assert.Equal((byte)0x3C, span[0]);
|
||||
|
||||
var length = BinaryPrimitives.ReadUInt16BigEndian(span[1..3]);
|
||||
var count = BinaryPrimitives.ReadUInt16BigEndian(span[3..5]);
|
||||
|
||||
Assert.Equal(65525, length);
|
||||
Assert.Equal(length, span.Length);
|
||||
Assert.Equal(3276, count);
|
||||
Assert.Equal(maxEntries, count);
|
||||
}
|
||||
finally
|
||||
{
|
||||
|
|
@ -295,32 +224,13 @@ public class ContainerPacketTests
|
|||
[Fact]
|
||||
public void TestContainerContent_RentedBuffer_MatchesReferencePacket()
|
||||
{
|
||||
var cont = new Container(World.NewItem);
|
||||
|
||||
// Below the entry cap but past the 1024-byte stackalloc threshold, so SendContainerContent
|
||||
// rents its buffer instead of using the stack.
|
||||
const int itemCount = 100;
|
||||
for (var i = 0; i < itemCount; i++)
|
||||
{
|
||||
cont.AddItem(new Item(World.NewItem));
|
||||
}
|
||||
|
||||
cont.Map = Map.Felucca;
|
||||
|
||||
var m = new Mobile((Serial)0x1);
|
||||
m.DefaultMobileInit();
|
||||
m.AccessLevel = AccessLevel.Administrator;
|
||||
m.Map = Map.Felucca;
|
||||
var (cont, m) = CreateViewedContainer(100);
|
||||
|
||||
try
|
||||
{
|
||||
var expected = new ContainerContent(m, cont).Compile();
|
||||
|
||||
using var ns = PacketTestUtilities.CreateTestNetState();
|
||||
ns.SendContainerContent(m, cont);
|
||||
|
||||
var result = ns.SendBuffer.GetReadSpan();
|
||||
AssertThat.Equal(result, expected);
|
||||
PacketAssert.Sends(new ContainerContent(m, cont), ns => ns.SendContainerContent(m, cont));
|
||||
}
|
||||
finally
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue