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.
315 lines
7.9 KiB
C#
315 lines
7.9 KiB
C#
using System;
|
|
using System.Collections.Generic;
|
|
using Server;
|
|
using Server.Engines.Events;
|
|
using Server.Tests;
|
|
using Xunit;
|
|
|
|
namespace UOContent.Tests;
|
|
|
|
[Collection("Sequential UOContent Tests")]
|
|
public class EventSchedulerTests : IDisposable
|
|
{
|
|
// Init() pins the process-wide loop clock and timer wheel; every other test in the host reads them.
|
|
private readonly TimerWheelScope _clock = new();
|
|
|
|
public void Dispose() => _clock.Dispose();
|
|
|
|
// Test implementations for controlled testing
|
|
private class TestRecurrencePattern : IRecurrencePattern
|
|
{
|
|
private readonly TimeSpan _interval;
|
|
private readonly int _maxOccurrences;
|
|
private int _currentOccurrence;
|
|
|
|
public TestRecurrencePattern(TimeSpan interval, int maxOccurrences = int.MaxValue)
|
|
{
|
|
_interval = interval;
|
|
_maxOccurrences = maxOccurrences;
|
|
_currentOccurrence = 0;
|
|
}
|
|
|
|
public DateTime GetNextOccurrence(DateTime afterUtc, TimeOnly time, TimeZoneInfo timeZone)
|
|
{
|
|
_currentOccurrence++;
|
|
|
|
if (_currentOccurrence > _maxOccurrences)
|
|
{
|
|
return DateTime.MaxValue;
|
|
}
|
|
|
|
return afterUtc + _interval;
|
|
}
|
|
}
|
|
|
|
private class TestScheduledEvent : ScheduledEvent
|
|
{
|
|
public int CallCount { get; private set; }
|
|
public Action Callback { get; }
|
|
|
|
public TestScheduledEvent(TimeOnly time, Action callback, IRecurrencePattern recurrence = null)
|
|
: base(time, recurrence)
|
|
{
|
|
CallCount = 0;
|
|
Callback = callback;
|
|
}
|
|
|
|
public override void OnEvent()
|
|
{
|
|
CallCount++;
|
|
Callback?.Invoke();
|
|
}
|
|
}
|
|
|
|
private static void Init()
|
|
{
|
|
Core._now = new DateTime(2024, 1, 1, 12, 0, 0, DateTimeKind.Utc);
|
|
EventScheduler.Configure();
|
|
}
|
|
|
|
private static void Finish()
|
|
{
|
|
EventScheduler.Shared.Stop();
|
|
}
|
|
|
|
[Fact]
|
|
public void ScheduleEvent_ExecutesCallback_HappyPath()
|
|
{
|
|
Init();
|
|
|
|
try
|
|
{
|
|
var called = false;
|
|
var evt = EventScheduler.Shared.ScheduleEvent(
|
|
Core._now,
|
|
TimeOnly.FromDateTime(Core._now),
|
|
() => called = true
|
|
);
|
|
|
|
Assert.Equal(Core._now, evt.NextOccurrence);
|
|
Timer.Slice(8);
|
|
|
|
Assert.True(called);
|
|
Assert.Equal(DateTime.MaxValue, evt.NextOccurrence);
|
|
|
|
evt.Cancel();
|
|
}
|
|
finally
|
|
{
|
|
Finish();
|
|
}
|
|
}
|
|
|
|
[Fact]
|
|
public void Scheduler_OrdersEventsByNextOccurrence()
|
|
{
|
|
Init();
|
|
|
|
try
|
|
{
|
|
var executionOrder = new List<int>();
|
|
|
|
// Create events with staggered occurrences
|
|
var evt1Start = Core._now.AddSeconds(10);
|
|
var evt1 = new TestScheduledEvent(
|
|
TimeOnly.FromDateTime(Core._now.AddSeconds(10)),
|
|
() => executionOrder.Add(1)
|
|
);
|
|
|
|
var evt2Start = Core._now.AddSeconds(20);
|
|
var evt2 = new TestScheduledEvent(
|
|
TimeOnly.FromDateTime(evt2Start),
|
|
() => executionOrder.Add(2)
|
|
);
|
|
|
|
var evt3Start = Core._now.AddSeconds(30);
|
|
var evt3 = new TestScheduledEvent(
|
|
TimeOnly.FromDateTime(evt3Start),
|
|
() => executionOrder.Add(3)
|
|
);
|
|
|
|
// Add out of order
|
|
evt3.Schedule(evt3Start);
|
|
evt1.Schedule(evt1Start);
|
|
evt2.Schedule(evt2Start);
|
|
|
|
// Advance time to after all events
|
|
Core._now = Core._now.AddSeconds(40);
|
|
Timer.Slice(8);
|
|
|
|
// Verify they executed in time order, not addition order
|
|
Assert.Equal([1, 2, 3], executionOrder);
|
|
|
|
evt1.Cancel();
|
|
evt2.Cancel();
|
|
evt3.Cancel();
|
|
}
|
|
finally
|
|
{
|
|
Finish();
|
|
}
|
|
}
|
|
|
|
[Fact]
|
|
public void Scheduler_HandlesRecurringEvents()
|
|
{
|
|
Init();
|
|
|
|
try
|
|
{
|
|
var callCount = 0;
|
|
|
|
// Create a recurrence pattern that fires every 10 seconds, up to 3 times
|
|
var recurrence = new TestRecurrencePattern(TimeSpan.FromSeconds(10), 3);
|
|
|
|
var evt = new TestScheduledEvent(
|
|
TimeOnly.FromDateTime(Core._now),
|
|
() => callCount++,
|
|
recurrence
|
|
);
|
|
|
|
evt.Schedule(Core._now);
|
|
|
|
// Advance time to after all occurrences should have happened
|
|
Core._now = Core._now.AddSeconds(50);
|
|
Timer.Slice(8);
|
|
|
|
// One call per occurrence the pattern yields
|
|
Assert.Equal(3, callCount);
|
|
Assert.Equal(3, evt.CallCount);
|
|
|
|
evt.Cancel();
|
|
}
|
|
finally
|
|
{
|
|
Finish();
|
|
}
|
|
}
|
|
|
|
[Fact]
|
|
public void Scheduler_HandlesExceptionsInEvents()
|
|
{
|
|
Init();
|
|
|
|
try
|
|
{
|
|
var failedEventCalled = false;
|
|
var laterEventCalled = false;
|
|
|
|
// Event that throws exception
|
|
var failedEvt = EventScheduler.Shared.ScheduleEvent(
|
|
Core._now.AddSeconds(10),
|
|
() =>
|
|
{
|
|
failedEventCalled = true;
|
|
throw new Exception("Test exception");
|
|
}
|
|
);
|
|
|
|
// Later event that should still execute
|
|
var laterEvt = EventScheduler.Shared.ScheduleEvent(
|
|
Core._now.AddSeconds(20),
|
|
() => laterEventCalled = true
|
|
);
|
|
|
|
// Advance time to after both events
|
|
Core._now = Core._now.AddSeconds(30);
|
|
Timer.Slice(8);
|
|
|
|
// Both should have been called despite the exception
|
|
Assert.True(failedEventCalled);
|
|
Assert.True(laterEventCalled);
|
|
|
|
failedEvt.Cancel();
|
|
laterEvt.Cancel();
|
|
}
|
|
finally
|
|
{
|
|
Finish();
|
|
}
|
|
}
|
|
|
|
[Fact]
|
|
public void Scheduler_RemovesEventsCorrectly()
|
|
{
|
|
Init();
|
|
|
|
try
|
|
{
|
|
var eventCalled = false;
|
|
|
|
var evt = EventScheduler.Shared.ScheduleEvent(
|
|
Core._now.AddSeconds(10),
|
|
() => eventCalled = true
|
|
);
|
|
|
|
// Remove before execution
|
|
evt.Cancel();
|
|
|
|
// Advance time
|
|
Core._now = Core._now.AddSeconds(20);
|
|
Timer.Slice(8);
|
|
|
|
// Event should not have executed
|
|
Assert.False(eventCalled);
|
|
}
|
|
finally
|
|
{
|
|
Finish();
|
|
}
|
|
}
|
|
|
|
[Fact]
|
|
public void Scheduler_HandlesEventsWithEndDates()
|
|
{
|
|
Init();
|
|
|
|
try
|
|
{
|
|
var callCount = 0;
|
|
|
|
// Create a recurrence pattern that fires every 10 seconds
|
|
var recurrence = new TestRecurrencePattern(TimeSpan.FromSeconds(10));
|
|
|
|
// Create a custom event with an end date
|
|
var startTime = Core._now;
|
|
var endTime = Core._now.AddSeconds(36);
|
|
|
|
var customEvent = new CustomEvent(
|
|
TimeOnly.FromDateTime(startTime),
|
|
endTime,
|
|
recurrence,
|
|
() => callCount++
|
|
);
|
|
|
|
customEvent.Schedule(startTime);
|
|
|
|
Core._now = Core._now.AddSeconds(50);
|
|
Timer.Slice(8);
|
|
|
|
// Should have fired 3 times only (initial + 2 within the timeframe)
|
|
Assert.Equal(3, callCount);
|
|
}
|
|
finally
|
|
{
|
|
Finish();
|
|
}
|
|
}
|
|
|
|
private class CustomEvent : ScheduledEvent
|
|
{
|
|
private readonly Action _callback;
|
|
|
|
public CustomEvent(
|
|
TimeOnly time,
|
|
DateTime endOn,
|
|
IRecurrencePattern recurrence,
|
|
Action callback
|
|
) : base(time, endOn, recurrence) => _callback = callback;
|
|
|
|
public override void OnEvent()
|
|
{
|
|
_callback?.Invoke();
|
|
}
|
|
}
|
|
}
|