warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Fixes flaky tests, formatting, and sequential testing. (#2168)

Browse source
This commit is contained in:
Kamron Batman 2025-04-30 16:42:38 -07:00 • committed by GitHub
parent 415c7a6bfd
commit 7dbfc9d161
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
60 changed files with 1304 additions and 1289 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Projects/UOContent.Tests/Tests/Engines/Chat/ChatPacketTests.cs
View file

@ -12,12 +12,12 @@ public class ChatPacketTests
[InlineData("ENU", 200, "a third param", "another param")]
public void TestSendChatMessage(string lang, int number, string param1, string param2)
{
var expected = new ChatMessagePacket(lang, number, param1, param2).Compile();
var expected = new ChatMessagePacket(lang, number, param1, param2).Compile();
var ns = PacketTestUtilities.CreateTestNetState();
ns.SendChatMessage(lang, number, param1, param2);
var ns = PacketTestUtilities.CreateTestNetState();
ns.SendChatMessage(lang, number, param1, param2);
var result = ns.SendPipe.Reader.AvailableToRead();
AssertThat.Equal(result, expected);
}
}
}
}

32
Projects/UOContent.Tests/Tests/Engines/Chat/Packets.cs
View file

@ -6,23 +6,23 @@ public sealed class ChatMessagePacket : Packet
{
public ChatMessagePacket(string lang, int number, string param1, string param2) : base(0xB2)
{
param1 ??= string.Empty;
param2 ??= string.Empty;
param1 ??= string.Empty;
param2 ??= string.Empty;
EnsureCapacity(13 + (param1.Length + param2.Length) * 2);
EnsureCapacity(13 + (param1.Length + param2.Length) * 2);
Stream.Write((ushort)(number - 20));
Stream.Write((ushort)(number - 20));
if (lang != null)
{
Stream.WriteAsciiFixed(lang, 4);
}
else
{
Stream.Write(0);
}
Stream.WriteBigUniNull(param1);
Stream.WriteBigUniNull(param2);
if (lang != null)
{
Stream.WriteAsciiFixed(lang, 4);
}
}
else
{
Stream.Write(0);
}
Stream.WriteBigUniNull(param1);
Stream.WriteBigUniNull(param2);
}
}

51
Projects/UOContent.Tests/Tests/Engines/Events/EventSchedulerTests.cs
View file

@ -6,7 +6,7 @@ using Xunit;
namespace UOContent.Tests;
[Collection("Sequential Tests")]
[Collection("Sequential UOContent Tests")]
public class EventSchedulerTests
{
// Test implementations for controlled testing
@ -144,36 +144,39 @@ public class EventSchedulerTests
[Fact]
public void Scheduler_HandlesRecurringEvents()
{
Init();
try
for (var i = 0; i < 100_000; i++)
{
int callCount = 0;
Init();
// Create a recurrence pattern that fires every 10 seconds, up to 3 times
var recurrence = new TestRecurrencePattern(TimeSpan.FromSeconds(10), 3);
try
{
int callCount = 0;
var evt = new TestScheduledEvent(
Core._now,
() => callCount++,
recurrence
);
// Create a recurrence pattern that fires every 10 seconds, up to 3 times
var recurrence = new TestRecurrencePattern(TimeSpan.FromSeconds(10), 3);
EventScheduler.Shared.ScheduleEvent(evt);
var evt = new TestScheduledEvent(
Core._now,
() => callCount++,
recurrence
);
// Advance time to after all occurrences should have happened
Core._now = Core._now.AddSeconds(50);
Timer.Slice(8);
EventScheduler.Shared.ScheduleEvent(evt);
// Should have fired 4 times (3 recurrences)
Assert.Equal(3, callCount);
Assert.Equal(3, evt.CallCount);
// Advance time to after all occurrences should have happened
Core._now = Core._now.AddSeconds(50);
Timer.Slice(8);
evt.Cancel();
}
finally
{
Finish();
// Should have fired 4 times (3 recurrences)
Assert.Equal(3, callCount);
Assert.Equal(3, evt.CallCount);
evt.Cancel();
}
finally
{
Finish();
}
}
}

14
Projects/UOContent.Tests/Tests/Engines/Help/HelpTopic.cs
View file

@ -4,11 +4,11 @@ public class DisplayHelpTopic : Packet
{
public DisplayHelpTopic(int topicID, bool display) : base(0xBF)
{
EnsureCapacity(11);
EnsureCapacity(11);
Stream.Write((short)0x17);
Stream.Write((byte)1);
Stream.Write(topicID);
Stream.Write(display);
}
}
Stream.Write((short)0x17);
Stream.Write((byte)1);
Stream.Write(topicID);
Stream.Write(display);
}
}

10
Projects/UOContent.Tests/Tests/Engines/Help/TestHelpTopicPacket.cs
View file

@ -13,12 +13,12 @@ public class TestHelpTopicPacket
[InlineData(HelpTopic.EmptyingBowl, true)]
public void TestDisplayHelpTopic(int topic, bool display)
{
var expected = new DisplayHelpTopic(topic, display).Compile();
var expected = new DisplayHelpTopic(topic, display).Compile();
var ns = PacketTestUtilities.CreateTestNetState();
ns.SendDisplayHelpTopic(topic, display);
var ns = PacketTestUtilities.CreateTestNetState();
ns.SendDisplayHelpTopic(topic, display);
var result = ns.SendPipe.Reader.AvailableToRead();
AssertThat.Equal(result, expected);
}
}
}
}

22
Projects/UOContent.Tests/Tests/Engines/ML Quests/Packets.cs
View file

@ -6,22 +6,22 @@ public sealed class RaceChanger : Packet
{
public RaceChanger(bool female, Race targetRace) : base(0xBF)
{
EnsureCapacity(7);
EnsureCapacity(7);
Stream.Write((short)0x2A);
Stream.Write((byte)(female ? 1 : 0));
Stream.Write((byte)(targetRace.RaceID + 1));
}
Stream.Write((short)0x2A);
Stream.Write((byte)(female ? 1 : 0));
Stream.Write((byte)(targetRace.RaceID + 1));
}
}
public sealed class CloseRaceChanger : Packet
{
public CloseRaceChanger() : base(0xBF)
{
EnsureCapacity(7);
EnsureCapacity(7);
Stream.Write((short)0x2A);
Stream.Write((byte)0);
Stream.Write((byte)0xFF);
}
}
Stream.Write((short)0x2A);
Stream.Write((byte)0);
Stream.Write((byte)0xFF);
}
}

72
Projects/UOContent.Tests/Tests/Engines/Party/Packets.cs
View file

@ -6,74 +6,74 @@ public sealed class PartyEmptyList : Packet
{
public PartyEmptyList(Serial m) : base(0xBF)
{
EnsureCapacity(7);
EnsureCapacity(7);
Stream.Write((short)0x0006);
Stream.Write((byte)0x02);
Stream.Write((byte)0);
Stream.Write(m);
}
Stream.Write((short)0x0006);
Stream.Write((byte)0x02);
Stream.Write((byte)0);
Stream.Write(m);
}
}
public sealed class PartyMemberList : Packet
{
public PartyMemberList(Party p) : base(0xBF)
{
EnsureCapacity(7 + p.Count * 4);
EnsureCapacity(7 + p.Count * 4);
Stream.Write((short)0x0006);
Stream.Write((byte)0x01);
Stream.Write((byte)p.Count);
Stream.Write((short)0x0006);
Stream.Write((byte)0x01);
Stream.Write((byte)p.Count);
for (var i = 0; i < p.Count; ++i)
{
Stream.Write(p[i].Mobile.Serial);
}
for (var i = 0; i < p.Count; ++i)
{
Stream.Write(p[i].Mobile.Serial);
}
}
}
public sealed class PartyRemoveMember : Packet
{
public PartyRemoveMember(Serial removed, Party p) : base(0xBF)
{
EnsureCapacity(11 + p.Count * 4);
EnsureCapacity(11 + p.Count * 4);
Stream.Write((short)0x0006);
Stream.Write((byte)0x02);
Stream.Write((byte)p.Count);
Stream.Write((short)0x0006);
Stream.Write((byte)0x02);
Stream.Write((byte)p.Count);
Stream.Write(removed);
Stream.Write(removed);
for (var i = 0; i < p.Count; ++i)
{
Stream.Write(p[i].Mobile.Serial);
}
for (var i = 0; i < p.Count; ++i)
{
Stream.Write(p[i].Mobile.Serial);
}
}
}
public sealed class PartyTextMessage : Packet
{
public PartyTextMessage(bool toAll, Serial from, string text) : base(0xBF)
{
text ??= "";
text ??= "";
EnsureCapacity(12 + text.Length * 2);
EnsureCapacity(12 + text.Length * 2);
Stream.Write((short)0x0006);
Stream.Write((byte)(toAll ? 0x04 : 0x03));
Stream.Write(from);
Stream.WriteBigUniNull(text);
}
Stream.Write((short)0x0006);
Stream.Write((byte)(toAll ? 0x04 : 0x03));
Stream.Write(from);
Stream.WriteBigUniNull(text);
}
}
public sealed class PartyInvitation : Packet
{
public PartyInvitation(Serial leader) : base(0xBF)
{
EnsureCapacity(10);
EnsureCapacity(10);
Stream.Write((short)0x0006);
Stream.Write((byte)0x07);
Stream.Write(leader);
}
}
Stream.Write((short)0x0006);
Stream.Write((byte)0x07);
Stream.Write(leader);
}
}

77
Projects/UOContent.Tests/Tests/Engines/Party/PartyPacketTests.cs
View file

@ -6,92 +6,93 @@ using Xunit;
namespace UOContent.Tests;
public class PartyPacketTests : IClassFixture<ServerFixture>
[Collection("Sequential UOContent Tests")]
public class PartyPacketTests
{
[Fact]
public void TestPartyEmptyList()
{
Serial m = (Serial)0x1024u;
Serial m = (Serial)0x1024u;
var expected = new PartyEmptyList(m).Compile();
var expected = new PartyEmptyList(m).Compile();
var ns = PacketTestUtilities.CreateTestNetState();
ns.SendPartyRemoveMember(m);
var ns = PacketTestUtilities.CreateTestNetState();
ns.SendPartyRemoveMember(m);
var result = ns.SendPipe.Reader.AvailableToRead();
AssertThat.Equal(result, expected);
}
}
[Fact]
public void TestPartyRemoveMember()
{
var leader = new Mobile((Serial)0x1024u);
leader.DefaultMobileInit();
var leader = new Mobile((Serial)0x1024u);
leader.DefaultMobileInit();
var member = new Mobile((Serial)0x2048u);
member.DefaultMobileInit();
var member = new Mobile((Serial)0x2048u);
member.DefaultMobileInit();
var p = new Party(leader);
p.Add(member);
var p = new Party(leader);
p.Add(member);
var expected = new PartyRemoveMember(member.Serial, p).Compile();
var expected = new PartyRemoveMember(member.Serial, p).Compile();
var ns = PacketTestUtilities.CreateTestNetState();
ns.SendPartyRemoveMember(member.Serial, p);
var ns = PacketTestUtilities.CreateTestNetState();
ns.SendPartyRemoveMember(member.Serial, p);
var result = ns.SendPipe.Reader.AvailableToRead();
AssertThat.Equal(result, expected);
}
}
[Fact]
public void TestPartyMemberList()
{
var leader = new Mobile((Serial)0x1024u);
leader.DefaultMobileInit();
var leader = new Mobile((Serial)0x1024u);
leader.DefaultMobileInit();
var member = new Mobile((Serial)0x2048u);
member.DefaultMobileInit();
var member = new Mobile((Serial)0x2048u);
member.DefaultMobileInit();
var p = new Party(leader);
p.Add(member);
var p = new Party(leader);
p.Add(member);
var expected = new PartyMemberList(p).Compile();
var expected = new PartyMemberList(p).Compile();
var ns = PacketTestUtilities.CreateTestNetState();
ns.SendPartyMemberList(p);
var ns = PacketTestUtilities.CreateTestNetState();
ns.SendPartyMemberList(p);
var result = ns.SendPipe.Reader.AvailableToRead();
AssertThat.Equal(result, expected);
}
}
[Theory]
[InlineData(true)]
[InlineData(false)]
public void TestPartyTextMessage(bool toAll)
{
Serial serial = (Serial)0x1024u;
var text = "[Party] Stuff Happens";
Serial serial = (Serial)0x1024u;
var text = "[Party] Stuff Happens";
var expected = new PartyTextMessage(toAll, serial, text).Compile();
var expected = new PartyTextMessage(toAll, serial, text).Compile();
var ns = PacketTestUtilities.CreateTestNetState();
ns.SendPartyTextMessage(serial, text, toAll);
var ns = PacketTestUtilities.CreateTestNetState();
ns.SendPartyTextMessage(serial, text, toAll);
var result = ns.SendPipe.Reader.AvailableToRead();
AssertThat.Equal(result, expected);
}
}
[Fact]
public void TestPartyInvitation()
{
Serial m = (Serial)0x1024u;
Serial m = (Serial)0x1024u;
var expected = new PartyInvitation(m).Compile();
var expected = new PartyInvitation(m).Compile();
var ns = PacketTestUtilities.CreateTestNetState();
ns.SendPartyInvitation(m);
var ns = PacketTestUtilities.CreateTestNetState();
ns.SendPartyInvitation(m);
var result = ns.SendPipe.Reader.AvailableToRead();
AssertThat.Equal(result, expected);
}
}
}
}

10
Projects/UOContent.Tests/Tests/Engines/Veteran Rewards/Character Statue Maker/CharacterStatuePacketTests.cs
View file

@ -13,12 +13,12 @@ public class CharacterStatuePacketTests
[InlineData(0x1024u, 1, 100, 200)]
public void TestSendStatueAnimation(uint s, int status, int anim, int frame)
{
var expected = new UpdateStatueAnimation((Serial)s, status, anim, frame).Compile();
var expected = new UpdateStatueAnimation((Serial)s, status, anim, frame).Compile();
var ns = PacketTestUtilities.CreateTestNetState();
ns.SendStatueAnimation((Serial)s, status, anim, frame);
var ns = PacketTestUtilities.CreateTestNetState();
ns.SendStatueAnimation((Serial)s, status, anim, frame);
var result = ns.SendPipe.Reader.AvailableToRead();
AssertThat.Equal(result, expected);
}
}
}
}

26
Projects/UOContent.Tests/Tests/Engines/Veteran Rewards/Character Statue Maker/Packets.cs
View file

@ -4,16 +4,16 @@ public class UpdateStatueAnimation : Packet
{
public UpdateStatueAnimation(Serial serial, int status, int animation, int frame) : base(0xBF, 17)
{
Stream.Write((short)0x11);
Stream.Write((short)0x19);
Stream.Write((byte)0x5);
Stream.Write(serial);
Stream.Write((byte)0);
Stream.Write((byte)0xFF);
Stream.Write((byte)status);
Stream.Write((byte)0);
Stream.Write((byte)animation);
Stream.Write((byte)0);
Stream.Write((byte)frame);
}
}
Stream.Write((short)0x11);
Stream.Write((short)0x19);
Stream.Write((byte)0x5);
Stream.Write(serial);
Stream.Write((byte)0);
Stream.Write((byte)0xFF);
Stream.Write((byte)status);
Stream.Write((byte)0);
Stream.Write((byte)animation);
Stream.Write((byte)0);
Stream.Write((byte)frame);
}
}