Skip to content

Commit 4a50248

Browse files
Copilotadamsitnik
Copilot
and
adamsitnik
committed
Address code review feedback - use PlatformSpecific with negation and fix ConditionalTheory
Co-authored-by: adamsitnik <6011991+adamsitnik@users.noreply.github.com>
1 parent 3243280 commit 4a50248

28 files changed

+142
-114
lines changed

‎test/Libraries/Microsoft.AspNetCore.Testing.Tests/FakeCertificateFactoryTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public void Create_CreatesCertificate()
2222
Assert.False(certificate.Extensions.OfType<X509EnhancedKeyUsageExtension>().Single().Critical);
2323
}
2424

25-
[PlatformSpecific(TestPlatforms.Windows | TestPlatforms.OSX)]
25+
[PlatformSpecific(~TestPlatforms.Linux)]
2626
[Theory]
2727
[InlineData(false)]
2828
[InlineData(true)]
@@ -31,7 +31,7 @@ public void GenerateRsa_RunsOnWindows_GeneratesRsa(bool runsOnWindows)
3131
Assert.NotNull(FakeSslCertificateFactory.GenerateRsa(runsOnWindows));
3232
}
3333

34-
[PlatformSpecific(TestPlatforms.Linux | TestPlatforms.OSX)]
34+
[PlatformSpecific(~TestPlatforms.Windows)]
3535
[Fact]
3636
public void GenerateRsa_DoesNotRunOnWindows_GeneratesRsa()
3737
{

‎test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/Linux/AcceptanceTest.cs‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,11 @@
2323

2424
namespace Microsoft.Extensions.Diagnostics.ResourceMonitoring.Linux.Test;
2525

26+
[PlatformSpecific(TestPlatforms.Linux)]
2627
public sealed class AcceptanceTest
2728
{
28-
[LinuxOnlyFact]
29+
[ConditionalFact]
30+
[PlatformSpecific(TestPlatforms.Linux)]
2931
public void Adding_Linux_Resource_Utilization_Allows_To_Query_Snapshot_Provider()
3032
{
3133
using var services = new ServiceCollection()
@@ -38,7 +40,8 @@ public void Adding_Linux_Resource_Utilization_Allows_To_Query_Snapshot_Provider(
3840
Assert.NotEqual(default, provider.GetSnapshot());
3941
}
4042

41-
[LinuxOnlyFact]
43+
[ConditionalFact]
44+
[PlatformSpecific(TestPlatforms.Linux)]
4245
[SuppressMessage("Minor Code Smell", "S3257:Declarations and initializations should be as concise as possible", Justification = "Broken analyzer.")]
4346
public void Adding_Linux_Resource_Utilization_Can_Be_Configured_With_Section()
4447
{
@@ -67,7 +70,8 @@ public void Adding_Linux_Resource_Utilization_Can_Be_Configured_With_Section()
6770
Assert.Equal(memoryRefresh, options.Value.MemoryConsumptionRefreshInterval);
6871
}
6972

70-
[LinuxOnlyFact]
73+
[ConditionalFact]
74+
[PlatformSpecific(TestPlatforms.Linux)]
7175
public void Adding_Linux_Resource_Utilization_Can_Be_Configured_With_Action()
7276
{
7377
var cpuRefresh = TimeSpan.FromMinutes(13);
@@ -88,7 +92,8 @@ public void Adding_Linux_Resource_Utilization_Can_Be_Configured_With_Action()
8892
Assert.Equal(memoryRefresh, options.Value.MemoryConsumptionRefreshInterval);
8993
}
9094

91-
[LinuxOnlyFact]
95+
[ConditionalFact]
96+
[PlatformSpecific(TestPlatforms.Linux)]
9297
[SuppressMessage("Minor Code Smell", "S3257:Declarations and initializations should be as concise as possible", Justification = "Broken analyzer.")]
9398
public void Adding_Linux_Resource_Utilization_With_Section_Registers_SnapshotProvider_Cgroupv1()
9499
{
@@ -136,7 +141,8 @@ public void Adding_Linux_Resource_Utilization_With_Section_Registers_SnapshotPro
136141
Assert.Equal(100_000UL, provider.Resources.MaximumMemoryInBytes);
137142
}
138143

139-
[LinuxOnlyFact]
144+
[ConditionalFact]
145+
[PlatformSpecific(TestPlatforms.Linux)]
140146
[SuppressMessage("Minor Code Smell", "S3257:Declarations and initializations should be as concise as possible", Justification = "Broken analyzer.")]
141147
public void Adding_Linux_Resource_Utilization_With_Section_Registers_SnapshotProvider_Cgroupv2()
142148
{
@@ -185,7 +191,7 @@ public void Adding_Linux_Resource_Utilization_With_Section_Registers_SnapshotPro
185191

186192
[ConditionalFact]
187193
[CombinatorialData]
188-
[OSSkipCondition(OperatingSystems.Windows | OperatingSystems.MacOSX, SkipReason = "Linux specific tests")]
194+
[PlatformSpecific(TestPlatforms.Linux)]
189195
public Task ResourceUtilizationTracker_And_Metrics_Report_Same_Values_With_Cgroupsv1()
190196
{
191197
var cpuRefresh = TimeSpan.FromMinutes(13);
@@ -283,7 +289,7 @@ public Task ResourceUtilizationTracker_And_Metrics_Report_Same_Values_With_Cgrou
283289

284290
[ConditionalFact]
285291
[CombinatorialData]
286-
[OSSkipCondition(OperatingSystems.Windows | OperatingSystems.MacOSX, SkipReason = "Linux specific tests")]
292+
[PlatformSpecific(TestPlatforms.Linux)]
287293
public Task ResourceUtilizationTracker_And_Metrics_Report_Same_Values_With_Cgroupsv2()
288294
{
289295
var cpuRefresh = TimeSpan.FromMinutes(13);
@@ -391,7 +397,7 @@ public Task ResourceUtilizationTracker_And_Metrics_Report_Same_Values_With_Cgrou
391397

392398
[ConditionalFact]
393399
[CombinatorialData]
394-
[OSSkipCondition(OperatingSystems.Windows | OperatingSystems.MacOSX, SkipReason = "Linux specific tests")]
400+
[PlatformSpecific(TestPlatforms.Linux)]
395401
public Task ResourceUtilizationTracker_And_Metrics_Report_Same_Values_With_Cgroupsv2_Using_LinuxCalculationV2()
396402
{
397403
var fileSystem = new HardcodedValueFileSystem(new Dictionary<FileInfo, string>

‎test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/Linux/Disk/DiskStatsReaderTests.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
namespace Microsoft.Extensions.Diagnostics.ResourceMonitoring.Linux.Disk.Test;
1111

12+
[PlatformSpecific(TestPlatforms.Linux)]
1213
public class DiskStatsReaderTests
1314
{
1415
private static readonly string[] _skipDevicePrefixes = new[] { "ram", "loop", "dm-" };

‎test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/Linux/Disk/LinuxSystemDiskMetricsTests.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
namespace Microsoft.Extensions.Diagnostics.ResourceMonitoring.Linux.Disk.Test;
1818

19+
[PlatformSpecific(TestPlatforms.Linux)]
1920
public class LinuxSystemDiskMetricsTests
2021
{
2122
private static readonly string[] _skipDevicePrefixes = new[] { "ram", "loop", "dm-" };

‎test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/Linux/LinuxCountersTests.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
namespace Microsoft.Extensions.Diagnostics.ResourceMonitoring.Linux.Test;
1717

18+
[PlatformSpecific(TestPlatforms.Linux)]
1819
public class LinuxCountersTests
1920
{
2021
[Fact]

‎test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/Linux/LinuxNetworkMetricsTests.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
namespace Microsoft.Extensions.Diagnostics.ResourceMonitoring.Linux.Test;
1717

18+
[PlatformSpecific(TestPlatforms.Linux)]
1819
public class LinuxNetworkMetricsTests
1920
{
2021
private readonly Mock<ITcpStateInfoProvider> _tcpStateInfoProvider = new();

‎test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/Linux/LinuxNetworkUtilizationParserTests.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
namespace Microsoft.Extensions.Diagnostics.ResourceMonitoring.Linux.Test;
1212

13+
[PlatformSpecific(TestPlatforms.Linux)]
1314
public sealed class LinuxNetworkUtilizationParserTests
1415
{
1516
private const string VerifiedDataDirectory = "Verified";

‎test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/Linux/LinuxUtilizationParserCgroupV1Tests.cs‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@
1313

1414
namespace Microsoft.Extensions.Diagnostics.ResourceMonitoring.Linux.Test;
1515

16+
[PlatformSpecific(TestPlatforms.Linux)]
1617
public sealed class LinuxUtilizationParserCgroupV1Tests
1718
{
18-
[LinuxOnlyTheory]
19+
[ConditionalTheory]
1920
[InlineData("DFIJEUWGHFWGBWEFWOMDOWKSLA")]
2021
[InlineData("")]
2122
[InlineData("________________________Asdasdasdas dd")]
@@ -38,7 +39,7 @@ public void Parser_Throws_When_Data_Is_Invalid(string line)
3839
Assert.Throws<NotSupportedException>(() => parser.GetCgroupRequestCpuV2());
3940
}
4041

41-
[LinuxOnlyFact]
42+
[ConditionalFact]
4243
public void Parser_Can_Read_Host_And_Cgroup_Available_Cpu_Count()
4344
{
4445
var parser = new LinuxUtilizationParserCgroupV1(new FileNamesOnlyFileSystem(TestResources.TestFilesLocation), new FakeUserHz(100));
@@ -49,7 +50,7 @@ public void Parser_Can_Read_Host_And_Cgroup_Available_Cpu_Count()
4950
Assert.Equal(1.0, cgroupCpuCount);
5051
}
5152

52-
[LinuxOnlyFact]
53+
[ConditionalFact]
5354
public void Parser_Provides_Total_Available_Memory_In_Bytes()
5455
{
5556
var fs = new FileNamesOnlyFileSystem(TestResources.TestFilesLocation);
@@ -60,7 +61,7 @@ public void Parser_Provides_Total_Available_Memory_In_Bytes()
6061
Assert.Equal(16_233_760UL * 1024, totalMem);
6162
}
6263

63-
[LinuxOnlyTheory]
64+
[ConditionalTheory]
6465
[InlineData("----------------------")]
6566
[InlineData("@ @#dddada")]
6667
[InlineData("1231234124124")]
@@ -91,7 +92,7 @@ public void When_Calling_GetMemoryUsageInBytes_Parser_Throws_When_MemoryStat_Doe
9192
Assert.Contains("total_inactive_file", r.Message);
9293
}
9394

94-
[LinuxOnlyTheory]
95+
[ConditionalTheory]
9596
[InlineData("----------------------")]
9697
[InlineData("@ @#dddada")]
9798
[InlineData("_1231234124124")]
@@ -117,7 +118,7 @@ public void When_Calling_GetMemoryUsageInBytes_Parser_Throws_When_UsageInBytes_D
117118
Assert.Contains("/sys/fs/cgroup/memory/memory.usage_in_bytes", r.Message);
118119
}
119120

120-
[LinuxOnlyTheory]
121+
[ConditionalTheory]
121122
[InlineData(10, 1)]
122123
[InlineData(23, 22)]
123124
[InlineData(100000, 10000)]
@@ -136,7 +137,7 @@ public void When_Calling_GetMemoryUsageInBytes_Parser_Throws_When_Inactive_Memor
136137
Assert.Contains("lesser than", r.Message);
137138
}
138139

139-
[LinuxOnlyTheory]
140+
[ConditionalTheory]
140141
[InlineData("Mem")]
141142
[InlineData("MemTotal:")]
142143
[InlineData("MemTotal: 120")]
@@ -162,7 +163,7 @@ public void When_Calling_GetHostAvailableMemory_Parser_Throws_When_MemInfo_Does_
162163
Assert.Contains("/proc/meminfo", r.Message);
163164
}
164165

165-
[LinuxOnlyTheory]
166+
[ConditionalTheory]
166167
[InlineData("kB", 231, 236544)]
167168
[InlineData("MB", 287, 300_941_312)]
168169
[InlineData("GB", 372, 399_431_958_528)]
@@ -181,7 +182,7 @@ public void When_Calling_GetHostAvailableMemory_Parser_Correctly_Transforms_Supp
181182
Assert.Equal(bytes, memory);
182183
}
183184

184-
[LinuxOnlyTheory]
185+
[ConditionalTheory]
185186
[InlineData("0-11", 12)]
186187
[InlineData("0", 1)]
187188
[InlineData("1000", 1)]
@@ -208,7 +209,7 @@ public void When_No_Cgroup_Cpu_Limits_Are_Not_Set_We_Get_Available_Cpus_From_Cpu
208209
Assert.Equal(result, cpus);
209210
}
210211

211-
[LinuxOnlyTheory]
212+
[ConditionalTheory]
212213
[InlineData("-11")]
213214
[InlineData("0-")]
214215
[InlineData("d-22")]
@@ -236,7 +237,7 @@ public void Parser_Throws_When_CpuSet_Has_Invalid_Content(string content)
236237
Assert.Contains("/sys/fs/cgroup/cpuset/cpuset.cpus", r.Message);
237238
}
238239

239-
[LinuxOnlyTheory]
240+
[ConditionalTheory]
240241
[InlineData("-1", "18")]
241242
[InlineData("18", "-1")]
242243
[InlineData("18", "")]
@@ -257,7 +258,7 @@ public void When_Quota_And_Period_Are_Minus_One_It_Fallbacks_To_Cpuset(string qu
257258
Assert.Contains("/sys/fs/cgroup/cpuset/cpuset.cpus", r.Message);
258259
}
259260

260-
[LinuxOnlyTheory]
261+
[ConditionalTheory]
261262
[InlineData("dd1d", "18")]
262263
[InlineData("-18", "18")]
263264
[InlineData("\r\r\r\r\r", "18")]
@@ -285,7 +286,7 @@ public void Parser_Throws_When_Cgroup_Cpu_Files_Contain_Invalid_Data(string quot
285286
Assert.Contains("/sys/fs/cgroup/cpu/cpu.cfs_", r.Message);
286287
}
287288

288-
[LinuxOnlyFact]
289+
[ConditionalFact]
289290
public void ReadingCpuUsage_Does_Not_Throw_For_Valid_Input()
290291
{
291292
var f = new HardcodedValueFileSystem(new Dictionary<FileInfo, string>
@@ -299,7 +300,7 @@ public void ReadingCpuUsage_Does_Not_Throw_For_Valid_Input()
299300
Assert.Null(r);
300301
}
301302

302-
[LinuxOnlyFact]
303+
[ConditionalFact]
303304
public void ReadingTotalMemory_Does_Not_Throw_For_Valid_Input()
304305
{
305306
var f = new HardcodedValueFileSystem(new Dictionary<FileInfo, string>
@@ -314,7 +315,7 @@ public void ReadingTotalMemory_Does_Not_Throw_For_Valid_Input()
314315
Assert.Null(r);
315316
}
316317

317-
[LinuxOnlyTheory]
318+
[ConditionalTheory]
318319
[InlineData("2569530367000")]
319320
[InlineData(" 2569530 36700 245693 4860924 82283 0 4360 0dsa 0 0 asdasd @@@@")]
320321
[InlineData("asdasd 2569530 36700 245693 4860924 82283 0 4360 0 0 0")]
@@ -335,7 +336,7 @@ public void ReadingCpuUsage_Does_Throws_For_Valid_Input(string content)
335336
Assert.Contains("proc/stat", r.Message);
336337
}
337338

338-
[LinuxOnlyTheory]
339+
[ConditionalTheory]
339340
[InlineData("-1")]
340341
[InlineData("")]
341342
public void Parser_Throws_When_Cgroup_Cpu_Shares_Files_Contain_Invalid_Data(string content)
@@ -352,7 +353,7 @@ public void Parser_Throws_When_Cgroup_Cpu_Shares_Files_Contain_Invalid_Data(stri
352353
Assert.Contains("/sys/fs/cgroup/cpu/cpu.shares", r.Message);
353354
}
354355

355-
[LinuxOnlyFact]
356+
[ConditionalFact]
356357
public async Task ThreadSafetyAsync()
357358
{
358359
var f1 = new HardcodedValueFileSystem(new Dictionary<FileInfo, string>

0 commit comments

Comments
 (0)