merge master into develop

Author: AnakinRaW

Directory.Build.props

@@ -21,7 +21,7 @@
 	<ItemGroup>
 		<PackageReference Include="Nerdbank.GitVersioning" Condition="!Exists('packages.config')">
 			<PrivateAssets>all</PrivateAssets>
-			<Version>3.6.146</Version>
+			<Version>3.7.112</Version>
 		</PackageReference>
 		<PackageReference Include="SauceControl.InheritDoc" Version="2.0.2" PrivateAssets="all" />
 		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">

src/EawModinfo.Tests/DetectedModReferenceTest.cs

@@ -0,0 +1,39 @@
+using System;
+using System.IO.Abstractions;
+using System.IO.Abstractions.TestingHelpers;
+using EawModinfo.Model;
+using EawModinfo.Spec;
+using EawModinfo.Utilities;
+using Xunit;
+
+namespace EawModinfo.Tests;
+
+public class DetectedModReferenceTest
+{
+    private readonly IFileSystem _fileSystem = new MockFileSystem();
+    
+    [Fact]
+    public void Constructor_ThrowsArgumentNullException()
+    {
+        var modReference = new ModReference("TestMod", ModType.Default);
+        var directory = _fileSystem.DirectoryInfo.New("TestDirectory");
+        Assert.Throws<ArgumentNullException>(() => new DetectedModReference(modReference, null!, null));
+        Assert.Throws<ArgumentNullException>(() => new DetectedModReference(null!, directory, null));
+    }
+
+    [Theory]
+    [InlineData(null)]
+    [InlineData("string")]
+    public void Constructor_InitializesPropertiesCorrectly_WhenValidArgumentsArePassed(string? modName)
+    {
+        var directory = _fileSystem.DirectoryInfo.New("TestDirectory");
+        var modReference = new ModReference("TestMod", ModType.Default);
+        IModinfo? modinfo = modName is null ? null : new ModinfoData(modName);
+
+        var detectedModReference = new DetectedModReference(modReference, directory, modinfo);
+
+        Assert.Equal(modReference, detectedModReference.ModReference);
+        Assert.Same(directory, detectedModReference.Directory);
+        Assert.Same(modinfo, detectedModReference.Modinfo);
+    }
+}

src/EawModinfo.Tests/EawModinfo.Tests.csproj

@@ -18,7 +18,7 @@
 		</PackageReference>
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
 		<PackageReference Include="System.IO.Abstractions" Version="21.1.7" />
-		<PackageReference Include="System.IO.Abstractions.TestingHelpers" Version="21.1.3" />
+		<PackageReference Include="System.IO.Abstractions.TestingHelpers" Version="21.1.7" />
 		<PackageReference Include="xunit" Version="2.9.2" />
 		<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
 			<PrivateAssets>all</PrivateAssets>

src/EawModinfo.Tests/ModIdentityEqualityTest.cs

@@ -42,7 +42,8 @@ public void Equal_GetHashCode_Instance()
         EqualityTestHelpers.AssertDefaultEquals<IModIdentity>(false, false, data, diffVer);
         EqualityTestHelpers.AssertDefaultEquals(false, false, data, diffListVer);
         EqualityTestHelpers.AssertDefaultEquals<IModIdentity>(false, false, data, diffListVer);
-        EqualityTestHelpers.AssertDefaultEquals(false, false, data, insensitiveName);
-        EqualityTestHelpers.AssertDefaultEquals<IModIdentity>(false, false, data, insensitiveName);
+
+        EqualityTestHelpers.AssertDefaultEquals(true, true, data, insensitiveName);
+        EqualityTestHelpers.AssertDefaultEquals<IModIdentity>(true, true, data, insensitiveName);
     }
 }

src/EawModinfo.Tests/ModIdentityEqualityTestsBase.cs

@@ -32,7 +32,7 @@ public void Equal_GetHashCode_Default()
         EqualityTestHelpers.AssertWithComparer(false,  comparer, data, diffDep);
         EqualityTestHelpers.AssertWithComparer(false,  comparer, data, diffVer);
         EqualityTestHelpers.AssertWithComparer(false,  comparer, data, diffListVer);
-        EqualityTestHelpers.AssertWithComparer(false, comparer, data, insensitiveName);
+        EqualityTestHelpers.AssertWithComparer(true, comparer, data, insensitiveName);
     }
 
     [Fact]

src/EawModinfo.Tests/ModInfoEqualityTest.cs

@@ -44,7 +44,7 @@ public void Equal_GetHashCode_Instance()
         EqualityTestHelpers.AssertDefaultEquals(false, false, data, diffListVer);
         EqualityTestHelpers.HashSetTest(false, ModIdentityEqualityComparer.Default, data, diffListVer);
 
-        EqualityTestHelpers.AssertDefaultEquals(false, false, data, insensitiveName);
-        EqualityTestHelpers.HashSetTest(false, ModIdentityEqualityComparer.Default, data, insensitiveName);
+        EqualityTestHelpers.AssertDefaultEquals(false, true, data, insensitiveName);
+        EqualityTestHelpers.HashSetTest(true, ModIdentityEqualityComparer.Default, data, insensitiveName);
     }
 }