Move test infrastructure code to sub-dir (#30)

src/IntegrationTests/DistributedApplicationExtensions.cs → src/IntegrationTests/Infrastructure/DistributedApplicationExtensions.cs

@@ -5,12 +5,12 @@
 using System.Net;
 using System.Reflection;
 using System.Security.Cryptography;
-using Aspire.Hosting.Utils;
+using IntegrationTests.Infrastructure;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 
-namespace IntegrationTests;
+namespace IntegrationTests.Infrastructure;
 
 public static partial class DistributedApplicationExtensions
 {
@@ -75,7 +75,7 @@ public static TBuilder WithRandomVolumeNames<TBuilder>(this TBuilder builder)
     {
         // Named volumes that aren't shared across resources should be replaced with anonymous volumes.
         // Named volumes shared by mulitple resources need to have their name randomized but kept shared across those resources.
-        
+
         // Find all shared volumes and make a map of their original name to a new randomized name
         var allResourceNamedVolumes = builder.Resources.SelectMany(r => r.Annotations
             .OfType<ContainerMountAnnotation>()
@@ -142,7 +142,7 @@ public static HttpClient CreateHttpClient(this DistributedApplication app, strin
             .ConfigureHttpClientDefaults(configure)
             .BuildServiceProvider();
         var httpClientFactory = services.GetRequiredService<IHttpClientFactory>();
-        
+
         var httpClient = httpClientFactory.CreateClient();
         httpClient.BaseAddress = app.GetEndpoint(resourceName, endpointName);
 

src/IntegrationTests/LoggerLogStore.cs → src/IntegrationTests/Infrastructure/LoggerLogStore.cs

@@ -2,7 +2,7 @@
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 
-namespace IntegrationTests;
+namespace IntegrationTests.Infrastructure;
 
 /// <summary>
 /// Stores logs from <see cref="ILogger"/> instances created from <see cref="StoredLogsLoggerProvider"/>.

src/IntegrationTests/PasswordGenerator.cs → src/IntegrationTests/Infrastructure/PasswordGenerator.cs

@@ -5,7 +5,7 @@
 using System.Runtime.CompilerServices;
 using System.Security.Cryptography;
 
-namespace Aspire.Hosting.Utils;
+namespace IntegrationTests.Infrastructure;
 
 internal static class PasswordGenerator
 {

src/IntegrationTests/ResourceExtensions.cs → src/IntegrationTests/Infrastructure/ResourceExtensions.cs

@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-namespace IntegrationTests;
+namespace IntegrationTests.Infrastructure;
 
 internal static class ResourceExtensions
 {

src/IntegrationTests/ResourceLogStore.cs → src/IntegrationTests/Infrastructure/ResourceLogStore.cs

@@ -3,7 +3,7 @@
 
 using System.Collections.Concurrent;
 
-namespace IntegrationTests;
+namespace IntegrationTests.Infrastructure;
 
 public class ResourceLogStore
 {

src/IntegrationTests/ResourceWatcher.cs → src/IntegrationTests/Infrastructure/ResourceWatcher.cs

@@ -5,7 +5,7 @@
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 
-namespace IntegrationTests;
+namespace IntegrationTests.Infrastructure;
 
 /// <summary>
 /// A background service that watches for resource start/stop notifications and logs resource state changes.

src/IntegrationTests/StoredLogsLogger.cs → src/IntegrationTests/Infrastructure/StoredLogsLogger.cs

@@ -3,7 +3,7 @@
 
 using Microsoft.Extensions.Logging;
 
-namespace IntegrationTests;
+namespace IntegrationTests.Infrastructure;
 
 /// <summary>
 /// A logger that stores logs in a <see cref="LoggerLogStore"/>.

src/IntegrationTests/StoredLogsLoggerProvider.cs → src/IntegrationTests/Infrastructure/StoredLogsLoggerProvider.cs

@@ -3,7 +3,7 @@
 
 using Microsoft.Extensions.Logging;
 
-namespace IntegrationTests;
+namespace IntegrationTests.Infrastructure;
 
 /// <summary>
 /// A logger provider that stores logs in an <see cref="LoggerLogStore"/>.

src/IntegrationTests/XUnitExtensions.cs → src/IntegrationTests/Infrastructure/XUnitExtensions.cs

@@ -5,7 +5,7 @@
 using Microsoft.Extensions.Logging;
 using Xunit.Abstractions;
 
-namespace IntegrationTests;
+namespace IntegrationTests.Infrastructure;
 
 internal static partial class DistributedApplicationTestFactory
 {

src/IntegrationTests/XUnitLogger.cs → src/IntegrationTests/Infrastructure/XUnitLogger.cs

@@ -5,7 +5,7 @@
 using Microsoft.Extensions.Logging;
 using Xunit.Abstractions;
 
-namespace IntegrationTests;
+namespace IntegrationTests.Infrastructure;
 
 /// <summary>
 /// An <see cref="ILogger"/> that writes log messages to an <see cref="ITestOutputHelper"/>.

src/IntegrationTests/XUnitLoggerProvider.cs → src/IntegrationTests/Infrastructure/XUnitLoggerProvider.cs

@@ -4,7 +4,7 @@
 using Microsoft.Extensions.Logging;
 using Xunit.Abstractions;
 
-namespace IntegrationTests;
+namespace IntegrationTests.Infrastructure;
 
 /// <summary>
 /// An <see cref="ILoggerProvider"/> that creates <see cref="ILogger"/> instances that output to the supplied <see cref="ITestOutputHelper"/>.

src/IntegrationTests/XUnitTextWriter.cs → src/IntegrationTests/Infrastructure/XUnitTextWriter.cs

@@ -4,7 +4,7 @@
 using System.Text;
 using Xunit.Abstractions;
 
-namespace IntegrationTests;
+namespace IntegrationTests.Infrastructure;
 
 /// <summary>
 /// A <see cref="TextWriter"/> that writes to an <see cref="ITestOutputHelper"/>.

src/IntegrationTests/WebAppTests.cs

@@ -1,4 +1,5 @@
 using System.Net;
+using IntegrationTests.Infrastructure;
 using Microsoft.Extensions.DependencyInjection;
 using Xunit.Abstractions;