Adding public API test coverage

src/Aspire.Hosting.Oracle/OracleDatabaseBuilderExtensions.cs

@@ -27,6 +27,9 @@ public static class OracleDatabaseBuilderExtensions
     /// <returns>A reference to the <see cref="IResourceBuilder{T}"/>.</returns>
     public static IResourceBuilder<OracleDatabaseServerResource> AddOracle(this IDistributedApplicationBuilder builder, [ResourceName] string name, IResourceBuilder<ParameterResource>? password = null, int? port = null)
     {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentException.ThrowIfNullOrEmpty(name);
+
         var passwordParameter = password?.Resource ?? ParameterResourceBuilderExtensions.CreateDefaultPasswordParameter(builder, $"{name}-password");
 
         var oracleDatabaseServer = new OracleDatabaseServerResource(name, passwordParameter);
@@ -67,6 +70,9 @@ public static IResourceBuilder<OracleDatabaseServerResource> AddOracle(this IDis
     /// <returns>A reference to the <see cref="IResourceBuilder{T}"/>.</returns>
     public static IResourceBuilder<OracleDatabaseResource> AddDatabase(this IResourceBuilder<OracleDatabaseServerResource> builder, [ResourceName] string name, string? databaseName = null)
     {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentException.ThrowIfNullOrEmpty(name);
+
         // Use the resource name as the database name if it's not provided
         databaseName ??= name;
 
@@ -82,7 +88,12 @@ public static IResourceBuilder<OracleDatabaseResource> AddDatabase(this IResourc
     /// <param name="name">The name of the volume. Defaults to an auto-generated name based on the application and resource names.</param>
     /// <returns>The <see cref="IResourceBuilder{T}"/>.</returns>
     public static IResourceBuilder<OracleDatabaseServerResource> WithDataVolume(this IResourceBuilder<OracleDatabaseServerResource> builder, string? name = null)
-        => builder.WithVolume(name ?? VolumeNameGenerator.CreateVolumeName(builder, "data"), "/opt/oracle/oradata", false);
+    {
+        ArgumentNullException.ThrowIfNull(builder);
+
+        return builder.WithVolume(name ?? VolumeNameGenerator.CreateVolumeName(builder, "data"), "/opt/oracle/oradata",
+            false);
+    }
 
     /// <summary>
     /// Adds a bind mount for the data folder to a Oracle Database server container resource.
@@ -91,7 +102,12 @@ public static IResourceBuilder<OracleDatabaseServerResource> WithDataVolume(this
     /// <param name="source">The source directory on the host to mount into the container.</param>
     /// <returns>The <see cref="IResourceBuilder{T}"/>.</returns>
     public static IResourceBuilder<OracleDatabaseServerResource> WithDataBindMount(this IResourceBuilder<OracleDatabaseServerResource> builder, string source)
-        => builder.WithBindMount(source, "/opt/oracle/oradata", false);
+    {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentException.ThrowIfNullOrEmpty(source);
+
+        return builder.WithBindMount(source, "/opt/oracle/oradata", false);
+    }
 
     /// <summary>
     /// Adds a bind mount for the init folder to a Oracle Database server container resource.
@@ -100,7 +116,12 @@ public static IResourceBuilder<OracleDatabaseServerResource> WithDataBindMount(t
     /// <param name="source">The source directory on the host to mount into the container.</param>
     /// <returns>The <see cref="IResourceBuilder{T}"/>.</returns>
     public static IResourceBuilder<OracleDatabaseServerResource> WithInitBindMount(this IResourceBuilder<OracleDatabaseServerResource> builder, string source)
-        => builder.WithBindMount(source, "/opt/oracle/scripts/startup", false);
+    {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentException.ThrowIfNullOrEmpty(source);
+
+        return builder.WithBindMount(source, "/opt/oracle/scripts/startup", false);
+    }
 
     /// <summary>
     /// Adds a bind mount for the database setup folder to a Oracle Database server container resource.
@@ -109,5 +130,10 @@ public static IResourceBuilder<OracleDatabaseServerResource> WithInitBindMount(t
     /// <param name="source">The source directory on the host to mount into the container.</param>
     /// <returns>The <see cref="IResourceBuilder{T}"/>.</returns>
     public static IResourceBuilder<OracleDatabaseServerResource> WithDbSetupBindMount(this IResourceBuilder<OracleDatabaseServerResource> builder, string source)
-        => builder.WithBindMount(source, "/opt/oracle/scripts/setup", false);
+    {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentException.ThrowIfNullOrEmpty(source);
+
+        return builder.WithBindMount(source, "/opt/oracle/scripts/setup", false);
+    }
 }

src/Aspire.Hosting.Oracle/OracleDatabaseResource.cs

@@ -1,6 +1,9 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Diagnostics.CodeAnalysis;
+using System.Runtime.CompilerServices;
+
 namespace Aspire.Hosting.ApplicationModel;
 
 /// <summary>
@@ -9,12 +12,12 @@ namespace Aspire.Hosting.ApplicationModel;
 /// <param name="name">The name of the resource.</param>
 /// <param name="databaseName">The database name.</param>
 /// <param name="parent">The Oracle Database parent resource associated with this database.</param>
-public class OracleDatabaseResource(string name, string databaseName, OracleDatabaseServerResource parent) : Resource(name), IResourceWithParent<OracleDatabaseServerResource>, IResourceWithConnectionString
+public class OracleDatabaseResource(string name, string databaseName, OracleDatabaseServerResource parent) : Resource(ThrowIfNullOrEmpty(name)), IResourceWithParent<OracleDatabaseServerResource>, IResourceWithConnectionString
 {
     /// <summary>
     /// Gets the parent Oracle container resource.
     /// </summary>
-    public OracleDatabaseServerResource Parent { get; } = parent;
+    public OracleDatabaseServerResource Parent { get; } = ThrowIfNullOrEmpty(parent);
 
     /// <summary>
     /// Gets the connection string expression for the Oracle Database.
@@ -25,5 +28,19 @@ public class OracleDatabaseResource(string name, string databaseName, OracleData
     /// <summary>
     /// Gets the database name.
     /// </summary>
-    public string DatabaseName { get; } = databaseName;
+    public string DatabaseName { get; } = ThrowIfNullOrEmpty(databaseName);
+
+    private static T ThrowIfNullOrEmpty<T>([NotNull] T? argument, [CallerArgumentExpression(nameof(argument))] string? paramName = null)
+    {
+        ArgumentNullException.ThrowIfNull(argument, paramName);
+
+        if (argument is not string str)
+        {
+            return argument;
+        }
+
+        ArgumentException.ThrowIfNullOrEmpty(str, paramName);
+        return argument;
+
+    }
 }

src/Aspire.Hosting.Oracle/OracleDatabaseServerResource.cs

@@ -1,6 +1,9 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Diagnostics.CodeAnalysis;
+using System.Runtime.CompilerServices;
+
 namespace Aspire.Hosting.ApplicationModel;
 
 /// <summary>
@@ -15,9 +18,9 @@ public class OracleDatabaseServerResource : ContainerResource, IResourceWithConn
     /// </summary>
     /// <param name="name">The name of the resource.</param>
     /// <param name="password">A parameter that contains the Oracle Database server password.</param>
-    public OracleDatabaseServerResource(string name, ParameterResource password) : base(name)
+    public OracleDatabaseServerResource(string name, ParameterResource password) : base(ThrowIfNullOrEmpty(name))
     {
-        ArgumentNullException.ThrowIfNull(password);
+        ThrowIfNullOrEmpty(password);
 
         PrimaryEndpoint = new(this, PrimaryEndpointName);
         PasswordParameter = password;
@@ -51,4 +54,18 @@ internal void AddDatabase(string name, string databaseName)
     {
         _databases.TryAdd(name, databaseName);
     }
+
+    private static T ThrowIfNullOrEmpty<T>([NotNull] T? argument, [CallerArgumentExpression(nameof(argument))] string? paramName = null)
+    {
+        ArgumentNullException.ThrowIfNull(argument, paramName);
+
+        if (argument is not string str)
+        {
+            return argument;
+        }
+
+        ArgumentException.ThrowIfNullOrEmpty(str, paramName);
+        return argument;
+
+    }
 }

src/Components/Aspire.Pomelo.EntityFrameworkCore.MySql/AspireEFMySqlExtensions.cs

@@ -53,6 +53,7 @@ public static partial class AspireEFMySqlExtensions
         Action<DbContextOptionsBuilder>? configureDbContextOptions = null) where TContext : DbContext
     {
         ArgumentNullException.ThrowIfNull(builder);
+        ArgumentException.ThrowIfNullOrEmpty(connectionName);
 
         builder.EnsureDbContextNotRegistered<TContext>();
 

src/Components/Aspire.Qdrant.Client/AspireQdrantExtensions.cs

@@ -30,6 +30,8 @@ public static void AddQdrantClient(
         string connectionName,
         Action<QdrantClientSettings>? configureSettings = null)
     {
+        ArgumentException.ThrowIfNullOrEmpty(connectionName);
+
         AddQdrant(builder, configureSettings, connectionName, serviceKey: null);
     }
 
@@ -47,6 +49,8 @@ public static void AddKeyedQdrantClient(
         string name,
         Action<QdrantClientSettings>? configureSettings = null)
     {
+        ArgumentException.ThrowIfNullOrEmpty(name);
+
         AddQdrant(builder, configureSettings, connectionName: name, serviceKey: name);
     }
 

src/Components/Aspire.RabbitMQ.Client/AspireRabbitMQExtensions.cs

@@ -9,7 +9,6 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Diagnostics.HealthChecks;
-using Microsoft.Extensions.Logging;
 using Polly;
 using Polly.Retry;
 using RabbitMQ.Client;
@@ -40,7 +39,11 @@ public static void AddRabbitMQClient(
         string connectionName,
         Action<RabbitMQClientSettings>? configureSettings = null,
         Action<ConnectionFactory>? configureConnectionFactory = null)
-        => AddRabbitMQClient(builder, configureSettings, configureConnectionFactory, connectionName, serviceKey: null);
+    {
+        ArgumentException.ThrowIfNullOrEmpty(connectionName);
+
+        AddRabbitMQClient(builder, configureSettings, configureConnectionFactory, connectionName, serviceKey: null);
+    }
 
     /// <summary>
     /// Registers <see cref="IConnection"/> as a keyed singleton for the given <paramref name="name"/> in the services provided by the <paramref name="builder"/>.

src/Components/Aspire.Seq/AspireSeqExtensions.cs

@@ -32,6 +32,7 @@ public static void AddSeqEndpoint(
         Action<SeqSettings>? configureSettings = null)
     {
         ArgumentNullException.ThrowIfNull(builder);
+        ArgumentException.ThrowIfNullOrEmpty(connectionName);
 
         var settings = new SeqSettings();
         settings.Logs.Protocol = OtlpExportProtocol.HttpProtobuf;
@@ -63,13 +64,15 @@ public static void AddSeqEndpoint(
         }
 
         builder.Services.Configure<OpenTelemetryLoggerOptions>(logging => logging.AddProcessor(
-            _ => settings.Logs.ExportProcessorType switch {
+            _ => settings.Logs.ExportProcessorType switch
+            {
                 ExportProcessorType.Batch => new BatchLogRecordExportProcessor(new OtlpLogExporter(settings.Logs)),
                 _ => new SimpleLogRecordExportProcessor(new OtlpLogExporter(settings.Logs))
             }));
 
         builder.Services.ConfigureOpenTelemetryTracerProvider(tracing => tracing.AddProcessor(
-            _ => settings.Traces.ExportProcessorType switch {
+            _ => settings.Traces.ExportProcessorType switch
+            {
                 ExportProcessorType.Batch => new BatchActivityExportProcessor(new OtlpTraceExporter(settings.Traces)),
                 _ => new SimpleActivityExportProcessor(new OtlpTraceExporter(settings.Traces))
             }));

src/Components/Aspire.StackExchange.Redis.DistributedCaching/AspireRedisDistributedCacheExtensions.cs

@@ -29,6 +29,9 @@ public static class AspireRedisDistributedCacheExtensions
     /// </remarks>
     public static void AddRedisDistributedCache(this IHostApplicationBuilder builder, string connectionName, Action<StackExchangeRedisSettings>? configureSettings = null, Action<ConfigurationOptions>? configureOptions = null)
     {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentException.ThrowIfNullOrEmpty(connectionName);
+
         builder.AddRedisClient(connectionName, configureSettings, configureOptions);
 
         builder.AddRedisDistributedCacheCore((RedisCacheOptions options, IServiceProvider sp) =>
@@ -52,6 +55,9 @@ public static void AddRedisDistributedCache(this IHostApplicationBuilder builder
     /// </remarks>
     public static void AddKeyedRedisDistributedCache(this IHostApplicationBuilder builder, string name, Action<StackExchangeRedisSettings>? configureSettings = null, Action<ConfigurationOptions>? configureOptions = null)
     {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentException.ThrowIfNullOrEmpty(name);
+
         builder.AddKeyedRedisClient(name, configureSettings, configureOptions);
 
         builder.AddRedisDistributedCacheCore((RedisCacheOptions options, IServiceProvider sp) =>

src/Components/Aspire.StackExchange.Redis.OutputCaching/AspireRedisOutputCacheExtensions.cs

@@ -28,6 +28,9 @@ public static class AspireRedisOutputCacheExtensions
     /// </remarks>
     public static void AddRedisOutputCache(this IHostApplicationBuilder builder, string connectionName, Action<StackExchangeRedisSettings>? configureSettings = null, Action<ConfigurationOptions>? configureOptions = null)
     {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentException.ThrowIfNullOrEmpty(connectionName);
+
         builder.AddRedisClient(connectionName, configureSettings, configureOptions);
 
         builder.AddRedisOutputCacheCore((RedisOutputCacheOptions options, IServiceProvider sp) =>
@@ -51,6 +54,9 @@ public static void AddRedisOutputCache(this IHostApplicationBuilder builder, str
     /// </remarks>
     public static void AddKeyedRedisOutputCache(this IHostApplicationBuilder builder, string name, Action<StackExchangeRedisSettings>? configureSettings = null, Action<ConfigurationOptions>? configureOptions = null)
     {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentException.ThrowIfNullOrEmpty(name);
+
         builder.AddKeyedRedisClient(name, configureSettings, configureOptions);
 
         builder.AddRedisOutputCacheCore((RedisOutputCacheOptions options, IServiceProvider sp) =>

src/Components/Aspire.StackExchange.Redis/AspireRedisExtensions.cs

@@ -36,7 +36,11 @@ public static void AddRedisClient(
         string connectionName,
         Action<StackExchangeRedisSettings>? configureSettings = null,
         Action<ConfigurationOptions>? configureOptions = null)
-        => AddRedisClient(builder, configureSettings, configureOptions, connectionName, serviceKey: null);
+    {
+        ArgumentException.ThrowIfNullOrEmpty(connectionName);
+
+        AddRedisClient(builder, configureSettings, configureOptions, connectionName, serviceKey: null);
+    }
 
     /// <summary>
     /// Registers <see cref="IConnectionMultiplexer"/> as a keyed singleton for the given <paramref name="name"/> in the services provided by the <paramref name="builder"/>.