Skip to content

Commit 142a8c1

Browse files
sbomersbomer
committed
Fix more test failures
1 parent 6deccef commit 142a8c1

File tree

4 files changed

+89
-9
lines changed

4 files changed

+89
-9
lines changed

‎src/Tests/CollectionRuleActions.UnitTests/CollectTraceActionTests.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,8 @@ await TestHostHelper.CreateCollectionRulesHost(_outputHelper, rootOptions =>
8080
options.Duration = TimeSpan.FromSeconds(2);
8181
})
8282
.SetStartupTrigger();
83-
}, host => PerformTrace(host, tfm));
83+
}, host => PerformTrace(host, tfm),
84+
TestValidatableTypes.AddValidation);
8485
}
8586

8687
[Fact]

‎src/Tests/CollectionRuleActions.UnitTests/LoadProfilerActionTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ await runner.ExecuteAsync(async () =>
7373

7474
await runner.SendCommandAsync(TestAppScenarios.AsyncWait.Commands.Continue);
7575
});
76-
});
76+
}, TestValidatableTypes.AddValidation);
7777
}
7878

7979
/// <summary>

‎src/Tests/CollectionRuleActions.UnitTests/TestValidatableType.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ internal sealed class TestValidatableTypes
3838

3939
public required FileSystemEgressProviderOptions FileSystemEgressProviderOptions { get; init; }
4040

41+
public required CollectDumpOptions CollectDumpOptions { get; init; }
42+
43+
public required LoadProfilerOptions LoadProfilerOptions { get; init; }
44+
4145
public static void AddValidation(IServiceCollection services)
4246
{
4347
GeneratedServiceCollectionExtensions.AddValidation(services);

‎src/Tests/CollectionRuleActions.UnitTests/ValidatableInfoResolver.cs

Lines changed: 82 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,16 @@ public bool TryGetValidatableTypeInfo(global::System.Type type, [global::System.
294294
validatableInfo = CreateFileSystemEgressProviderOptions();
295295
return true;
296296
}
297+
if (type == typeof(global::Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options.Actions.CollectDumpOptions))
298+
{
299+
validatableInfo = CreateCollectDumpOptions();
300+
return true;
301+
}
302+
if (type == typeof(global::Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options.Actions.LoadProfilerOptions))
303+
{
304+
validatableInfo = CreateLoadProfilerOptions();
305+
return true;
306+
}
297307
if (type == typeof(global::Microsoft.Diagnostics.Tools.Monitor.TestValidatableTypes))
298308
{
299309
validatableInfo = CreateTestValidatableTypes();
@@ -717,12 +727,13 @@ private ValidatableTypeInfo CreateGuid()
717727
return new GeneratedValidatableTypeInfo(
718728
type: typeof(global::System.Guid),
719729
members: [
720-
new GeneratedValidatablePropertyInfo(
721-
containingType: typeof(global::System.Guid),
722-
propertyType: typeof(global::System.Guid),
723-
name: "AllBitsSet",
724-
displayName: "AllBitsSet"
725-
),
730+
// https://github.com/dotnet/aspnetcore/issues/61525
731+
// new GeneratedValidatablePropertyInfo(
732+
// containingType: typeof(global::System.Guid),
733+
// propertyType: typeof(global::System.Guid),
734+
// name: "AllBitsSet",
735+
// displayName: "AllBitsSet"
736+
// ),
726737
]
727738
);
728739
}
@@ -1500,6 +1511,58 @@ private ValidatableTypeInfo CreateFileSystemEgressProviderOptions()
15001511
]
15011512
);
15021513
}
1514+
private ValidatableTypeInfo CreateCollectDumpOptions()
1515+
{
1516+
return new GeneratedValidatableTypeInfo(
1517+
type: typeof(global::Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options.Actions.CollectDumpOptions),
1518+
members: [
1519+
// new GeneratedValidatablePropertyInfo(
1520+
// containingType: typeof(global::Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options.Actions.CollectDumpOptions),
1521+
// propertyType: typeof(global::System.Type),
1522+
// name: "EqualityContract",
1523+
// displayName: "EqualityContract"
1524+
// ),
1525+
new GeneratedValidatablePropertyInfo(
1526+
containingType: typeof(global::Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options.Actions.CollectDumpOptions),
1527+
propertyType: typeof(global::Microsoft.Diagnostics.Monitoring.WebApi.Models.DumpType?),
1528+
name: "Type",
1529+
displayName: "Microsoft.Diagnostics.Monitoring.WebApi.OptionsDisplayStrings"
1530+
),
1531+
new GeneratedValidatablePropertyInfo(
1532+
containingType: typeof(global::Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options.Actions.CollectDumpOptions),
1533+
propertyType: typeof(string),
1534+
name: "Egress",
1535+
displayName: "Microsoft.Diagnostics.Monitoring.WebApi.OptionsDisplayStrings"
1536+
),
1537+
]
1538+
);
1539+
}
1540+
private ValidatableTypeInfo CreateLoadProfilerOptions()
1541+
{
1542+
return new GeneratedValidatableTypeInfo(
1543+
type: typeof(global::Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options.Actions.LoadProfilerOptions),
1544+
members: [
1545+
// new GeneratedValidatablePropertyInfo(
1546+
// containingType: typeof(global::Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options.Actions.LoadProfilerOptions),
1547+
// propertyType: typeof(global::System.Type),
1548+
// name: "EqualityContract",
1549+
// displayName: "EqualityContract"
1550+
// ),
1551+
new GeneratedValidatablePropertyInfo(
1552+
containingType: typeof(global::Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options.Actions.LoadProfilerOptions),
1553+
propertyType: typeof(string),
1554+
name: "Path",
1555+
displayName: "Microsoft.Diagnostics.Monitoring.WebApi.OptionsDisplayStrings"
1556+
),
1557+
new GeneratedValidatablePropertyInfo(
1558+
containingType: typeof(global::Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options.Actions.LoadProfilerOptions),
1559+
propertyType: typeof(global::System.Guid),
1560+
name: "Clsid",
1561+
displayName: "Microsoft.Diagnostics.Monitoring.WebApi.OptionsDisplayStrings"
1562+
),
1563+
]
1564+
);
1565+
}
15031566
private ValidatableTypeInfo CreateTestValidatableTypes()
15041567
{
15051568
return new GeneratedValidatableTypeInfo(
@@ -1565,6 +1628,18 @@ private ValidatableTypeInfo CreateTestValidatableTypes()
15651628
name: "FileSystemEgressProviderOptions",
15661629
displayName: "FileSystemEgressProviderOptions"
15671630
),
1631+
new GeneratedValidatablePropertyInfo(
1632+
containingType: typeof(global::Microsoft.Diagnostics.Tools.Monitor.TestValidatableTypes),
1633+
propertyType: typeof(global::Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options.Actions.CollectDumpOptions),
1634+
name: "CollectDumpOptions",
1635+
displayName: "CollectDumpOptions"
1636+
),
1637+
new GeneratedValidatablePropertyInfo(
1638+
containingType: typeof(global::Microsoft.Diagnostics.Tools.Monitor.TestValidatableTypes),
1639+
propertyType: typeof(global::Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options.Actions.LoadProfilerOptions),
1640+
name: "LoadProfilerOptions",
1641+
displayName: "LoadProfilerOptions"
1642+
),
15681643
]
15691644
);
15701645
}
@@ -1574,7 +1649,7 @@ private ValidatableTypeInfo CreateTestValidatableTypes()
15741649
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.Http.ValidationsGenerator, Version=10.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60", "10.0.0.0")]
15751650
internal static class GeneratedServiceCollectionExtensions
15761651
{
1577-
// [global::System.Runtime.CompilerServices.InterceptsLocationAttribute(1, "o12abVmqqV0zqGgiPVl+aU9UAQBWYWxpZGF0YWJsZUluZm9SZXNvbHZlci5jcw==")]
1652+
// [global::System.Runtime.CompilerServices.InterceptsLocationAttribute(1, "tmDjl/scvJBp7h4Jis0nT+NkAQBWYWxpZGF0YWJsZUluZm9SZXNvbHZlci5jcw==")]
15781653
public static global::Microsoft.Extensions.DependencyInjection.IServiceCollection AddValidation(this global::Microsoft.Extensions.DependencyInjection.IServiceCollection services, global::System.Action<ValidationOptions>? configureOptions = null)
15791654
{
15801655
// Use non-extension method to avoid infinite recursion.

0 commit comments

Comments
 (0)