Minor internal-only refactorings for consistency (#1532)

* Stronger assertions on exception type

* Move [Theory] above test data

Author: bart-vmware

src/Common/test/Net.Test/WindowsNetworkFileShareTest.cs

@@ -14,12 +14,12 @@ public void GetErrorForKnownNumber_ReturnsKnownError()
     {
         Action action = () => WindowsNetworkFileShare.ThrowForNonZeroResult(5, "execute");
 
-        action.Should().ThrowExactly<IOException>().WithInnerException<Win32Exception>()
+        action.Should().ThrowExactly<IOException>().WithInnerExceptionExactly<Win32Exception>()
             .WithMessage(Platform.IsWindows ? "Access is Denied*" : "Input/output error");
 
         action = () => WindowsNetworkFileShare.ThrowForNonZeroResult(1222, "execute");
 
-        action.Should().ThrowExactly<IOException>().WithInnerException<Win32Exception>()
+        action.Should().ThrowExactly<IOException>().WithInnerExceptionExactly<Win32Exception>()
             .WithMessage(Platform.IsWindows ? "The network is not present or not started." : "Unknown error 1222");
     }
 
@@ -28,7 +28,7 @@ public void GetErrorForUnknownNumber_ReturnsUnKnownError()
     {
         Action action = () => WindowsNetworkFileShare.ThrowForNonZeroResult(9999, "execute");
 
-        action.Should().ThrowExactly<IOException>().WithInnerException<Win32Exception>()
+        action.Should().ThrowExactly<IOException>().WithInnerExceptionExactly<Win32Exception>()
             .WithMessage(Platform.IsWindows ? "Unknown error (0x270f)" : "Unknown error 9999");
     }
 

src/Management/test/Endpoint.Test/Actuators/CloudFoundry/CloudFoundrySecurityMiddlewareTest.cs

@@ -326,8 +326,8 @@ public async Task RedactsHttpHeaders()
         logMessages.Should().Contain("Authorization: *");
     }
 
-    [ClassData(typeof(CloudFoundrySecurityMiddlewareTestScenarios))]
     [Theory]
+    [ClassData(typeof(CloudFoundrySecurityMiddlewareTestScenarios))]
     public async Task Returns_expected_response_on_permission_check(string scenario, HttpStatusCode? steeltoeStatusCode, string? errorMessage,
         string[] expectedLogs, bool useStatusCodeFromResponse)
     {

src/Management/test/Endpoint.Test/Actuators/CloudFoundry/PermissionsProviderTest.cs

@@ -32,9 +32,9 @@ public async Task EmptyTokenIsUnauthorized()
         unauthorized.Message.Should().Be(PermissionsProvider.Messages.AuthorizationHeaderInvalid);
     }
 
+    [Theory]
     [InlineData(false, true, EndpointPermissions.Restricted)]
     [InlineData(true, true, EndpointPermissions.Full)]
-    [Theory]
     public async Task ParsePermissionsResponseAsyncReturnsExpected(bool readSensitive, bool readBasic, EndpointPermissions expectedPermissions)
     {
         PermissionsProvider permissionsProvider = GetPermissionsProvider();
@@ -52,6 +52,7 @@ public async Task ParsePermissionsResponseAsyncReturnsExpected(bool readSensitiv
         result.Should().Be(expectedPermissions);
     }
 
+    [Theory]
     [InlineData("unavailable", HttpStatusCode.ServiceUnavailable, PermissionsProvider.Messages.CloudFoundryNotReachable)]
     [InlineData("not-found", HttpStatusCode.Unauthorized, PermissionsProvider.Messages.InvalidToken)]
     [InlineData("unauthorized", HttpStatusCode.Unauthorized, PermissionsProvider.Messages.InvalidToken)]
@@ -61,7 +62,6 @@ public async Task ParsePermissionsResponseAsyncReturnsExpected(bool readSensitiv
         "Exception of type 'System.Net.Http.HttpRequestException' with error 'NameResolutionError' was thrown")]
     [InlineData("no_sensitive_data", HttpStatusCode.OK, "")]
     [InlineData("success", HttpStatusCode.OK, "")]
-    [Theory]
     public async Task Returns_expected_response_on_permission_check(string scenario, HttpStatusCode? steeltoeStatusCode, string errorMessage)
     {
         var appSettings = new Dictionary<string, string?>

src/Management/test/Endpoint.Test/Actuators/HeapDump/HeapDumperTest.cs

@@ -80,7 +80,7 @@ public void Includes_captured_log_for_thrown_exception()
 
         action.Should().ThrowExactly<InvalidOperationException>()
             .WithMessage($"Failed to create a gcdump. Captured log:{System.Environment.NewLine}Failed to perform this operation.")
-            .WithInnerException<ArgumentException>().WithMessage("Simulated failure.");
+            .WithInnerExceptionExactly<ArgumentException>().WithMessage("Simulated failure.");
     }
 
     [Fact]

src/Management/test/Endpoint.Test/SpringBootAdminClient/SpringBootAdminContentNegotiationTest.cs

@@ -30,6 +30,7 @@ public sealed class SpringBootAdminContentNegotiationTest
     };
 
     // AcceptHeader values captured from Spring Boot Admin 3.4.1
+    [Theory]
     [InlineData("", $"{ActuatorV3},{SpringBootStandardAccept}", ActuatorV3)]
     [InlineData("beans", SpringBootStandardAccept, ActuatorV3)]
     [InlineData("env", SpringBootStandardAccept, ActuatorV3)]
@@ -42,7 +43,6 @@ public sealed class SpringBootAdminContentNegotiationTest
     [InlineData("loggers", SpringBootStandardAccept, ActuatorV3)]
     [InlineData("mappings", SpringBootStandardAccept, ActuatorV3)]
     [InlineData("threaddump", SpringBootStandardAccept, ActuatorV3)]
-    [Theory]
     public async Task Responses_for_SpringBootAdmin_match_expectations(string endpoint, string acceptHeader, string responseContentType)
     {
         WebApplicationBuilder builder = TestWebApplicationBuilderFactory.Create();

src/Security/test/Authorization.Certificate.Test/ApplicationInstanceCertificateTest.cs

@@ -6,6 +6,7 @@ namespace Steeltoe.Security.Authorization.Certificate.Test;
 
 public sealed class ApplicationInstanceCertificateTest
 {
+    [Theory]
     [InlineData("This subject does not match a supported pattern", false, null, null)]
     [InlineData(
         "CN=34c9765d-b5da-49a7-4a53-1c58, OU=app:e5950275-afce-480a-a017-babafd3d5798 + OU=space:ab60aac2-fb64-43ab-ba24-c57a15a7e114 + OU=organization:7fe4d027-2058-4539-a40c-702ac1373905",
@@ -14,7 +15,6 @@ public sealed class ApplicationInstanceCertificateTest
         "CN=69ed1418-8434-4b14-9ad9-636d71ba782a, OU=app:e268b8bf-cdad-4014-a18f-1131c73d9450 + OU=space:122b942a-d7b9-4839-b26e-836654b9785f + OU=organization:a8fef16f-94c0-49e3-aa0b-ced7c3da6229",
         true, "a8fef16f-94c0-49e3-aa0b-ced7c3da6229", "122b942a-d7b9-4839-b26e-836654b9785f")]
     [InlineData("CN=\"69ed1418\", OU=app:e268b8bf + OU=space:\"122b942a\" + OU=organization:a8fef16f", true, "a8fef16f", "122b942a")]
-    [Theory]
     public void SubjectParsingProducesExpectedResults(string subject, bool shouldParse, string? expectedOrgId, string? expectedSpaceId)
     {
         ApplicationInstanceCertificate.TryParse(subject, out ApplicationInstanceCertificate? instanceCertificate).Should().Be(shouldParse);