Enable more tests to run during PR (#4784)

dotnet · Jun 30, 2023 · 6214cee · 6214cee
1 parent b64e141
commit 6214cee
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 52 deletions.
diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/FileSystemEgressExtensionTests.cs b/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/FileSystemEgressExtensionTests.cs
@@ -22,6 +22,7 @@
 
 namespace Microsoft.Diagnostics.Monitoring.Tool.UnitTests
 {
+    [TargetFrameworkMonikerTrait(TargetFrameworkMonikerExtensions.CurrentTargetFrameworkMoniker)]
     public sealed class FileSystemEgressExtensionTests
     {
         const string ProviderName = "TestProvider";

diff --git a/...ts/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/InProcessFeaturesOptionsBinderTests.cs b/...ts/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/InProcessFeaturesOptionsBinderTests.cs
@@ -2,13 +2,15 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.Diagnostics.Monitoring.Options;
+using Microsoft.Diagnostics.Monitoring.TestCommon;
 using Microsoft.Diagnostics.Tools.Monitor;
 using Microsoft.Extensions.Configuration;
 using System.Collections.Generic;
 using Xunit;
 
 namespace Microsoft.Diagnostics.Monitoring.Tool.UnitTests
 {
+    [TargetFrameworkMonikerTrait(TargetFrameworkMonikerExtensions.CurrentTargetFrameworkMoniker)]
     public sealed class InProcessFeaturesOptionsBinderTests
     {
         private const string FeatureConfigurationKey = "InProcessFeatures:TestFeature";
@@ -199,58 +201,6 @@ public void InProcessFeaturesOptionsBinder_BindEnabled_EnabledPropertyDisabledFe
             Assert.False(options.Enabled.Value);
         }
 
-        /// <summary>
-        /// Tests that a feature is enabled if InProcessFeatures:<Feature> is true.
-        /// </summary>
-        [Fact]
-        public void InProcessFeaturesOptionsBinder_BindEnabled_EnabledSection()
-        {
-            IConfigurationRoot configurationRoot = new ConfigurationBuilder()
-                .AddInMemoryCollection(new Dictionary<string, string>()
-                {
-                    { FeatureConfigurationKey, "true" }
-                })
-                .Build();
-
-            TestFeatureOptions options = new();
-
-            InProcessFeatureOptionsBinder.BindEnabled(
-                options,
-                FeatureConfigurationKey,
-                configurationRoot,
-                enabledByDefault: true);
-
-            Assert.True(options.Enabled.HasValue);
-            Assert.True(options.Enabled.Value);
-        }
-
-        /// <summary>
-        /// Tests that a feature is disabled if InProcessFeatures:<Feature> is true
-        /// and InProcessFeatures:Enabled is false.
-        /// </summary>
-        [Fact]
-        public void InProcessFeaturesOptionsBinder_BindEnabled_EnabledSectionDisabledFeatures()
-        {
-            IConfigurationRoot configurationRoot = new ConfigurationBuilder()
-                .AddInMemoryCollection(new Dictionary<string, string>()
-                {
-                    { ConfigurationKeys.InProcessFeatures_Enabled, "false" },
-                    { FeatureConfigurationKey, "true" }
-                })
-                .Build();
-
-            TestFeatureOptions options = new();
-
-            InProcessFeatureOptionsBinder.BindEnabled(
-                options,
-                FeatureConfigurationKey,
-                configurationRoot,
-                enabledByDefault: true);
-
-            Assert.True(options.Enabled.HasValue);
-            Assert.False(options.Enabled.Value);
-        }
-
         private sealed class TestFeatureOptions : IInProcessFeatureOptions
         {
             public bool? Enabled { get; set; }

diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/MetricsFormattingTests.cs b/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/MetricsFormattingTests.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.Diagnostics.Monitoring.EventPipe;
+using Microsoft.Diagnostics.Monitoring.TestCommon;
 using Microsoft.Diagnostics.Monitoring.WebApi;
 using Microsoft.Extensions.Logging;
 using System;
@@ -14,6 +15,7 @@
 
 namespace Microsoft.Diagnostics.Monitoring.Tool.UnitTests
 {
+    [TargetFrameworkMonikerTrait(TargetFrameworkMonikerExtensions.CurrentTargetFrameworkMoniker)]
     public sealed class MetricsFormattingTests
     {
         private ITestOutputHelper _outputHelper;

diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/MetricsSettingsTests.cs b/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/MetricsSettingsTests.cs
@@ -15,6 +15,7 @@
 
 namespace Microsoft.Diagnostics.Monitoring.Tool.UnitTests
 {
+    [TargetFrameworkMonikerTrait(TargetFrameworkMonikerExtensions.CurrentTargetFrameworkMoniker)]
     public class MetricsSettingsTests
     {
         private readonly ITestOutputHelper _outputHelper;