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

fix(core): Removes disposable netstates. (#467)

Browse source 
- [X] Removes IDisposable from NetState
- [X] Swaps Disconnect and Dispose methods
This commit is contained in:
Kamron Batman 2021-02-05 14:33:35 -08:00 • committed by GitHub
parent 079eeb1b96
commit 67625ad249
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
49 changed files with 204 additions and 210 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -15,7 +15,7 @@ namespace UOContent.Tests
{
var expected = new ChatMessagePacket(lang, number, param1, param2).Compile();
using var ns = PacketTestUtilities.CreateTestNetState();
var ns = PacketTestUtilities.CreateTestNetState();
ns.SendChatMessage(lang, number, param1, param2);
var result = ns.SendPipe.Reader.TryRead();

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

@ -16,7 +16,7 @@ namespace UOContent.Tests
{
var expected = new DisplayHelpTopic(topic, display).Compile();
using var ns = PacketTestUtilities.CreateTestNetState();
var ns = PacketTestUtilities.CreateTestNetState();
ns.SendDisplayHelpTopic(topic, display);
var result = ns.SendPipe.Reader.TryRead();

4
Projects/UOContent.Tests/Tests/Engines/ML Quests/MLQuestPacketTests.cs
View file

@ -21,7 +21,7 @@ namespace Server.Engines.MLQuests
var expected = new RaceChanger(female, race).Compile();
using var ns = PacketTestUtilities.CreateTestNetState();
var ns = PacketTestUtilities.CreateTestNetState();
ns.SendRaceChanger(female, race);
var result = ns.SendPipe.Reader.TryRead();
@ -33,7 +33,7 @@ namespace Server.Engines.MLQuests
{
var expected = new CloseRaceChanger().Compile();
using var ns = PacketTestUtilities.CreateTestNetState();
var ns = PacketTestUtilities.CreateTestNetState();
ns.SendCloseRaceChanger();
var result = ns.SendPipe.Reader.TryRead();

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

@ -16,7 +16,7 @@ namespace UOContent.Tests
var expected = new PartyEmptyList(m).Compile();
using var ns = PacketTestUtilities.CreateTestNetState();
var ns = PacketTestUtilities.CreateTestNetState();
ns.SendPartyRemoveMember(m);
var result = ns.SendPipe.Reader.TryRead();
@ -37,7 +37,7 @@ namespace UOContent.Tests
var expected = new PartyRemoveMember(member.Serial, p).Compile();
using var ns = PacketTestUtilities.CreateTestNetState();
var ns = PacketTestUtilities.CreateTestNetState();
ns.SendPartyRemoveMember(member.Serial, p);
var result = ns.SendPipe.Reader.TryRead();
@ -58,7 +58,7 @@ namespace UOContent.Tests
var expected = new PartyMemberList(p).Compile();
using var ns = PacketTestUtilities.CreateTestNetState();
var ns = PacketTestUtilities.CreateTestNetState();
ns.SendPartyMemberList(p);
var result = ns.SendPipe.Reader.TryRead();
@ -75,7 +75,7 @@ namespace UOContent.Tests
var expected = new PartyTextMessage(toAll, serial, text).Compile();
using var ns = PacketTestUtilities.CreateTestNetState();
var ns = PacketTestUtilities.CreateTestNetState();
ns.SendPartyTextMessage(serial, text, toAll);
var result = ns.SendPipe.Reader.TryRead();
@ -89,7 +89,7 @@ namespace UOContent.Tests
var expected = new PartyInvitation(m).Compile();
using var ns = PacketTestUtilities.CreateTestNetState();
var ns = PacketTestUtilities.CreateTestNetState();
ns.SendPartyInvitation(m);
var result = ns.SendPipe.Reader.TryRead();

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

@ -17,7 +17,7 @@ namespace UOContent.Tests
Serial serial = s;
var expected = new UpdateStatueAnimation(serial, status, anim, frame).Compile();
using var ns = PacketTestUtilities.CreateTestNetState();
var ns = PacketTestUtilities.CreateTestNetState();
ns.SendStatueAnimation(serial, status, anim, frame);
var result = ns.SendPipe.Reader.TryRead();

4
Projects/UOContent.Tests/Tests/Items/Books/BookPacketTests.cs
View file

@ -21,7 +21,7 @@ namespace UOContent.Tests
var expected = new BookHeader(m, book).Compile();
using var ns = PacketTestUtilities.CreateTestNetState();
var ns = PacketTestUtilities.CreateTestNetState();
ns.SendBookCover(m, book);
var result = ns.SendPipe.Reader.TryRead();
@ -57,7 +57,7 @@ namespace UOContent.Tests
var expected = new BookPageDetails(book).Compile();
using var ns = PacketTestUtilities.CreateTestNetState();
var ns = PacketTestUtilities.CreateTestNetState();
ns.SendBookContent(book);
var result = ns.SendPipe.Reader.TryRead();

4
Projects/UOContent.Tests/Tests/Items/Bulletin Boards/BulletinBoardPacketTests.cs
View file

@ -21,7 +21,7 @@ namespace UOContent.Tests
var expected = new BBDisplayBoard(bb).Compile();
using var ns = PacketTestUtilities.CreateTestNetState();
var ns = PacketTestUtilities.CreateTestNetState();
ns.SendBBDisplayBoard(bb);
var result = ns.SendPipe.Reader.TryRead();
@ -48,7 +48,7 @@ namespace UOContent.Tests
var expected = (content ?
(Packet)new BBMessageContent(bb, msg) : new BBMessageHeader(bb, msg)).Compile();
using var ns = PacketTestUtilities.CreateTestNetState();
var ns = PacketTestUtilities.CreateTestNetState();
ns.SendBBMessage(bb, msg, content);
var result = ns.SendPipe.Reader.TryRead();

12
Projects/UOContent.Tests/Tests/Items/Games/Mahjong/MahjongPacketTests.cs
View file

@ -17,7 +17,7 @@ namespace UOContent.Tests
var expected = new MahjongJoinGame(game).Compile();
using var ns = PacketTestUtilities.CreateTestNetState();
var ns = PacketTestUtilities.CreateTestNetState();
ns.SendMahjongJoinGame(game);
var result = ns.SendPipe.Reader.TryRead();
@ -37,7 +37,7 @@ namespace UOContent.Tests
var expected = new MahjongPlayersInfo(game, m).Compile();
using var ns = PacketTestUtilities.CreateTestNetState();
var ns = PacketTestUtilities.CreateTestNetState();
ns.SendMahjongPlayersInfo(game, m);
var result = ns.SendPipe.Reader.TryRead();
@ -55,7 +55,7 @@ namespace UOContent.Tests
var expected = new MahjongGeneralInfo(game).Compile();
using var ns = PacketTestUtilities.CreateTestNetState();
var ns = PacketTestUtilities.CreateTestNetState();
ns.SendMahjongGeneralInfo(game);
var result = ns.SendPipe.Reader.TryRead();
@ -75,7 +75,7 @@ namespace UOContent.Tests
var expected = new MahjongTilesInfo(game, m).Compile();
using var ns = PacketTestUtilities.CreateTestNetState();
var ns = PacketTestUtilities.CreateTestNetState();
ns.SendMahjongTilesInfo(game, m);
var result = ns.SendPipe.Reader.TryRead();
@ -95,7 +95,7 @@ namespace UOContent.Tests
var expected = new MahjongTileInfo(game.Tiles[0], m).Compile();
using var ns = PacketTestUtilities.CreateTestNetState();
var ns = PacketTestUtilities.CreateTestNetState();
ns.SendMahjongTileInfo(game.Tiles[0], m);
var result = ns.SendPipe.Reader.TryRead();
@ -109,7 +109,7 @@ namespace UOContent.Tests
var expected = new MahjongRelieve(game).Compile();
using var ns = PacketTestUtilities.CreateTestNetState();
var ns = PacketTestUtilities.CreateTestNetState();
ns.SendMahjongRelieve(game);
var result = ns.SendPipe.Reader.TryRead();

4
Projects/UOContent.Tests/Tests/Items/Maps/TestMapItemPackets.cs
View file

@ -18,7 +18,7 @@ namespace UOContent.Tests
{
var mapItem = new MapItem(Map.Trammel);
using var ns = PacketTestUtilities.CreateTestNetState();
var ns = PacketTestUtilities.CreateTestNetState();
ns.ProtocolChanges = changes;
var expected = (ns.NewCharacterList ?
@ -40,7 +40,7 @@ namespace UOContent.Tests
var expected = new MapCommand(mapItem, command, number, x, y).Compile();
using var ns = PacketTestUtilities.CreateTestNetState();
var ns = PacketTestUtilities.CreateTestNetState();
ns.SendMapCommand(mapItem, command, x, y, number > 0);
var result = ns.SendPipe.Reader.TryRead();

4
Projects/UOContent.Tests/Tests/Items/Misc/Corpses/CorpsePacketTests.cs
View file

@ -24,7 +24,7 @@ namespace UOContent.Tests
var expected = new CorpseEquip(m, c).Compile();
using var ns = PacketTestUtilities.CreateTestNetState();
var ns = PacketTestUtilities.CreateTestNetState();
ns.SendCorpseEquip(m, c);
var result = ns.SendPipe.Reader.TryRead();
@ -44,7 +44,7 @@ namespace UOContent.Tests
var c = new Corpse(m, m.Items);
using var ns = PacketTestUtilities.CreateTestNetState();
var ns = PacketTestUtilities.CreateTestNetState();
ns.ProtocolChanges = changes;
var expected = (ns.ContainerGridLines ? (Packet)new CorpseContent6017(m, c) : new CorpseContent(m, c)).Compile();

4
Projects/UOContent.Tests/Tests/Multis/Boats/BoatPacketTests.cs
View file

@ -52,7 +52,7 @@ namespace UOContent.Tests
beholder.Setup(m => m.CanSee(It.Is<IEntity>(e => e == boat))).Returns(true);
using var ns = PacketTestUtilities.CreateTestNetState();
var ns = PacketTestUtilities.CreateTestNetState();
ns.ProtocolChanges = ProtocolChanges.HighSeas;
var expected = new MoveBoatHS(beholder.Object, boat, d, speed, list, xOffset, yOffset).Compile();
@ -95,7 +95,7 @@ namespace UOContent.Tests
beholder.Setup(m => m.CanSee(It.Is<IEntity>(e => e == boat))).Returns(true);
using var ns = PacketTestUtilities.CreateTestNetState();
var ns = PacketTestUtilities.CreateTestNetState();
ns.ProtocolChanges = ProtocolChanges.HighSeas;
var expected = new DisplayBoatHS(beholder.Object, boat).Compile();

8
Projects/UOContent.Tests/Tests/Network/Packets/ArrowPacketTests.cs
View file

@ -11,7 +11,7 @@ namespace Server.Tests.Network
{
var expected = new CancelArrow().Compile();
using var ns = PacketTestUtilities.CreateTestNetState();
var ns = PacketTestUtilities.CreateTestNetState();
ns.SendCancelArrow(0, 0, Serial.Zero);
var result = ns.SendPipe.Reader.TryRead();
@ -26,7 +26,7 @@ namespace Server.Tests.Network
{
var expected = new SetArrow(x, y).Compile();
using var ns = PacketTestUtilities.CreateTestNetState();
var ns = PacketTestUtilities.CreateTestNetState();
ns.SendSetArrow(x, y, Serial.Zero);
var result = ns.SendPipe.Reader.TryRead();
@ -43,7 +43,7 @@ namespace Server.Tests.Network
var expected = new CancelArrowHS(x, y, serial).Compile();
using var ns = PacketTestUtilities.CreateTestNetState();
var ns = PacketTestUtilities.CreateTestNetState();
ns.ProtocolChanges = ProtocolChanges.HighSeas;
ns.SendCancelArrow(x, y, serial);
@ -61,7 +61,7 @@ namespace Server.Tests.Network
var expected = new SetArrowHS(x, y, serial).Compile();
using var ns = PacketTestUtilities.CreateTestNetState();
var ns = PacketTestUtilities.CreateTestNetState();
ns.ProtocolChanges = ProtocolChanges.HighSeas;
ns.SendSetArrow(x, y, serial);

4
Projects/UOContent.Tests/Tests/Network/Packets/BuffIconPacketTests.cs
View file

@ -19,7 +19,7 @@ namespace UOContent.Tests
mob, iconID, titleCliloc, secondaryCliloc, args, timeSpan
).Compile();
using var ns = PacketTestUtilities.CreateTestNetState();
var ns = PacketTestUtilities.CreateTestNetState();
BuffInfo.SendAddBuffPacket(ns, mob, iconID, titleCliloc, secondaryCliloc, args, timeSpan);
var result = ns.SendPipe.Reader.TryRead();
@ -33,7 +33,7 @@ namespace UOContent.Tests
var buffIcon = BuffIcon.Disguised;
var expected = new RemoveBuffPacket(m, buffIcon).Compile();
using var ns = PacketTestUtilities.CreateTestNetState();
var ns = PacketTestUtilities.CreateTestNetState();
BuffInfo.SendRemoveBuffPacket(ns, m, buffIcon);
var result = ns.SendPipe.Reader.TryRead();

2
Projects/UOContent.Tests/Tests/Skills/Tracking/TrackingGumpTests.cs
View file

@ -20,7 +20,7 @@ namespace UOContent.Tests
pm.Skills.Tracking.BaseFixedPoint = 1000;
var g = new TrackWhatGump(pm);
using var ns = PacketTestUtilities.CreateTestNetState();
var ns = PacketTestUtilities.CreateTestNetState();
ns.ProtocolChanges = changes;
var expected = g.Compile(ns).Compile();