Simplify TestContainerExtensions.WrapException into StartAsync(failureMessage)

Author: C0nquistadore

src/Dibix.Testing/TestContainers/TestContainerExtensions.cs

@@ -80,23 +80,16 @@ public static async Task ThrowOnNonZeroExitCode(this IContainer container)
             throw await WrapException($"Container exited with exit code {exitCode}", container).ConfigureAwait(false);
         }
 
-        public static async Task<Exception> WrapException(TimeoutException exception, IContainer container, string serviceName, int port, TimeSpan timeout)
+        public static async Task StartAsync(this IContainer container, string failureMessage)
         {
-            string message = $"{serviceName} did not respond on port {port} within the given timeout: {timeout}";
-            return await WrapException(message, container, exception).ConfigureAwait(false);
-        }
-        public static async Task<Exception> WrapException(string message, IContainer container, Exception innerException = null)
-        {
-            return new InvalidOperationException($"""
-                                                  {message}
-                                                  -
-                                                  {await GetErrors(container).ConfigureAwait(false)}
-                                                  -
-                                                  Image: {container.Image.FullName}
-                                                  Name: {(Exists(container) ? container.Name : null)}
-                                                  Health: {container.Health}
-                                                  State: {container.State}
-                                                  """, innerException);
+            try
+            {
+                await container.StartAsync().ConfigureAwait(false);
+            }
+            catch (TimeoutException timeoutException)
+            {
+                throw await WrapException(failureMessage, container, timeoutException).ConfigureAwait(false);
+            }
         }
 
         public static string GenerateContainerName(this IImage image)
@@ -123,6 +116,21 @@ await logger.WriteLineAsync($"""
                                          """).ConfigureAwait(false);
         }
 
+        private static async Task<Exception> WrapException(string message, IContainer container, Exception innerException = null)
+        {
+            return new InvalidOperationException($"""
+                                                  {message}
+                                                  -
+                                                  {await GetErrors(container).ConfigureAwait(false)}
+                                                  -
+                                                  Name: {(Exists(container) ? container.Name : null)}
+                                                  Image: {container.Image.FullName}
+                                                  State: {container.State}
+                                                  Health: {container.Health}
+                                                  HealthCheckFailingStreak: {container.HealthCheckFailingStreak}
+                                                  """, innerException);
+        }
+
         private static async Task<string> GetErrors(IContainer container)
         {
             (_, string stdErr) = await container.GetLogsAsync().ConfigureAwait(false);

tests/Dibix.Dapper.Tests/Environment/ContainerServices.cs

@@ -61,14 +61,7 @@ private static async Task<MsSqlServerContainerInstance> CreateMsSqlServer(TextWr
             MsSqlContainer container = builder.Build();
 
             await builder.LogDockerRunDebugStatement(logger).ConfigureAwait(false);
-            try
-            {
-                await container.StartAsync().ConfigureAwait(false);
-            }
-            catch (TimeoutException exception)
-            {
-                throw await TestContainerExtensions.WrapException("Container did not start in time", container, exception).ConfigureAwait(false);
-            }
+            await container.StartAsync(failureMessage: "Container did not start in time").ConfigureAwait(false);
             await container.ExecScriptAsync(initializeDatabaseScript).ConfigureAwait(false);
             await logger.WriteLineAsync("Container is ready").ConfigureAwait(false);