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

modernuo · Aug 17, 2023 · 35b7c35 · 35b7c35
1 parent 2c8d545
commit 35b7c35
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 13 deletions.
diff --git a/Projects/Server.Tests/Server.Tests.csproj b/Projects/Server.Tests/Server.Tests.csproj
@@ -4,7 +4,7 @@
         <Configurations>Debug;Release;Analyze</Configurations>
     </PropertyGroup>
     <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.runner.visualstudio" Version="2.5.0" />
         <ProjectReference Include="..\Server\Server.csproj" />

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

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

diff --git a/Projects/UOContent.Tests/Tests/Multis/Boats/BoatPacketTests.cs b/Projects/UOContent.Tests/Tests/Multis/Boats/BoatPacketTests.cs
@@ -102,19 +102,33 @@ public void TestDisplayBoatHS()
         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 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) =>
-            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 MockedMobile(Serial serial) : base(serial)
+        {
+        }
+
         public override bool CanSee(Mobile m) => m == this;
 
         public override bool CanSee(Item i) => CanSeeEntities.Contains(i);

diff --git a/Projects/UOContent.Tests/UOContent.Tests.csproj b/Projects/UOContent.Tests/UOContent.Tests.csproj
@@ -4,7 +4,7 @@
         <Configurations>Debug;Release;Analyze</Configurations>
     </PropertyGroup>
     <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.runner.visualstudio" Version="2.5.0" />
         <ProjectReference Include="..\Server\Server.csproj" />