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
|
|
@ -33,6 +33,8 @@ public class CanFitItemTests
|
|||
Assert.False(map.CanFitItem(100, map.Height + 1, 0, 1));
|
||||
}
|
||||
|
||||
// Plain walkable land in the real Felucca map. Without map files every cell is the default land
|
||||
// tile at Z 0 with no flags, which these tests treat the same way: a surface with nothing above it.
|
||||
private const int TestLandX = 1500;
|
||||
private const int TestLandY = 1600;
|
||||
|
||||
|
|
@ -170,23 +172,19 @@ public class CanFitItemTests
|
|||
Item movableItem = null;
|
||||
try
|
||||
{
|
||||
// Create a movable surface item
|
||||
// Raised well clear of the land so the movable item's top is the only candidate surface there
|
||||
var itemZ = map.GetAverageZ(x, y) + 20;
|
||||
|
||||
movableItem = new Item(ServerFixture.SurfaceTileId)
|
||||
{
|
||||
Movable = true
|
||||
};
|
||||
movableItem.MoveToWorld(new Point3D(x, y, 10), map);
|
||||
movableItem.MoveToWorld(new Point3D(x, y, itemZ), map);
|
||||
|
||||
var itemTop = 10 + movableItem.ItemData.CalcHeight;
|
||||
// Try placing at item top - should fail unless there's land there too
|
||||
var avgZ = map.GetAverageZ(x, y);
|
||||
var itemTop = itemZ + movableItem.ItemData.CalcHeight;
|
||||
var result = map.CanFitItem(x, y, itemTop, 1);
|
||||
|
||||
// If avgZ != itemTop, there's no other surface, so it should fail
|
||||
if (avgZ != itemTop)
|
||||
{
|
||||
var result = map.CanFitItem(x, y, itemTop, 1);
|
||||
Assert.False(result, "Movable item should not count as valid surface");
|
||||
}
|
||||
Assert.False(result, "Movable item should not count as valid surface");
|
||||
}
|
||||
finally
|
||||
{
|
||||
|
|
@ -248,16 +246,4 @@ public class CanFitItemTests
|
|||
multi.MoveToWorld(location, map);
|
||||
return multi;
|
||||
}
|
||||
|
||||
private class TestMulti : BaseMulti
|
||||
{
|
||||
private readonly MultiComponentList _components;
|
||||
|
||||
public TestMulti(MultiComponentList components) : base(0x1)
|
||||
{
|
||||
_components = components ?? MultiComponentList.Empty;
|
||||
}
|
||||
|
||||
public override MultiComponentList Components => _components;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,7 +29,8 @@ public class CanSpawnMobileTests
|
|||
Assert.False(map.CanSpawnMobile(100, map.Height + 1, -128, 127, false, false, out _));
|
||||
}
|
||||
|
||||
// Use coordinates near Britain which should be walkable land in both test and real data
|
||||
// Plain walkable land near Britain in the real Felucca map. Without map files every cell is the
|
||||
// default land tile at Z 0 with no flags, which CanSpawnMobile treats the same way: walkable, not water.
|
||||
private const int TestLandX = 1500;
|
||||
private const int TestLandY = 1600;
|
||||
|
||||
|
|
@ -37,10 +38,9 @@ public class CanSpawnMobileTests
|
|||
public void CanSpawnMobile_EmptyLocationWithLandReturnsTrue()
|
||||
{
|
||||
var map = Map.Felucca;
|
||||
map.GetAverageZ(TestLandX, TestLandY, out _, out var landZ, out _);
|
||||
|
||||
// Test with full Z range to find land
|
||||
var result = map.CanSpawnMobile(TestLandX, TestLandY, -128, 127, false, false, out var spawnZ);
|
||||
var result = map.CanSpawnMobile(TestLandX, TestLandY, -128, 127, false, false, out _);
|
||||
|
||||
// Should find a valid spawn point (land surface)
|
||||
Assert.True(result, $"Expected to find valid spawn point on land at ({TestLandX}, {TestLandY})");
|
||||
|
|
@ -53,7 +53,7 @@ public class CanSpawnMobileTests
|
|||
map.GetAverageZ(TestLandX, TestLandY, out _, out var avgZ, out _);
|
||||
|
||||
// Use a Z range that excludes the land surface (50+ units above land)
|
||||
var result = map.CanSpawnMobile(TestLandX, TestLandY, avgZ + 50, avgZ + 100, false, false, out var spawnZ);
|
||||
var result = map.CanSpawnMobile(TestLandX, TestLandY, avgZ + 50, avgZ + 100, false, false, out _);
|
||||
|
||||
Assert.False(result, $"Expected no spawn point above land at Z={avgZ}");
|
||||
}
|
||||
|
|
@ -63,7 +63,7 @@ public class CanSpawnMobileTests
|
|||
{
|
||||
var map = Map.Felucca;
|
||||
// cantWalk=true means the mob can only swim, so land shouldn't be valid
|
||||
var result = map.CanSpawnMobile(TestLandX, TestLandY, -128, 127, false, true, out var spawnZ);
|
||||
var result = map.CanSpawnMobile(TestLandX, TestLandY, -128, 127, false, true, out _);
|
||||
|
||||
Assert.False(result, "cantWalk=true should not find land as valid surface");
|
||||
}
|
||||
|
|
@ -83,7 +83,7 @@ public class CanSpawnMobileTests
|
|||
blockingMobile.MoveToWorld(new Point3D(TestLandX, TestLandY, landZ), map);
|
||||
|
||||
// The mobile should block spawning at its location and Z
|
||||
var result = map.CanSpawnMobile(TestLandX, TestLandY, landZ - 16, landZ + 16, false, false, out var spawnZ);
|
||||
var result = map.CanSpawnMobile(TestLandX, TestLandY, landZ - 16, landZ + 16, false, false, out _);
|
||||
|
||||
// Land surface is blocked by mobile at the same Z
|
||||
Assert.False(result, "Mobile should block spawn at same location");
|
||||
|
|
@ -115,7 +115,7 @@ public class CanSpawnMobileTests
|
|||
gm.MoveToWorld(new Point3D(x, y, landZ), map);
|
||||
|
||||
// Hidden GM should not block spawning
|
||||
var result = map.CanSpawnMobile(x, y, landZ - 16, landZ + 16, false, false, out var spawnZ);
|
||||
var result = map.CanSpawnMobile(x, y, landZ - 16, landZ + 16, false, false, out _);
|
||||
|
||||
Assert.True(result, "Hidden GM should not block spawn");
|
||||
}
|
||||
|
|
@ -142,7 +142,7 @@ public class CanSpawnMobileTests
|
|||
blockingMobile.MoveToWorld(new Point3D(x, y, landZ + 50), map);
|
||||
|
||||
// Land should still be valid (mobile above doesn't block ground level)
|
||||
var result = map.CanSpawnMobile(x, y, landZ - 16, landZ + 16, false, false, out var spawnZ);
|
||||
var result = map.CanSpawnMobile(x, y, landZ - 16, landZ + 16, false, false, out _);
|
||||
|
||||
Assert.True(result, "Mobile at different Z should not block");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,13 +11,6 @@ namespace Server.Tests.Maps;
|
|||
[Collection("Sequential Server Tests")]
|
||||
public class CanSpawnMobileTileDataTests
|
||||
{
|
||||
private readonly ServerFixture _fixture;
|
||||
|
||||
public CanSpawnMobileTileDataTests(ServerFixture fixture)
|
||||
{
|
||||
_fixture = fixture;
|
||||
}
|
||||
|
||||
private void SkipIfNoTileData()
|
||||
{
|
||||
Skip.If(!ServerFixture.TileDataLoaded, "TileData not loaded - client files required");
|
||||
|
|
@ -96,7 +89,7 @@ public class CanSpawnMobileTileDataTests
|
|||
multi = CreateFloorWithCeilingMulti(map, new Point3D(x, y, 0), floorZ: 20, ceilingZ: 28);
|
||||
|
||||
// The low ceiling should block spawning (need 16 units clearance for mobiles)
|
||||
var result = map.CanSpawnMobile(x, y, 15, 35, false, false, out var spawnZ);
|
||||
var result = map.CanSpawnMobile(x, y, 15, 35, false, false, out _);
|
||||
|
||||
Assert.False(result);
|
||||
}
|
||||
|
|
@ -121,7 +114,7 @@ public class CanSpawnMobileTileDataTests
|
|||
// Create a multi with floor at Z=20 and ceiling at Z=50 (30 units clearance)
|
||||
multi = CreateFloorWithCeilingMulti(map, new Point3D(x, y, 0), floorZ: 20, ceilingZ: 50);
|
||||
|
||||
var result = map.CanSpawnMobile(x, y, 15, 35, false, false, out var spawnZ);
|
||||
var result = map.CanSpawnMobile(x, y, 15, 35, false, false, out _);
|
||||
|
||||
Assert.True(result);
|
||||
}
|
||||
|
|
@ -147,7 +140,7 @@ public class CanSpawnMobileTileDataTests
|
|||
multi = CreateFloorWithCeilingMulti(map, new Point3D(x, y, 0), floorZ: 20, ceilingZ: 100);
|
||||
|
||||
// The blocker at Z=100 shouldn't affect spawning in range 15-35
|
||||
var result = map.CanSpawnMobile(x, y, 15, 35, false, false, out var spawnZ);
|
||||
var result = map.CanSpawnMobile(x, y, 15, 35, false, false, out _);
|
||||
|
||||
Assert.True(result);
|
||||
}
|
||||
|
|
@ -173,7 +166,7 @@ public class CanSpawnMobileTileDataTests
|
|||
multi = CreateWaterMulti(map, new Point3D(x, y, 0), waterZ: 0);
|
||||
|
||||
// canSwim=true should find the water surface
|
||||
var result = map.CanSpawnMobile(x, y, -10, 10, true, false, out var spawnZ);
|
||||
var result = map.CanSpawnMobile(x, y, -10, 10, true, false, out _);
|
||||
|
||||
Assert.True(result);
|
||||
}
|
||||
|
|
@ -202,7 +195,7 @@ public class CanSpawnMobileTileDataTests
|
|||
};
|
||||
surfaceItem.MoveToWorld(new Point3D(x, y, 10), map);
|
||||
|
||||
var result = map.CanSpawnMobile(x, y, 5, 30, false, false, out var spawnZ);
|
||||
var result = map.CanSpawnMobile(x, y, 5, 30, false, false, out _);
|
||||
|
||||
// Should find either land at Z=0 or the item surface, whichever is lowest
|
||||
Assert.True(result);
|
||||
|
|
@ -274,16 +267,4 @@ public class CanSpawnMobileTileDataTests
|
|||
new MultiTileEntry(ServerFixture.WetTileId, 0, 0, (short)waterZ, TileFlag.Wet)
|
||||
]);
|
||||
}
|
||||
|
||||
private class TestMulti : BaseMulti
|
||||
{
|
||||
private readonly MultiComponentList _components;
|
||||
|
||||
public TestMulti(MultiComponentList components) : base(0x1)
|
||||
{
|
||||
_components = components ?? MultiComponentList.Empty;
|
||||
}
|
||||
|
||||
public override MultiComponentList Components => _components;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -313,7 +313,7 @@ public class MultiEnumeratorTests
|
|||
var map = Map.Felucca;
|
||||
|
||||
// Components reach two tiles either side, so at x = 1024 the multi spans sectors 63 and 64
|
||||
var spanning = new SpanningMulti();
|
||||
var spanning = new TestMulti(SpanningComponents);
|
||||
try
|
||||
{
|
||||
spanning.MoveToWorld(new Point3D(1024, 1000, 0), map);
|
||||
|
|
@ -351,29 +351,11 @@ public class MultiEnumeratorTests
|
|||
}
|
||||
}
|
||||
|
||||
// Test implementation of BaseMulti
|
||||
private class TestMulti : BaseMulti
|
||||
{
|
||||
public TestMulti() : base(0x1)
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
private class SpanningMulti : BaseMulti
|
||||
{
|
||||
// Entries after the first need non-zero flags or MultiComponentList drops them
|
||||
private static readonly MultiComponentList _components = new(
|
||||
[
|
||||
new MultiTileEntry(0x1, -2, 0, 0, TileFlag.Background),
|
||||
new MultiTileEntry(0x1, 2, 0, 0, TileFlag.Background)
|
||||
]
|
||||
);
|
||||
|
||||
public SpanningMulti() : base(0x1)
|
||||
{
|
||||
}
|
||||
|
||||
public override MultiComponentList Components => _components;
|
||||
}
|
||||
// Entries after the first need non-zero flags or MultiComponentList drops them
|
||||
private static readonly MultiComponentList SpanningComponents = new(
|
||||
[
|
||||
new MultiTileEntry(0x1, -2, 0, 0, TileFlag.Background),
|
||||
new MultiTileEntry(0x1, 2, 0, 0, TileFlag.Background)
|
||||
]
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -13,21 +13,17 @@ public class StaticTileEnumeratorTests
|
|||
var map = Map.Felucca;
|
||||
var location = new Point2D(200, 200);
|
||||
|
||||
// Real map files may have statics here; without them there are none. Either way the multi adds nothing.
|
||||
var mapStatics = CollectTiles(map, location, includeStatics: true, includeMultis: false);
|
||||
|
||||
TestMulti multi = null;
|
||||
try
|
||||
{
|
||||
// Create a multi at the location
|
||||
multi = CreateMultiWithComponents(map, new Point3D(200, 200, 0));
|
||||
|
||||
// Get tiles with statics only (no multis)
|
||||
var tiles = new List<StaticTile>();
|
||||
foreach (var tile in new Map.StaticTileEnumerable(map, location, includeStatics: true, includeMultis: false))
|
||||
{
|
||||
tiles.Add(tile);
|
||||
}
|
||||
var tiles = CollectTiles(map, location, includeStatics: true, includeMultis: false);
|
||||
|
||||
// Should not include multi tiles
|
||||
Assert.Empty(tiles);
|
||||
Assert.Equal(mapStatics, tiles);
|
||||
}
|
||||
finally
|
||||
{
|
||||
|
|
@ -69,21 +65,20 @@ public class StaticTileEnumeratorTests
|
|||
var map = Map.Felucca;
|
||||
var location = new Point2D(400, 400);
|
||||
|
||||
var mapStatics = CollectTiles(map, location, includeStatics: true, includeMultis: false);
|
||||
|
||||
TestMulti multi = null;
|
||||
try
|
||||
{
|
||||
// Create a multi at the location
|
||||
multi = CreateMultiWithComponents(map, new Point3D(400, 400, 0));
|
||||
|
||||
// Get all tiles (statics and multis)
|
||||
var tiles = new List<StaticTile>();
|
||||
foreach (var tile in new Map.StaticTileEnumerable(map, location, includeStatics: true, includeMultis: true))
|
||||
{
|
||||
tiles.Add(tile);
|
||||
}
|
||||
var multiTiles = CollectTiles(map, location, includeStatics: false, includeMultis: true);
|
||||
var tiles = CollectTiles(map, location, includeStatics: true, includeMultis: true);
|
||||
|
||||
// Should include multi tiles (statics would be empty without map files)
|
||||
Assert.NotEmpty(tiles);
|
||||
Assert.NotEmpty(multiTiles);
|
||||
Assert.Equal(mapStatics.Count + multiTiles.Count, tiles.Count);
|
||||
Assert.All(mapStatics, tile => Assert.Contains(tile, tiles));
|
||||
Assert.All(multiTiles, tile => Assert.Contains(tile, tiles));
|
||||
}
|
||||
finally
|
||||
{
|
||||
|
|
@ -257,10 +252,10 @@ public class StaticTileEnumeratorTests
|
|||
{
|
||||
// Outer's bounds cover the probe cell but it has no tile there; placing it first puts it
|
||||
// ahead of inner in the sector's multi list
|
||||
outer = new TestMulti(World.NewItem, GappedComponents);
|
||||
outer = new TestMulti(GappedComponents);
|
||||
outer.MoveToWorld(new Point3D(1100, 1100, 0), map);
|
||||
|
||||
inner = new TestMulti(World.NewItem, SingleTileComponents);
|
||||
inner = new TestMulti(SingleTileComponents);
|
||||
inner.MoveToWorld(new Point3D(location.X, location.Y, 20), map);
|
||||
|
||||
var tiles = new List<StaticTile>();
|
||||
|
|
@ -294,28 +289,28 @@ public class StaticTileEnumeratorTests
|
|||
]
|
||||
);
|
||||
|
||||
private static readonly MultiComponentList DefaultComponents = new(
|
||||
[
|
||||
new MultiTileEntry(0x1, 0, 0, 0, 0x0),
|
||||
new MultiTileEntry(0x2, 1, 0, 0, 0x0)
|
||||
]
|
||||
);
|
||||
|
||||
private static List<StaticTile> CollectTiles(Map map, Point2D location, bool includeStatics, bool includeMultis)
|
||||
{
|
||||
var tiles = new List<StaticTile>();
|
||||
foreach (var tile in new Map.StaticTileEnumerable(map, location, includeStatics, includeMultis))
|
||||
{
|
||||
tiles.Add(tile);
|
||||
}
|
||||
|
||||
return tiles;
|
||||
}
|
||||
|
||||
private static TestMulti CreateMultiWithComponents(Map map, Point3D location)
|
||||
{
|
||||
var multi = new TestMulti(World.NewItem);
|
||||
var multi = new TestMulti(DefaultComponents);
|
||||
multi.MoveToWorld(location, map);
|
||||
return multi;
|
||||
}
|
||||
|
||||
private class TestMulti : BaseMulti
|
||||
{
|
||||
private readonly MultiComponentList _components;
|
||||
|
||||
public TestMulti(Serial serial, MultiComponentList components = null) : base(serial) =>
|
||||
_components = components ?? DefaultComponents;
|
||||
|
||||
public override MultiComponentList Components => _components;
|
||||
|
||||
private static readonly MultiComponentList DefaultComponents = new(
|
||||
[
|
||||
new MultiTileEntry(0x1, 0, 0, 0, 0x0),
|
||||
new MultiTileEntry(0x2, 1, 0, 0, 0x0)
|
||||
]
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue