Extract Aspire.Hosting.Oracle.Tests

Aspire.sln

@@ -527,6 +527,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aspire.Hosting.PostgreSQL.T
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aspire.Hosting.Qdrant.Tests", "tests\Aspire.Hosting.Qdrant.Tests\Aspire.Hosting.Qdrant.Tests.csproj", "{8E2AA85E-C351-47B4-AF91-58557FAD5840}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aspire.Hosting.Oracle.Tests", "tests\Aspire.Hosting.Oracle.Tests\Aspire.Hosting.Oracle.Tests.csproj", "{8759FBB6-008F-4F11-80D9-073FDC1810EC}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aspire.Hosting.Kafka.Tests", "tests\Aspire.Hosting.Kafka.Tests\Aspire.Hosting.Kafka.Tests.csproj", "{0A83AA67-221E-44B4-9BA9-DC64DC17949E}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aspire.Hosting.Python.Tests", "tests\Aspire.Hosting.Python.Tests\Aspire.Hosting.Python.Tests.csproj", "{72F5A6F3-3516-402B-8F8D-50A7BC2E4BD4}"
@@ -1403,6 +1405,10 @@ Global
 		{8E2AA85E-C351-47B4-AF91-58557FAD5840}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8E2AA85E-C351-47B4-AF91-58557FAD5840}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8E2AA85E-C351-47B4-AF91-58557FAD5840}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8759FBB6-008F-4F11-80D9-073FDC1810EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8759FBB6-008F-4F11-80D9-073FDC1810EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8759FBB6-008F-4F11-80D9-073FDC1810EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8759FBB6-008F-4F11-80D9-073FDC1810EC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0A83AA67-221E-44B4-9BA9-DC64DC17949E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0A83AA67-221E-44B4-9BA9-DC64DC17949E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0A83AA67-221E-44B4-9BA9-DC64DC17949E}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -1689,6 +1695,9 @@ Global
 		{C424395C-1235-41A4-BF55-07880A04368C} = {4981B3A5-4AFD-4191-BF7D-8692D9783D60}
 		{830A89EC-4029-4753-B25A-068BAE37DEC7} = {4981B3A5-4AFD-4191-BF7D-8692D9783D60}
 		{1BC02557-B78B-48CE-9D3C-488A6B7672F4} = {830A89EC-4029-4753-B25A-068BAE37DEC7}
+		{7425E5B2-BC47-4521-AC40-B8CECA329E08} = {830A89EC-4029-4753-B25A-068BAE37DEC7}
+		{8E2AA85E-C351-47B4-AF91-58557FAD5840} = {830A89EC-4029-4753-B25A-068BAE37DEC7}
+		{8759FBB6-008F-4F11-80D9-073FDC1810EC} = {830A89EC-4029-4753-B25A-068BAE37DEC7}
 		{72F5A6F3-3516-402B-8F8D-50A7BC2E4BD4} = {830A89EC-4029-4753-B25A-068BAE37DEC7}
 		{7425E5B2-BC47-4521-AC40-B8CECA329E08} = {830A89EC-4029-4753-B25A-068BAE37DEC7}
 		{8E2AA85E-C351-47B4-AF91-58557FAD5840} = {830A89EC-4029-4753-B25A-068BAE37DEC7}

src/Aspire.Hosting.PostgreSQL/Aspire.Hosting.PostgreSQL.csproj

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

src/Aspire.Hosting.Testing/PublicAPI.Unshipped.txt

@@ -1,5 +1,9 @@
 #nullable enable
 Aspire.Hosting.Testing.DistributedApplicationFactory.DistributedApplicationFactory(System.Type! entryPoint, string![]! args) -> void
 Aspire.Hosting.Testing.IDistributedApplicationTestingBuilder.AppHostAssembly.get -> System.Reflection.Assembly?
+Aspire.Hosting.Testing.ResourceLoggerForwarderService
+Aspire.Hosting.Testing.ResourceLoggerForwarderService.OnResourceLog.get -> System.Action<string!>?
+Aspire.Hosting.Testing.ResourceLoggerForwarderService.OnResourceLog.set -> void
+Aspire.Hosting.Testing.ResourceLoggerForwarderService.ResourceLoggerForwarderService(Aspire.Hosting.ApplicationModel.ResourceNotificationService! resourceNotificationService, Aspire.Hosting.ApplicationModel.ResourceLoggerService! resourceLoggerService, Microsoft.Extensions.Hosting.IHostEnvironment! hostEnvironment, Microsoft.Extensions.Logging.ILoggerFactory! loggerFactory) -> void
 static Aspire.Hosting.Testing.DistributedApplicationTestingBuilder.CreateAsync(System.Type! entryPoint, string![]! args, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<Aspire.Hosting.Testing.IDistributedApplicationTestingBuilder!>!
 static Aspire.Hosting.Testing.DistributedApplicationTestingBuilder.CreateAsync<TEntryPoint>(string![]! args, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<Aspire.Hosting.Testing.IDistributedApplicationTestingBuilder!>!

src/Aspire.Hosting.Testing/ResourceLoggerForwarderService.cs

@@ -10,7 +10,7 @@ namespace Aspire.Hosting.Testing;
 /// <summary>
 /// A background service that watches resource logs and forwards them to the host's <see cref="ILogger"/> infrastructure.
 /// </summary>
-internal sealed class ResourceLoggerForwarderService(
+public sealed class ResourceLoggerForwarderService(
     ResourceNotificationService resourceNotificationService,
     ResourceLoggerService resourceLoggerService,
     IHostEnvironment hostEnvironment,

tests/Aspire.EndToEnd.Tests/IntegrationServicesFixture.cs

@@ -108,7 +108,6 @@ public Task DumpComponentLogsAsync(TestResourceNames resource, ITestOutputHelper
             TestResourceNames.milvus => "milvus",
             TestResourceNames.mongodb => "mongodb",
             TestResourceNames.mysql or TestResourceNames.efmysql => "mysql",
-            TestResourceNames.oracledatabase => "oracledatabase",
             TestResourceNames.postgres or TestResourceNames.efnpgsql => "postgres",
             TestResourceNames.rabbitmq => "rabbitmq",
             TestResourceNames.redis => "redis",
@@ -142,7 +141,6 @@ private static TestResourceNames GetResourcesToSkip()
     {
         TestResourceNames resourcesToInclude = TestScenario switch
         {
-            "oracle" => TestResourceNames.oracledatabase,
             "cosmos" => TestResourceNames.cosmos | TestResourceNames.efcosmos,
             "eventhubs" => TestResourceNames.eventhubs,
             "basicservices" => TestResourceNames.mongodb
@@ -173,7 +171,6 @@ private static TestResourceNames GetResourcesToSkip()
             if (BuildEnvironment.IsRunningOnCI)
             {
                 resourcesToSkip |= TestResourceNames.cosmos;
-                resourcesToSkip |= TestResourceNames.oracledatabase;
             }
         }
 

tests/Aspire.EndToEnd.Tests/IntegrationServicesTests.cs

@@ -57,12 +57,6 @@ public Task VerifyComponentWorks(TestResourceNames resourceName)
     public Task VerifyAzureEventHubsComponentWorks()
         => VerifyComponentWorks(TestResourceNames.eventhubs);
 
-    [ConditionalFact]
-    [SkipOnCI("https://github.com/dotnet/aspire/issues/3161")]
-    [Trait("scenario", "oracle")]
-    public Task VerifyOracleComponentWorks()
-        => VerifyComponentWorks(TestResourceNames.oracledatabase);
-
     [ConditionalTheory]
     [Trait("scenario", "cosmos")]
     [InlineData(TestResourceNames.cosmos)]
@@ -80,7 +74,6 @@ public Task VerifyCosmosComponentWorks(TestResourceNames resourceName)
     [Fact]
     // Include all the scenarios here so this test gets run for all of them.
     [Trait("scenario", "cosmos")]
-    [Trait("scenario", "oracle")]
     [Trait("scenario", "basicservices")]
     public Task VerifyHealthyOnIntegrationServiceA()
         => RunTestAsync(async () =>

tests/Aspire.Hosting.Tests/Oracle/AddOracleDatabaseTests.cs → tests/Aspire.Hosting.Oracle.Tests/AddOracleTests.cs

@@ -2,12 +2,13 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Net.Sockets;
+using Aspire.Hosting.ApplicationModel;
 using Aspire.Hosting.Tests.Utils;
 using Aspire.Hosting.Utils;
 using Microsoft.Extensions.DependencyInjection;
 using Xunit;
 
-namespace Aspire.Hosting.Tests.Oracle;
+namespace Aspire.Hosting.Oracle.Tests;
 
 public class AddOracleTests
 {
@@ -18,7 +19,7 @@ public void AddOracleAddsGeneratedPasswordParameterWithUserSecretsParameterDefau
 
         var orcl = appBuilder.AddOracle("orcl");
 
-        Assert.IsType<UserSecretsParameterDefault>(orcl.Resource.PasswordParameter.Default);
+        Assert.Equal(nameof(UserSecretsParameterDefault), orcl.Resource.PasswordParameter.Default?.GetType().Name);
     }
 
     [Fact]
@@ -28,7 +29,7 @@ public void AddOracleDoesNotAddGeneratedPasswordParameterWithUserSecretsParamete
 
         var orcl = appBuilder.AddOracle("orcl");
 
-        Assert.IsNotType<UserSecretsParameterDefault>(orcl.Resource.PasswordParameter.Default);
+        Assert.Equal(nameof(GenerateParameterDefault), orcl.Resource.PasswordParameter.Default?.GetType().Name);
     }
 
     [Fact]

tests/Aspire.Hosting.Oracle.Tests/Aspire.Hosting.Oracle.Tests.csproj

@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>$(NetCurrent)</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Aspire.Hosting.AppHost\Aspire.Hosting.AppHost.csproj" />
+    <ProjectReference Include="..\Aspire.Hosting.Tests\Aspire.Hosting.Tests.csproj" />
+    <ProjectReference Include="..\..\src\Aspire.Hosting.Oracle\Aspire.Hosting.Oracle.csproj" />
+    <ProjectReference Include="..\..\src\Components\Aspire.Oracle.EntityFrameworkCore\Aspire.Oracle.EntityFrameworkCore.csproj" IsAspireProjectResource="false" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Include="$(SharedDir)SecretsStore.cs" Link="Utils\SecretsStore.cs" />
+    <Compile Include="$(RepoRoot)src\Aspire.Hosting\ApplicationModel\UserSecretsParameterDefault.cs" Link="Utils\UserSecretsParameterDefault.cs" />
+    <Compile Include="$(RepoRoot)src\Aspire.Hosting.Oracle\OracleContainerImageTags.cs" />
+    <Compile Include="$(SharedDir)VolumeNameGenerator.cs" Link="Utils\VolumeNameGenerator.cs" />
+    <Compile Include="$(RepoRoot)src\Aspire.Hosting\Utils\PasswordGenerator.cs" Link="Utils\PasswordGenerator.cs" />
+  </ItemGroup>
+
+</Project>