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

fix: Removes Moq due to privacy concerns (#1445)

Browse source 
Due to privacy/security concerns, Moq has been removed.

See: https://github.com/moq/moq/issues/1372
This commit is contained in:
Kamron Batman 2023-08-09 08:12:45 -07:00 • committed by GitHub
parent 0fa2e5cedb
commit bde5357f89
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 511 additions and 406 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,43 +1,86 @@
using System;
using Moq;
using Server.Tests;
using Server.Tests.Network;
using Xunit;
namespace Server.Engines.MLQuests
namespace Server.Engines.MLQuests;
public class MLQuestPacketTests
{
public class MLQuestPacketTests
private class MockedRace(
int raceID,
int raceIndex,
string name,
string pluralName,
int maleBody,
int femaleBody,
int maleGhostBody,
int femaleGhostBody,
Expansion requiredExpansion
)
: Race(raceID,
raceIndex,
name,
pluralName,
maleBody,
femaleBody,
maleGhostBody,
femaleGhostBody,
requiredExpansion
)
{
[Theory]
[InlineData(true, 1)]
[InlineData(false, 2)]
public void TestRaceChanger(bool female, int raceId)
{
var raceMock = new Mock<Race>(
raceId, 0, "Test Race", "Test Races", 0x1, 0x2, 0x3, 0x4, Expansion.None
);
public override bool ValidateHair(bool female, int itemID) => throw new NotImplementedException();
var race = raceMock.Object;
public override int RandomHair(bool female) => throw new NotImplementedException();
var expected = new RaceChanger(female, race).Compile();
public override bool ValidateFacialHair(bool female, int itemID) => throw new NotImplementedException();
var ns = PacketTestUtilities.CreateTestNetState();
ns.SendRaceChanger(female, race);
public override int RandomFacialHair(bool female) => throw new NotImplementedException();
var result = ns.SendPipe.Reader.TryRead();
AssertThat.Equal(result.Buffer[0].AsSpan(0), expected);
}
public override int ClipSkinHue(int hue) => throw new NotImplementedException();
[Fact]
public void TestCloseRaceChanger()
{
var expected = new CloseRaceChanger().Compile();
public override int RandomSkinHue() => throw new NotImplementedException();
var ns = PacketTestUtilities.CreateTestNetState();
ns.SendCloseRaceChanger();
public override int ClipHairHue(int hue) => throw new NotImplementedException();
var result = ns.SendPipe.Reader.TryRead();
AssertThat.Equal(result.Buffer[0].AsSpan(0), expected);
}
public override int RandomHairHue() => throw new NotImplementedException();
}
[Theory]
[InlineData(true, 1)]
[InlineData(false, 2)]
public void TestRaceChanger(bool female, int raceId)
{
var race = new MockedRace(
raceId,
0,
"Test Race",
"Test Races",
0x1,
0x2,
0x3,
0x4,
Expansion.None
);
var expected = new RaceChanger(female, race).Compile();
var ns = PacketTestUtilities.CreateTestNetState();
ns.SendRaceChanger(female, race);
var result = ns.SendPipe.Reader.TryRead();
AssertThat.Equal(result.Buffer[0].AsSpan(0), expected);
}
[Fact]
public void TestCloseRaceChanger()
{
var expected = new CloseRaceChanger().Compile();
var ns = PacketTestUtilities.CreateTestNetState();
ns.SendCloseRaceChanger();
var result = ns.SendPipe.Reader.TryRead();
AssertThat.Equal(result.Buffer[0].AsSpan(0), expected);
}
}

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

@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Moq;
using Server;
using Server.Multis;
using Server.Multis.Boats;
@ -10,120 +9,114 @@ using Server.Tests;
using Server.Tests.Network;
using Xunit;
namespace UOContent.Tests
namespace UOContent.Tests;
public class BoatPacketTests : IClassFixture<ServerFixture>
{
public class BoatPacketTests : IClassFixture<ServerFixture>
[Theory]
[InlineData(Direction.West, 10, 100, 200)]
public void TestMoveBoatHS(Direction d, int speed, int xOffset, int yOffset)
{
[Theory]
[InlineData(Direction.West, 10, 100, 200)]
public void TestMoveBoatHS(Direction d, int speed, int xOffset, int yOffset)
var item1 = new Item((Serial)0x1000)
{
var item1 = new Item((Serial)0x1000)
{
ItemID = 0x13B9,
Location = new Point3D(11, 21, 16),
Map = Map.Felucca,
Visible = true
};
var item2 = new Item((Serial)0x2000)
{
ItemID = 0x13B9,
Location = new Point3D(100, 200, 16),
Map = Map.Felucca,
Visible = true
};
var beholder = new Mock<Mobile>((Serial)0x100);
beholder.Object.DefaultMobileInit();
beholder.Object.Location = new Point3D(10, 20, 15);
beholder.Object.Map = Map.Felucca;
beholder.Setup(m => m.CanSee(It.Is<IEntity>(e => e == beholder.Object))).Returns(true);
beholder.Setup(m => m.CanSee(It.Is<IEntity>(e => e == item1))).Returns(true);
beholder.Setup(m => m.CanSee(It.Is<IEntity>(e => e == item2))).Returns(false);
var list = new List<IEntity> { item1, beholder.Object };
var notContained = new List<IEntity> { item2 };
var boat = new TestBoat((Serial)0x3000, list, notContained)
{
Location = new Point3D(10, 20, 15),
Facing = Direction.Right,
Map = Map.Felucca
};
beholder.Setup(m => m.CanSee(It.Is<IEntity>(e => e == boat))).Returns(true);
var ns = PacketTestUtilities.CreateTestNetState();
ns.ProtocolChanges = ProtocolChanges.HighSeas;
var expected = new MoveBoatHS(beholder.Object, boat, d, speed, list, xOffset, yOffset).Compile();
ns.SendMoveBoatHS(beholder.Object, boat, d, speed, boat.GetMovingEntities(true), xOffset, yOffset);
var result = ns.SendPipe.Reader.TryRead();
AssertThat.Equal(result.Buffer[0].AsSpan(0), expected);
}
[Fact]
public void TestDisplayBoatHS()
ItemID = 0x13B9,
Location = new Point3D(11, 21, 16),
Map = Map.Felucca,
Visible = true
};
var item2 = new Item((Serial)0x2000)
{
var item1 = new Item((Serial)0x1000)
{
ItemID = 0x13B9,
Location = new Point3D(11, 21, 16),
Map = Map.Felucca
};
var item2 = new Item((Serial)0x2000)
{
ItemID = 0x13B9,
Location = new Point3D(100, 200, 16),
Map = Map.Felucca
};
ItemID = 0x13B9,
Location = new Point3D(100, 200, 16),
Map = Map.Felucca,
Visible = true
};
var beholder = new Mock<Mobile>((Serial)0x100);
beholder.Object.DefaultMobileInit();
beholder.Object.Location = new Point3D(10, 20, 15);
beholder.Setup(m => m.CanSee(It.Is<IEntity>(e => e == beholder.Object))).Returns(true);
beholder.Setup(m => m.CanSee(It.Is<IEntity>(e => e == item1))).Returns(true);
beholder.Setup(m => m.CanSee(It.Is<IEntity>(e => e == item2))).Returns(false);
var beholder = new MockedMobile((Serial)0x100);
beholder.DefaultMobileInit();
beholder.Location = new Point3D(10, 20, 15);
beholder.Map = Map.Felucca;
beholder.CanSeeEntities.Add(item1);
var list = new List<IEntity> { item1, beholder.Object };
var notContained = new List<IEntity> { item2 };
var boat = new TestBoat((Serial)0x3000, list, notContained)
{
Location = new Point3D(10, 20, 15),
Facing = Direction.Right
};
beholder.Setup(m => m.CanSee(It.Is<IEntity>(e => e == boat))).Returns(true);
var ns = PacketTestUtilities.CreateTestNetState();
ns.ProtocolChanges = ProtocolChanges.HighSeas;
var expected = new DisplayBoatHS(beholder.Object, boat).Compile();
ns.SendDisplayBoatHS(beholder.Object, boat);
var result = ns.SendPipe.Reader.TryRead();
AssertThat.Equal(result.Buffer[0].AsSpan(0), expected);
}
public class TestBoat : BaseBoat
var list = new List<IEntity> { item1, beholder };
var notContained = new List<IEntity> { item2 };
var boat = new TestBoat((Serial)0x3000, list, notContained)
{
private readonly List<IEntity> components;
private readonly List<IEntity> notContained;
Location = new Point3D(10, 20, 15),
Facing = Direction.Right,
Map = Map.Felucca
};
public TestBoat(Serial serial, List<IEntity> list, List<IEntity> notContainedList) : base(serial)
{
components = list;
notContained = notContainedList;
Components = new MultiComponentList(new List<MultiTileEntry>());
}
beholder.CanSeeEntities.Add(boat);
public override MultiComponentList Components { get; }
var ns = PacketTestUtilities.CreateTestNetState();
ns.ProtocolChanges = ProtocolChanges.HighSeas;
var expected = new MoveBoatHS(beholder, boat, d, speed, list, xOffset, yOffset).Compile();
public override bool Contains(int x, int y) => !notContained.Any(e => e.X == x && e.Y == y);
ns.SendMoveBoatHS(beholder, boat, d, speed, boat.GetMovingEntities(true), xOffset, yOffset);
public override MovingEntitiesEnumerable GetMovingEntities(bool includeBoat = false) =>
new(this, true, new Map.PooledEnumerable<IEntity>(components));
}
var result = ns.SendPipe.Reader.TryRead();
AssertThat.Equal(result.Buffer[0].AsSpan(0), expected);
}
[Fact]
public void TestDisplayBoatHS()
{
var item1 = new Item((Serial)0x1000)
{
ItemID = 0x13B9,
Location = new Point3D(11, 21, 16),
Map = Map.Felucca
};
var item2 = new Item((Serial)0x2000)
{
ItemID = 0x13B9,
Location = new Point3D(100, 200, 16),
Map = Map.Felucca
};
var beholder = new MockedMobile((Serial)0x100);
beholder.DefaultMobileInit();
beholder.Location = new Point3D(10, 20, 15);
beholder.CanSeeEntities.Add(item1);
var list = new List<IEntity> { item1, beholder };
var notContained = new List<IEntity> { item2 };
var boat = new TestBoat((Serial)0x3000, list, notContained)
{
Location = new Point3D(10, 20, 15),
Facing = Direction.Right
};
beholder.CanSeeEntities.Add(boat);
var ns = PacketTestUtilities.CreateTestNetState();
ns.ProtocolChanges = ProtocolChanges.HighSeas;
var expected = new DisplayBoatHS(beholder, boat).Compile();
ns.SendDisplayBoatHS(beholder, boat);
var result = ns.SendPipe.Reader.TryRead();
AssertThat.Equal(result.Buffer[0].AsSpan(0), expected);
}
private class TestBoat(Serial serial, List<IEntity> list, List<IEntity> notContainedList) : BaseBoat(serial)
{
public override MultiComponentList Components { get; } = new(new List<MultiTileEntry>());
public override bool Contains(int x, int y) => !notContainedList.Any(e => e.X == x && e.Y == y);
public override MovingEntitiesEnumerable GetMovingEntities(bool includeBoat = false) =>
new(this, true, new Map.PooledEnumerable<IEntity>(list));
}
private class MockedMobile(Serial serial) : Mobile(serial)
{
public HashSet<IEntity> CanSeeEntities = new();
public override bool CanSee(Mobile m) => m == this;
public override bool CanSee(Item i) => CanSeeEntities.Contains(i);
}
}

3
Projects/UOContent.Tests/UOContent.Tests.csproj
View file

@ -4,8 +4,7 @@
<Configurations>Debug;Release;Analyze</Configurations>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
<PackageReference Include="Moq" Version="4.18.4" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
<PackageReference Include="xunit" Version="2.5.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0" />
<ProjectReference Include="..\Server\Server.csproj" />