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
|
|
@ -4,89 +4,20 @@ using Xunit;
|
|||
namespace Server.Tests.Network;
|
||||
|
||||
/// <summary>
|
||||
/// Manual tests for MovementThrottle latency scenarios.
|
||||
/// These tests simulate specific timing scenarios and should NOT run in CI/CD.
|
||||
///
|
||||
/// To run these tests manually:
|
||||
/// dotnet test --filter "Category=Manual"
|
||||
///
|
||||
/// To exclude from CI/CD, add to your test command:
|
||||
/// dotnet test --filter "Category!=Manual"
|
||||
/// MovementThrottle burst forgiveness against a full, wrapped movement history.
|
||||
/// </summary>
|
||||
[Collection("Sequential Server Tests")]
|
||||
[Trait("Category", "Manual")]
|
||||
public class MovementThrottleLatencyTests
|
||||
{
|
||||
/// <summary>
|
||||
/// Sets the simulated tick count for testing.
|
||||
/// </summary>
|
||||
private static void SetTickCount(long ticks)
|
||||
{
|
||||
Core._tickCount = ticks;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Simulates recording movements at specific intervals.
|
||||
/// </summary>
|
||||
private static void SimulateMovements(NetState ns, params (int delayMs, int costMs)[] movements)
|
||||
{
|
||||
ns._movementHistory ??= new NetState.MovementRecord[20];
|
||||
ns._movementHistoryIndex = 0;
|
||||
ns._movementHistoryFull = false;
|
||||
ns._lastMovementRecordTime = 0;
|
||||
|
||||
var currentTime = 0L;
|
||||
|
||||
foreach (var (delayMs, costMs) in movements)
|
||||
{
|
||||
currentTime += delayMs;
|
||||
SetTickCount(currentTime);
|
||||
|
||||
if (ns._lastMovementRecordTime > 0)
|
||||
{
|
||||
var interval = (int)(currentTime - ns._lastMovementRecordTime);
|
||||
|
||||
// Skip chain-breaking gaps (> 2000ms) like the real code does
|
||||
if (interval > 2000)
|
||||
{
|
||||
ns._lastGapDuration = interval;
|
||||
ns._lastMovementRecordTime = currentTime;
|
||||
continue;
|
||||
}
|
||||
|
||||
ns._movementHistory[ns._movementHistoryIndex] = new NetState.MovementRecord
|
||||
{
|
||||
Interval = (short)interval,
|
||||
TargetSpeed = (ushort)costMs,
|
||||
QueueDepth = 0,
|
||||
Flags = 0
|
||||
};
|
||||
|
||||
ns._movementHistoryIndex++;
|
||||
if (ns._movementHistoryIndex >= 20)
|
||||
{
|
||||
ns._movementHistoryIndex = 0;
|
||||
ns._movementHistoryFull = true;
|
||||
}
|
||||
}
|
||||
|
||||
ns._lastMovementRecordTime = currentTime;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Scenario: Verifies that burst forgiveness triggers correctly and clears gap duration.
|
||||
/// </summary>
|
||||
[Fact]
|
||||
public void MultipleLagSpikes_NoAccumulatedSuspicion()
|
||||
public void AnalyzeMovement_BurstAfterGap_WrappedFullHistory_ForgivesAndClearsGap()
|
||||
{
|
||||
var ns = PacketTestUtilities.CreateTestNetState();
|
||||
SetTickCount(0);
|
||||
|
||||
// Set up history buffer with mostly normal movements and a burst at the end
|
||||
// The production recorder is private and only reachable through a full movement request, so
|
||||
// the history is laid out directly: 17 normal steps, then a 3-step burst ending at the wrap
|
||||
ns._movementHistory = new NetState.MovementRecord[20];
|
||||
|
||||
// Fill with 17 normal movements (100ms intervals)
|
||||
for (var i = 0; i < 17; i++)
|
||||
{
|
||||
ns._movementHistory[i] = new NetState.MovementRecord
|
||||
|
|
@ -98,7 +29,6 @@ public class MovementThrottleLatencyTests
|
|||
};
|
||||
}
|
||||
|
||||
// Add 3 burst movements at the end (10ms intervals = burst)
|
||||
for (var i = 17; i < 20; i++)
|
||||
{
|
||||
ns._movementHistory[i] = new NetState.MovementRecord
|
||||
|
|
@ -110,26 +40,19 @@ public class MovementThrottleLatencyTests
|
|||
};
|
||||
}
|
||||
|
||||
ns._movementHistoryIndex = 0; // Next write position (wrapped)
|
||||
ns._movementHistoryFull = true; // Buffer is full
|
||||
ns._movementHistoryIndex = 0;
|
||||
ns._movementHistoryFull = true;
|
||||
|
||||
// Set gap duration (simulating a lag spike before the burst)
|
||||
// A lag spike longer than the chain gap preceded the burst
|
||||
ns._lastGapDuration = 2500;
|
||||
|
||||
// Analyze - burst forgiveness should trigger
|
||||
var verdict = MovementThrottle.AnalyzeMovement(ns, out var rate, out var samples, out var confidence);
|
||||
var verdict = MovementThrottle.AnalyzeMovement(ns, out var rate, out _, out var confidence);
|
||||
|
||||
// Key assertions:
|
||||
// 1. Gap duration should be cleared (burst forgiveness triggered)
|
||||
Assert.Equal(0, ns._lastGapDuration);
|
||||
|
||||
// 2. Confidence should be reduced by 0.3x multiplier
|
||||
Assert.True(
|
||||
confidence < 0.5f,
|
||||
$"Burst after gap should have low confidence. Confidence={confidence}, Rate={rate}"
|
||||
);
|
||||
|
||||
// 3. Should NOT be Definite despite the burst (forgiveness applied)
|
||||
Assert.True(
|
||||
verdict != MovementThrottle.DetectionVerdict.Definite,
|
||||
$"Should not be Definite after burst forgiveness. Verdict={verdict}"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue