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

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);
}
}
}
}