[tests] Add resource logging to Aspire.Hosting.* tests

src/Aspire.Hosting.Testing/ResourceLoggerForwarderService.cs

@@ -1,7 +1,9 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+#pragma warning disable IDE0005 // Using directive is unnecessary. This warning happens when building this file in Aspire.Hosting.Tests.csproj
 using Aspire.Hosting.ApplicationModel;
+#pragma warning restore IDE0005 // Using directive is unnecessary.
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 

tests/Aspire.Dashboard.Components.Tests/Pages/MetricsTests.cs

@@ -1,3 +1,4 @@
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Aspire.Dashboard.Components.Controls;

tests/Aspire.Hosting.Azure.Tests/AzureStorageEmulatorFunctionalTests.cs

@@ -6,7 +6,6 @@
 using Azure.Storage.Blobs;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -18,7 +17,7 @@ public class AzureStorageEmulatorFunctionalTests(ITestOutputHelper testOutputHel
     [RequiresDocker]
     public async Task VerifyAzureStorageEmulatorResource()
     {
-        using var builder = CreateDistributedApplicationBuilder();
+        using var builder = TestDistributedApplicationBuilder.Create().WithTestAndResourceLogging(testOutputHelper);
         var storage = builder.AddAzureStorage("storage").RunAsEmulator().AddBlobs("BlobConnection");
 
         using var app = builder.Build();
@@ -40,11 +39,4 @@ public async Task VerifyAzureStorageEmulatorResource()
         var downloadResult = (await blobClient.DownloadContentAsync()).Value;
         Assert.Equal("testValue", downloadResult.Content.ToString());
     }
-
-    private TestDistributedApplicationBuilder CreateDistributedApplicationBuilder()
-    {
-        var builder = TestDistributedApplicationBuilder.Create();
-        builder.Services.AddXunitLogging(testOutputHelper);
-        return builder;
-    }
 }

tests/Aspire.Hosting.Elasticsearch.Tests/ElasticsearchFunctionalTests.cs

@@ -6,7 +6,6 @@
 using Elastic.Clients.Elasticsearch;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
 using Polly;
 using Xunit;
 using Xunit.Abstractions;
@@ -32,7 +31,7 @@ public async Task VerifyElasticsearchResource()
            .AddRetry(new() { MaxRetryAttempts = 10, Delay = TimeSpan.FromSeconds(10) })
            .Build();
 
-        var builder = CreateDistributedApplicationBuilder();
+        using var builder = TestDistributedApplicationBuilder.CreateWithTestContainerRegistry(testOutputHelper);
 
         var elasticsearch = builder.AddElasticsearch("elasticsearch");
 
@@ -76,8 +75,8 @@ public async Task WithDataShouldPersistStateBetweenUsages(bool useVolume)
 
         try
         {
-            var builder1 = CreateDistributedApplicationBuilder();
-            
+            using var builder1 = TestDistributedApplicationBuilder.CreateWithTestContainerRegistry(testOutputHelper);
+
             var elasticsearch1 = builder1.AddElasticsearch("elasticsearch");
 
             var password = elasticsearch1.Resource.PasswordParameter.Value;
@@ -128,7 +127,7 @@ await pipeline.ExecuteAsync(
                 }
             }
 
-            var builder2 = CreateDistributedApplicationBuilder();
+            using var builder2 = TestDistributedApplicationBuilder.CreateWithTestContainerRegistry(testOutputHelper);
             var passwordParameter2 = builder2.AddParameter("pwd");
             builder2.Configuration["Parameters:pwd"] = password;
             var elasticsearch2 = builder2.AddElasticsearch("elasticsearch", passwordParameter2);
@@ -215,13 +214,6 @@ private static async Task CreateTestData(ElasticsearchClient elasticsearchClient
         Assert.Equal(s_person.Id, getResponse.Source?.Id);
     }
 
-    private TestDistributedApplicationBuilder CreateDistributedApplicationBuilder()
-    {
-        var builder = TestDistributedApplicationBuilder.CreateWithTestContainerRegistry();
-        builder.Services.AddXunitLogging(testOutputHelper);
-        return builder;
-    }
-
     private sealed class Person
     {
         public int Id { get; set; }

tests/Aspire.Hosting.Garnet.Tests/GarnetFunctionalTests.cs

@@ -6,7 +6,6 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
 using Polly;
 using StackExchange.Redis;
 using Xunit;
@@ -25,7 +24,7 @@ public async Task VerifyGarnetResource()
            .AddRetry(new() { MaxRetryAttempts = 10, Delay = TimeSpan.FromSeconds(3) })
            .Build();
 
-        var builder = CreateDistributedApplicationBuilder();
+        using var builder = TestDistributedApplicationBuilder.Create().WithTestAndResourceLogging(testOutputHelper);
 
         var garnet = builder.AddGarnet("garnet");
 
@@ -60,11 +59,4 @@ await pipeline.ExecuteAsync(async token =>
 
          }, cts.Token);
     }
-
-    private TestDistributedApplicationBuilder CreateDistributedApplicationBuilder()
-    {
-        var builder = TestDistributedApplicationBuilder.Create();
-        builder.Services.AddXunitLogging(testOutputHelper);
-        return builder;
-    }
 }

tests/Aspire.Hosting.Kafka.Tests/KafkaFunctionalTests.cs

@@ -7,7 +7,6 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
 using Polly;
 using Xunit;
 using Xunit.Abstractions;
@@ -22,7 +21,7 @@ public async Task VerifyKafkaResource()
     {
         var cts = new CancellationTokenSource(TimeSpan.FromMinutes(3));
 
-        var builder = CreateDistributedApplicationBuilder();
+        using var builder = TestDistributedApplicationBuilder.CreateWithTestContainerRegistry(testOutputHelper);
 
         var kafka = builder.AddKafka("kafka");
 
@@ -87,7 +86,7 @@ public async Task WithDataShouldPersistStateBetweenUsages(bool useVolume)
 
         try
         {
-            var builder1 = CreateDistributedApplicationBuilder();
+            using var builder1 = TestDistributedApplicationBuilder.CreateWithTestContainerRegistry(testOutputHelper);
             var kafka1 = builder1.AddKafka("kafka");
 
             if (useVolume)
@@ -143,7 +142,7 @@ await pipeline.ExecuteAsync(async token =>
                 }
             }
 
-            var builder2 = CreateDistributedApplicationBuilder();
+            using var builder2 = TestDistributedApplicationBuilder.CreateWithTestContainerRegistry(testOutputHelper);
             var kafka2 = builder2.AddKafka("kafka");
 
             if (useVolume)
@@ -221,11 +220,4 @@ await pipeline.ExecuteAsync(async token =>
             }
         }
     }
-
-    private TestDistributedApplicationBuilder CreateDistributedApplicationBuilder()
-    {
-        var builder = TestDistributedApplicationBuilder.CreateWithTestContainerRegistry();
-        builder.Services.AddXunitLogging(testOutputHelper);
-        return builder;
-    }
 }

tests/Aspire.Hosting.Milvus.Tests/MilvusFunctionalTests.cs

@@ -7,7 +7,6 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
 using Milvus.Client;
 using Polly;
 using Xunit;
@@ -31,7 +30,7 @@ public async Task VerifyMilvusResource()
            .AddRetry(new() { MaxRetryAttempts = 10, Delay = TimeSpan.FromSeconds(3), ShouldHandle = new PredicateBuilder().Handle<RpcException>() })
            .Build();
 
-        var builder = CreateDistributedApplicationBuilder();
+        using var builder = TestDistributedApplicationBuilder.CreateWithTestContainerRegistry(testOutputHelper);
 
         builder.Configuration["Parameters:apikey"] = MilvusToken;
         var apiKey = builder.AddParameter("apikey");
@@ -100,7 +99,7 @@ public async Task WithDataShouldPersistStateBetweenUsages(bool useVolume)
 
         try
         {
-            var builder1 = CreateDistributedApplicationBuilder();
+            using var builder1 = TestDistributedApplicationBuilder.CreateWithTestContainerRegistry(testOutputHelper);
             builder1.Configuration["Parameters:apikey"] = MilvusToken;
             var apiKey1 = builder1.AddParameter("apikey");
             var milvus1 = builder1.AddMilvus("milvus1", apiKey1);
@@ -159,7 +158,7 @@ await pipeline.ExecuteAsync(
                 }
             }
 
-            var builder2 = CreateDistributedApplicationBuilder();
+            using var builder2 = TestDistributedApplicationBuilder.CreateWithTestContainerRegistry(testOutputHelper);
             builder2.Configuration["Parameters:apikey"] = MilvusToken;
             var apiKey2 = builder2.AddParameter("apikey");
             var milvus2 = builder2.AddMilvus("milvus2", apiKey2);
@@ -234,11 +233,4 @@ await pipeline.ExecuteAsync(
             }
         }
     }
-
-    private TestDistributedApplicationBuilder CreateDistributedApplicationBuilder()
-    {
-        var builder = TestDistributedApplicationBuilder.CreateWithTestContainerRegistry();
-        builder.Services.AddXunitLogging(testOutputHelper);
-        return builder;
-    }
 }

tests/Aspire.Hosting.MongoDB.Tests/Aspire.Hosting.MongoDB.Tests.csproj

@@ -16,7 +16,6 @@
   <ItemGroup>
     <Compile Include="$(RepoRoot)src\Aspire.Hosting.MongoDB\MongoDBContainerImageTags.cs" />
     <Compile Include="$(SharedDir)VolumeNameGenerator.cs" Link="Utils\VolumeNameGenerator.cs" />
-    <Compile Include="$(RepoRoot)src\Aspire.Hosting.Testing\ResourceLoggerForwarderService.cs" Link="Utils\ResourceLoggerForwarderService.cs" />
   </ItemGroup>
 
 </Project>

tests/Aspire.Hosting.MongoDB.Tests/MongoDbFunctionalTests.cs

@@ -5,14 +5,12 @@
 using Aspire.Hosting.Utils;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
 using MongoDB.Bson.Serialization.Attributes;
 using MongoDB.Bson;
 using MongoDB.Driver;
 using Xunit;
 using Xunit.Abstractions;
 using Polly;
-using Aspire.Hosting.Testing;
 
 namespace Aspire.Hosting.MongoDB.Tests;
 
@@ -37,7 +35,7 @@ public async Task VerifyMongoDBResource()
             .AddRetry(new() { MaxRetryAttempts = 10, Delay = TimeSpan.FromSeconds(1) })
             .Build();
 
-        var builder = CreateDistributedApplicationBuilder();
+        using var builder = TestDistributedApplicationBuilder.CreateWithTestContainerRegistry(testOutputHelper);
 
         var mongodb = builder.AddMongoDB("mongodb");
         var db = mongodb.AddDatabase("testdb");
@@ -80,7 +78,7 @@ public async Task WithDataShouldPersistStateBetweenUsages(bool useVolume)
 
         try
         {
-            var builder1 = CreateDistributedApplicationBuilder();
+            using var builder1 = TestDistributedApplicationBuilder.CreateWithTestContainerRegistry(testOutputHelper);
             var mongodb1 = builder1.AddMongoDB("mongodb");
             var db1 = mongodb1.AddDatabase(dbName);
 
@@ -128,7 +126,7 @@ await pipeline.ExecuteAsync(async token =>
                 }
             }
 
-            var builder2 = CreateDistributedApplicationBuilder();
+            using var builder2 = TestDistributedApplicationBuilder.CreateWithTestContainerRegistry(testOutputHelper);
             var mongodb2 = builder2.AddMongoDB("mongodb");
             var db2 = mongodb2.AddDatabase(dbName);
 
@@ -258,7 +256,7 @@ await File.WriteAllTextAsync(initFilePath, $$"""
                 File.SetUnixFileMode(initFilePath, UnixFileMode.UserRead | UnixFileMode.UserWrite | UnixFileMode.GroupRead | UnixFileMode.OtherRead);
             }
 
-            var builder = CreateDistributedApplicationBuilder();
+            using var builder = TestDistributedApplicationBuilder.CreateWithTestContainerRegistry(testOutputHelper);
 
             var mongodb = builder.AddMongoDB("mongodb")
                 .WithInitBindMount(bindMountPath);
@@ -324,15 +322,6 @@ private static async Task CreateTestDataAsync(IMongoDatabase mongoDatabase, Canc
                         item => Assert.Contains("Schindler's List", item.Name)
                         );
     }
-
-    private TestDistributedApplicationBuilder CreateDistributedApplicationBuilder()
-    {
-        var builder = TestDistributedApplicationBuilder.CreateWithTestContainerRegistry();
-        builder.Services.AddXunitLogging(testOutputHelper);
-        builder.Services.AddHostedService<ResourceLoggerForwarderService>();
-
-        return builder;
-    }
 }
 
 public class Movie

tests/Aspire.Hosting.MySql.Tests/Aspire.Hosting.MySql.Tests.csproj

@@ -12,9 +12,4 @@
     <ProjectReference Include="..\..\src\Components\Aspire.Pomelo.EntityFrameworkCore.MySql\Aspire.Pomelo.EntityFrameworkCore.MySql.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Compile Include="$(SharedDir)SecretsStore.cs" Link="Utils\SecretsStore.cs" />
-    <Compile Include="$(RepoRoot)src\Aspire.Hosting.Testing\ResourceLoggerForwarderService.cs" Link="Utils\ResourceLoggerForwarderService.cs" />
-  </ItemGroup>
-
 </Project>

tests/Aspire.Hosting.MySql.Tests/MySqlFunctionalTests.cs

@@ -3,15 +3,13 @@
 
 using System.Data;
 using Aspire.Components.Common.Tests;
-using Aspire.Hosting.Testing;
 using Aspire.Hosting.Utils;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Storage;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
 using MySqlConnector;
 using Polly;
 using Xunit;
@@ -30,7 +28,7 @@ public async Task VerifyMySqlResource()
             .AddRetry(new() { MaxRetryAttempts = 10, BackoffType = DelayBackoffType.Linear, Delay = TimeSpan.FromSeconds(2), ShouldHandle = new PredicateBuilder().Handle<MySqlException>() })
             .Build();
 
-        var builder = CreateDistributedApplicationBuilder();
+        using var builder = TestDistributedApplicationBuilder.CreateWithTestContainerRegistry(testOutputHelper);
 
         var mySqlDbName = "db1";
 
@@ -84,7 +82,7 @@ public async Task WithDataShouldPersistStateBetweenUsages(bool useVolume)
 
         try
         {
-            var builder1 = CreateDistributedApplicationBuilder();
+            using var builder1 = TestDistributedApplicationBuilder.CreateWithTestContainerRegistry(testOutputHelper);
 
             var mysql1 = builder1.AddMySql("mysql").WithEnvironment("MYSQL_DATABASE", mySqlDbName);
             var password = mysql1.Resource.PasswordParameter.Value;
@@ -158,7 +156,7 @@ await pipeline.ExecuteAsync(async token =>
                 }
             }
 
-            var builder2 = CreateDistributedApplicationBuilder();
+            using var builder2 = TestDistributedApplicationBuilder.CreateWithTestContainerRegistry(testOutputHelper);
             var passwordParameter2 = builder2.AddParameter("pwd");
             builder2.Configuration["Parameters:pwd"] = password;
 
@@ -270,7 +268,7 @@ public async Task VerifyWithInitBindMount()
                 INSERT INTO cars (brand) VALUES ('BatMobile');
             """);
 
-            var builder = CreateDistributedApplicationBuilder();
+            using var builder = TestDistributedApplicationBuilder.CreateWithTestContainerRegistry(testOutputHelper);
 
             var mySqlDbName = "db1";
 
@@ -340,7 +338,7 @@ public async Task VerifyEfMySql()
             .AddRetry(new() { MaxRetryAttempts = 10, BackoffType = DelayBackoffType.Linear, Delay = TimeSpan.FromSeconds(1), ShouldHandle = new PredicateBuilder().Handle<MySqlException>() })
             .Build();
 
-        var builder = CreateDistributedApplicationBuilder();
+        var builder = TestDistributedApplicationBuilder.CreateWithTestContainerRegistry(testOutputHelper);
 
         var mySqlDbName = "db1";
 
@@ -395,12 +393,4 @@ await pipeline.ExecuteAsync(async token =>
             Assert.Equal("BatMobile", cars[0].Brand);
         }, cts.Token);
     }
-
-    private TestDistributedApplicationBuilder CreateDistributedApplicationBuilder()
-    {
-        var builder = TestDistributedApplicationBuilder.CreateWithTestContainerRegistry();
-        builder.Services.AddXunitLogging(testOutputHelper);
-        builder.Services.AddHostedService<ResourceLoggerForwarderService>();
-        return builder;
-    }
 }