Enable Java tests (#7)

* Enabling java tests and trying to push diagnostic logs

* fixing path

* Fixing the project that the tests were starting up

* seems it was set wrong

* Using new WaitForResource method to delay test execution

* Turning up the logging

* Trying something out

* Not having the StandardResilienceHandler is the problem

Author: aaronpowell

.github/workflows/dotnet.yml

@@ -12,6 +12,9 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    env:
+      DCP_PRESERVE_EXECUTABLE_LOGS: "yes"
+      DCP_DIAGNOSTICS_LOG_FOLDER: ${{ github.workspace }}/diagnostics
 
     steps:
       - uses: actions/checkout@v4
@@ -35,4 +38,10 @@ jobs:
         run: dotnet build --no-restore
       - name: Test
         run: dotnet test --no-build --verbosity normal
-
+      - name: Upload build artifact
+        uses: actions/upload-artifact@v3
+        if: failure()
+        with:
+          name: build-output
+          path: |
+            ${{ github.workspace }}/diagnostics/**

.gitignore

@@ -5,3 +5,4 @@ obj
 *.user
 .azure
 appsettings.*.json
+*.orig

CommunityToolkit.Aspire.sln

@@ -21,7 +21,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommunityToolkit.Aspire.Jav
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{899F0713-7FC6-4750-BAFC-AC650B35B453}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommunityToolkit.Aspire.Java.Hosting.EndToEndTests", "test\CommunityToolkit.Aspire.Java.Hosting.EndToEndTests\CommunityToolkit.Aspire.Java.Hosting.EndToEndTests.csproj", "{E2905A71-E25D-46FC-A128-D6A366D4D751}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommunityToolkit.Aspire.Java.Hosting.EndToEndTests", "tests\CommunityToolkit.Aspire.Java.Hosting.EndToEndTests\CommunityToolkit.Aspire.Java.Hosting.EndToEndTests.csproj", "{E2905A71-E25D-46FC-A128-D6A366D4D751}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

Directory.Packages.props

@@ -2,27 +2,23 @@
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
-
   <ItemGroup>
     <!-- Aspire packages -->
     <PackageVersion Include="Aspire.Hosting" Version="$(AspireVersion)" />
     <PackageVersion Include="Aspire.Hosting.AppHost" Version="$(AspireVersion)" />
-
+    <PackageVersion Include="MartinCostello.Logging.XUnit" Version="0.4.0" />
     <!-- AspNetCore packages -->
     <PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="$(AspNetCoreVersion)" />
     <PackageVersion Include="Swashbuckle.AspNetCore" Version="6.6.2" />
-
     <!-- .NET packages -->
     <PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="8.7.0" />
     <PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="8.0.2" />
-
     <!-- OpenTelemetry packages -->
     <PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="$(OpenTelemetryVersion)" />
     <PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="$(OpenTelemetryVersion)" />
     <PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="$(OpenTelemetryVersion)" />
     <PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="$(OpenTelemetryVersion)" />
     <PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="$(OpenTelemetryVersion)" />
-
     <!-- Testing packages -->
     <PackageVersion Include="Aspire.Hosting.Testing" Version="$(AspireVersion)" />
     <PackageVersion Include="coverlet.collector" Version="6.0.2" />

test/CommunityToolkit.Aspire.Java.Hosting.EndToEndTests/ProgramTests.cs

@@ -9,6 +9,7 @@
     <PackageReference Include="Aspire.Hosting.Testing" />
     <PackageReference Include="coverlet.collector" />
     <PackageReference Include="FluentAssertions" />
+    <PackageReference Include="MartinCostello.Logging.XUnit" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="xunit" />
     <PackageReference Include="xunit.runner.visualstudio" />

test/CommunityToolkit.Aspire.Java.Hosting.EndToEndTests/CommunityToolkit.Aspire.Java.Hosting.EndToEndTests.csproj renamed to tests/CommunityToolkit.Aspire.Java.Hosting.EndToEndTests/CommunityToolkit.Aspire.Java.Hosting.EndToEndTests.csproj

@@ -0,0 +1,68 @@
+using System.Net;
+using FluentAssertions;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Xunit.Abstractions;
+
+namespace CommunityToolkit.Aspire.Java.Hosting.EndToEndTests;
+
+public class ProgramTests(ITestOutputHelper testOutput)
+{
+    [Fact]
+    public async Task Given_Container_Resource_When_Invoked_Then_Root_Returns_OK()
+    {
+        // Arrange
+        var appHost = await DistributedApplicationTestingBuilder.CreateAsync<Projects.CommunityToolkit_Aspire_Java_AppHost>();
+
+        appHost.Services
+            .AddLogging(builder =>
+            {
+                builder.AddXUnit(testOutput);
+                builder.SetMinimumLevel(LogLevel.Trace);
+            })
+            .ConfigureHttpClientDefaults(clientBuilder => clientBuilder.AddStandardResilienceHandler());
+
+        await using var app = await appHost.BuildAsync();
+        var resourceNotificationService = app.Services.GetRequiredService<ResourceNotificationService>();
+        await app.StartAsync();
+
+        // Act
+        var httpClient = app.CreateHttpClient("containerapp");
+
+        await resourceNotificationService.WaitForResourceAsync("containerapp", KnownResourceStates.Running).WaitAsync(TimeSpan.FromSeconds(30));
+
+        var response = await httpClient.GetAsync("/");
+
+        // Assert
+        response.StatusCode.Should().Be(HttpStatusCode.OK);
+    }
+
+    [Fact]
+    public async Task Given_Executable_Resource_When_Invoked_Then_Root_Returns_OK()
+    {
+        // Arrange
+        var appHost = await DistributedApplicationTestingBuilder.CreateAsync<Projects.CommunityToolkit_Aspire_Java_AppHost>();
+
+        appHost.Services
+            .AddLogging(builder =>
+            {
+                builder.AddXUnit(testOutput);
+                builder.SetMinimumLevel(LogLevel.Trace);
+            })
+            .ConfigureHttpClientDefaults(clientBuilder => clientBuilder.AddStandardResilienceHandler());
+
+        await using var app = await appHost.BuildAsync();
+        var resourceNotificationService = app.Services.GetRequiredService<ResourceNotificationService>();
+        await app.StartAsync();
+
+        // Act
+        var httpClient = app.CreateHttpClient("executableapp");
+
+        await resourceNotificationService.WaitForResourceAsync("executableapp", KnownResourceStates.Running).WaitAsync(TimeSpan.FromSeconds(30));
+
+        var response = await httpClient.GetAsync("/");
+
+        // Assert
+        response.StatusCode.Should().Be(HttpStatusCode.OK);
+    }
+}