From 84bb2eb28dec3810da20c3614f6ea2816ddc56e3 Mon Sep 17 00:00:00 2001 From: Lucas Falslev Date: Fri, 8 May 2026 11:21:01 -0600 Subject: [PATCH 1/2] resolve xunit warnings --- test/unit/ACLProcessorTest.cs | 150 +++++++++++----------- test/unit/DefaultLabelValuesCacheTests.cs | 4 +- test/unit/LDAPFilterTest.cs | 4 +- test/unit/LDAPUtilsTest.cs | 9 +- test/unit/LdapPropertyTests.cs | 12 +- test/unit/MetricAggregatorTests.cs | 3 +- test/unit/SPNProcessorsTest.cs | 8 +- 7 files changed, 94 insertions(+), 96 deletions(-) diff --git a/test/unit/ACLProcessorTest.cs b/test/unit/ACLProcessorTest.cs index c9da64d55..e7c9b0adf 100644 --- a/test/unit/ACLProcessorTest.cs +++ b/test/unit/ACLProcessorTest.cs @@ -256,10 +256,10 @@ public async Task ACLProcessor_ProcessACL_Yields_Owns_ACE() { Assert.Single(result); var actual = result.First(); - Assert.Equal(actual.PrincipalSID, expectedSID); - Assert.Equal(actual.PrincipalType, expectedPrincipalType); + Assert.Equal(expectedSID, actual.PrincipalSID); + Assert.Equal(expectedPrincipalType, actual.PrincipalType); Assert.False(actual.IsInherited); - Assert.Equal(actual.RightName, EdgeNames.Owns); + Assert.Equal(EdgeNames.Owns, actual.RightName); } [Fact] @@ -440,10 +440,10 @@ public async Task ACLProcessor_ProcessACL_GenericAll() { Assert.Single(result); var actual = result.First(); - Assert.Equal(actual.PrincipalType, expectedPrincipalType); - Assert.Equal(actual.PrincipalSID, expectedPrincipalSID); + Assert.Equal(expectedPrincipalType, actual.PrincipalType); + Assert.Equal(expectedPrincipalSID, actual.PrincipalSID); Assert.False(actual.IsInherited); - Assert.Equal(actual.RightName, EdgeNames.GenericAll); + Assert.Equal(EdgeNames.GenericAll, actual.RightName); } [Fact] @@ -478,10 +478,10 @@ public async Task ACLProcessor_ProcessACL_GenericAll_WriteSPN() { Assert.Single(result); var actual = result.First(); - Assert.Equal(actual.PrincipalType, expectedPrincipalType); - Assert.Equal(actual.PrincipalSID, expectedPrincipalSID); + Assert.Equal(expectedPrincipalType, actual.PrincipalType); + Assert.Equal(expectedPrincipalSID, actual.PrincipalSID); Assert.False(actual.IsInherited); - Assert.Equal(actual.RightName, EdgeNames.WriteSPN); + Assert.Equal(EdgeNames.WriteSPN, actual.RightName); } [Fact] @@ -516,10 +516,10 @@ public async Task ACLProcessor_ProcessACL_GenericAll_ForceChangePassword() { Assert.Single(result); var actual = result.First(); - Assert.Equal(actual.PrincipalType, expectedPrincipalType); - Assert.Equal(actual.PrincipalSID, expectedPrincipalSID); + Assert.Equal(expectedPrincipalType, actual.PrincipalType); + Assert.Equal(expectedPrincipalSID, actual.PrincipalSID); Assert.False(actual.IsInherited); - Assert.Equal(actual.RightName, EdgeNames.ForceChangePassword); + Assert.Equal(EdgeNames.ForceChangePassword, actual.RightName); } [Fact] @@ -589,10 +589,10 @@ public async Task ACLProcessor_ProcessACL_WriteDacl() { Assert.Single(result); var actual = result.First(); - Assert.Equal(actual.PrincipalType, expectedPrincipalType); - Assert.Equal(actual.PrincipalSID, expectedPrincipalSID); + Assert.Equal(expectedPrincipalType, actual.PrincipalType); + Assert.Equal(expectedPrincipalSID, actual.PrincipalSID); Assert.False(actual.IsInherited); - Assert.Equal(actual.RightName, expectedRightName.ToString()); + Assert.Equal(expectedRightName.ToString(), actual.RightName); } [Fact] @@ -662,10 +662,10 @@ public async Task ACLProcessor_ProcessACL_WriteOwner() { Assert.Single(result); var actual = result.First(); - Assert.Equal(actual.PrincipalType, expectedPrincipalType); - Assert.Equal(actual.PrincipalSID, expectedPrincipalSID); + Assert.Equal(expectedPrincipalType, actual.PrincipalType); + Assert.Equal(expectedPrincipalSID, actual.PrincipalSID); Assert.False(actual.IsInherited); - Assert.Equal(actual.RightName, expectedRightName.ToString()); + Assert.Equal(expectedRightName.ToString(), actual.RightName); } [Fact] @@ -735,10 +735,10 @@ public async Task ACLProcessor_ProcessACL_Self() { Assert.Single(result); var actual = result.First(); - Assert.Equal(actual.PrincipalType, expectedPrincipalType); - Assert.Equal(actual.PrincipalSID, expectedPrincipalSID); + Assert.Equal(expectedPrincipalType, actual.PrincipalType); + Assert.Equal(expectedPrincipalSID, actual.PrincipalSID); Assert.False(actual.IsInherited); - Assert.Equal(actual.RightName, expectedRightName); + Assert.Equal(expectedRightName, actual.RightName); } [Fact] @@ -774,10 +774,10 @@ public async Task ACLProcessor_ProcessACL_Self_AllGuid() { Assert.Single(result); var actual = result.First(); - Assert.Equal(actual.PrincipalType, expectedPrincipalType); - Assert.Equal(actual.PrincipalSID, expectedPrincipalSID); + Assert.Equal(expectedPrincipalType, actual.PrincipalType); + Assert.Equal(expectedPrincipalSID, actual.PrincipalSID); Assert.False(actual.IsInherited); - Assert.Equal(actual.RightName, expectedRightName); + Assert.Equal(expectedRightName, actual.RightName); } [Fact] @@ -878,10 +878,10 @@ public async Task ACLProcessor_ProcessACL_ExtendedRight_Domain_DSReplicationGetC Assert.Single(result); var actual = result.First(); - Assert.Equal(actual.PrincipalType, expectedPrincipalType); - Assert.Equal(actual.PrincipalSID, expectedPrincipalSID); + Assert.Equal(expectedPrincipalType, actual.PrincipalType); + Assert.Equal(expectedPrincipalSID, actual.PrincipalSID); Assert.False(actual.IsInherited); - Assert.Equal(actual.RightName, expectedRightName); + Assert.Equal(expectedRightName, actual.RightName); } [Fact] @@ -916,10 +916,10 @@ public async Task ACLProcessor_ProcessACL_ExtendedRight_Domain_All() { Assert.Single(result); var actual = result.First(); - Assert.Equal(actual.PrincipalType, expectedPrincipalType); - Assert.Equal(actual.PrincipalSID, expectedPrincipalSID); + Assert.Equal(expectedPrincipalType, actual.PrincipalType); + Assert.Equal(expectedPrincipalSID, actual.PrincipalSID); Assert.False(actual.IsInherited); - Assert.Equal(actual.RightName, expectedRightName); + Assert.Equal(expectedRightName, actual.RightName); } [Fact] @@ -957,10 +957,10 @@ public async Task ACLProcessor_ProcessACL_ExtendedRight_Domain_DSReplicationGetC Assert.Single(result); var actual = result.First(); - Assert.Equal(actual.PrincipalType, expectedPrincipalType); - Assert.Equal(actual.PrincipalSID, expectedPrincipalSID); + Assert.Equal(expectedPrincipalType, actual.PrincipalType); + Assert.Equal(expectedPrincipalSID, actual.PrincipalSID); Assert.False(actual.IsInherited); - Assert.Equal(actual.RightName, expectedRightName); + Assert.Equal(expectedRightName, actual.RightName); } [Fact] @@ -1602,10 +1602,10 @@ public async Task ACLProcessor_ProcessACL_ExtendedRight_Domain_DSReplicationGetC Assert.Single(result); var actual = result.First(); - Assert.Equal(actual.PrincipalType, expectedPrincipalType); - Assert.Equal(actual.PrincipalSID, expectedPrincipalSID); + Assert.Equal(expectedPrincipalType, actual.PrincipalType); + Assert.Equal(expectedPrincipalSID, actual.PrincipalSID); Assert.False(actual.IsInherited); - Assert.Equal(actual.RightName, expectedRightName); + Assert.Equal(expectedRightName, actual.RightName); } [Fact] @@ -1641,10 +1641,10 @@ public async Task ACLProcessor_ProcessACL_GenericWrite_User_WriteSPN() Assert.Single(result); var actual = result.First(); - Assert.Equal(actual.PrincipalType, expectedPrincipalType); - Assert.Equal(actual.PrincipalSID, expectedPrincipalSID); + Assert.Equal(expectedPrincipalType, actual.PrincipalType); + Assert.Equal(expectedPrincipalSID, actual.PrincipalSID); Assert.False(actual.IsInherited); - Assert.Equal(actual.RightName, expectedRightName); + Assert.Equal(expectedRightName, actual.RightName); } [Fact] @@ -1680,10 +1680,10 @@ public async Task ACLProcessor_ProcessACL_GenericWrite_Computer_UserAccountRestr Assert.Single(result); var actual = result.First(); - Assert.Equal(actual.PrincipalType, expectedPrincipalType); - Assert.Equal(actual.PrincipalSID, expectedPrincipalSID); + Assert.Equal(expectedPrincipalType, actual.PrincipalType); + Assert.Equal(expectedPrincipalSID, actual.PrincipalSID); Assert.False(actual.IsInherited); - Assert.Equal(actual.RightName, expectedRightName); + Assert.Equal(expectedRightName, actual.RightName); } [Fact] @@ -1719,10 +1719,10 @@ public async Task ACLProcessor_ProcessACL_GenericWrite_Domain_WriteGPLink() Assert.Single(result); var actual = result.First(); - Assert.Equal(actual.PrincipalType, expectedPrincipalType); - Assert.Equal(actual.PrincipalSID, expectedPrincipalSID); + Assert.Equal(expectedPrincipalType, actual.PrincipalType); + Assert.Equal(expectedPrincipalSID, actual.PrincipalSID); Assert.False(actual.IsInherited); - Assert.Equal(actual.RightName, expectedRightName); + Assert.Equal(expectedRightName, actual.RightName); } [Fact] @@ -1758,10 +1758,10 @@ public async Task ACLProcessor_ProcessACL_GenericWrite_OU_WriteGPLink() Assert.Single(result); var actual = result.First(); - Assert.Equal(actual.PrincipalType, expectedPrincipalType); - Assert.Equal(actual.PrincipalSID, expectedPrincipalSID); + Assert.Equal(expectedPrincipalType, actual.PrincipalType); + Assert.Equal(expectedPrincipalSID, actual.PrincipalSID); Assert.False(actual.IsInherited); - Assert.Equal(actual.RightName, expectedRightName); + Assert.Equal(expectedRightName, actual.RightName); } [Fact] @@ -1797,10 +1797,10 @@ public async Task ACLProcessor_ProcessACL_GenericWrite_User_AddKeyPrincipal() Assert.Single(result); var actual = result.First(); - Assert.Equal(actual.PrincipalType, expectedPrincipalType); - Assert.Equal(actual.PrincipalSID, expectedPrincipalSID); + Assert.Equal(expectedPrincipalType, actual.PrincipalType); + Assert.Equal(expectedPrincipalSID, actual.PrincipalSID); Assert.False(actual.IsInherited); - Assert.Equal(actual.RightName, expectedRightName); + Assert.Equal(expectedRightName, actual.RightName); } [Fact] @@ -1836,10 +1836,10 @@ public async Task ACLProcessor_ProcessACL_GenericWrite_Computer_AddKeyPrincipal( Assert.Single(result); var actual = result.First(); - Assert.Equal(actual.PrincipalType, expectedPrincipalType); - Assert.Equal(actual.PrincipalSID, expectedPrincipalSID); + Assert.Equal(expectedPrincipalType, actual.PrincipalType); + Assert.Equal(expectedPrincipalSID, actual.PrincipalSID); Assert.False(actual.IsInherited); - Assert.Equal(actual.RightName, expectedRightName); + Assert.Equal(expectedRightName, actual.RightName); } [Fact] @@ -1875,10 +1875,10 @@ public async Task ACLProcessor_ProcessACL_GenericWrite_CertTemplate_PKIEnrollmen Assert.Single(result); var actual = result.First(); - Assert.Equal(actual.PrincipalType, expectedPrincipalType); - Assert.Equal(actual.PrincipalSID, expectedPrincipalSID); + Assert.Equal(expectedPrincipalType, actual.PrincipalType); + Assert.Equal(expectedPrincipalSID, actual.PrincipalSID); Assert.False(actual.IsInherited); - Assert.Equal(actual.RightName, expectedRightName); + Assert.Equal(expectedRightName, actual.RightName); } [Fact] @@ -1925,10 +1925,10 @@ public async Task ACLProcessor_ProcessACL_LAPS_CertTemplate_AllGuid() Assert.Single(result); var actual = result.First(); - Assert.Equal(actual.PrincipalType, expectedPrincipalType); - Assert.Equal(actual.PrincipalSID, expectedPrincipalSID); + Assert.Equal(expectedPrincipalType, actual.PrincipalType); + Assert.Equal(expectedPrincipalSID, actual.PrincipalSID); Assert.False(actual.IsInherited); - Assert.Equal(actual.RightName, expectedRightName); + Assert.Equal(expectedRightName, actual.RightName); } [Fact] @@ -1975,10 +1975,10 @@ public async Task ACLProcessor_ProcessACL_LAPS_CertTemplate_Enroll() Assert.Single(result); var actual = result.First(); - Assert.Equal(actual.PrincipalType, expectedPrincipalType); - Assert.Equal(actual.PrincipalSID, expectedPrincipalSID); + Assert.Equal(expectedPrincipalType, actual.PrincipalType); + Assert.Equal(expectedPrincipalSID, actual.PrincipalSID); Assert.False(actual.IsInherited); - Assert.Equal(actual.RightName, expectedRightName); + Assert.Equal(expectedRightName, actual.RightName); } [Fact] @@ -2014,10 +2014,10 @@ public async Task ACLProcessor_ProcessACL_GenericWrite_EnterpriseCA() Assert.Single(result); var actual = result.First(); - Assert.Equal(actual.PrincipalType, expectedPrincipalType); - Assert.Equal(actual.PrincipalSID, expectedPrincipalSID); + Assert.Equal(expectedPrincipalType, actual.PrincipalType); + Assert.Equal(expectedPrincipalSID, actual.PrincipalSID); Assert.False(actual.IsInherited); - Assert.Equal(actual.RightName, expectedRightName); + Assert.Equal(expectedRightName, actual.RightName); } [Fact] @@ -2053,10 +2053,10 @@ public async Task ACLProcessor_ProcessACL_EnterpriseCA_ManageCA() Assert.Single(result); var actual = result.First(); - Assert.Equal(actual.PrincipalType, expectedPrincipalType); - Assert.Equal(actual.PrincipalSID, expectedPrincipalSID); + Assert.Equal(expectedPrincipalType, actual.PrincipalType); + Assert.Equal(expectedPrincipalSID, actual.PrincipalSID); Assert.False(actual.IsInherited); - Assert.Equal(actual.RightName, expectedRightName); + Assert.Equal(expectedRightName, actual.RightName); } [Fact] @@ -2092,10 +2092,10 @@ public async Task ACLProcessor_ProcessACL_EnterpriseCA_ManageCertificates() Assert.Single(result); var actual = result.First(); - Assert.Equal(actual.PrincipalType, expectedPrincipalType); - Assert.Equal(actual.PrincipalSID, expectedPrincipalSID); + Assert.Equal(expectedPrincipalType, actual.PrincipalType); + Assert.Equal(expectedPrincipalSID, actual.PrincipalSID); Assert.False(actual.IsInherited); - Assert.Equal(actual.RightName, expectedRightName); + Assert.Equal(expectedRightName, actual.RightName); } [Fact] @@ -2131,10 +2131,10 @@ public async Task ACLProcessor_ProcessACL_EnterpriseCA_Enroll() Assert.Single(result); var actual = result.First(); - Assert.Equal(actual.PrincipalType, expectedPrincipalType); - Assert.Equal(actual.PrincipalSID, expectedPrincipalSID); + Assert.Equal(expectedPrincipalType, actual.PrincipalType); + Assert.Equal(expectedPrincipalSID, actual.PrincipalSID); Assert.False(actual.IsInherited); - Assert.Equal(actual.RightName, expectedRightName); + Assert.Equal(expectedRightName, actual.RightName); } } } \ No newline at end of file diff --git a/test/unit/DefaultLabelValuesCacheTests.cs b/test/unit/DefaultLabelValuesCacheTests.cs index d8634d6d7..71716fe95 100644 --- a/test/unit/DefaultLabelValuesCacheTests.cs +++ b/test/unit/DefaultLabelValuesCacheTests.cs @@ -50,7 +50,7 @@ public void Empty_Intern_Returns_Empty_Array() { } [Fact] - public void LabelValuesCache_ReturnsSameReference_UnderConcurrency() + public async Task LabelValuesCache_ReturnsSameReference_UnderConcurrency() { // setup var cache = new DefaultLabelValuesCache(); @@ -72,7 +72,7 @@ public void LabelValuesCache_ReturnsSameReference_UnderConcurrency() } // act - Task.WaitAll(tasks); + await Task.WhenAll(tasks); // assert // Take the first reference diff --git a/test/unit/LDAPFilterTest.cs b/test/unit/LDAPFilterTest.cs index 84e44f95b..b4f10d233 100644 --- a/test/unit/LDAPFilterTest.cs +++ b/test/unit/LDAPFilterTest.cs @@ -100,8 +100,8 @@ public void LDAPFilter_GetFilterList_MergeFilter() } // Check that each of userFilter and computerFilter are accounted for - Assert.Single(filters.Where(f => f.Contains(userFilter))); - Assert.Single(filters.Where(f => f.Contains(computerFilter))); + Assert.Single(filters, f => f.Contains(userFilter)); + Assert.Single(filters, f => f.Contains(computerFilter)); Assert.Equal(2, filters.Count()); } diff --git a/test/unit/LDAPUtilsTest.cs b/test/unit/LDAPUtilsTest.cs index d6d6514ec..33ea5d067 100644 --- a/test/unit/LDAPUtilsTest.cs +++ b/test/unit/LDAPUtilsTest.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.DirectoryServices.ActiveDirectory; using System.Runtime.Versioning; using System.Threading.Tasks; using CommonLibTest.Facades; @@ -60,7 +59,7 @@ public async Task ResolveIDAndType_DuplicateSid_ReturnsNull() { } [Fact] - public async void ResolveIDAndType_WellKnownAdministrators_ReturnsConvertedSID() { + public async Task ResolveIDAndType_WellKnownAdministrators_ReturnsConvertedSID() { var test = await _utils.ResolveIDAndType("S-1-5-32-544", "TESTLAB.LOCAL"); Assert.True(test.Success); Assert.NotNull(test.Principal); @@ -69,7 +68,7 @@ public async void ResolveIDAndType_WellKnownAdministrators_ReturnsConvertedSID() } [Fact] - public async void GetWellKnownPrincipal_EnterpriseDomainControllers_ReturnsCorrectedSID() + public async Task GetWellKnownPrincipal_EnterpriseDomainControllers_ReturnsCorrectedSID() { var mock = new Mock(); mock.Setup(x => x.GetForest(It.IsAny())).ReturnsAsync((true, _testForestName)); @@ -80,14 +79,14 @@ public async void GetWellKnownPrincipal_EnterpriseDomainControllers_ReturnsCorre } [Fact] - public async void GetWellKnownPrincipal_NonWellKnown_ReturnsNull() { + public async Task GetWellKnownPrincipal_NonWellKnown_ReturnsNull() { var result = await _utils.GetWellKnownPrincipal("S-1-5-21-123456-78910", _testDomainName); Assert.False(result.Success); Assert.Null(result.WellKnownPrincipal); } [Fact] - public async void GetWellKnownPrincipal_WithDomain_ConvertsSID() { + public async Task GetWellKnownPrincipal_WithDomain_ConvertsSID() { var result = await _utils.GetWellKnownPrincipal("S-1-5-32-544", _testDomainName); Assert.True(result.Success); diff --git a/test/unit/LdapPropertyTests.cs b/test/unit/LdapPropertyTests.cs index 6fe094509..49aaa4622 100644 --- a/test/unit/LdapPropertyTests.cs +++ b/test/unit/LdapPropertyTests.cs @@ -31,7 +31,7 @@ public LdapPropertyTests(ITestOutputHelper testOutputHelper) } [Fact] - public async void LDAPPropertyProcessor_ReadDomainProperties_TestGoodData() + public async Task LDAPPropertyProcessor_ReadDomainProperties_TestGoodData() { var mock = new MockDirectoryObject("DC\u003dtestlab,DC\u003dlocal", new Dictionary { @@ -48,7 +48,7 @@ public async void LDAPPropertyProcessor_ReadDomainProperties_TestGoodData() } [Fact] - public async void LDAPPropertyProcessor_ReadDomainProperties_TestBadFunctionalLevel() + public async Task LDAPPropertyProcessor_ReadDomainProperties_TestBadFunctionalLevel() { var mock = new MockDirectoryObject("DC\u003dtestlab,DC\u003dlocal", new Dictionary { @@ -1206,7 +1206,7 @@ public void LDAPPropertyProcessor_ParseAllProperties_GUID() { [Theory] [MemberData(nameof(ReadDomainPropertiesData))] - public async void LDAPPropertyProcessor_ReadDomainProperties(MockDirectoryObject mock, + public async Task LDAPPropertyProcessor_ReadDomainProperties(MockDirectoryObject mock, string expectedProp, T expectedValue) { var processor = new LdapPropertyProcessor(new MockLdapUtils()); @@ -1328,7 +1328,7 @@ public async void LDAPPropertyProcessor_ReadDomainProperties(MockDirectoryObj }; [Fact] - public async void LDAPPropertyProcessor_ReadDomainProperties_ConvertNanoDuration_TestNull() + public async Task LDAPPropertyProcessor_ReadDomainProperties_ConvertNanoDuration_TestNull() { var mock = new MockDirectoryObject("DC\u003dtestlab,DC\u003dlocal", new Dictionary { @@ -1342,7 +1342,7 @@ public async void LDAPPropertyProcessor_ReadDomainProperties_ConvertNanoDuration [Theory] [MemberData(nameof(ReadUserPropertiesData))] - public async void LDAPPropertyProcessor_ReadUserProperties(MockDirectoryObject mock, + public async Task LDAPPropertyProcessor_ReadUserProperties(MockDirectoryObject mock, string expectedProp, T expectedValue) { var processor = new LdapPropertyProcessor(new MockLdapUtils()); @@ -1619,7 +1619,7 @@ public async Task LDAPPropertyProcessor_ReadComputerProperties_AllowedToActOnBeh [Theory] [MemberData(nameof(ConvertEncryptionTypesData))] - public async void LDAPPropertyProcessor_ConvertEncryptionTypes(MockDirectoryObject mock, + public async Task LDAPPropertyProcessor_ConvertEncryptionTypes(MockDirectoryObject mock, string expectedProp, List expectedValue) { var processor = new LdapPropertyProcessor(new MockLdapUtils()); diff --git a/test/unit/MetricAggregatorTests.cs b/test/unit/MetricAggregatorTests.cs index 820bbfe10..21cab625f 100644 --- a/test/unit/MetricAggregatorTests.cs +++ b/test/unit/MetricAggregatorTests.cs @@ -4,12 +4,11 @@ using SharpHoundCommonLib.Models; using SharpHoundCommonLib.Services; using Xunit; -using Xunit.Abstractions; namespace CommonLibTest; -public class MetricAggregatorTests(ITestOutputHelper output) { +public class MetricAggregatorTests { [Theory] [MemberData(nameof(MetricAggregatorTestData.CreateTestData), MemberType = typeof(MetricAggregatorTestData))] diff --git a/test/unit/SPNProcessorsTest.cs b/test/unit/SPNProcessorsTest.cs index 183cc8fb9..ccee1ca92 100644 --- a/test/unit/SPNProcessorsTest.cs +++ b/test/unit/SPNProcessorsTest.cs @@ -65,7 +65,7 @@ public async Task ReadSPNTargets_BadPortSupplied_ParsedCorrectly() } [Fact] - public async void ReadSPNTargets_SuppliedPort_ParsedCorrectly() + public async Task ReadSPNTargets_SuppliedPort_ParsedCorrectly() { var processor = new SPNProcessors(new MockLdapUtils()); string[] servicePrincipalNames = {"MSSQLSvc/PRIMARY.TESTLAB.LOCAL:2345"}; @@ -86,7 +86,7 @@ public async void ReadSPNTargets_SuppliedPort_ParsedCorrectly() } [Fact] - public async void ReadSPNTargets_MissingMssqlSvc_NotRead() + public async Task ReadSPNTargets_MissingMssqlSvc_NotRead() { var processor = new SPNProcessors(new MockLdapUtils()); string[] servicePrincipalNames = {"myhost.redmond.microsoft.com:1433"}; @@ -96,7 +96,7 @@ public async void ReadSPNTargets_MissingMssqlSvc_NotRead() } [Fact] - public async void ReadSPNTargets_SPNWithAddressSign_NotRead() + public async Task ReadSPNTargets_SPNWithAddressSign_NotRead() { var processor = new SPNProcessors(new MockLdapUtils()); string[] servicePrincipalNames = {"MSSQLSvc/myhost.redmond.microsoft.com:1433 user@domain"}; @@ -106,7 +106,7 @@ public async void ReadSPNTargets_SPNWithAddressSign_NotRead() } [Fact] - public async void ReadSPNTargets_SendComputerStatus() + public async Task ReadSPNTargets_SendComputerStatus() { var processor = new SPNProcessors(new MockLdapUtils()); string[] servicePrincipalNames = {"MSSQLSvc/PRIMARY.TESTLAB.LOCAL:2345"}; From 9b276ee82bc849c4325ea486ca12eed923c0093a Mon Sep 17 00:00:00 2001 From: Lucas Falslev Date: Fri, 8 May 2026 11:32:36 -0600 Subject: [PATCH 2/2] materialize filter list to avoid multiple enumeration --- test/unit/LDAPFilterTest.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/unit/LDAPFilterTest.cs b/test/unit/LDAPFilterTest.cs index b4f10d233..3c5f86d07 100644 --- a/test/unit/LDAPFilterTest.cs +++ b/test/unit/LDAPFilterTest.cs @@ -86,7 +86,7 @@ public void LDAPFilter_GetFilterList_MergeFilter() test.AddFilter(mandatoryFilter1, true); test.AddFilter(mandatoryFilter2, true); - IEnumerable filters = test.GetFilterList(); + IReadOnlyList filters = test.GetFilterList().ToList(); string computerFilter = "(samaccounttype=805306369)"; string userFilter = "(|(samaccounttype=805306368)(samaccounttype=805306370))"; @@ -103,7 +103,7 @@ public void LDAPFilter_GetFilterList_MergeFilter() Assert.Single(filters, f => f.Contains(userFilter)); Assert.Single(filters, f => f.Contains(computerFilter)); - Assert.Equal(2, filters.Count()); + Assert.Equal(2, filters.Count); } #endregion