Fix FileSystemEgressExtension_DirectoryPath_Success

Author: sbomer

src/Microsoft.Diagnostics.Monitoring.Options/Microsoft.Diagnostics.Monitoring.Options.csproj

@@ -22,6 +22,7 @@
     <InternalsVisibleTo Include="Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests" />
     <InternalsVisibleTo Include="Microsoft.Diagnostics.Monitoring.Tool.UnitTestCommon" />
     <InternalsVisibleTo Include="Microsoft.Diagnostics.Monitoring.Tool.UnitTests" />
+    <InternalsVisibleTo Include="Microsoft.Diagnostics.Monitoring.Tool.UnitTestsSample" />
     <InternalsVisibleTo Include="Microsoft.Diagnostics.Monitoring.WebApi" />
     <InternalsVisibleTo Include="Microsoft.Diagnostics.Monitoring.WebApi.UnitTests" />
     <InternalsVisibleTo Include="$(MoqInternalsVisibleTo)" Key="$(MoqInternalsVisibleToKey)" />

src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/FileSystemEgressExtensionTests.cs

@@ -1,12 +1,15 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Microsoft.AspNetCore.Http.Validation;
+using Microsoft.AspNetCore.Mvc.Testing;
 using Microsoft.Diagnostics.Monitoring.TestCommon;
 using Microsoft.Diagnostics.Tools.Monitor;
 using Microsoft.Diagnostics.Tools.Monitor.Egress;
 using Microsoft.Diagnostics.Tools.Monitor.Egress.Configuration;
 using Microsoft.Diagnostics.Tools.Monitor.Egress.FileSystem;
 using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Moq;
@@ -22,8 +25,12 @@
 
 namespace Microsoft.Diagnostics.Monitoring.Tool.UnitTests
 {
+    public class FileSystemEgressExtensionFixture : WebApplicationFactory<Program>
+    {
+    }
+
     [TargetFrameworkMonikerTrait(TargetFrameworkMonikerExtensions.CurrentTargetFrameworkMoniker)]
-    public sealed class FileSystemEgressExtensionTests
+    public sealed class FileSystemEgressExtensionTests : IClassFixture<FileSystemEgressExtensionFixture>
     {
         const string ProviderName = "TestProvider";
         const string ExpectedFileName = "EgressedData.txt";
@@ -35,10 +42,12 @@ public sealed class FileSystemEgressExtensionTests
             FileSystemEgressProviderOptions.CopyBufferSize_MaxValue.ToString());
 
         private readonly ITestOutputHelper _outputHelper;
+        private readonly FileSystemEgressExtensionFixture _fixture;
 
-        public FileSystemEgressExtensionTests(ITestOutputHelper outputHelper)
+        public FileSystemEgressExtensionTests(ITestOutputHelper outputHelper, FileSystemEgressExtensionFixture fixture)
         {
             _outputHelper = outputHelper;
+            _fixture = fixture;
         }
 
         [Fact]
@@ -145,7 +154,7 @@ public async Task FileSystemEgressExtension_IntermediateDirectoryPath_Success()
             Assert.False(intermediateDirInfo.EnumerateFiles().Any(), "Intermediate directory should not contain any files.");
         }
 
-        private static IEgressExtension CreateExtension(Action<ConfigurationSection> callback = null)
+        private IEgressExtension CreateExtension(Action<ConfigurationSection> callback = null)
         {
             List<IConfigurationProvider> configProviders = new()
             {
@@ -163,6 +172,8 @@ private static IEgressExtension CreateExtension(Action<ConfigurationSection> cal
 
             Mock<ILogger<FileSystemEgressExtension>> mockLogger = new();
             Mock<IServiceProvider> mockServiceProvider = new();
+            mockServiceProvider.Setup(provider => provider.GetService(typeof(IOptions<ValidationOptions>)))
+                .Returns(_fixture.Services.GetRequiredService<IOptions<ValidationOptions>>());
 
             return new FileSystemEgressExtension(mockServiceProvider.Object, mockConfigurationProvider.Object, mockLogger.Object);
         }

src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTestsSample/Program.cs

@@ -2,7 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.AspNetCore.Http.Validation;
+using Microsoft.Diagnostics.Tools.Monitor;
 using Microsoft.Diagnostics.Tools.Monitor.Extensibility;
+using Microsoft.Diagnostics.Tools.Monitor.Egress.FileSystem;
 
 var builder = WebApplication.CreateBuilder(args);
 builder.Services.AddValidation();
@@ -14,4 +16,8 @@ public partial class Program {}
 sealed class TestValidatableType
 {
     public required ExtensionManifest ExtensionManifest { get; init; }
+
+    // public RootOptions RootOptions { get; init; } // TODO: this hits bad generated code.
+    // Take a more granular approach for now.
+    public required FileSystemEgressProviderOptions FileSystemEgressProviderOptions { get; init; }
 }