00134cac33
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.
291 lines
14 KiB
C#
291 lines
14 KiB
C#
using System;
|
|
using Server;
|
|
using Server.Engines.Events;
|
|
using Xunit;
|
|
|
|
namespace UOContent.Tests;
|
|
|
|
public class RecurrencePatternTests
|
|
{
|
|
[Theory]
|
|
[InlineData(2024, 5, 15, 12, 30, 1, 2024, 5, 15, 13, 30)] // Normal case
|
|
[InlineData(2024, 5, 15, 23, 30, 2, 2024, 5, 16, 1, 30)] // Cross day boundary
|
|
public void HourlyRecurrencePattern_GetNextOccurrence_ReturnsCorrectTime(
|
|
int startYear, int startMonth, int startDay, int startHour, int startMinute,
|
|
int intervalHours,
|
|
int expectedYear, int expectedMonth, int expectedDay, int expectedHour, int expectedMinute)
|
|
{
|
|
// Arrange
|
|
var tz = TimeZoneInfo.Utc;
|
|
var pattern = new HourlyRecurrencePattern(intervalHours);
|
|
var afterUtc = new DateTime(startYear, startMonth, startDay, startHour, startMinute, 0, DateTimeKind.Utc);
|
|
var time = new TimeOnly(0, expectedMinute);
|
|
|
|
// Act
|
|
var result = pattern.GetNextOccurrence(afterUtc, time, tz);
|
|
|
|
// Assert
|
|
var expected = new DateTime(expectedYear, expectedMonth, expectedDay, expectedHour, expectedMinute, 0, DateTimeKind.Utc);
|
|
Assert.Equal(expected, result);
|
|
}
|
|
|
|
[Theory]
|
|
[InlineData(2024, 5, 15, 12, 30, 1, 2024, 5, 16, 12, 30)] // Next day
|
|
[InlineData(2024, 5, 31, 12, 30, 2, 2024, 6, 2, 12, 30)] // Across month boundary
|
|
public void DailyRecurrencePattern_GetNextOccurrence_ReturnsCorrectDay(
|
|
int startYear, int startMonth, int startDay, int startHour, int startMinute,
|
|
int intervalDays,
|
|
int expectedYear, int expectedMonth, int expectedDay, int expectedHour, int expectedMinute)
|
|
{
|
|
// Arrange
|
|
var tz = TimeZoneInfo.Utc;
|
|
var pattern = new DailyRecurrencePattern(intervalDays);
|
|
var afterUtc = new DateTime(startYear, startMonth, startDay, startHour, startMinute, 0, DateTimeKind.Utc);
|
|
var time = new TimeOnly(expectedHour, expectedMinute);
|
|
|
|
// Act
|
|
var result = pattern.GetNextOccurrence(afterUtc, time, tz);
|
|
|
|
// Assert
|
|
var expected = new DateTime(expectedYear, expectedMonth, expectedDay, expectedHour, expectedMinute, 0, DateTimeKind.Utc);
|
|
Assert.Equal(expected, result);
|
|
}
|
|
|
|
[Theory]
|
|
[InlineData(2024, 5, 15, 12, 30, 1, AllowedDays.All, 2024, 5, 16, 12, 30)] // Next day (Thursday)
|
|
[InlineData(2024, 5, 15, 12, 30, 1, AllowedDays.Monday, 2024, 5, 20, 12, 30)] // Next Monday
|
|
[InlineData(2024, 5, 15, 12, 30, 2, AllowedDays.Wednesday, 2024, 5, 29, 12, 30)] // Biweekly Wednesday
|
|
public void WeeklyRecurrencePattern_BasicPatterns_ReturnsCorrectDay(
|
|
int startYear, int startMonth, int startDay, int startHour, int startMinute,
|
|
int intervalWeeks, AllowedDays allowedDays,
|
|
int expectedYear, int expectedMonth, int expectedDay, int expectedHour, int expectedMinute)
|
|
{
|
|
// Arrange
|
|
var tz = TimeZoneInfo.Utc;
|
|
var pattern = new WeeklyRecurrencePattern(intervalWeeks, AllowedMonths.All, allowedDays);
|
|
var afterUtc = new DateTime(startYear, startMonth, startDay, startHour, startMinute, 0, DateTimeKind.Utc);
|
|
var time = new TimeOnly(expectedHour, expectedMinute);
|
|
|
|
// Act
|
|
var result = pattern.GetNextOccurrence(afterUtc, time, tz);
|
|
|
|
// Assert
|
|
var expected = new DateTime(expectedYear, expectedMonth, expectedDay, expectedHour, expectedMinute, 0, DateTimeKind.Utc);
|
|
Assert.Equal(expected, result);
|
|
}
|
|
|
|
[Theory]
|
|
[InlineData(2024, 12, 30, 12, 30, 1, AllowedDays.Monday, 2025, 1, 6, 12, 30)] // Across year boundary
|
|
[InlineData(2024, 5, 31, 12, 30, 1, AllowedDays.Saturday, 2024, 6, 1, 12, 30)] // Across month boundary
|
|
public void WeeklyRecurrencePattern_CrossBoundaries_ReturnsCorrectDay(
|
|
int startYear, int startMonth, int startDay, int startHour, int startMinute,
|
|
int intervalWeeks, AllowedDays allowedDays,
|
|
int expectedYear, int expectedMonth, int expectedDay, int expectedHour, int expectedMinute)
|
|
{
|
|
// Arrange
|
|
var tz = TimeZoneInfo.Utc;
|
|
var pattern = new WeeklyRecurrencePattern(intervalWeeks, AllowedMonths.All, allowedDays);
|
|
var afterUtc = new DateTime(startYear, startMonth, startDay, startHour, startMinute, 0, DateTimeKind.Utc);
|
|
var time = new TimeOnly(expectedHour, expectedMinute);
|
|
|
|
// Act
|
|
var result = pattern.GetNextOccurrence(afterUtc, time, tz);
|
|
|
|
// Assert
|
|
var expected = new DateTime(expectedYear, expectedMonth, expectedDay, expectedHour, expectedMinute, 0, DateTimeKind.Utc);
|
|
Assert.Equal(expected, result);
|
|
}
|
|
|
|
[Theory]
|
|
[InlineData(2024, 5, 15, 12, 30, AllowedMonths.January | AllowedMonths.February, AllowedDays.Wednesday, 2025, 1, 1, 12, 30)] // Skip to January
|
|
[InlineData(2024, 12, 15, 12, 30, AllowedMonths.January | AllowedMonths.December, AllowedDays.Wednesday, 2024, 12, 18, 12, 30)] // Same month
|
|
[InlineData(2024, 1, 31, 12, 30, AllowedMonths.February | AllowedMonths.April, AllowedDays.Saturday, 2024, 2, 3, 12, 30)] // Next month allowed
|
|
public void WeeklyRecurrencePattern_MonthFiltering_ReturnsCorrectDay(
|
|
int startYear, int startMonth, int startDay, int startHour, int startMinute,
|
|
AllowedMonths allowedMonths, AllowedDays allowedDays,
|
|
int expectedYear, int expectedMonth, int expectedDay, int expectedHour, int expectedMinute)
|
|
{
|
|
// Arrange
|
|
var tz = TimeZoneInfo.Utc;
|
|
var pattern = new WeeklyRecurrencePattern(1, allowedMonths, allowedDays);
|
|
var afterUtc = new DateTime(startYear, startMonth, startDay, startHour, startMinute, 0, DateTimeKind.Utc);
|
|
var time = new TimeOnly(expectedHour, expectedMinute);
|
|
|
|
// Act
|
|
var result = pattern.GetNextOccurrence(afterUtc, time, tz);
|
|
|
|
// Assert
|
|
var expected = new DateTime(expectedYear, expectedMonth, expectedDay, expectedHour, expectedMinute, 0, DateTimeKind.Utc);
|
|
Assert.Equal(expected, result);
|
|
}
|
|
|
|
[Theory]
|
|
[InlineData("America/New_York", 2024, 3, 9, 12, 0, 1, AllowedDays.Sunday, 2024, 3, 10, 12, 0)] // Before spring forward
|
|
[InlineData("America/New_York", 2024, 3, 10, 2, 30, 1, AllowedDays.Sunday, 2024, 3, 17, 2, 30)] // During spring forward (invalid time)
|
|
[InlineData("America/New_York", 2024, 11, 2, 12, 0, 1, AllowedDays.Sunday, 2024, 11, 3, 12, 0)] // Before fall back
|
|
[InlineData("America/New_York", 2024, 11, 3, 1, 30, 1, AllowedDays.Sunday, 2024, 11, 10, 1, 30)] // During fall back (ambiguous time)
|
|
public void WeeklyRecurrencePattern_DSTTransitions_HandlesCorrectly(
|
|
string tzId, int startYear, int startMonth, int startDay, int startHour, int startMinute,
|
|
int intervalWeeks, AllowedDays allowedDays,
|
|
int expectedYear, int expectedMonth, int expectedDay, int expectedHour, int expectedMinute)
|
|
{
|
|
// Arrange
|
|
var tz = TimeZoneInfo.FindSystemTimeZoneById(tzId);
|
|
var pattern = new WeeklyRecurrencePattern(intervalWeeks, AllowedMonths.All, allowedDays);
|
|
|
|
var startLocal = new DateTime(startYear, startMonth, startDay, startHour, startMinute, 0);
|
|
var afterUtc = startLocal.LocalToUtc(tz);
|
|
var time = new TimeOnly(expectedHour, expectedMinute);
|
|
|
|
// Act
|
|
var result = pattern.GetNextOccurrence(afterUtc, time, tz);
|
|
|
|
// Assert
|
|
var resultLocal = TimeZoneInfo.ConvertTimeFromUtc(result, tz);
|
|
Assert.Equal(new DateTime(expectedYear, expectedMonth, expectedDay, expectedHour, expectedMinute, 0), resultLocal);
|
|
}
|
|
|
|
[Theory]
|
|
[InlineData(2024, 5, 29, 12, 0, AllowedDays.None, 2024, 5, 29, 12, 30)] // Default to current day
|
|
[InlineData(2024, 5, 29, 12, 0, AllowedDays.Wednesday | AllowedDays.Friday, 2024, 5, 29, 12, 30)] // Current day is Wednesday
|
|
[InlineData(2024, 5, 29, 12, 0, AllowedDays.Monday | AllowedDays.Friday, 2024, 5, 31, 12, 30)] // Next allowed day (Friday)
|
|
public void WeeklyRecurrencePattern_DaysOfWeekHandling_ReturnsCorrectDay(
|
|
int startYear, int startMonth, int startDay, int startHour, int startMinute,
|
|
AllowedDays allowedDays,
|
|
int expectedYear, int expectedMonth, int expectedDay, int expectedHour, int expectedMinute)
|
|
{
|
|
// Arrange
|
|
var tz = TimeZoneInfo.Utc;
|
|
var pattern = new WeeklyRecurrencePattern(1, AllowedMonths.All, allowedDays);
|
|
var afterUtc = new DateTime(startYear, startMonth, startDay, startHour, startMinute, 0, DateTimeKind.Utc);
|
|
var time = new TimeOnly(expectedHour, expectedMinute);
|
|
|
|
// Act
|
|
var result = pattern.GetNextOccurrence(afterUtc, time, tz);
|
|
|
|
// Assert
|
|
var expected = new DateTime(expectedYear, expectedMonth, expectedDay, expectedHour, expectedMinute, 0, DateTimeKind.Utc);
|
|
Assert.Equal(expected, result);
|
|
}
|
|
|
|
[Theory]
|
|
[InlineData(2024, 1, 29, 12, 0, 1, 2024, 1, 29, 12, 30, AllowedMonths.January | AllowedMonths.March, 2024, 1, 30, 12, 30)] // Current month allowed
|
|
[InlineData(2024, 1, 31, 12, 0, 1, 2024, 1, 31, 12, 30, AllowedMonths.January | AllowedMonths.March, 2024, 3, 1, 12, 30)] // Skip February
|
|
public void WeeklyRecurrencePattern_WeekSpanningMonths_ReturnsCorrectDay(
|
|
int startYear, int startMonth, int startDay, int startHour, int startMinute,
|
|
int intervalWeeks,
|
|
int expectedYear, int expectedMonth, int expectedDay, int expectedHour, int expectedMinute,
|
|
AllowedMonths allowedMonths,
|
|
int nextExpectedYear, int nextExpectedMonth, int nextExpectedDay, int nextExpectedHour, int nextExpectedMinute)
|
|
{
|
|
// Arrange
|
|
var tz = TimeZoneInfo.Utc;
|
|
var pattern = new WeeklyRecurrencePattern(intervalWeeks, allowedMonths);
|
|
var afterUtc = new DateTime(startYear, startMonth, startDay, startHour, startMinute, 0, DateTimeKind.Utc);
|
|
var time = new TimeOnly(expectedHour, expectedMinute);
|
|
|
|
// Act - first call should hit expectedDate
|
|
var result = pattern.GetNextOccurrence(afterUtc, time, tz);
|
|
|
|
// Assert
|
|
var expected = new DateTime(expectedYear, expectedMonth, expectedDay, expectedHour, expectedMinute, 0, DateTimeKind.Utc);
|
|
Assert.Equal(expected, result);
|
|
|
|
// Call again - should move to next available day in allowed months
|
|
var nextResult = pattern.GetNextOccurrence(result, time, tz);
|
|
var nextExpected = new DateTime(nextExpectedYear, nextExpectedMonth, nextExpectedDay, nextExpectedHour, nextExpectedMinute, 0, DateTimeKind.Utc);
|
|
Assert.Equal(nextExpected, nextResult);
|
|
}
|
|
|
|
[Theory]
|
|
[InlineData(2024, 11, 3, 1, 30, DayOfWeek.Sunday, OrdinalDayOccurrence.First, "America/New_York", 2024, 11, 3)]
|
|
[InlineData(2024, 3, 31, 0, 0, DayOfWeek.Sunday, OrdinalDayOccurrence.Last, "America/New_York", 2024, 3, 31)]
|
|
[InlineData(2024, 3, 31, 0, 0, DayOfWeek.Sunday, OrdinalDayOccurrence.Fifth, "America/New_York", 2024, 3, 31)]
|
|
[InlineData(2024, 4, 3, 0, 0, DayOfWeek.Sunday, OrdinalDayOccurrence.Fifth, "America/New_York", 2024, 6, 30)] // June has 5 Sundays (2, 9, 16, 23, 30)
|
|
public void MonthlyOrdinalRecurrencePattern_GetNextOccurrence_ReturnsCorrectDate(
|
|
int startYear, int startMonth, int startDay, int startHour, int startMinute,
|
|
DayOfWeek dow, OrdinalDayOccurrence ordinal, string tzId,
|
|
int expectedYear, int expectedMonth, int expectedDay)
|
|
{
|
|
// Arrange
|
|
var tz = TimeZoneInfo.FindSystemTimeZoneById(tzId);
|
|
var pattern = new MonthlyOrdinalRecurrencePattern(ordinal, dow);
|
|
|
|
// Use a day BEFORE the expected date
|
|
var startLocal = new DateTime(startYear, startMonth, startDay, startHour, startMinute, 0);
|
|
var beforeUtc = startLocal.AddDays(-1).LocalToUtc(tz);
|
|
var timeOnly = new TimeOnly(startHour, startMinute);
|
|
|
|
// Act
|
|
var result = pattern.GetNextOccurrence(beforeUtc, timeOnly, tz);
|
|
|
|
// Assert - convert back to local for comparison
|
|
var resultLocal = TimeZoneInfo.ConvertTimeFromUtc(result, tz);
|
|
Assert.Equal(new DateTime(expectedYear, expectedMonth, expectedDay, startHour, startMinute, 0), resultLocal);
|
|
}
|
|
|
|
[Theory]
|
|
// 2:30 AM does not exist on the spring-forward day, so the occurrence moves to the next month.
|
|
[InlineData("America/New_York", 2024, 3, 10, 2, 30, 2024, 4, 10, 6, 30)]
|
|
// 1:30 AM happens twice on the fall-back day; LocalToUtc resolves it to the first (EDT) pass.
|
|
[InlineData("America/New_York", 2024, 11, 3, 1, 30, 2024, 11, 3, 5, 30)]
|
|
public void MonthlyRecurrencePattern_DSTTransitions_HandlesCorrectly(
|
|
string tzId, int year, int month, int day, int hour, int minute,
|
|
int expectedYear, int expectedMonth, int expectedDay, int expectedHour, int expectedMinute)
|
|
{
|
|
// Arrange
|
|
var tz = TimeZoneInfo.FindSystemTimeZoneById(tzId);
|
|
var pattern = new MonthlyRecurrencePattern(day);
|
|
|
|
var localDateBefore = new DateTime(year, month, day, 0, 0, 0);
|
|
var beforeUtc = localDateBefore.LocalToUtc(tz);
|
|
var timeOnly = new TimeOnly(hour, minute);
|
|
|
|
// Act
|
|
var result = pattern.GetNextOccurrence(beforeUtc, timeOnly, tz);
|
|
|
|
// Assert
|
|
var expectedUtc = new DateTime(
|
|
expectedYear, expectedMonth, expectedDay, expectedHour, expectedMinute, 0, DateTimeKind.Utc
|
|
);
|
|
Assert.Equal(expectedUtc, result);
|
|
}
|
|
|
|
[Fact]
|
|
public void MonthlyRecurrence_MonthWithoutDay_SkipsToNextValidMonth()
|
|
{
|
|
// Arrange
|
|
var tz = TimeZoneInfo.Utc;
|
|
var pattern = new MonthlyRecurrencePattern(31);
|
|
|
|
// February doesn't have 31 days
|
|
var februaryDate = new DateTime(2024, 2, 1, 12, 0, 0, DateTimeKind.Utc);
|
|
var timeOnly = new TimeOnly(12, 0);
|
|
|
|
// Act
|
|
var result = pattern.GetNextOccurrence(februaryDate, timeOnly, tz);
|
|
|
|
// Assert - should be March 31
|
|
Assert.Equal(new DateTime(2024, 3, 31, 12, 0, 0), result);
|
|
}
|
|
|
|
[Theory]
|
|
[InlineData("America/New_York", 2024, 11, 3, 1, 30)] // Fall back - ambiguous time
|
|
public void LocalToUtc_AmbiguousTime_HandlesConsistently(
|
|
string tzId, int year, int month, int day, int hour, int minute)
|
|
{
|
|
// Arrange
|
|
var tz = TimeZoneInfo.FindSystemTimeZoneById(tzId);
|
|
var localTime = new DateTime(year, month, day, hour, minute, 0);
|
|
|
|
// Act
|
|
var result = localTime.LocalToUtc(tz);
|
|
|
|
// Assert - should be consistent, not testing exact value
|
|
Assert.Equal(DateTimeKind.Utc, result.Kind);
|
|
|
|
// Convert back should give either standard or DST time
|
|
var backToLocal = TimeZoneInfo.ConvertTimeFromUtc(result, tz);
|
|
Assert.Equal(new DateTime(year, month, day, hour, minute, 0), backToLocal);
|
|
}
|
|
}
|