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.
410 lines
11 KiB
C#
410 lines
11 KiB
C#
using Server.Items;
|
|
using Server.Network;
|
|
using Xunit;
|
|
using static Server.Tests.TestClientHarness;
|
|
|
|
namespace Server.Tests;
|
|
|
|
[Collection("Sequential Server Tests")]
|
|
public class ContainerChildRemovalTests
|
|
{
|
|
private class PublicContainer : Container
|
|
{
|
|
public PublicContainer() : base(0xE75)
|
|
{
|
|
}
|
|
|
|
public override bool IsPublicContainer => true;
|
|
}
|
|
|
|
private class OneChildPublicContainer : Container
|
|
{
|
|
public OneChildPublicContainer() : base(0xE75)
|
|
{
|
|
}
|
|
|
|
public Item PublicChild { get; set; }
|
|
|
|
public override bool IsChildPublic(Item child) => child == PublicChild;
|
|
}
|
|
|
|
// An override that narrows below IsPublicContainer instead of only widening it, exercising the guard
|
|
// that keeps a public container's removals broadcast regardless of what IsChildPublic returns.
|
|
private class PublicContainerWithNarrowingOverride : Container
|
|
{
|
|
public PublicContainerWithNarrowingOverride() : base(0xE75)
|
|
{
|
|
}
|
|
|
|
public override bool IsPublicContainer => true;
|
|
|
|
public override bool IsChildPublic(Item child) => false;
|
|
}
|
|
|
|
private static readonly Point3D _ownerLoc = new(1500, 1500, 0);
|
|
|
|
private static Mobile CreateOwnerWith(Container pack)
|
|
{
|
|
var owner = new Mobile(World.NewMobile);
|
|
owner.DefaultMobileInit();
|
|
owner.MoveToWorld(_ownerLoc, Map.Felucca);
|
|
pack.Layer = Layer.ShopBuy;
|
|
pack.Visible = false;
|
|
owner.AddItem(pack);
|
|
return owner;
|
|
}
|
|
|
|
private static void Cleanup(NetState ns, Mobile client, Mobile owner)
|
|
{
|
|
DisposeClient(ns, client);
|
|
owner.Delete();
|
|
}
|
|
|
|
[Fact]
|
|
public void PrivateChildDelete_IsNotBroadcastToNearbyClients()
|
|
{
|
|
var (ns, client) = CreateClient(new Point3D(_ownerLoc.X + 1, _ownerLoc.Y, 0));
|
|
var owner = CreateOwnerWith(new Container(0xE75));
|
|
var child = new Item(0x1234);
|
|
((Container)owner.FindItemOnLayer(Layer.ShopBuy)).DropItem(child);
|
|
|
|
try
|
|
{
|
|
child.Delete();
|
|
Assert.False(ReceivedRemove(ns, child.Serial));
|
|
}
|
|
finally
|
|
{
|
|
Cleanup(ns, client, owner);
|
|
}
|
|
}
|
|
|
|
[Fact]
|
|
public void PrivateChildDelete_ReachesOpeners()
|
|
{
|
|
var (ns, client) = CreateClient(new Point3D(_ownerLoc.X + 1, _ownerLoc.Y, 0));
|
|
var pack = new Container(0xE75);
|
|
var owner = CreateOwnerWith(pack);
|
|
var child = new Item(0x1234);
|
|
pack.DropItem(child);
|
|
pack.Openers = [client];
|
|
|
|
try
|
|
{
|
|
child.Delete();
|
|
Assert.True(ReceivedRemove(ns, child.Serial));
|
|
}
|
|
finally
|
|
{
|
|
Cleanup(ns, client, owner);
|
|
}
|
|
}
|
|
|
|
[Fact]
|
|
public void PrivateChildDelete_ReachesTheRootOwnersClient()
|
|
{
|
|
var (ownerNs, owner) = CreateClient(_ownerLoc);
|
|
var (bystanderNs, bystander) = CreateClient(new Point3D(_ownerLoc.X + 1, _ownerLoc.Y, 0));
|
|
|
|
var pack = new Container(0xE75)
|
|
{
|
|
Layer = Layer.Backpack,
|
|
Visible = false
|
|
};
|
|
owner.AddItem(pack);
|
|
|
|
var child = new Item(0x1234);
|
|
pack.DropItem(child);
|
|
|
|
try
|
|
{
|
|
child.Delete();
|
|
Assert.True(ReceivedRemove(ownerNs, child.Serial));
|
|
Assert.False(ReceivedRemove(bystanderNs, child.Serial));
|
|
}
|
|
finally
|
|
{
|
|
DisposeClient(ownerNs, owner);
|
|
DisposeClient(bystanderNs, bystander);
|
|
}
|
|
}
|
|
|
|
[Fact]
|
|
public void PublicContainerChildDelete_IsBroadcast()
|
|
{
|
|
var (ns, client) = CreateClient(new Point3D(_ownerLoc.X + 1, _ownerLoc.Y, 0));
|
|
var owner = CreateOwnerWith(new PublicContainer());
|
|
var child = new Item(0x1234);
|
|
((Container)owner.FindItemOnLayer(Layer.ShopBuy)).DropItem(child);
|
|
|
|
try
|
|
{
|
|
child.Delete();
|
|
Assert.True(ReceivedRemove(ns, child.Serial));
|
|
}
|
|
finally
|
|
{
|
|
Cleanup(ns, client, owner);
|
|
}
|
|
}
|
|
|
|
[Fact]
|
|
public void PublicContainer_NarrowingChildOverride_StillBroadcastsRemoval()
|
|
{
|
|
var (ns, client) = CreateClient(new Point3D(_ownerLoc.X + 1, _ownerLoc.Y, 0));
|
|
var owner = CreateOwnerWith(new PublicContainerWithNarrowingOverride());
|
|
var child = new Item(0x1234);
|
|
((Container)owner.FindItemOnLayer(Layer.ShopBuy)).DropItem(child);
|
|
|
|
try
|
|
{
|
|
child.Delete();
|
|
Assert.True(ReceivedRemove(ns, child.Serial));
|
|
}
|
|
finally
|
|
{
|
|
Cleanup(ns, client, owner);
|
|
}
|
|
}
|
|
|
|
[Fact]
|
|
public void IsChildPublic_BroadcastsOnlyThatChild()
|
|
{
|
|
var (ns, client) = CreateClient(new Point3D(_ownerLoc.X + 1, _ownerLoc.Y, 0));
|
|
var pack = new OneChildPublicContainer();
|
|
var owner = CreateOwnerWith(pack);
|
|
var publicChild = new Item(0x1234);
|
|
var privateChild = new Item(0x1235);
|
|
pack.DropItem(publicChild);
|
|
pack.DropItem(privateChild);
|
|
pack.PublicChild = publicChild;
|
|
|
|
try
|
|
{
|
|
privateChild.Delete();
|
|
Assert.False(ReceivedRemove(ns, privateChild.Serial));
|
|
|
|
publicChild.Delete();
|
|
Assert.True(ReceivedRemove(ns, publicChild.Serial));
|
|
}
|
|
finally
|
|
{
|
|
Cleanup(ns, client, owner);
|
|
}
|
|
}
|
|
|
|
[Fact]
|
|
public void DeletingOwner_SendsNoRemoveForPrivateChildren()
|
|
{
|
|
var (ns, client) = CreateClient(new Point3D(_ownerLoc.X + 1, _ownerLoc.Y, 0));
|
|
var pack = new Container(0xE75);
|
|
var owner = CreateOwnerWith(pack);
|
|
var children = new Item[50];
|
|
for (var i = 0; i < children.Length; i++)
|
|
{
|
|
children[i] = new Item(0x1234);
|
|
pack.DropItem(children[i]);
|
|
}
|
|
|
|
try
|
|
{
|
|
owner.Delete();
|
|
|
|
for (var i = 0; i < children.Length; i++)
|
|
{
|
|
Assert.True(children[i].Deleted);
|
|
Assert.False(ReceivedRemove(ns, children[i].Serial));
|
|
}
|
|
}
|
|
finally
|
|
{
|
|
Cleanup(ns, client, owner);
|
|
}
|
|
}
|
|
|
|
[Fact]
|
|
public void TradePartner_ReceivesRemoveForNestedItem()
|
|
{
|
|
var (nsA, a) = CreateClient(_ownerLoc);
|
|
var (nsB, b) = CreateClient(new Point3D(_ownerLoc.X + 1, _ownerLoc.Y, 0));
|
|
|
|
var trade = new SecureTrade(a, b);
|
|
var pouch = new Container(0xE75);
|
|
trade.From.Container.DropItem(pouch);
|
|
var item = new Item(0x1234);
|
|
pouch.DropItem(item);
|
|
|
|
try
|
|
{
|
|
item.Delete();
|
|
Assert.True(ReceivedRemove(nsB, item.Serial));
|
|
}
|
|
finally
|
|
{
|
|
trade.From.Container.Delete();
|
|
trade.To.Container.Delete();
|
|
DisposeClient(nsA, a);
|
|
DisposeClient(nsB, b);
|
|
}
|
|
}
|
|
|
|
[Fact]
|
|
public void FacetChange_DoesNotRemoveNestedContainerChildren()
|
|
{
|
|
var (ownerNs, owner) = CreateClient(_ownerLoc);
|
|
var (bystanderNs, bystander) = CreateClient(new Point3D(_ownerLoc.X + 1, _ownerLoc.Y, 0));
|
|
|
|
var backpack = new Container(0xE75) { Layer = Layer.Backpack };
|
|
owner.AddItem(backpack);
|
|
|
|
var pouch = new Container(0xE75);
|
|
backpack.DropItem(pouch);
|
|
|
|
var reagent = new Item(0xF7A);
|
|
pouch.DropItem(reagent);
|
|
|
|
try
|
|
{
|
|
owner.MoveToWorld(_ownerLoc, Map.Trammel);
|
|
|
|
Assert.False(ReceivedRemove(ownerNs, pouch.Serial));
|
|
Assert.False(ReceivedRemove(ownerNs, reagent.Serial));
|
|
Assert.False(ReceivedRemove(bystanderNs, pouch.Serial));
|
|
Assert.False(ReceivedRemove(bystanderNs, reagent.Serial));
|
|
}
|
|
finally
|
|
{
|
|
DisposeClient(ownerNs, owner);
|
|
DisposeClient(bystanderNs, bystander);
|
|
}
|
|
}
|
|
|
|
[Fact]
|
|
public void NoDuplicateRemove_WhenRootIsAlsoAnOpener()
|
|
{
|
|
var (ownerNs, owner) = CreateClient(_ownerLoc);
|
|
|
|
var pack = new Container(0xE75)
|
|
{
|
|
Layer = Layer.Backpack,
|
|
Visible = false
|
|
};
|
|
owner.AddItem(pack);
|
|
pack.Openers = [owner];
|
|
|
|
var child = new Item(0x1234);
|
|
pack.DropItem(child);
|
|
|
|
try
|
|
{
|
|
child.Delete();
|
|
Assert.Equal(1, CountRemoves(ownerNs, child.Serial));
|
|
}
|
|
finally
|
|
{
|
|
DisposeClient(ownerNs, owner);
|
|
}
|
|
}
|
|
|
|
[Fact]
|
|
public void LiftingFromOwnBackpack_DoesNotBroadcastRemove()
|
|
{
|
|
var (ownerNs, owner) = CreateClient(_ownerLoc);
|
|
var (bystanderNs, bystander) = CreateClient(new Point3D(_ownerLoc.X + 1, _ownerLoc.Y, 0));
|
|
|
|
var pack = new Container(0xE75) { Layer = Layer.Backpack };
|
|
owner.AddItem(pack);
|
|
|
|
var item = new Item(0x1234);
|
|
pack.DropItem(item);
|
|
|
|
try
|
|
{
|
|
item.Internalize();
|
|
|
|
Assert.True(ReceivedRemove(ownerNs, item.Serial));
|
|
Assert.False(ReceivedRemove(bystanderNs, item.Serial));
|
|
}
|
|
finally
|
|
{
|
|
item.Delete();
|
|
DisposeClient(ownerNs, owner);
|
|
DisposeClient(bystanderNs, bystander);
|
|
}
|
|
}
|
|
|
|
[Fact]
|
|
public void MovingPrivateChildToGroundSameMap_DoesNotSendOldLocationRemoveToBystanders()
|
|
{
|
|
var (ownerNs, owner) = CreateClient(_ownerLoc);
|
|
var (bystanderNs, bystander) = CreateClient(new Point3D(_ownerLoc.X + 1, _ownerLoc.Y, 0));
|
|
|
|
var pack = new Container(0xE75) { Layer = Layer.Backpack };
|
|
owner.AddItem(pack);
|
|
|
|
var item = new Item(0x1234);
|
|
pack.DropItem(item);
|
|
|
|
var farLocation = new Point3D(_ownerLoc.X + 100, _ownerLoc.Y, 0);
|
|
|
|
try
|
|
{
|
|
item.MoveToWorld(farLocation, Map.Felucca);
|
|
|
|
Assert.False(ReceivedRemove(bystanderNs, item.Serial));
|
|
}
|
|
finally
|
|
{
|
|
item.Delete();
|
|
DisposeClient(ownerNs, owner);
|
|
DisposeClient(bystanderNs, bystander);
|
|
}
|
|
}
|
|
|
|
[Fact]
|
|
public void LiftingEquippedItem_StillBroadcastsRemove()
|
|
{
|
|
var (ownerNs, owner) = CreateClient(_ownerLoc);
|
|
var (bystanderNs, bystander) = CreateClient(new Point3D(_ownerLoc.X + 1, _ownerLoc.Y, 0));
|
|
|
|
var weapon = new Item(0x1234) { Layer = Layer.OneHanded };
|
|
owner.AddItem(weapon);
|
|
|
|
try
|
|
{
|
|
weapon.Internalize();
|
|
|
|
Assert.True(ReceivedRemove(bystanderNs, weapon.Serial));
|
|
}
|
|
finally
|
|
{
|
|
weapon.Delete();
|
|
DisposeClient(ownerNs, owner);
|
|
DisposeClient(bystanderNs, bystander);
|
|
}
|
|
}
|
|
|
|
[Fact]
|
|
public void GroundItemMove_StillSendsOldLocationRemove()
|
|
{
|
|
var (bystanderNs, bystander) = CreateClient(_ownerLoc);
|
|
|
|
var groundLocation = new Point3D(_ownerLoc.X + 1, _ownerLoc.Y, 0);
|
|
var item = new Item(0x1234);
|
|
item.MoveToWorld(groundLocation, Map.Felucca);
|
|
|
|
var farLocation = new Point3D(_ownerLoc.X + 100, _ownerLoc.Y, 0);
|
|
|
|
try
|
|
{
|
|
item.MoveToWorld(farLocation, Map.Felucca);
|
|
|
|
Assert.True(ReceivedRemove(bystanderNs, item.Serial));
|
|
}
|
|
finally
|
|
{
|
|
item.Delete();
|
|
DisposeClient(bystanderNs, bystander);
|
|
}
|
|
}
|
|
}
|