Make the TryGetDbProviderFactory method available to all container builders

Author: 0xced

src/Testcontainers.FirebirdSql/FirebirdSqlBuilder.cs

@@ -81,38 +81,22 @@ public override FirebirdSqlContainer Build()
         return new FirebirdSqlContainer(DockerResourceConfiguration);
     }
 
+    /// <inheritdoc />
+    protected override string DbFactoryTypeName => "FirebirdSql.Data.FirebirdClient.FirebirdClientFactory, FirebirdSql.Data.FirebirdClient, PublicKeyToken=3750abcc3150b00c";
+
     /// <inheritdoc />
     protected override FirebirdSqlBuilder Init()
     {
+        var hasDbProviderFactory = TryGetDbProviderFactory(out var dbProviderFactory);
+        var wait = Wait.ForUnixContainer();
         return base.Init()
             .WithImage(FirebirdSqlImage)
             .WithPortBinding(FirebirdSqlPort, true)
             .WithDatabase(DefaultDatabase)
             .WithUsername(DefaultUsername)
             .WithPassword(DefaultPassword)
             .WithResourceMapping(Encoding.Default.GetBytes(TestQueryString), "/home/firebird_check.sql")
-            .WithWaitStrategy(GetDefaultWaitStrategy(Wait.ForUnixContainer()));
-    }
-
-    private static IWaitForContainerOS GetDefaultWaitStrategy(IWaitForContainerOS waitStrategy)
-    {
-        return TryGetDbProviderFactory("FirebirdSql.Data.FirebirdClient.FirebirdClientFactory, FirebirdSql.Data.FirebirdClient, PublicKeyToken=3750abcc3150b00c", out var dbProviderFactory)
-            ? waitStrategy.UntilDatabaseIsAvailable(dbProviderFactory)
-            : waitStrategy.UntilContainerIsHealthy();
-    }
-
-    private static bool TryGetDbProviderFactory(string factoryTypeName, out DbProviderFactory dbProviderFactory)
-    {
-        try
-        {
-            dbProviderFactory = (DbProviderFactory)Type.GetType(factoryTypeName)?.GetField("Instance")?.GetValue(null);
-            return dbProviderFactory != null;
-        }
-        catch
-        {
-            dbProviderFactory = null;
-            return false;
-        }
+            .WithWaitStrategy(hasDbProviderFactory ? wait.UntilDatabaseIsAvailable(dbProviderFactory) : wait.UntilContainerIsHealthy());
     }
 
     /// <inheritdoc />

src/Testcontainers/Builders/ContainerBuilder`3.cs

@@ -2,6 +2,7 @@ namespace DotNet.Testcontainers.Builders
 {
   using System;
   using System.Collections.Generic;
+  using System.Data.Common;
   using System.Globalization;
   using System.IO;
   using System.Linq;
@@ -51,6 +52,13 @@ protected ContainerBuilder(TConfigurationEntity dockerResourceConfiguration)
     /// </summary>
     protected virtual string DeclineLicenseAgreement { get; }
 
+    /// <summary>
+    /// The assembly-qualified name of the type which contains an <c>Instance</c> field which is a <see cref="DbProviderFactory"/>.
+    /// </summary>
+    /// <example><c>FirebirdSql.Data.FirebirdClient.FirebirdClientFactory, FirebirdSql.Data.FirebirdClient, PublicKeyToken=3750abcc3150b00c</c></example>
+    /// <remarks>Used for database containers only.</remarks>
+    protected virtual string DbFactoryTypeName => "";
+
     /// <inheritdoc />
     public virtual TBuilderEntity WithAcceptLicenseAgreement(bool acceptLicenseAgreement)
     {
@@ -383,6 +391,27 @@ public TBuilderEntity WithStartupCallback(Func<TContainerEntity, CancellationTok
       return Clone(new ContainerConfiguration(startupCallback: (container, ct) => startupCallback((TContainerEntity)container, ct)));
     }
 
+    /// <summary>
+    /// Gets a <see cref="DbProviderFactory"/> through reflection, using the <c>Instance</c> field of the <see cref="DbFactoryTypeName"/> type.
+    /// </summary>
+    /// <param name="dbProviderFactory">
+    /// When this method returns, contains the <see cref="DbProviderFactory"/> if the type is loaded; otherwise, <see langword="null"/>. This parameter is passed uninitialized.
+    /// </param>
+    /// <returns><see langword="true"/> if a <see cref="DbProviderFactory"/> was found; otherwise, <see langword="false"/>.</returns>
+    protected virtual bool TryGetDbProviderFactory(out DbProviderFactory dbProviderFactory)
+    {
+      try
+      {
+        dbProviderFactory = (DbProviderFactory)Type.GetType(DbFactoryTypeName)?.GetField("Instance")?.GetValue(null);
+        return dbProviderFactory != null;
+      }
+      catch
+      {
+        dbProviderFactory = null;
+        return false;
+      }
+    }
+
     /// <inheritdoc />
     protected override TBuilderEntity Init()
     {