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

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

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" />

View file

@ -1,5 +1,4 @@
using System;
using Moq;
using Server.Collections;
using Server.Random;
using Xunit;
@ -8,22 +7,57 @@ namespace Server.Tests;
public sealed class PooledRefQueueTests : IDisposable
{
private class MockedRandomSource(int queueCount, int mockedValue) : IRandomSource
{
private int _queueCount = queueCount;
private int _mockedValue = mockedValue;
public int Next() => throw new NotImplementedException();
public int Next(int maxValue) => _mockedValue;
public int Next(int minValue, int count) => throw new NotImplementedException();
public uint Next(uint maxValue) => throw new NotImplementedException();
public uint Next(uint minValue, uint count) => throw new NotImplementedException();
public long Next(long maxValue) => throw new NotImplementedException();
public long Next(long minValue, long count) => throw new NotImplementedException();
public double NextDouble() => throw new NotImplementedException();
public void NextBytes(Span<byte> buffer)
{
throw new NotImplementedException();
}
public int NextInt() => throw new NotImplementedException();
public uint NextUInt() => throw new NotImplementedException();
public ulong NextULong() => throw new NotImplementedException();
public bool NextBool() => throw new NotImplementedException();
public byte NextByte() => throw new NotImplementedException();
public float NextFloat() => throw new NotImplementedException();
public float NextFloatNonZero() => throw new NotImplementedException();
public double NextDoubleNonZero() => throw new NotImplementedException();
public double NextDoubleHighRes() => throw new NotImplementedException();
}
public void Dispose() => RandomSources.SetRng(null);
private static void PrepareRng(int queueCount, int rngValue)
{
Mock<IRandomSource> mockRng = new Mock<IRandomSource>();
mockRng
.Setup(rng => rng.Next(It.IsAny<int>()))
.Returns(
(int size) =>
{
Assert.Equal(queueCount, size);
return rngValue;
}
);
RandomSources.SetRng(mockRng.Object);
var mockedRng = new MockedRandomSource(queueCount, rngValue);
RandomSources.SetRng(mockedRng);
}
[Fact]

View file

@ -1,290 +1,327 @@
using System;
using System.Collections.Generic;
using System.Net;
using Moq;
using Server.Accounting;
using Server.Network;
using Xunit;
namespace Server.Tests.Network
namespace Server.Tests.Network;
public class AccountPacketTests : IClassFixture<ServerFixture>
{
public class AccountPacketTests : IClassFixture<ServerFixture>
private class MockedAccount : IAccount
{
public readonly Dictionary<int, Mobile> dictionary = new();
public Mock<IAccount> accountMock;
public int TotalGold { get; }
public int TotalPlat { get; }
public bool DepositGold(int amount) => throw new NotImplementedException();
public AccountPacketTests()
public bool DepositPlat(int amount) => throw new NotImplementedException();
public bool WithdrawGold(int amount) => throw new NotImplementedException();
public bool WithdrawPlat(int amount) => throw new NotImplementedException();
public long GetTotalGold() => throw new NotImplementedException();
public int CompareTo(IAccount other) => throw new NotImplementedException();
public string Username { get; set; }
public string Email { get; set; }
public AccessLevel AccessLevel { get; set; }
public int Length { get; }
public int Limit { get; }
public int Count { get; }
private Dictionary<int, Mobile> _mobiles = new();
public Mobile this[int index]
{
accountMock = new Mock<IAccount>();
accountMock
.Setup(sb => sb[It.IsAny<int>()])
.Returns((int key) => dictionary[key]);
accountMock
.SetupSet(sb => sb[It.IsAny<int>()] = It.IsAny<Mobile>())
.Callback(
(int key, Mobile m) =>
{
dictionary[key] = m;
if (m != null)
{
m.Account = accountMock.Object;
}
});
}
[Fact]
public void TestChangeCharacter()
{
var firstMobile = new Mobile((Serial)0x1);
firstMobile.DefaultMobileInit();
firstMobile.RawName = "Test Mobile";
var secondMobile = new Mobile((Serial)0x2);
secondMobile.DefaultMobileInit();
secondMobile.RawName = null;
var account = accountMock.Object;
account[0] = firstMobile;
account[1] = null;
account[2] = secondMobile;
// var account = new MockAccount(new[] { firstMobile, null, secondMobile });
var expected = new ChangeCharacter(account).Compile();
var ns = PacketTestUtilities.CreateTestNetState();
ns.SendChangeCharacter(account);
var result = ns.SendPipe.Reader.TryRead();
AssertThat.Equal(result.Buffer[0].AsSpan(0), expected);
}
[Fact]
public void TestClientVersionReq()
{
var expected = new ClientVersionReq().Compile();
var ns = PacketTestUtilities.CreateTestNetState();
ns.SendClientVersionRequest();
var result = ns.SendPipe.Reader.TryRead();
AssertThat.Equal(result.Buffer[0].AsSpan(0), expected);
}
[Fact]
public void TestDeleteResult()
{
var expected = new DeleteResult(DeleteResultType.BadRequest).Compile();
var ns = PacketTestUtilities.CreateTestNetState();
ns.SendCharacterDeleteResult(DeleteResultType.BadRequest);
var result = ns.SendPipe.Reader.TryRead();
AssertThat.Equal(result.Buffer[0].AsSpan(0), expected);
}
[Fact]
public void TestPopupMessage()
{
var expected = new PopupMessage(PMMessage.LoginSyncError).Compile();
var ns = PacketTestUtilities.CreateTestNetState();
ns.SendPopupMessage(PMMessage.LoginSyncError);
var result = ns.SendPipe.Reader.TryRead();
AssertThat.Equal(result.Buffer[0].AsSpan(0), expected);
}
[Theory, InlineData(ProtocolChanges.Version70610), InlineData(ProtocolChanges.Version6000)]
public void TestSupportedFeatures(ProtocolChanges protocolChanges)
{
var firstMobile = new Mobile((Serial)0x1);
firstMobile.DefaultMobileInit();
firstMobile.Name = "Test Mobile";
var account = accountMock.Object;
account[0] = firstMobile;
account[1] = null;
account[2] = null;
account[3] = null;
account[4] = null;
var ns = PacketTestUtilities.CreateTestNetState();
ns.Account = account;
ns.ProtocolChanges = protocolChanges;
var expected = new SupportedFeatures(ns).Compile();
ns.SendSupportedFeature();
var result = ns.SendPipe.Reader.TryRead();
AssertThat.Equal(result.Buffer[0].AsSpan(0), expected);
}
[Fact]
public void TestLoginConfirm()
{
var m = new Mobile((Serial)0x1);
m.DefaultMobileInit();
m.Body = 0x100;
m.X = 100;
m.Y = 10;
m.Z = -10;
m.Direction = Direction.Down;
m.LogoutMap = Map.Felucca;
var expected = new LoginConfirm(m).Compile();
var ns = PacketTestUtilities.CreateTestNetState();
ns.SendLoginConfirmation(m);
var result = ns.SendPipe.Reader.TryRead();
AssertThat.Equal(result.Buffer[0].AsSpan(0), expected);
}
[Fact]
public void TestLoginComplete()
{
var expected = new LoginComplete().Compile();
var ns = PacketTestUtilities.CreateTestNetState();
ns.SendLoginComplete();
var result = ns.SendPipe.Reader.TryRead();
AssertThat.Equal(result.Buffer[0].AsSpan(0), expected);
}
[Fact]
public void TestCharacterListUpdate()
{
var firstMobile = new Mobile((Serial)0x1);
firstMobile.DefaultMobileInit();
firstMobile.RawName = "Test Mobile";
var account = accountMock.Object;
account[0] = null;
account[1] = firstMobile;
account[2] = null;
account[3] = null;
account[4] = null;
var expected = new CharacterListUpdate(account).Compile();
var ns = PacketTestUtilities.CreateTestNetState();
ns.SendCharacterListUpdate(account);
var result = ns.SendPipe.Reader.TryRead();
AssertThat.Equal(result.Buffer[0].AsSpan(0), expected);
}
[Fact]
public void TestCharacterList70130()
{
var firstMobile = new Mobile((Serial)0x1);
firstMobile.DefaultMobileInit();
firstMobile.Name = "Test Mobile";
var account = accountMock.Object;
account[0] = null;
account[1] = firstMobile;
account[2] = null;
account[3] = null;
account[4] = null;
var info = new[]
get => _mobiles[index];
set
{
new CityInfo("Test City", "Test Building", 50, 100, 10, -10)
};
var expected = new CharacterList(account, info).Compile();
var ns = PacketTestUtilities.CreateTestNetState();
ns.CityInfo = info;
ns.Account = account;
ns.ProtocolChanges = ProtocolChanges.Version70130;
ns.SendCharacterList();
var result = ns.SendPipe.Reader.TryRead();
AssertThat.Equal(result.Buffer[0].AsSpan(0), expected);
_mobiles[index] = value;
if (value != null)
{
value.Account = this;
}
}
}
[Fact]
public void TestCharacterListOld()
public void Delete()
{
var firstMobile = new Mobile((Serial)0x1);
firstMobile.DefaultMobileInit();
firstMobile.Name = "Test Mobile";
var account = accountMock.Object;
account[0] = null;
account[1] = firstMobile;
account[2] = null;
account[3] = null;
account[4] = null;
var info = new[]
{
new CityInfo("Test City", "Test Building", 50, 100, 10, -10)
};
var expected = new CharacterListOld(account, info).Compile();
var ns = PacketTestUtilities.CreateTestNetState();
ns.CityInfo = info;
ns.Account = account;
ns.SendCharacterList();
var result = ns.SendPipe.Reader.TryRead();
AssertThat.Equal(result.Buffer[0].AsSpan(0), expected);
throw new NotImplementedException();
}
[Fact]
public void TestAccountLoginRej()
public void SetPassword(string password)
{
var reason = ALRReason.BadComm;
var expected = new AccountLoginRej(reason).Compile();
var ns = PacketTestUtilities.CreateTestNetState();
ns.SendAccountLoginRejected(reason);
var result = ns.SendPipe.Reader.TryRead();
AssertThat.Equal(result.Buffer[0].AsSpan(0), expected);
throw new NotImplementedException();
}
[Fact]
public void TestAccountLoginAck()
public bool CheckPassword(string password) => throw new NotImplementedException();
}
[Fact]
public void TestChangeCharacter()
{
var firstMobile = new Mobile((Serial)0x1);
firstMobile.DefaultMobileInit();
firstMobile.RawName = "Test Mobile";
var secondMobile = new Mobile((Serial)0x2);
secondMobile.DefaultMobileInit();
secondMobile.RawName = null;
var account = new MockedAccount
{
var info = new[]
{
new ServerInfo("Test Server", 0, TimeZoneInfo.Local, IPEndPoint.Parse("127.0.0.1"))
};
[0] = firstMobile,
[1] = null,
[2] = secondMobile
};
var expected = new AccountLoginAck(info).Compile();
// var account = new MockAccount(new[] { firstMobile, null, secondMobile });
var expected = new ChangeCharacter(account).Compile();
var ns = PacketTestUtilities.CreateTestNetState();
ns.ServerInfo = info;
var ns = PacketTestUtilities.CreateTestNetState();
ns.SendChangeCharacter(account);
ns.SendAccountLoginAck();
var result = ns.SendPipe.Reader.TryRead();
AssertThat.Equal(result.Buffer[0].AsSpan(0), expected);
}
var result = ns.SendPipe.Reader.TryRead();
AssertThat.Equal(result.Buffer[0].AsSpan(0), expected);
}
[Fact]
public void TestClientVersionReq()
{
var expected = new ClientVersionReq().Compile();
[Fact]
public void TestPlayServerAck()
var ns = PacketTestUtilities.CreateTestNetState();
ns.SendClientVersionRequest();
var result = ns.SendPipe.Reader.TryRead();
AssertThat.Equal(result.Buffer[0].AsSpan(0), expected);
}
[Fact]
public void TestDeleteResult()
{
var expected = new DeleteResult(DeleteResultType.BadRequest).Compile();
var ns = PacketTestUtilities.CreateTestNetState();
ns.SendCharacterDeleteResult(DeleteResultType.BadRequest);
var result = ns.SendPipe.Reader.TryRead();
AssertThat.Equal(result.Buffer[0].AsSpan(0), expected);
}
[Fact]
public void TestPopupMessage()
{
var expected = new PopupMessage(PMMessage.LoginSyncError).Compile();
var ns = PacketTestUtilities.CreateTestNetState();
ns.SendPopupMessage(PMMessage.LoginSyncError);
var result = ns.SendPipe.Reader.TryRead();
AssertThat.Equal(result.Buffer[0].AsSpan(0), expected);
}
[Theory, InlineData(ProtocolChanges.Version70610), InlineData(ProtocolChanges.Version6000)]
public void TestSupportedFeatures(ProtocolChanges protocolChanges)
{
var firstMobile = new Mobile((Serial)0x1);
firstMobile.DefaultMobileInit();
firstMobile.Name = "Test Mobile";
var account = new MockedAccount
{
var si = new ServerInfo("Test Server", 0, TimeZoneInfo.Local, IPEndPoint.Parse("127.0.0.1"));
var authId = 0x123456;
[0] = firstMobile,
[1] = null,
[2] = null,
[3] = null,
[4] = null
};
var expected = new PlayServerAck(si, authId).Compile();
var ns = PacketTestUtilities.CreateTestNetState();
ns.Account = account;
ns.ProtocolChanges = protocolChanges;
var ns = PacketTestUtilities.CreateTestNetState();
var expected = new SupportedFeatures(ns).Compile();
ns.SendSupportedFeature();
ns.SendPlayServerAck(si, authId);
var result = ns.SendPipe.Reader.TryRead();
AssertThat.Equal(result.Buffer[0].AsSpan(0), expected);
}
var result = ns.SendPipe.Reader.TryRead();
AssertThat.Equal(result.Buffer[0].AsSpan(0), expected);
}
[Fact]
public void TestLoginConfirm()
{
var m = new Mobile((Serial)0x1);
m.DefaultMobileInit();
m.Body = 0x100;
m.X = 100;
m.Y = 10;
m.Z = -10;
m.Direction = Direction.Down;
m.LogoutMap = Map.Felucca;
var expected = new LoginConfirm(m).Compile();
var ns = PacketTestUtilities.CreateTestNetState();
ns.SendLoginConfirmation(m);
var result = ns.SendPipe.Reader.TryRead();
AssertThat.Equal(result.Buffer[0].AsSpan(0), expected);
}
[Fact]
public void TestLoginComplete()
{
var expected = new LoginComplete().Compile();
var ns = PacketTestUtilities.CreateTestNetState();
ns.SendLoginComplete();
var result = ns.SendPipe.Reader.TryRead();
AssertThat.Equal(result.Buffer[0].AsSpan(0), expected);
}
[Fact]
public void TestCharacterListUpdate()
{
var firstMobile = new Mobile((Serial)0x1);
firstMobile.DefaultMobileInit();
firstMobile.RawName = "Test Mobile";
var account = new MockedAccount
{
[0] = null,
[1] = firstMobile,
[2] = null,
[3] = null,
[4] = null
};
var expected = new CharacterListUpdate(account).Compile();
var ns = PacketTestUtilities.CreateTestNetState();
ns.SendCharacterListUpdate(account);
var result = ns.SendPipe.Reader.TryRead();
AssertThat.Equal(result.Buffer[0].AsSpan(0), expected);
}
[Fact]
public void TestCharacterList70130()
{
var firstMobile = new Mobile((Serial)0x1);
firstMobile.DefaultMobileInit();
firstMobile.Name = "Test Mobile";
var account = new MockedAccount
{
[0] = null,
[1] = firstMobile,
[2] = null,
[3] = null,
[4] = null
};
var info = new[]
{
new CityInfo("Test City", "Test Building", 50, 100, 10, -10)
};
var expected = new CharacterList(account, info).Compile();
var ns = PacketTestUtilities.CreateTestNetState();
ns.CityInfo = info;
ns.Account = account;
ns.ProtocolChanges = ProtocolChanges.Version70130;
ns.SendCharacterList();
var result = ns.SendPipe.Reader.TryRead();
AssertThat.Equal(result.Buffer[0].AsSpan(0), expected);
}
[Fact]
public void TestCharacterListOld()
{
var firstMobile = new Mobile((Serial)0x1);
firstMobile.DefaultMobileInit();
firstMobile.Name = "Test Mobile";
var account = new MockedAccount
{
[0] = null,
[1] = firstMobile,
[2] = null,
[3] = null,
[4] = null
};
var info = new[]
{
new CityInfo("Test City", "Test Building", 50, 100, 10, -10)
};
var expected = new CharacterListOld(account, info).Compile();
var ns = PacketTestUtilities.CreateTestNetState();
ns.CityInfo = info;
ns.Account = account;
ns.SendCharacterList();
var result = ns.SendPipe.Reader.TryRead();
AssertThat.Equal(result.Buffer[0].AsSpan(0), expected);
}
[Fact]
public void TestAccountLoginRej()
{
var reason = ALRReason.BadComm;
var expected = new AccountLoginRej(reason).Compile();
var ns = PacketTestUtilities.CreateTestNetState();
ns.SendAccountLoginRejected(reason);
var result = ns.SendPipe.Reader.TryRead();
AssertThat.Equal(result.Buffer[0].AsSpan(0), expected);
}
[Fact]
public void TestAccountLoginAck()
{
var info = new[]
{
new ServerInfo("Test Server", 0, TimeZoneInfo.Local, IPEndPoint.Parse("127.0.0.1"))
};
var expected = new AccountLoginAck(info).Compile();
var ns = PacketTestUtilities.CreateTestNetState();
ns.ServerInfo = info;
ns.SendAccountLoginAck();
var result = ns.SendPipe.Reader.TryRead();
AssertThat.Equal(result.Buffer[0].AsSpan(0), expected);
}
[Fact]
public void TestPlayServerAck()
{
var si = new ServerInfo("Test Server", 0, TimeZoneInfo.Local, IPEndPoint.Parse("127.0.0.1"));
var authId = 0x123456;
var expected = new PlayServerAck(si, authId).Compile();
var ns = PacketTestUtilities.CreateTestNetState();
ns.SendPlayServerAck(si, authId);
var result = ns.SendPipe.Reader.TryRead();
AssertThat.Equal(result.Buffer[0].AsSpan(0), expected);
}
}