Skip to content

Commit

Permalink
Merge pull request #162 from dorssel/fix_warnings
Browse files Browse the repository at this point in the history 
Fix analyzer suggestions
  • Loading branch information
@dorssel
dorssel authored Feb 20, 2025
2 parents 847bb76 + d1915dd commit 4076486
Show file tree
Hide file tree
Showing 18 changed files with 69 additions and 68 deletions.
1 change: 1 addition & 0 deletions .editorconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ dotnet_style_prefer_inferred_tuple_names = true:suggestion
dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion
dotnet_style_prefer_simplified_boolean_expressions = true:suggestion
dotnet_style_prefer_simplified_interpolation = true:suggestion
csharp_style_prefer_unbound_generic_type_in_nameof = true:suggestion
dotnet_style_qualification_for_event = false:suggestion
dotnet_style_qualification_for_field = false:suggestion
dotnet_style_qualification_for_method = false:suggestion
Expand Down
2 changes: 1 addition & 1 deletion UnitTests/Internal.UnitTests/ErrorStringMarshallerTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ sealed unsafe class ErrorStringMarshallerTests
[TestMethod]
public void ConvertToUnmanagedThrows()
{
Assert.ThrowsException<NotImplementedException>(() =>
Assert.ThrowsExactly<NotImplementedException>(() =>
{
ErrorStringMarshaller.ConvertToUnmanaged(string.Empty);
});
Expand Down
4 changes: 2 additions & 2 deletions UnitTests/Internal.UnitTests/InteropServices/CriticalXmssHandleTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public void SwapWith_ThisClosed()

other.Dispose();

Assert.ThrowsException<ObjectDisposedException>(() =>
Assert.ThrowsExactly<ObjectDisposedException>(() =>
{
blob.SwapWith(other);
});
Expand All @@ -55,7 +55,7 @@ public void SwapWith_OtherClosed()

other.Dispose();

Assert.ThrowsException<ObjectDisposedException>(() =>
Assert.ThrowsExactly<ObjectDisposedException>(() =>
{
blob.SwapWith(other);
});
Expand Down
2 changes: 1 addition & 1 deletion UnitTests/Internal.UnitTests/VersionTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public void ThrowIfVersionsNotEqual()
[TestMethod]
public void ThrowIfVersionsNotEqual_Throws()
{
Assert.ThrowsException<DllNotFoundException>(() =>
Assert.ThrowsExactly<DllNotFoundException>(() =>
{
Xmss.ThrowIfVersionsNotEqual(Defines.XMSS_LIBRARY_VERSION, uint.MaxValue);
});
Expand Down
6 changes: 3 additions & 3 deletions UnitTests/Internal.UnitTests/XmssExceptionTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public void Constructor_Error_Inner()
[TestMethod]
public void ThrowIfNotOkay_Error()
{
Assert.ThrowsException<XmssException>(() =>
Assert.ThrowsExactly<XmssException>(() =>
{
XmssException.ThrowIfNotOkay(XmssError.XMSS_ERR_FAULT_DETECTED);
});
Expand All @@ -58,7 +58,7 @@ public void ThrowFaultDetectedIf_False()
[TestMethod]
public void ThrowFaultDetectedIf_True()
{
Assert.ThrowsException<XmssException>(() =>
Assert.ThrowsExactly<XmssException>(() =>
{
XmssException.ThrowFaultDetectedIf(true);
});
Expand All @@ -75,7 +75,7 @@ public void ThrowFaultDetectedIf_Exception()
{
var inner = new InvalidOperationException();

var exception = Assert.ThrowsException<XmssException>(() =>
var exception = Assert.ThrowsExactly<XmssException>(() =>
{
XmssException.ThrowFaultDetectedIf(inner);
});
Expand Down
2 changes: 1 addition & 1 deletion UnitTests/NativeHelper.UnitTests/NativeHelperTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public static void AssemblyInitialize(TestContext testContext)
[TestMethod]
public void LoadUnknownLibraryFails()
{
Assert.ThrowsException<DllNotFoundException>(() =>
Assert.ThrowsExactly<DllNotFoundException>(() =>
{
_ = NativeMethods.unknown_library();
});
Expand Down
2 changes: 1 addition & 1 deletion UnitTests/NativeHelper.UnitTests/NoRuntimeTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public void TestCleanup()
[TestMethod]
public void LoadFails()
{
Assert.ThrowsException<DllNotFoundException>(() =>
Assert.ThrowsExactly<DllNotFoundException>(() =>
{
_ = NativeMethods.xmss_library_get_version();
});
Expand Down
2 changes: 1 addition & 1 deletion UnitTests/NativeHelper.UnitTests/NoRuntimesTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public void TestCleanup()
[TestMethod]
public void LoadFails()
{
Assert.ThrowsException<DllNotFoundException>(() =>
Assert.ThrowsExactly<DllNotFoundException>(() =>
{
_ = NativeMethods.xmss_library_get_version();
});
Expand Down
4 changes: 2 additions & 2 deletions UnitTests/UnitTests/CalculateTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ await xmss.CalculatePublicKeyAsync((percentage) =>
Assert.IsTrue(xmss.HasPrivateKey);
Assert.IsTrue(xmss.HasPublicKey);

await Assert.ThrowsExceptionAsync<InvalidOperationException>(async () =>
await Assert.ThrowsExactlyAsync<InvalidOperationException>(async () =>
{
await xmss.CalculatePublicKeyAsync();
});
Expand All @@ -121,7 +121,7 @@ public async Task CalculatePublicKeyAsync_DeletePublicFails()

stateManager.Setup(false); // DeletePublicPart

await Assert.ThrowsExceptionAsync<XmssStateManagerException>(async () =>
await Assert.ThrowsExactlyAsync<XmssStateManagerException>(async () =>
{
await xmss.CalculatePublicKeyAsync();
});
Expand Down
2 changes: 1 addition & 1 deletion UnitTests/UnitTests/CryptoConfigTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public void SignatureAlgorithm_Invalid()
{
using var xmss = new Xmss();

Assert.ThrowsException<InvalidOperationException>(() =>
Assert.ThrowsExactly<InvalidOperationException>(() =>
{
_ = xmss.SignatureAlgorithm;
});
Expand Down
4 changes: 2 additions & 2 deletions UnitTests/UnitTests/GenerateTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public void GeneratePrivateKey_StoreStatelessFails()
stateManager.Setup(); // Purge
stateManager.Setup(false); // Store stateless

Assert.ThrowsException<XmssStateManagerException>(() =>
Assert.ThrowsExactly<XmssStateManagerException>(() =>
{
xmss.GeneratePrivateKey(stateManager, XmssParameterSet.XMSS_SHA2_10_256, false);
});
Expand All @@ -94,7 +94,7 @@ public void GeneratePrivateKey_StoreStatelessAndRollbackFail()
stateManager.Setup(false); // Store stateless
stateManager.Setup(false); // Purge

Assert.ThrowsException<AggregateException>(() =>
Assert.ThrowsExactly<AggregateException>(() =>
{
xmss.GeneratePrivateKey(stateManager, XmssParameterSet.XMSS_SHA2_10_256, false);
});
Expand Down
20 changes: 10 additions & 10 deletions UnitTests/UnitTests/ImportTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public void ImportPrivateKey_Invalid()
Array.Clear(stateManager.GetPartData(XmssKeyPart.PrivateStateless)!);
Array.Clear(stateManager.GetPartData(XmssKeyPart.PrivateStateful)!);

Assert.ThrowsException<XmssException>(() =>
Assert.ThrowsExactly<XmssException>(() =>
{
xmss.ImportPrivateKey(stateManager);
});
Expand All @@ -108,7 +108,7 @@ public void ImportRfcPublicKey_TooShort()
{
using var xmss = new Xmss();

Assert.ThrowsException<CryptographicException>(() =>
Assert.ThrowsExactly<CryptographicException>(() =>
{
xmss.ImportRfcPublicKey([1], out _);
});
Expand All @@ -121,7 +121,7 @@ public void ImportRfcPublicKey_WrongOid()

var wrong = new byte[ExampleCertificate.RfcPublicKey.Length];

Assert.ThrowsException<CryptographicException>(() =>
Assert.ThrowsExactly<CryptographicException>(() =>
{
xmss.ImportRfcPublicKey(wrong, out _);
});
Expand All @@ -134,7 +134,7 @@ public void ImportRfcPublicKey_WrongSize()

var tooShort = ExampleCertificate.RfcPublicKey[..^1];

Assert.ThrowsException<CryptographicException>(() =>
Assert.ThrowsExactly<CryptographicException>(() =>
{
xmss.ImportRfcPublicKey(tooShort.Span, out _);
});
Expand Down Expand Up @@ -183,7 +183,7 @@ public void ImportAsnPublicKey_Invalid()
{
using var xmss = new Xmss();

Assert.ThrowsException<CryptographicException>(() =>
Assert.ThrowsExactly<CryptographicException>(() =>
{
xmss.ImportAsnPublicKey([42], out var bytesRead);
});
Expand Down Expand Up @@ -225,7 +225,7 @@ public void ImportSubjectPublicKeyInfo_WrongOid()
Assert.IsFalse(xmss.HasPrivateKey);
Assert.IsFalse(xmss.HasPublicKey);

Assert.ThrowsException<CryptographicException>(() =>
Assert.ThrowsExactly<CryptographicException>(() =>
{
xmss.ImportSubjectPublicKeyInfo(info, out var bytesRead);
});
Expand Down Expand Up @@ -316,7 +316,7 @@ public void ImportFromPem_SubjectPublicKeyInfo_ExtraneousData()

using var xmss = new Xmss();

Assert.ThrowsException<CryptographicException>(() =>
Assert.ThrowsExactly<CryptographicException>(() =>
{
xmss.ImportFromPem(infoPemWithExtraneousData);
});
Expand All @@ -341,7 +341,7 @@ public void ImportFromPem_InvalidPem()
{
using var xmss = new Xmss();

Assert.ThrowsException<ArgumentException>(() =>
Assert.ThrowsExactly<ArgumentException>(() =>
{
xmss.ImportFromPem("This is invalid PEM.");
});
Expand All @@ -354,7 +354,7 @@ public void ImportFromPem_UnsupportedPem()

var unsupported = PemEncoding.WriteString("UNSUPPORTED", [1, 2, 3]);

Assert.ThrowsException<ArgumentException>(() =>
Assert.ThrowsExactly<ArgumentException>(() =>
{
xmss.ImportFromPem(unsupported);
});
Expand All @@ -365,7 +365,7 @@ public void ImportFromPem_AmbiguousPem()
{
using var xmss = new Xmss();

Assert.ThrowsException<ArgumentException>(() =>
Assert.ThrowsExactly<ArgumentException>(() =>
{
xmss.ImportFromPem(ExampleCertificate.Pem + Environment.NewLine + ExampleCertificate.Pem);
});
Expand Down
34 changes: 17 additions & 17 deletions UnitTests/UnitTests/PartitionTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public void SplitPrivateKey_Ephemeral()
using var xmss = new Xmss();
xmss.GeneratePrivateKey(null, XmssParameterSet.XMSS_SHA2_10_256, false);

Assert.ThrowsException<InvalidOperationException>(() =>
Assert.ThrowsExactly<InvalidOperationException>(() =>
{
xmss.SplitPrivateKey(new MockStateManager(), 100);
});
Expand Down Expand Up @@ -84,7 +84,7 @@ public void SplitPrivateKey_StatelessExists()
var newPartition = new MockStateManager();
newPartition.Store(XmssKeyPart.PrivateStateless, stateManager.GetPartData(XmssKeyPart.PrivateStateless));

Assert.ThrowsException<XmssStateManagerException>(() =>
Assert.ThrowsExactly<XmssStateManagerException>(() =>
{
xmss.SplitPrivateKey(newPartition, 100);
});
Expand All @@ -100,7 +100,7 @@ public void SplitPrivateKey_StatefulExists()
var newPartition = new MockStateManager();
newPartition.Store(XmssKeyPart.PrivateStateful, stateManager.GetPartData(XmssKeyPart.PrivateStateful));

Assert.ThrowsException<XmssStateManagerException>(() =>
Assert.ThrowsExactly<XmssStateManagerException>(() =>
{
xmss.SplitPrivateKey(newPartition, 100);
});
Expand All @@ -118,7 +118,7 @@ public void SplitPrivateKey_CleanupFails()
newPartition.Setup(); // Load stateless
newPartition.Setup(false); // Purge

Assert.ThrowsException<XmssStateManagerException>(() =>
Assert.ThrowsExactly<XmssStateManagerException>(() =>
{
xmss.SplitPrivateKey(newPartition, 100);
});
Expand All @@ -137,7 +137,7 @@ public void SplitPrivateKey_CopyStatelessFails()
newPartition.Setup(); // Purge
newPartition.Setup(false); // Store stateless

Assert.ThrowsException<XmssStateManagerException>(() =>
Assert.ThrowsExactly<XmssStateManagerException>(() =>
{
xmss.SplitPrivateKey(newPartition, 100);
});
Expand All @@ -157,7 +157,7 @@ public void SplitPrivateKey_CopyStatelessAndRollbackFail()
newPartition.Setup(false); // Store stateless
newPartition.Setup(false); // Purge

Assert.ThrowsException<AggregateException>(() =>
Assert.ThrowsExactly<AggregateException>(() =>
{
xmss.SplitPrivateKey(newPartition, 100);
});
Expand All @@ -173,7 +173,7 @@ public void SplitPrivateKey_CopyPublicFails()
newPartition.Setup(); // Store stateless
newPartition.Setup(false); // Store public

Assert.ThrowsException<XmssStateManagerException>(() =>
Assert.ThrowsExactly<XmssStateManagerException>(() =>
{
SharedXmss.SplitPrivateKey(newPartition, 100);
});
Expand All @@ -190,7 +190,7 @@ public void SplitPrivateKey_CopyPublicAndRollbackFail()
newPartition.Setup(false); // Store public
newPartition.Setup(false); // Purge

Assert.ThrowsException<AggregateException>(() =>
Assert.ThrowsExactly<AggregateException>(() =>
{
SharedXmss.SplitPrivateKey(newPartition, 100);
});
Expand All @@ -205,7 +205,7 @@ public void SplitPrivateKey_SplitFails()

var newPartition = new MockStateManager();

Assert.ThrowsException<XmssException>(() =>
Assert.ThrowsExactly<XmssException>(() =>
{
xmss.SplitPrivateKey(newPartition, 9999);
});
Expand All @@ -225,7 +225,7 @@ public void SplitPrivateKey_SplitAndRollbackFail()
newPartition.Setup(); // Store stateless
newPartition.Setup(false); // Purge

Assert.ThrowsException<AggregateException>(() =>
Assert.ThrowsExactly<AggregateException>(() =>
{
xmss.SplitPrivateKey(newPartition, 9999);
});
Expand All @@ -243,7 +243,7 @@ public void SplitPrivateKey_UpdateStatefulFails()
// corrupt stateful part
Array.Clear(stateManager.GetPartData(XmssKeyPart.PrivateStateful)!);

Assert.ThrowsException<XmssStateManagerException>(() =>
Assert.ThrowsExactly<XmssStateManagerException>(() =>
{
xmss.SplitPrivateKey(newPartition, 100);
});
Expand All @@ -267,7 +267,7 @@ public void SplitPrivateKey_UpdateStatefulAndRollbackFail()
// corrupt stateful part
Array.Clear(stateManager.GetPartData(XmssKeyPart.PrivateStateful)!);

Assert.ThrowsException<AggregateException>(() =>
Assert.ThrowsExactly<AggregateException>(() =>
{
xmss.SplitPrivateKey(newPartition, 100);
});
Expand All @@ -288,7 +288,7 @@ public void SplitPrivateKey_StoreStatefulFails()
newPartition.Setup(); // Store stateless
newPartition.Setup(false); // Store stateful

Assert.ThrowsException<XmssStateManagerException>(() =>
Assert.ThrowsExactly<XmssStateManagerException>(() =>
{
xmss.SplitPrivateKey(newPartition, 100);
});
Expand All @@ -309,7 +309,7 @@ public void SplitPrivateKey_StoreStatefulAndRollbackFail()
newPartition.Setup(false); // Store stateful
newPartition.Setup(false); // Purge

Assert.ThrowsException<AggregateException>(() =>
Assert.ThrowsExactly<AggregateException>(() =>
{
xmss.SplitPrivateKey(newPartition, 100);
});
Expand Down Expand Up @@ -337,7 +337,7 @@ public void MergePartition()
Assert.AreEqual(oldRemaining + 100, xmss.SignaturesRemaining);
{
using var otherXmss = new Xmss();
Assert.ThrowsException<XmssStateManagerException>(() =>
Assert.ThrowsExactly<XmssStateManagerException>(() =>
{
otherXmss.ImportPrivateKey(partition2);
});
Expand All @@ -356,7 +356,7 @@ public void MergePartition_Ephemeral()
using var xmss = new Xmss();
xmss.GeneratePrivateKey(null, XmssParameterSet.XMSS_SHA2_10_256, false);

Assert.ThrowsException<InvalidOperationException>(() =>
Assert.ThrowsExactly<InvalidOperationException>(() =>
{
xmss.MergePartition(stateManager);
});
Expand All @@ -383,7 +383,7 @@ public void MergePartition_DeleteFails()
partition2.Setup(); // Load stateful
partition2.Setup(false); // Purge

Assert.ThrowsException<XmssStateManagerException>(() =>
Assert.ThrowsExactly<XmssStateManagerException>(() =>
{
xmss.MergePartition(partition2);
});
Expand Down
Loading

0 comments on commit 4076486

Please sign in to comment.