Extract Aspire.Hosting.Oracle.Tests

Aspire.sln

@@ -525,6 +525,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aspire.Hosting.Qdrant.Tests
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aspire.Hosting.Milvus.Tests", "tests\Aspire.Hosting.Milvus.Tests\Aspire.Hosting.Milvus.Tests.csproj", "{986886B7-0E38-4890-92C3-5B46DE322DAF}"
 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.MySql.Tests", "tests\Aspire.Hosting.MySql.Tests\Aspire.Hosting.MySql.Tests.csproj", "{F3F33CF8-A2BB-4351-8501-A6884C5126FE}"
 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}"
@@ -577,9 +579,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BrowserTelemetry.AppHost",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BrowserTelemetry.Web", "playground\BrowserTelemetry\BrowserTelemetry.Web\BrowserTelemetry.Web.csproj", "{091EA540-355B-4763-9980-5F83F0BB6F11}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.Hosting.Dapr.Tests", "tests\Aspire.Hosting.Dapr.Tests\Aspire.Hosting.Dapr.Tests.csproj", "{C60C5CFA-5B6D-4432-BFCD-54D1BEEC7DBE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aspire.Hosting.Dapr.Tests", "tests\Aspire.Hosting.Dapr.Tests\Aspire.Hosting.Dapr.Tests.csproj", "{C60C5CFA-5B6D-4432-BFCD-54D1BEEC7DBE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.Hosting.AWS.Tests", "tests\Aspire.Hosting.AWS.Tests\Aspire.Hosting.AWS.Tests.csproj", "{6F71BC73-B703-4E64-98E0-801781302E7A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aspire.Hosting.AWS.Tests", "tests\Aspire.Hosting.AWS.Tests\Aspire.Hosting.AWS.Tests.csproj", "{6F71BC73-B703-4E64-98E0-801781302E7A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -1427,6 +1429,10 @@ Global
 		{986886B7-0E38-4890-92C3-5B46DE322DAF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{986886B7-0E38-4890-92C3-5B46DE322DAF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{986886B7-0E38-4890-92C3-5B46DE322DAF}.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
 		{F3F33CF8-A2BB-4351-8501-A6884C5126FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F3F33CF8-A2BB-4351-8501-A6884C5126FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F3F33CF8-A2BB-4351-8501-A6884C5126FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -1783,6 +1789,7 @@ Global
 		{7425E5B2-BC47-4521-AC40-B8CECA329E08} = {830A89EC-4029-4753-B25A-068BAE37DEC7}
 		{8E2AA85E-C351-47B4-AF91-58557FAD5840} = {830A89EC-4029-4753-B25A-068BAE37DEC7}
 		{986886B7-0E38-4890-92C3-5B46DE322DAF} = {830A89EC-4029-4753-B25A-068BAE37DEC7}
+		{8759FBB6-008F-4F11-80D9-073FDC1810EC} = {830A89EC-4029-4753-B25A-068BAE37DEC7}
 		{F3F33CF8-A2BB-4351-8501-A6884C5126FE} = {830A89EC-4029-4753-B25A-068BAE37DEC7}
 		{0A83AA67-221E-44B4-9BA9-DC64DC17949E} = {830A89EC-4029-4753-B25A-068BAE37DEC7}
 		{72F5A6F3-3516-402B-8F8D-50A7BC2E4BD4} = {830A89EC-4029-4753-B25A-068BAE37DEC7}

tests/Aspire.EndToEnd.Tests/IntegrationServicesFixture.cs

@@ -104,7 +104,6 @@ public Task DumpComponentLogsAsync(TestResourceNames resource, ITestOutputHelper
         {
             TestResourceNames.cosmos or TestResourceNames.efcosmos => "cosmos",
             TestResourceNames.eventhubs => "eventhubs",
-            TestResourceNames.oracledatabase => "oracledatabase",
             TestResourceNames.postgres or TestResourceNames.efnpgsql => "postgres",
             TestResourceNames.redis => "redis",
             _ => throw new ArgumentException($"Unknown resource: {resource}")
@@ -136,7 +135,6 @@ private static TestResourceNames GetResourcesToSkip()
     {
         TestResourceNames resourcesToInclude = TestScenario switch
         {
-            "oracle" => TestResourceNames.oracledatabase,
             "cosmos" => TestResourceNames.cosmos | TestResourceNames.efcosmos,
             "eventhubs" => TestResourceNames.eventhubs,
             "basicservices" => TestResourceNames.redis
@@ -159,7 +157,6 @@ private static TestResourceNames GetResourcesToSkip()
             if (BuildEnvironment.IsRunningOnCI)
             {
                 resourcesToSkip |= TestResourceNames.cosmos;
-                resourcesToSkip |= TestResourceNames.oracledatabase;
             }
         }
 

tests/Aspire.EndToEnd.Tests/IntegrationServicesTests.cs

@@ -49,12 +49,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)]
@@ -72,7 +66,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.MySql.Tests/TestDbContext.cs

@@ -3,6 +3,8 @@
 
 using Microsoft.EntityFrameworkCore;
 
+namespace Aspire.Hosting.MySql.Tests;
+
 public class TestDbContext : DbContext
 {
     public TestDbContext(DbContextOptions<TestDbContext> options) : base(options)

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("Aspire.Hosting.ApplicationModel.UserSecretsParameterDefault", orcl.Resource.PasswordParameter.Default?.GetType().FullName);
     }
 
     [Fact]
@@ -28,7 +29,7 @@ public void AddOracleDoesNotAddGeneratedPasswordParameterWithUserSecretsParamete
 
         var orcl = appBuilder.AddOracle("orcl");
 
-        Assert.IsNotType<UserSecretsParameterDefault>(orcl.Resource.PasswordParameter.Default);
+        Assert.NotEqual("Aspire.Hosting.ApplicationModel.UserSecretsParameterDefault", orcl.Resource.PasswordParameter.Default?.GetType().FullName);
     }
 
     [Fact]

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

@@ -0,0 +1,19 @@
+<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" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Include="$(RepoRoot)src\Aspire.Hosting.Oracle\OracleContainerImageTags.cs" />
+    <Compile Include="$(SharedDir)VolumeNameGenerator.cs" Link="Utils\VolumeNameGenerator.cs" />
+  </ItemGroup>
+
+</Project>