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

fix: Fixes tests to use C# 11 syntax (#1462)

Browse source
This commit is contained in:
Kamron Batman 2023-08-17 00:58:44 -07:00 • committed by GitHub
parent 2c8d54549c
commit 35b7c35167
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 37 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Projects/Server.Tests/Server.Tests.csproj
View file

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

12
Projects/Server.Tests/Tests/Collections/PooledRefQueueTests.cs
View file

@ -7,10 +7,16 @@ namespace Server.Tests;
public sealed class PooledRefQueueTests : IDisposable public sealed class PooledRefQueueTests : IDisposable
{ {
private class MockedRandomSource(int queueCount, int mockedValue) : IRandomSource private class MockedRandomSource : IRandomSource
{ {
private int _queueCount = queueCount; private int _queueCount;
private int _mockedValue = mockedValue; private int _mockedValue;
public MockedRandomSource(int queueCount, int mockedValue)
{
_queueCount = queueCount;
_mockedValue = mockedValue;
}
public int Next() => throw new NotImplementedException(); public int Next() => throw new NotImplementedException();

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

@ -7,7 +7,9 @@ namespace Server.Engines.MLQuests;
public class MLQuestPacketTests public class MLQuestPacketTests
{ {
private class MockedRace( private class MockedRace : Race
{
public MockedRace(
int raceID, int raceID,
int raceIndex, int raceIndex,
string name, string name,
@ -17,8 +19,8 @@ public class MLQuestPacketTests
int maleGhostBody, int maleGhostBody,
int femaleGhostBody, int femaleGhostBody,
Expansion requiredExpansion Expansion requiredExpansion
) ) : base(
: Race(raceID, raceID,
raceIndex, raceIndex,
name, name,
pluralName, pluralName,
@ -28,7 +30,9 @@ public class MLQuestPacketTests
femaleGhostBody, femaleGhostBody,
requiredExpansion requiredExpansion
) )
{ {
}
public override bool ValidateHair(bool female, int itemID) => throw new NotImplementedException(); public override bool ValidateHair(bool female, int itemID) => throw new NotImplementedException();
public override int RandomHair(bool female) => throw new NotImplementedException(); public override int RandomHair(bool female) => throw new NotImplementedException();

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

@ -102,19 +102,33 @@ public class BoatPacketTests : IClassFixture<ServerFixture>
AssertThat.Equal(result.Buffer[0].AsSpan(0), expected); AssertThat.Equal(result.Buffer[0].AsSpan(0), expected);
} }
private class TestBoat(Serial serial, List<IEntity> list, List<IEntity> notContainedList) : BaseBoat(serial) private class TestBoat : BaseBoat
{ {
private readonly List<IEntity> _list;
private readonly List<IEntity> _notContainedList;
public TestBoat(Serial serial, List<IEntity> list, List<IEntity> notContainedList) : base(serial)
{
_list = list;
_notContainedList = notContainedList;
}
public override MultiComponentList Components { get; } = new(new List<MultiTileEntry>()); 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 bool Contains(int x, int y) => !_notContainedList.Any(e => e.X == x && e.Y == y);
public override MovingEntitiesEnumerable GetMovingEntities(bool includeBoat = false) => public override MovingEntitiesEnumerable GetMovingEntities(bool includeBoat = false) =>
new(this, true, new Map.PooledEnumerable<IEntity>(list)); new(this, true, new Map.PooledEnumerable<IEntity>(_list));
} }
private class MockedMobile(Serial serial) : Mobile(serial) private class MockedMobile : Mobile
{ {
public HashSet<IEntity> CanSeeEntities = new(); public HashSet<IEntity> CanSeeEntities = new();
public MockedMobile(Serial serial) : base(serial)
{
}
public override bool CanSee(Mobile m) => m == this; public override bool CanSee(Mobile m) => m == this;
public override bool CanSee(Item i) => CanSeeEntities.Contains(i); public override bool CanSee(Item i) => CanSeeEntities.Contains(i);

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

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