From 351fc0c03c60ba44ade023147367ea549b866c8d Mon Sep 17 00:00:00 2001 From: Evgenii Fedorov Date: Mon, 6 Jan 2025 11:58:15 +0100 Subject: [PATCH] Added more conditions to OS specific tests Remove unused project references --- .gitignore | 1 + ...ions.Diagnostics.ResourceMonitoring.csproj | 1 - ...lthChecks.ResourceUtilization.Tests.csproj | 1 + .../ResourceHealthCheckExtensionsTests.cs | 46 ++++++++++--------- .../ResourceMonitoringBuilderTests.cs | 6 ++- .../ResourceMonitoringExtensionsTests.cs | 18 ++++---- 6 files changed, 40 insertions(+), 33 deletions(-) diff --git a/.gitignore b/.gitignore index 4e8c5f439a9..7f8315b2a36 100644 --- a/.gitignore +++ b/.gitignore @@ -314,3 +314,4 @@ BenchmarkDotNet.artifacts/ *.binlog /eng/scripts/repo-digest.html +**/.DS_Store diff --git a/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Microsoft.Extensions.Diagnostics.ResourceMonitoring.csproj b/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Microsoft.Extensions.Diagnostics.ResourceMonitoring.csproj index 3e46b1f400d..5f5890dd420 100644 --- a/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Microsoft.Extensions.Diagnostics.ResourceMonitoring.csproj +++ b/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Microsoft.Extensions.Diagnostics.ResourceMonitoring.csproj @@ -40,7 +40,6 @@ - diff --git a/test/Libraries/Microsoft.Extensions.Diagnostics.HealthChecks.ResourceUtilization.Tests/Microsoft.Extensions.Diagnostics.HealthChecks.ResourceUtilization.Tests.csproj b/test/Libraries/Microsoft.Extensions.Diagnostics.HealthChecks.ResourceUtilization.Tests/Microsoft.Extensions.Diagnostics.HealthChecks.ResourceUtilization.Tests.csproj index 6ffb8086b4b..db56ee5e43f 100644 --- a/test/Libraries/Microsoft.Extensions.Diagnostics.HealthChecks.ResourceUtilization.Tests/Microsoft.Extensions.Diagnostics.HealthChecks.ResourceUtilization.Tests.csproj +++ b/test/Libraries/Microsoft.Extensions.Diagnostics.HealthChecks.ResourceUtilization.Tests/Microsoft.Extensions.Diagnostics.HealthChecks.ResourceUtilization.Tests.csproj @@ -6,6 +6,7 @@ + diff --git a/test/Libraries/Microsoft.Extensions.Diagnostics.HealthChecks.ResourceUtilization.Tests/ResourceHealthCheckExtensionsTests.cs b/test/Libraries/Microsoft.Extensions.Diagnostics.HealthChecks.ResourceUtilization.Tests/ResourceHealthCheckExtensionsTests.cs index 122c283ede8..5319e2922d8 100644 --- a/test/Libraries/Microsoft.Extensions.Diagnostics.HealthChecks.ResourceUtilization.Tests/ResourceHealthCheckExtensionsTests.cs +++ b/test/Libraries/Microsoft.Extensions.Diagnostics.HealthChecks.ResourceUtilization.Tests/ResourceHealthCheckExtensionsTests.cs @@ -8,14 +8,16 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Diagnostics.ResourceMonitoring; using Microsoft.Extensions.Options; +using Microsoft.TestUtilities; using Moq; using Xunit; namespace Microsoft.Extensions.Diagnostics.HealthChecks.Test; +[OSSkipCondition(OperatingSystems.MacOSX, SkipReason = "Not supported on MacOs.")] public class ResourceHealthCheckExtensionsTests { - [Fact] + [ConditionalFact] public async Task AddResourceHealthCheck() { var dataTracker = new Mock(); @@ -35,7 +37,7 @@ public async Task AddResourceHealthCheck() dataTracker.Verify(tracker => tracker.GetUtilization(samplingWindow), Times.Once); } - [Fact] + [ConditionalFact] public async Task AddResourceHealthCheck_WithCustomResourceMonitorAddedAfterInternalResourceMonitor_OverridesIt() { var dataTracker = new Mock(); @@ -55,7 +57,7 @@ public async Task AddResourceHealthCheck_WithCustomResourceMonitorAddedAfterInte dataTracker.Verify(tracker => tracker.GetUtilization(samplingWindow), Times.Once); } - [Fact] + [ConditionalFact] public void AddResourceHealthCheck_RegistersInternalResourceMonitoring() { var dataTracker = new Mock(); @@ -75,7 +77,7 @@ public void AddResourceHealthCheck_RegistersInternalResourceMonitoring() Assert.NotNull(resourceMonitor); } - [Fact] + [ConditionalFact] public async Task AddResourceHealthCheck_WithTags() { var dataTracker = new Mock(); @@ -95,7 +97,7 @@ public async Task AddResourceHealthCheck_WithTags() dataTracker.Verify(tracker => tracker.GetUtilization(samplingWindow), Times.Once); } - [Fact] + [ConditionalFact] public void AddResourceHealthCheck_WithTags_RegistersInternalResourceMonitoring() { var serviceCollection = new ServiceCollection(); @@ -110,7 +112,7 @@ public void AddResourceHealthCheck_WithTags_RegistersInternalResourceMonitoring( Assert.NotNull(resourceMonitor); } - [Fact] + [ConditionalFact] public async Task AddResourceHealthCheck_WithTags_WithCustomResourceMonitorAddedAfterInternalResourceMonitor_OverridesIt() { var dataTracker = new Mock(); @@ -130,7 +132,7 @@ public async Task AddResourceHealthCheck_WithTags_WithCustomResourceMonitorAdded dataTracker.Verify(tracker => tracker.GetUtilization(samplingWindow), Times.Once); } - [Fact] + [ConditionalFact] public async Task AddResourceHealthCheck_WithTagsEnumerable() { var dataTracker = new Mock(); @@ -150,7 +152,7 @@ public async Task AddResourceHealthCheck_WithTagsEnumerable() dataTracker.Verify(tracker => tracker.GetUtilization(samplingWindow), Times.Once); } - [Fact] + [ConditionalFact] public void AddResourceHealthCheck_WithTagsEnumerable_RegistersInternalResourceMonitoring() { var serviceCollection = new ServiceCollection(); @@ -165,7 +167,7 @@ public void AddResourceHealthCheck_WithTagsEnumerable_RegistersInternalResourceM Assert.NotNull(resourceMonitor); } - [Fact] + [ConditionalFact] public async Task AddResourceHealthCheck_WithAction() { var dataTracker = new Mock(); @@ -188,7 +190,7 @@ public async Task AddResourceHealthCheck_WithAction() dataTracker.Verify(tracker => tracker.GetUtilization(samplingWindow), Times.Once); } - [Fact] + [ConditionalFact] public void AddResourceHealthCheck_WithAction_RegistersInternalResourceMonitoring() { var serviceCollection = new ServiceCollection(); @@ -206,7 +208,7 @@ public void AddResourceHealthCheck_WithAction_RegistersInternalResourceMonitorin Assert.NotNull(resourceMonitor); } - [Fact] + [ConditionalFact] public async Task AddResourceHealthCheck_WithActionAndTags() { var dataTracker = new Mock(); @@ -230,7 +232,7 @@ public async Task AddResourceHealthCheck_WithActionAndTags() dataTracker.Verify(tracker => tracker.GetUtilization(samplingWindow), Times.Once); } - [Fact] + [ConditionalFact] public void AddResourceHealthCheck_WithActionAndTags_RegistersInternalResourceMonitoring() { var serviceCollection = new ServiceCollection(); @@ -249,7 +251,7 @@ public void AddResourceHealthCheck_WithActionAndTags_RegistersInternalResourceMo Assert.NotNull(resourceMonitor); } - [Fact] + [ConditionalFact] public async Task AddResourceHealthCheck_WithActionAndTagsEnumerable() { var dataTracker = new Mock(); @@ -273,7 +275,7 @@ public async Task AddResourceHealthCheck_WithActionAndTagsEnumerable() dataTracker.Verify(tracker => tracker.GetUtilization(samplingWindow), Times.Once); } - [Fact] + [ConditionalFact] public void AddResourceHealthCheck_WithActionAndTagsEnumerable_RegistersInternalResourceMonitoring() { var serviceCollection = new ServiceCollection(); @@ -292,7 +294,7 @@ public void AddResourceHealthCheck_WithActionAndTagsEnumerable_RegistersInternal Assert.NotNull(resourceMonitor); } - [Fact] + [ConditionalFact] public async Task AddResourceHealthCheck_WithConfigurationSection() { var dataTracker = new Mock(); @@ -311,7 +313,7 @@ public async Task AddResourceHealthCheck_WithConfigurationSection() dataTracker.Verify(tracker => tracker.GetUtilization(samplingWindow), Times.Once); } - [Fact] + [ConditionalFact] public void AddResourceHealthCheck_WithConfigurationSection_RegistersInternalResourceMonitoring() { var serviceCollection = new ServiceCollection(); @@ -326,7 +328,7 @@ public void AddResourceHealthCheck_WithConfigurationSection_RegistersInternalRes Assert.NotNull(resourceMonitor); } - [Fact] + [ConditionalFact] public async Task AddResourceHealthCheck_WithConfigurationSectionAndTags() { var dataTracker = new Mock(); @@ -347,7 +349,7 @@ public async Task AddResourceHealthCheck_WithConfigurationSectionAndTags() dataTracker.Verify(tracker => tracker.GetUtilization(samplingWindow), Times.Once); } - [Fact] + [ConditionalFact] public void AddResourceHealthCheck_WithConfigurationSectionAndTags_RegistersInternalResourceMonitoring() { var serviceCollection = new ServiceCollection(); @@ -363,7 +365,7 @@ public void AddResourceHealthCheck_WithConfigurationSectionAndTags_RegistersInte Assert.NotNull(resourceMonitor); } - [Fact] + [ConditionalFact] public async Task AddResourceHealthCheck_WithConfigurationSectionAndTagsEnumerable() { var dataTracker = new Mock(); @@ -384,7 +386,7 @@ public async Task AddResourceHealthCheck_WithConfigurationSectionAndTagsEnumerab dataTracker.Verify(tracker => tracker.GetUtilization(samplingWindow), Times.Once); } - [Fact] + [ConditionalFact] public void AddResourceHealthCheck_WithConfigurationSectionAndTagsEnumerable_RegistersInternalResourceMonitoring() { var serviceCollection = new ServiceCollection(); @@ -401,7 +403,7 @@ public void AddResourceHealthCheck_WithConfigurationSectionAndTagsEnumerable_Reg Assert.NotNull(resourceMonitor); } - [Fact] + [ConditionalFact] public void ConfigureResourceUtilizationHealthCheck_WithAction() { TimeSpan samplingWindow = TimeSpan.FromSeconds(1); @@ -423,7 +425,7 @@ public void ConfigureResourceUtilizationHealthCheck_WithAction() Assert.Equal(0.4, options.CpuThresholds.UnhealthyUtilizationPercentage); } - [Fact] + [ConditionalFact] public void ConfigureResourceUtilizationHealthCheck_WithConfigurationSection() { TimeSpan samplingWindow = TimeSpan.FromSeconds(5); diff --git a/test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/ResourceMonitoringBuilderTests.cs b/test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/ResourceMonitoringBuilderTests.cs index 4247b390711..d2e3d5d8292 100644 --- a/test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/ResourceMonitoringBuilderTests.cs +++ b/test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/ResourceMonitoringBuilderTests.cs @@ -4,13 +4,15 @@ using System.Linq; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Diagnostics.ResourceMonitoring.Test.Publishers; +using Microsoft.TestUtilities; using Xunit; namespace Microsoft.Extensions.Diagnostics.ResourceMonitoring.Test; +[OSSkipCondition(OperatingSystems.MacOSX, SkipReason = "Not supported on MacOs.")] public sealed class ResourceMonitoringBuilderTests { - [Fact] + [ConditionalFact(Skip = "Not supported on MacOs.")] public void AddPublisher_CalledOnce_AddsSinglePublisherToServiceCollection() { using var provider = new ServiceCollection() @@ -31,7 +33,7 @@ public void AddPublisher_CalledOnce_AddsSinglePublisherToServiceCollection() Assert.IsAssignableFrom(publishersArray.First()); } - [Fact] + [ConditionalFact] public void AddPublisher_CalledMultipleTimes_AddsMultiplePublishersToServiceCollection() { using var provider = new ServiceCollection() diff --git a/test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/ResourceMonitoringExtensionsTests.cs b/test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/ResourceMonitoringExtensionsTests.cs index 447c9d4c827..ccdd81e6c4e 100644 --- a/test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/ResourceMonitoringExtensionsTests.cs +++ b/test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/ResourceMonitoringExtensionsTests.cs @@ -11,13 +11,15 @@ using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Hosting.Testing; using Microsoft.Extensions.Options; +using Microsoft.TestUtilities; using Xunit; namespace Microsoft.Extensions.Diagnostics.ResourceMonitoring.Test; +[OSSkipCondition(OperatingSystems.MacOSX, SkipReason = "Not supported on MacOs.")] public sealed class ResourceMonitoringExtensionsTests { - [Fact] + [ConditionalFact] public void Throw_Null_When_Registration_Ingredients_Null() { var services = new ServiceCollection(); @@ -28,7 +30,7 @@ public void Throw_Null_When_Registration_Ingredients_Null() Assert.Throws(() => services.AddResourceMonitoring((b) => b.ConfigureMonitor((Action)null!))); } - [Fact] + [ConditionalFact] public void AddResourceUtilization_AddsResourceMonitoringService_ToServicesCollection() { using var provider = new ServiceCollection() @@ -48,7 +50,7 @@ public void AddResourceUtilization_AddsResourceMonitoringService_ToServicesColle Assert.IsAssignableFrom(trackerService); } - [Fact] + [ConditionalFact] public void AddResourceUtilization_AddsResourceMonitoringService_ToServicesCollection_NoArgs() { using var provider = new ServiceCollection() @@ -64,7 +66,7 @@ public void AddResourceUtilization_AddsResourceMonitoringService_ToServicesColle Assert.IsAssignableFrom(trackerService); } - [Fact] + [ConditionalFact] public void AddResourceUtilization_AddsResourceMonitoringService_AsHostedService() { using var provider = new ServiceCollection() @@ -85,7 +87,7 @@ public void AddResourceUtilization_AddsResourceMonitoringService_AsHostedService Assert.IsAssignableFrom(trackerService); } - [Fact] + [ConditionalFact] public void ConfigureResourceUtilization_InitializeTrackerProperly() { using var host = FakeHost.CreateBuilder() @@ -111,7 +113,7 @@ public void ConfigureResourceUtilization_InitializeTrackerProperly() Assert.NotNull(publisher); } - [Fact] + [ConditionalFact] public void ConfigureTracker_GivenOptionsDelegate_InitializeTrackerWithOptionsProperly() { const int SamplingWindowValue = 3; @@ -139,7 +141,7 @@ public void ConfigureTracker_GivenOptionsDelegate_InitializeTrackerWithOptionsPr Assert.Equal(TimeSpan.FromSeconds(CalculationPeriodValue), options!.Value.PublishingWindow); } - [Fact] + [ConditionalFact] public void ConfigureTracker_GivenIConfigurationSection_InitializeTrackerWithOptionsProperly() { const int SamplingWindowValue = 3; @@ -180,7 +182,7 @@ public void ConfigureTracker_GivenIConfigurationSection_InitializeTrackerWithOpt Assert.Equal(TimeSpan.FromSeconds(CalculationPeriod), options!.Value.PublishingWindow); } - [Fact] + [ConditionalFact] public void Registering_Resource_Utilization_Adds_Only_One_Object_Of_Type_ResourceUtilizationService_To_DI_Container() { using var host = FakeHost.CreateBuilder()