Split redis tests into separate test assembly

src/Aspire.Hosting.Redis/Aspire.Hosting.Redis.csproj

@@ -18,6 +18,7 @@
 
   <ItemGroup>
     <InternalsVisibleTo Include="Aspire.Hosting.Tests" />
+    <InternalsVisibleTo Include="Aspire.Hosting.Redis.Tests" />
   </ItemGroup>
 
 </Project>

src/Aspire.Hosting/Aspire.Hosting.csproj

@@ -62,6 +62,7 @@
 
   <ItemGroup>
     <InternalsVisibleTo Include="Aspire.Hosting.Tests" />
+    <InternalsVisibleTo Include="Aspire.Hosting.Redis.Tests" />
   </ItemGroup>
 
 </Project>

tests/Aspire.Hosting.Tests/Redis/AddRedisTests.cs → tests/Aspire.Hosting.Redis.Tests/AddRedisTests.cs

@@ -2,13 +2,12 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Net.Sockets;
-using Aspire.Hosting.Redis;
 using Aspire.Hosting.Tests.Utils;
 using Aspire.Hosting.Utils;
 using Microsoft.Extensions.DependencyInjection;
 using Xunit;
 
-namespace Aspire.Hosting.Tests.Redis;
+namespace Aspire.Hosting.Redis.Tests;
 
 public class AddRedisTests
 {
@@ -125,7 +124,8 @@ public void WithRedisCommanderAddsRedisCommanderResource()
     public void WithRedisCommanderSupportsChangingContainerImageValues()
     {
         var builder = DistributedApplication.CreateBuilder();
-        builder.AddRedis("myredis").WithRedisCommander(c => {
+        builder.AddRedis("myredis").WithRedisCommander(c =>
+        {
             c.WithImageRegistry("example.mycompany.com");
             c.WithImage("customrediscommander");
             c.WithImageTag("someothertag");
@@ -142,7 +142,8 @@ public void WithRedisCommanderSupportsChangingContainerImageValues()
     public void WithRedisCommanderSupportsChangingHostPort()
     {
         var builder = DistributedApplication.CreateBuilder();
-        builder.AddRedis("myredis").WithRedisCommander(c => {
+        builder.AddRedis("myredis").WithRedisCommander(c =>
+        {
             c.WithHostPort(1000);
         });
 
@@ -218,7 +219,7 @@ public void WithDataVolumeAddsVolumeAnnotation(bool? isReadOnly)
 
         var volumeAnnotation = redis.Resource.Annotations.OfType<ContainerMountAnnotation>().Single();
 
-        Assert.Equal("Aspire.Hosting.Tests-myRedis-data", volumeAnnotation.Source);
+        Assert.Equal("Aspire.Hosting.Redis.Tests-myRedis-data", volumeAnnotation.Source);
         Assert.Equal("/data", volumeAnnotation.Target);
         Assert.Equal(ContainerMountType.Volume, volumeAnnotation.Type);
         Assert.Equal(isReadOnly ?? false, volumeAnnotation.IsReadOnly);

tests/Aspire.Hosting.Redis.Tests/Aspire.Hosting.Redis.Tests.csproj

@@ -0,0 +1,38 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>$(NetCurrent)</TargetFramework>
+    <IsAspireHost>true</IsAspireHost>
+    <!--
+      CS8002: Referenced assembly does not have a strong name. MongoDB.Driver package is unsigned, we ignore that warning on purpose
+    -->
+    <NoWarn>$(NoWarn);CS8002</NoWarn>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Aspire.Hosting.AppHost\Aspire.Hosting.AppHost.csproj" IsAspireProjectResource="false" />
+    <ProjectReference Include="..\..\src\Aspire.Hosting.Redis\Aspire.Hosting.Redis.csproj" IsAspireProjectResource="false" />
+    <ProjectReference Include="..\..\src\Components\Aspire.StackExchange.Redis\Aspire.StackExchange.Redis.csproj" />
+
+    <PackageReference Include="Microsoft.Extensions.Http.Resilience" />
+    <PackageReference Include="Newtonsoft.Json.Schema" />
+
+    <Compile Include="$(TestsSharedDir)Logging\*.cs" LinkBase="shared/Logging" />
+
+    <Compile Include="..\Aspire.Hosting.Tests\Utils\ArgumentEvaluator.cs" Link="Utils\ArgumentEvaluator.cs" />
+    <Compile Include="..\Aspire.Hosting.Tests\Utils\EnvironmentVariableEvaluator.cs" Link="Utils\EnvironmentVariableEvaluator.cs" />
+    <Compile Include="..\Aspire.Hosting.Tests\Utils\FileUtil.cs" Link="Utils\FileUtil.cs" />
+    <Compile Include="..\Aspire.Hosting.Tests\Utils\ManifestUtils.cs" Link="Utils\ManifestUtils.cs" />
+    <Compile Include="..\Aspire.Hosting.Tests\Utils\TestDistributedApplicationBuilder.cs" Link="Utils\TestDistributedApplicationBuilder.cs" />
+    <Compile Include="..\Aspire.Hosting.Tests\XunitAttributes.cs" Link="XunitAttributes.cs" />
+
+    <Content Include="$(RepoRoot)src\Schema\aspire-8.0.json" Link="Schema\aspire-8.0.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="Utils\" />
+  </ItemGroup>
+
+</Project>

tests/Aspire.Hosting.Redis.Tests/Directory.Build.props

@@ -0,0 +1,8 @@
+<Project>
+
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
+
+  <!-- NOTE: This line is only required because we are using P2P references, not NuGet. It will not exist in real apps. -->
+  <Import Project="../../src/Aspire.Hosting.AppHost/build/Aspire.Hosting.AppHost.props" />
+
+</Project>

tests/Aspire.Hosting.Redis.Tests/Directory.Build.targets

@@ -0,0 +1,8 @@
+<Project>
+
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
+
+  <!-- NOTE: This line is only required because we are using P2P references, not NuGet. It will not exist in real apps. -->
+  <Import Project="..\..\src\Aspire.Hosting.AppHost\build\Aspire.Hosting.AppHost.targets" />
+
+</Project>

tests/Aspire.Hosting.Redis.Tests/RedisFunctionalTests.cs

@@ -0,0 +1,49 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Aspire.Hosting.Utils;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using StackExchange.Redis;
+using Xunit;
+
+namespace Aspire.Hosting.Redis.Tests;
+
+public class RedisFunctionalTests
+{
+    [Fact]
+    public async Task VerifyRedisResource()
+    {
+        var builder = TestDistributedApplicationBuilder.Create();
+
+        var redis = builder.AddRedis("redis");
+
+        using var app = builder.Build();
+
+        await app.StartAsync();
+
+        var hb = Host.CreateApplicationBuilder();
+
+        hb.Configuration.AddInMemoryCollection(new Dictionary<string, string?>
+        {
+            ["ConnectionStrings:redis"] = await redis.Resource.GetConnectionStringAsync()
+        });
+
+        hb.AddRedisClient("redis");
+
+        using var host = hb.Build();
+
+        await host.StartAsync();
+
+        var redisClient = host.Services.GetRequiredService<IConnectionMultiplexer>();
+
+        var db = redisClient.GetDatabase();
+
+        await db.StringSetAsync("key", "value");
+
+        var value = await db.StringGetAsync("key");
+
+        Assert.Equal("value", value);
+    }
+}

tests/Aspire.Hosting.Tests/Containers/ContainerResourceBuilderTests.cs

@@ -1,7 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using Aspire.Hosting.Redis;
 using Aspire.Hosting.Utils;
 using Xunit;
 
@@ -54,8 +53,8 @@ public void WithImageMutatesImageNameOfLastAnnotation()
     public void WithImageTagMutatesImageTag()
     {
         using var builder = TestDistributedApplicationBuilder.Create();
-        var redis = builder.AddRedis("redis").WithImageTag(RedisContainerImageTags.Tag);
-        Assert.Equal(RedisContainerImageTags.Tag, redis.Resource.Annotations.OfType<ContainerImageAnnotation>().Single().Tag);
+        var redis = builder.AddRedis("redis").WithImageTag("7.1");
+        Assert.Equal("7.1", redis.Resource.Annotations.OfType<ContainerImageAnnotation>().Single().Tag);
     }
 
     [Fact]
@@ -80,7 +79,7 @@ public void WithImageTagThrowsIfNoImageAnnotation()
         using var builder = TestDistributedApplicationBuilder.Create();
         var container = builder.AddResource(new TestContainerResource("testcontainer"));
 
-        var exception = Assert.Throws<InvalidOperationException>(() => container.WithImageTag(RedisContainerImageTags.Tag));
+        var exception = Assert.Throws<InvalidOperationException>(() => container.WithImageTag("7.1"));
         Assert.Equal("The resource 'testcontainer' does not have a container image specified. Use WithImage to specify the container image and tag.", exception.Message);
     }
 

tests/Aspire.Hosting.Tests/ManifestGenerationTests.cs

@@ -97,23 +97,14 @@ public async Task WithContainerRegistryUpdatesContainerImageAnnotationsDuringPub
             ContainerRegistryOverride = "myprivateregistry.company.com"
         });
 
-        var redis = builder.AddRedis("redis");
+        var redis = builder.AddContainer("redis", "redis");
         builder.Build().Run();
 
         var redisManifest = await ManifestUtils.GetManifest(redis.Resource);
         var expectedManifest = $$"""
             {
               "type": "container.v0",
-              "connectionString": "{redis.bindings.tcp.host}:{redis.bindings.tcp.port}",
-              "image": "myprivateregistry.company.com/{{RedisContainerImageTags.Image}}:{{RedisContainerImageTags.Tag}}",
-              "bindings": {
-                "tcp": {
-                  "scheme": "tcp",
-                  "protocol": "tcp",
-                  "transport": "tcp",
-                  "targetPort": 6379
-                }
-              }
+              "image": "myprivateregistry.company.com/redis:latest"
             }
             """;
         Assert.Equal(expectedManifest, redisManifest.ToString());